From 82f780e948444cd9938613e99b3a77f32056f3ba Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Thu, 19 Jan 2012 20:16:54 +0100
Subject: [PATCH 001/999] [REM] unused imports.

bzr revid: florent.xicluna@gmail.com-20120119191654-scm8c3o07icyz5b1
---
 openerp/osv/fields.py     | 3 ---
 openerp/tests/common.py   | 1 -
 openerp/tests/test_orm.py | 1 -
 openerp/tiny_socket.py    | 1 -
 4 files changed, 6 deletions(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 871fc32f884..ff02a8c89f9 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -35,14 +35,11 @@
 import base64
 import datetime as DT
 import re
-import string
-import sys
 import warnings
 import xmlrpclib
 from psycopg2 import Binary
 
 import openerp
-import openerp.netsvc as netsvc
 import openerp.tools as tools
 from openerp.tools.translate import _
 from openerp.tools import float_round, float_repr
diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index 44696384ce7..93e5f6d5bc2 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import os
 import time
 import xmlrpclib
 
diff --git a/openerp/tests/test_orm.py b/openerp/tests/test_orm.py
index c11d4cd19d2..cf880933fe5 100644
--- a/openerp/tests/test_orm.py
+++ b/openerp/tests/test_orm.py
@@ -1,4 +1,3 @@
-import os
 import unittest2
 
 import openerp
diff --git a/openerp/tiny_socket.py b/openerp/tiny_socket.py
index b4bed83a4c0..f86797f0f67 100644
--- a/openerp/tiny_socket.py
+++ b/openerp/tiny_socket.py
@@ -22,7 +22,6 @@
 import socket
 import cPickle
 import cStringIO
-import marshal
 
 import netsvc
 

From e7838dfbc44472a444b1f58dd7869febbc5984b7 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Thu, 19 Jan 2012 20:17:56 +0100
Subject: [PATCH 002/999] [REF] fix weird indentation, not multiple of four.

bzr revid: florent.xicluna@gmail.com-20120119191756-niny262vp1nvmpp8
---
 openerp/netsvc.py                | 16 ++++++++--------
 openerp/osv/orm.py               | 12 ++++++------
 openerp/service/netrpc_server.py |  6 +++---
 openerp/service/web_services.py  | 10 +++++-----
 openerp/tests/test_xmlrpc.py     |  4 ++--
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index ca08a362771..53750ed84da 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -84,12 +84,12 @@ class Service(object):
             cls._services.pop(name)
 
 def LocalService(name):
-  # Special case for addons support, will be removed in a few days when addons
-  # are updated to directly use openerp.osv.osv.service.
-  if name == 'object_proxy':
-      return openerp.osv.osv.service
+    # Special case for addons support, will be removed in a few days when addons
+    # are updated to directly use openerp.osv.osv.service.
+    if name == 'object_proxy':
+        return openerp.osv.osv.service
 
-  return Service._services[name]
+    return Service._services[name]
 
 class ExportService(object):
     """ Proxy for exported services.
@@ -198,9 +198,9 @@ def init_logger():
 # 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
+        def emit(self, record):
+            if record.levelno > 20:
+                print record.levelno, record.pathname, record.msg
     handler = H()
     logger = logging.getLogger()
     logger.handlers = []
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 1c12fab27c9..f2686708436 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -98,10 +98,10 @@ def transfer_node_to_modifiers(node, modifiers, context=None, in_tree_view=False
 
     if node.get('states'):
         if 'invisible' in modifiers and isinstance(modifiers['invisible'], list):
-             # TODO combine with AND or OR, use implicit AND for now.
-             modifiers['invisible'].append(('state', 'not in', node.get('states').split(',')))
+            # TODO combine with AND or OR, use implicit AND for now.
+            modifiers['invisible'].append(('state', 'not in', node.get('states').split(',')))
         else:
-             modifiers['invisible'] = [('state', 'not in', node.get('states').split(','))]
+            modifiers['invisible'] = [('state', 'not in', node.get('states').split(','))]
 
     for a in ('invisible', 'readonly', 'required'):
         if node.get(a):
@@ -894,8 +894,8 @@ class BaseModel(object):
                         for c in cls.__dict__.get(s, []):
                             exist = False
                             for c2 in range(len(new)):
-                                 #For _constraints, we should check field and methods as well
-                                 if new[c2][2]==c[2] and (new[c2][0] == c[0] \
+                                #For _constraints, we should check field and methods as well
+                                if new[c2][2]==c[2] and (new[c2][0] == c[0] \
                                         or getattr(new[c2][0],'__name__', True) == \
                                             getattr(c[0],'__name__', False)):
                                     # If new class defines a constraint with
@@ -2690,7 +2690,7 @@ class BaseModel(object):
         elif val in dict(self._columns[field].selection(self, cr, uid, context=context)):
             return
         raise except_orm(_('ValidateError'),
-			_('The value "%s" for the field "%s.%s" is not in the selection') % (value, self._table, field))
+                         _('The value "%s" for the field "%s.%s" is not in the selection') % (value, self._table, field))
 
     def _check_removed_columns(self, cr, log=False):
         # iterate on the database columns to drop the NOT NULL constraints
diff --git a/openerp/service/netrpc_server.py b/openerp/service/netrpc_server.py
index f86d6d21273..efe26906720 100644
--- a/openerp/service/netrpc_server.py
+++ b/openerp/service/netrpc_server.py
@@ -125,9 +125,9 @@ class TinySocketServerThread(threading.Thread,netsvc.Server):
                 ct.start()
                 lt = len(self.threads)
                 if (lt > 10) and (lt % 10 == 0):
-                     # Not many threads should be serving at the same time, so log
-                     # their abuse.
-                     netsvc.Logger().notifyChannel("web-services", netsvc.LOG_DEBUG,
+                    # Not many threads should be serving at the same time, so log
+                    # their abuse.
+                    netsvc.Logger().notifyChannel("web-services", netsvc.LOG_DEBUG,
                         "Netrpc: %d threads" % len(self.threads))
             self.socket.close()
         except Exception, e:
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 1bda0230c89..8c3db0e88af 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -521,11 +521,11 @@ GNU Public Licence.
                      'OS Name : %s\n' \
                      %(platform.platform(), platform.os.name)
         if os.name == 'posix':
-          if platform.system() == 'Linux':
-             lsbinfo = os.popen('lsb_release -a').read()
-             environment += '%s'%(lsbinfo)
-          else:
-             environment += 'Your System is not lsb compliant\n'
+            if platform.system() == 'Linux':
+                lsbinfo = os.popen('lsb_release -a').read()
+                environment += '%s'%(lsbinfo)
+            else:
+                environment += 'Your System is not lsb compliant\n'
         environment += 'Operating System Release : %s\n' \
                     'Operating System Version : %s\n' \
                     'Operating System Architecture : %s\n' \
diff --git a/openerp/tests/test_xmlrpc.py b/openerp/tests/test_xmlrpc.py
index 954d3447360..ca0ae454437 100644
--- a/openerp/tests/test_xmlrpc.py
+++ b/openerp/tests/test_xmlrpc.py
@@ -19,8 +19,8 @@ ADMIN_USER_ID = common.ADMIN_USER_ID
 ADMIN_PASSWORD = common.ADMIN_PASSWORD
 
 def setUpModule():
-  common.start_openerp()
-  common.create_xmlrpc_proxies()
+    common.start_openerp()
+    common.create_xmlrpc_proxies()
 
 tearDownModule = common.tearDownModule
 

From efef81654b90e70a24d1a330c0ef8d9942e05444 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Thu, 19 Jan 2012 20:18:38 +0100
Subject: [PATCH 003/999] [REF] replace deprecated <> symbol.

bzr revid: florent.xicluna@gmail.com-20120119191838-r07oybyiqbkfehsz
---
 openerp/osv/orm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index f2686708436..dceb14a2710 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1303,7 +1303,7 @@ class BaseModel(object):
                 if not line[i]:
                     continue
 
-                if field[:len(prefix)] <> prefix:
+                if field[:len(prefix)] != prefix:
                     if line[i] and skip:
                         return False
                     continue
@@ -2666,7 +2666,7 @@ class BaseModel(object):
                 # if val is a many2one, just write the ID
                 if type(val) == tuple:
                     val = val[0]
-                if (val<>False) or (type(val)<>bool):
+                if val is not False:
                     cr.execute(update_query, (ss[1](val), key))
 
     def _check_selection_field_value(self, cr, uid, field, value, context=None):

From c749cd8fcc864e6103f55bcf7b12e0910f2ffa14 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Mon, 23 Jan 2012 15:29:32 +0100
Subject: [PATCH 004/999] =?UTF-8?q?[IMP]=C2=A0upgrade=20the=20Pickle=20pro?=
 =?UTF-8?q?tocol=20to=20consume=20less=20bandwidth.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: florent.xicluna@gmail.com-20120123142932-idcqz4p46gvbvhfh
---
 openerp/tiny_socket.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/openerp/tiny_socket.py b/openerp/tiny_socket.py
index b4bed83a4c0..c3960afd054 100644
--- a/openerp/tiny_socket.py
+++ b/openerp/tiny_socket.py
@@ -28,6 +28,10 @@ import netsvc
 
 #.apidoc title: Net-RPC classes
 
+# Pickle protocol version 2 is optimized compared to default (version 0)
+PICKLE_PROTOCOL = 2
+
+
 class Myexception(Exception):
     """
     custom exception object store
@@ -63,8 +67,8 @@ class mysocket:
         netsvc.close_socket(self.sock)
         
     def mysend(self, msg, exception=False, traceback=None):
-        msg = cPickle.dumps([msg,traceback])
-        self.sock.sendall('%8d%s%s' % (len(msg), exception and "1" or "0", msg))
+        msg = cPickle.dumps([msg, traceback], PICKLE_PROTOCOL)
+        self.sock.sendall('%8d%d%s' % (len(msg), bool(exception), msg))
             
     def myreceive(self):
         buf=''

From bac1a957193c5b76fc944d268d2b711809e34d19 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Mon, 23 Jan 2012 15:30:15 +0100
Subject: [PATCH 005/999] =?UTF-8?q?[IMP]=C2=A0merge=20two=20socket.recv=20?=
 =?UTF-8?q?into=20one.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: florent.xicluna@gmail.com-20120123143015-gz22l5qre6ria8f4
---
 openerp/tiny_socket.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/openerp/tiny_socket.py b/openerp/tiny_socket.py
index c3960afd054..87db82f6d91 100644
--- a/openerp/tiny_socket.py
+++ b/openerp/tiny_socket.py
@@ -72,15 +72,14 @@ class mysocket:
             
     def myreceive(self):
         buf=''
-        while len(buf) < 8:
-            chunk = self.sock.recv(8 - len(buf))
+        while len(buf) < 9:
+            chunk = self.sock.recv(9 - len(buf))
             if not chunk:
                 raise socket.timeout
             buf += chunk
-        size = int(buf)
-        buf = self.sock.recv(1)
-        if buf != "0":
-            exception = buf
+        size = int(buf[:8])
+        if buf[8] != "0":
+            exception = buf[8]
         else:
             exception = False
         msg = ''

From 5c40627e4bd91c2355a4d196f62e1ccfa83aaf12 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jan 2012 14:30:13 +0100
Subject: [PATCH 006/999] [FIX] don't just print a warning if an @eval fails in
 an XML file

bzr revid: xmo@openerp.com-20120126133013-5fnsouix8cutwlik
---
 openerp/tools/convert.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 553aa48effc..ec3e67670c3 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -129,15 +129,14 @@ def _eval_xml(self, node, pool, cr, uid, idref, context=None):
                     f_val = f_val[0]
             return f_val
         a_eval = node.get('eval','')
-        idref2 = {}
         if a_eval:
             idref2 = _get_idref(self, cr, uid, f_model, context, idref)
             try:
                 return unsafe_eval(a_eval, idref2)
             except Exception:
-                logger = logging.getLogger('init')
-                logger.warning('could not eval(%s) for %s in %s' % (a_eval, node.get('name'), context), exc_info=True)
-                return ""
+                logging.getLogger('openerp.tools.convert.init').error(
+                    'Could not eval(%s) for %s in %s', a_eval, node.get('name'), context)
+                raise
         if t == 'xml':
             def _process(s, idref):
                 m = re.findall('[^%]%\((.*?)\)[ds]', s)

From 111d8b76f7e384a3b1a77d802b52eedbb7ae04c7 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Wed, 1 Feb 2012 13:33:11 +0100
Subject: [PATCH 007/999] [REF] one unused import and one redundant import.

bzr revid: florent.xicluna@gmail.com-20120201123311-yvljvcj0luly77qt
---
 openerp-server | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/openerp-server b/openerp-server
index 334c1790526..5868b4f33d5 100755
--- a/openerp-server
+++ b/openerp-server
@@ -42,9 +42,6 @@ import openerp
 __author__ = openerp.release.author
 __version__ = openerp.release.version
 
-import sys
-import imp
-
 def check_root_user():
     """ Exit if the process's user is 'root' (on POSIX system)."""
     if os.name == 'posix':
@@ -200,7 +197,7 @@ def quit_on_signals():
     try:
         while quit_signals_received == 0:
             time.sleep(60)
-    except KeyboardInterrupt, e:
+    except KeyboardInterrupt:
         pass
 
     if config['pidfile']:

From 1ef81548ba5dd463adaf20433b7bc4b39ebb8e78 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Wed, 8 Feb 2012 15:22:48 +0100
Subject: [PATCH 008/999] [REF] additional cleanup after vmt's logging
 refactoring.

bzr revid: florent.xicluna@gmail.com-20120208142248-p63odfqo673yqqml
---
 openerp/service/netrpc_server.py |  2 +-
 openerp/service/web_services.py  | 17 ++++++++---------
 openerp/wizard/__init__.py       |  6 +-----
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/openerp/service/netrpc_server.py b/openerp/service/netrpc_server.py
index 327ebc5bbdc..fcbfaf0ba82 100644
--- a/openerp/service/netrpc_server.py
+++ b/openerp/service/netrpc_server.py
@@ -131,7 +131,7 @@ class TinySocketServerThread(threading.Thread,netsvc.Server):
                     _logger.debug("Netrpc: %d threads", len(self.threads))
             self.socket.close()
         except Exception, e:
-            _logger.warning("Netrpc: closing because of exception %s" % str(e))
+            _logger.warning("Netrpc: closing because of exception %s", e)
             self.socket.close()
             return False
 
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 43f4d1af639..661b74a6995 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -224,9 +224,9 @@ class db(netsvc.ExportService):
     
             if not data or res:
                 _logger.error(
-                        'DUMP DB: %s failed! Please verify the configuration of the database password on the server. '\
-                        'It should be provided as a -w <PASSWD> command-line option, or as `db_password` in the '\
-                        'server configuration file.\n %s'  % (db_name, data))
+                        'DUMP DB: %s failed! Please verify the configuration of the database password on the server. '
+                        'It should be provided as a -w <PASSWD> command-line option, or as `db_password` in the '
+                        'server configuration file.\n %s', db_name, data)
                 raise Exception, "Couldn't dump database"
             _logger.info('DUMP DB successful: %s', db_name)
     
@@ -239,7 +239,7 @@ class db(netsvc.ExportService):
             self._set_pg_psw_env_var()
 
             if self.exp_db_exist(db_name):
-                _logger.warning('RESTORE DB: %s already exists' % (db_name,))
+                _logger.warning('RESTORE DB: %s already exists', db_name)
                 raise Exception, "Database already exists"
 
             self._create_empty_database(db_name)
@@ -268,7 +268,7 @@ class db(netsvc.ExportService):
             res = stdout.close()
             if res:
                 raise Exception, "Couldn't restore database"
-            _logger.info('RESTORE DB: %s' % (db_name))
+            _logger.info('RESTORE DB: %s', db_name)
 
             return True
         finally:
@@ -451,8 +451,7 @@ GNU Public Licence.
 
             backup_directory = os.path.join(tools.config['root_path'], 'backup', time.strftime('%Y-%m-%d-%H-%M'))
             if zips and not os.path.isdir(backup_directory):
-                _logger.info('create a new backup directory to \
-                                store the old modules: %s', backup_directory)
+                _logger.info('create a new backup directory to store the old modules: %s', backup_directory)
                 os.makedirs(backup_directory)
 
             for module in zips:
@@ -678,7 +677,7 @@ class report_spool(netsvc.ExportService):
             self._reports[id]['state'] = True
         except Exception, exception:
 
-            _logger.exception('Exception: %s\n', str(exception))
+            _logger.exception('Exception: %s\n', exception)
             if hasattr(exception, 'name') and hasattr(exception, 'value'):
                 self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.ustr(exception.name), tools.ustr(exception.value))
             else:
@@ -715,7 +714,7 @@ class report_spool(netsvc.ExportService):
                 self._reports[id]['format'] = format
                 self._reports[id]['state'] = True
             except Exception, exception:
-                _logger.exception('Exception: %s\n', str(exception))
+                _logger.exception('Exception: %s\n', exception)
                 if hasattr(exception, 'name') and hasattr(exception, 'value'):
                     self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.ustr(exception.name), tools.ustr(exception.value))
                 else:
diff --git a/openerp/wizard/__init__.py b/openerp/wizard/__init__.py
index 7354a43498d..debf0f1e74f 100644
--- a/openerp/wizard/__init__.py
+++ b/openerp/wizard/__init__.py
@@ -31,7 +31,6 @@ import openerp.pooler as pooler
 
 from openerp.osv.osv import except_osv
 from openerp.osv.orm import except_orm
-import sys
 
 _logger = logging.getLogger(__name__)
 
@@ -168,10 +167,7 @@ class interface(netsvc.Service):
                 or isinstance(e, except_orm):
                 netsvc.abort_response(2, e.name, 'warning', e.value)
             else:
-                import traceback
-                tb_s = reduce(lambda x, y: x+y, traceback.format_exception(
-                    sys.exc_type, sys.exc_value, sys.exc_traceback))
-                _logger.error('Exception in call: ' + tb_s)
+                _logger.exception('Exception in call:')
                 raise
 
         return res

From 44e02f756b0066f61e1bbea648f92ea23a0aac02 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Wed, 8 Feb 2012 16:33:04 +0100
Subject: [PATCH 009/999] =?UTF-8?q?[FIX]=C2=A0file=5Fopen=20should=20not?=
 =?UTF-8?q?=20search=20zip=20files=20outside=20its=20root=20directory.=20?=
 =?UTF-8?q?=20Fix=20the=20returned=20value=20with=20pathinfo=3DTrue.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

lp bug: https://launchpad.net/bugs/928507 fixed
lp bug: https://launchpad.net/bugs/928376 fixed

bzr revid: florent.xicluna@gmail.com-20120208153304-9443zx2z09bws10x
---
 openerp/tools/misc.py | 89 ++++++++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 40 deletions(-)

diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index a5c72900fc7..3c9210214b1 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -134,7 +134,7 @@ def file_open(name, mode="r", subdir='addons', pathinfo=False):
     @param name name of the file
     @param mode file open mode
     @param subdir subdirectory
-    @param pathinfo if True returns tupple (fileobject, filepath)
+    @param pathinfo if True returns tuple (fileobject, filepath)
 
     @return fileobject if pathinfo is False else (fileobject, filepath)
     """
@@ -142,44 +142,51 @@ def file_open(name, mode="r", subdir='addons', pathinfo=False):
     adps = addons.module.ad_paths
     rtp = os.path.normcase(os.path.abspath(config['root_path']))
 
-    if name.replace(os.path.sep, '/').startswith('addons/'):
+    if os.path.isabs(name):
+        # It is an absolute path
+        # Is it below 'addons_path' or 'root_path'?
+        name = os.path.normcase(os.path.normpath(name))
+        for root in adps + [rtp]:
+            if name.startswith(root):
+                base = root.rstrip(os.sep)
+                name = name[len(base) + 1:]
+                break
+        else:
+            # It is outside the OpenERP root: skip zipfile lookup.
+            base, name = os.path.split(name)
+        return _fileopen(name, mode=mode, basedir=base, pathinfo=pathinfo)
+
+    if name.replace(os.sep, '/').startswith('addons/'):
         subdir = 'addons'
-        name = name[7:]
+        name2 = name[7:]
+    elif subdir:
+        name = os.path.join(subdir, name)
+        if name.replace(os.sep, '/').startswith('addons/'):
+            subdir = 'addons'
+            name2 = name[7:]
+        else:
+            name2 = name
 
-    # First try to locate in addons_path
+    # First, try to locate in addons_path
     if subdir:
-        subdir2 = subdir
-        if subdir2.replace(os.path.sep, '/').startswith('addons/'):
-            subdir2 = subdir2[7:]
-
-        subdir2 = (subdir2 != 'addons' or None) and subdir2
-
         for adp in adps:
             try:
-                if subdir2:
-                    fn = os.path.join(adp, subdir2, name)
-                else:
-                    fn = os.path.join(adp, name)
-                fn = os.path.normpath(fn)
-                fo = file_open(fn, mode=mode, subdir=None, pathinfo=pathinfo)
-                if pathinfo:
-                    return fo, fn
-                return fo
+                return _fileopen(name2, mode=mode, basedir=adp,
+                                 pathinfo=pathinfo)
             except IOError:
                 pass
 
-    if subdir:
-        name = os.path.join(rtp, subdir, name)
-    else:
-        name = os.path.join(rtp, name)
+    # Second, try to locate in root_path
+    return _fileopen(name, mode=mode, basedir=rtp, pathinfo=pathinfo)
 
-    name = os.path.normpath(name)
 
-    # Check for a zipfile in the path
-    head = name
-    zipname = False
+def _fileopen(path, mode, basedir, pathinfo):
+    head = os.path.normpath(path)
+    name = os.path.normpath(os.path.join(basedir, path))
     name2 = False
-    while True:
+    zipname = False
+    # Check for a zipfile in the path, but stop at the 'basedir' level
+    while os.sep in head:
         head, tail = os.path.split(head)
         if not tail:
             break
@@ -187,9 +194,10 @@ def file_open(name, mode="r", subdir='addons', pathinfo=False):
             zipname = os.path.join(tail, zipname)
         else:
             zipname = tail
-        if zipfile.is_zipfile(head+'.zip'):
+        zpath = os.path.join(basedir, head + '.zip')
+        if zipfile.is_zipfile(zpath):
             from cStringIO import StringIO
-            zfile = zipfile.ZipFile(head+'.zip')
+            zfile = zipfile.ZipFile(zpath)
             try:
                 fo = StringIO()
                 fo.write(zfile.read(os.path.join(
@@ -197,20 +205,21 @@ def file_open(name, mode="r", subdir='addons', pathinfo=False):
                         os.sep, '/')))
                 fo.seek(0)
                 if pathinfo:
-                    return fo, name
+                    return (fo, name)
                 return fo
             except Exception:
-                name2 = os.path.normpath(os.path.join(head + '.zip', zipname))
-                pass
-    for i in (name2, name):
-        if i and os.path.isfile(i):
-            fo = file(i, mode)
+                name2 = os.path.normpath(os.path.join(zpath, zipname))
+    # Look for a normal file
+    for fname in (name2, name):
+        if fname and os.path.isfile(fname):
+            fo = open(fname, mode)
             if pathinfo:
-                return fo, i
+                return (fo, fname)
             return fo
-    if os.path.splitext(name)[1] == '.rml':
-        raise IOError, 'Report %s doesn\'t exist or deleted : ' %str(name)
-    raise IOError, 'File not found : %s' % name
+    # Not found
+    if name.endswith('.rml'):
+        raise IOError('Report %r doesn\'t exist or deleted' % name)
+    raise IOError('File not found: %s' % name)
 
 
 #----------------------------------------------------------

From 57ca8e47975101c57991cf89efe86c033ff8a6de Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Wed, 8 Feb 2012 18:00:34 +0100
Subject: [PATCH 010/999] [REF] openerp.report: better use of isinstance.

bzr revid: florent.xicluna@gmail.com-20120208170034-2w8szxy350qpwas6
---
 openerp/report/custom.py               | 2 +-
 openerp/report/render/rml2txt/utils.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/report/custom.py b/openerp/report/custom.py
index 051d1f29862..d06f2d721f7 100644
--- a/openerp/report/custom.py
+++ b/openerp/report/custom.py
@@ -108,7 +108,7 @@ class report_custom(report_int):
                     key = levels.keys()
                 for l in key:
                     objs = eval('obj.'+l,{'obj': obj})
-                    if not isinstance(objs, browse_record_list) and type(objs) <> type([]):
+                    if not isinstance(objs, (browse_record_list, list)):
                         objs = [objs]
                     field_new = []
                     cond_new = []
diff --git a/openerp/report/render/rml2txt/utils.py b/openerp/report/render/rml2txt/utils.py
index 122411afb2d..c08210ecc79 100644
--- a/openerp/report/render/rml2txt/utils.py
+++ b/openerp/report/render/rml2txt/utils.py
@@ -75,9 +75,9 @@ def _process_text(self, txt):
                     txt2 = eval(sps.pop(0),self.localcontext)
                 except:
                     txt2 = ''
-                if type(txt2) == type(0) or type(txt2) == type(0.0):
+                if isinstance(txt2, (int, float)):
                     txt2 = str(txt2)
-                if type(txt2)==type('') or type(txt2)==type(u''):
+                if isinstance(txt2, basestring):
                     result += txt2
         return result
 

From b5fa51f4a691b840e588bc33e4e960958860fd12 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Wed, 8 Feb 2012 18:02:17 +0100
Subject: [PATCH 011/999] =?UTF-8?q?[REF]=C2=A0openerp.report:=20use=20the?=
 =?UTF-8?q?=20recommended=20syntax=20to=20raise=20error=20and=20never=20us?=
 =?UTF-8?q?e=20empty=20except:.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: florent.xicluna@gmail.com-20120208170217-xsa5odzlhite0nda
---
 openerp/report/custom.py                   | 2 +-
 openerp/report/interface.py                | 4 ++--
 openerp/report/preprocess.py               | 2 +-
 openerp/report/printscreen/ps_list.py      | 2 +-
 openerp/report/render/rml2html/rml2html.py | 2 +-
 openerp/report/render/rml2pdf/trml2pdf.py  | 2 +-
 openerp/report/render/rml2txt/utils.py     | 8 ++++----
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/openerp/report/custom.py b/openerp/report/custom.py
index d06f2d721f7..a03ae0b8a53 100644
--- a/openerp/report/custom.py
+++ b/openerp/report/custom.py
@@ -267,7 +267,7 @@ class report_custom(report_int):
                     else:
                         try:
                             row.append(float(r[j]))
-                        except:
+                        except Exception:
                             row.append(r[j])
                 results2.append(row)
             if report['type']=='pie':
diff --git a/openerp/report/interface.py b/openerp/report/interface.py
index 9a97c445671..69474a18433 100644
--- a/openerp/report/interface.py
+++ b/openerp/report/interface.py
@@ -44,8 +44,8 @@ class report_int(netsvc.Service):
     def __init__(self, name):
         assert not self.exists(name), 'The report "%s" already exists!' % name
         super(report_int, self).__init__(name)
-        if name[0:7]<>'report.':
-            raise Exception, 'ConceptionError, bad report name, should start with "report."'
+        if not name.startswith('report.'):
+            raise Exception('ConceptionError, bad report name, should start with "report."')
         self.name = name
         self.id = 0
         self.name2 = '.'.join(name.split('.')[1:])
diff --git a/openerp/report/preprocess.py b/openerp/report/preprocess.py
index e681860d7a2..93b6b4d1bc9 100644
--- a/openerp/report/preprocess.py
+++ b/openerp/report/preprocess.py
@@ -48,7 +48,7 @@ class report(object):
                         try:
                             while n.tag != txt.group(3):
                                 n = n.getparent()
-                        except:
+                        except Exception:
                             n = node
                     else:
                         n = node.getparent()
diff --git a/openerp/report/printscreen/ps_list.py b/openerp/report/printscreen/ps_list.py
index dc280a53e3e..8f0629462f8 100644
--- a/openerp/report/printscreen/ps_list.py
+++ b/openerp/report/printscreen/ps_list.py
@@ -56,7 +56,7 @@ class report_printscreen_list(report_int):
     def _parse_string(self, view):
         try:
             dom = etree.XML(view.encode('utf-8'))
-        except:
+        except Exception:
             dom = etree.XML(view)
         return self._parse_node(dom)
 
diff --git a/openerp/report/render/rml2html/rml2html.py b/openerp/report/render/rml2html/rml2html.py
index 504492772df..a26f6eadaa6 100644
--- a/openerp/report/render/rml2html/rml2html.py
+++ b/openerp/report/render/rml2html/rml2html.py
@@ -98,7 +98,7 @@ class _flowable(object):
                     try:
                         if new_child.get('style').find('terp_tblheader')!= -1:
                             new_node.tag = 'th'
-                    except:
+                    except Exception:
                         pass
         process(node,new_node)
         if new_node.get('colWidths',False):
diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py
index 96287166074..58457993142 100644
--- a/openerp/report/render/rml2pdf/trml2pdf.py
+++ b/openerp/report/render/rml2pdf/trml2pdf.py
@@ -424,7 +424,7 @@ class _rml_canvas(object):
                 flow.drawOn(self.canvas,infos['x'],infos['y'])
                 infos['height']-=h
             else:
-                raise ValueError, "Not enough space"
+                raise ValueError("Not enough space")
 
     def _line_mode(self, node):
         ljoin = {'round':1, 'mitered':0, 'bevelled':2}
diff --git a/openerp/report/render/rml2txt/utils.py b/openerp/report/render/rml2txt/utils.py
index c08210ecc79..95e99c32ce1 100644
--- a/openerp/report/render/rml2txt/utils.py
+++ b/openerp/report/render/rml2txt/utils.py
@@ -37,7 +37,7 @@ def _child_get(node, self=None, tagname=None):
                     if n.get('rml_except', False):
                         try:
                             eval(n.get('rml_except'), {}, self.localcontext)
-                        except:
+                        except Exception:
                             continue
                     if n.get('rml_tag'):
                         try:
@@ -46,7 +46,7 @@ def _child_get(node, self=None, tagname=None):
                             n2.tag = tag
                             n2.attrib.update(attr)
                             yield n2
-                        except:
+                        except Exception:
                             yield n
                     else:
                         yield n
@@ -55,7 +55,7 @@ def _child_get(node, self=None, tagname=None):
         if self and self.localcontext and n.get('rml_except', False):
             try:
                 eval(n.get('rml_except'), {}, self.localcontext)
-            except:
+            except Exception:
                 continue
         if (tagname is None) or (n.tag==tagname):
             yield n
@@ -73,7 +73,7 @@ def _process_text(self, txt):
             if sps:
                 try:
                     txt2 = eval(sps.pop(0),self.localcontext)
-                except:
+                except Exception:
                     txt2 = ''
                 if isinstance(txt2, (int, float)):
                     txt2 = str(txt2)

From 9621008df12a65730a123e389d84ef8b21e5941d Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Wed, 8 Feb 2012 18:03:51 +0100
Subject: [PATCH 012/999] =?UTF-8?q?[REF]=C2=A0openerp.report:=20replace=20?=
 =?UTF-8?q?deprecated=20has=5Fkey.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: florent.xicluna@gmail.com-20120208170351-1vmewmuufmxn7x52
---
 openerp/report/custom.py    | 14 +++++++-------
 openerp/report/print_xml.py |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/openerp/report/custom.py b/openerp/report/custom.py
index a03ae0b8a53..b33065fcdee 100644
--- a/openerp/report/custom.py
+++ b/openerp/report/custom.py
@@ -221,7 +221,7 @@ class report_custom(report_int):
                     res_dic[prev].append(line)
                 else:
                     prev = line[groupby]
-                    if res_dic.has_key(line[groupby]):
+                    if line[groupby] in res_dic:
                         res_dic[line[groupby]].append(line)
                     else:
                         res_dic[line[groupby]] = []
@@ -389,7 +389,7 @@ class report_custom(report_int):
         if date_idx != None:
             for r in results:
                 key = process_date['Y'](r[date_idx])
-                if not data_by_year.has_key(key):
+                if key not in data_by_year:
                     data_by_year[key] = []
                 for i in range(len(r)):
                     r[i] = fct[i](r[i])
@@ -407,14 +407,14 @@ class report_custom(report_int):
             for d in data_by_year[line]:
                 for idx in range(len(fields)-1):
                     fields_bar.append({})
-                    if fields_bar[idx].has_key(d[0]):
+                    if d[0] in fields_bar[idx]:
                         fields_bar[idx][d[0]] += d[idx+1]
                     else:
                         fields_bar[idx][d[0]] = d[idx+1]
             for idx  in range(len(fields)-1):
                 data = {}
                 for k in fields_bar[idx].keys():
-                    if data.has_key(k):
+                    if k in data:
                         data[k] += fields_bar[idx][k]
                     else:
                         data[k] = fields_bar[idx][k]
@@ -488,7 +488,7 @@ class report_custom(report_int):
         if date_idx != None:
             for r in results:
                 key = process_date['Y'](r[date_idx])
-                if not data_by_year.has_key(key):
+                if key not in data_by_year:
                     data_by_year[key] = []
                 for i in range(len(r)):
                     r[i] = fct[i](r[i])
@@ -507,14 +507,14 @@ class report_custom(report_int):
             for d in data_by_year[line]:
                 for idx in range(len(fields)-1):
                     fields_bar.append({})
-                    if fields_bar[idx].has_key(d[0]):
+                    if d[0] in fields_bar[idx]:
                         fields_bar[idx][d[0]] += d[idx+1]
                     else:
                         fields_bar[idx][d[0]] = d[idx+1]
             for idx  in range(len(fields)-1):
                 data = {}
                 for k in fields_bar[idx].keys():
-                    if data.has_key(k):
+                    if k in data:
                         data[k] += fields_bar[idx][k]
                     else:
                         data[k] = fields_bar[idx][k]
diff --git a/openerp/report/print_xml.py b/openerp/report/print_xml.py
index ee1b9a316b3..2137eabee79 100644
--- a/openerp/report/print_xml.py
+++ b/openerp/report/print_xml.py
@@ -200,7 +200,7 @@ class document(object):
                     else:
                         args = []
                     # get the object
-                    if attrs.has_key('model'):
+                    if 'model' in attrs:
                         obj = self.pool.get(attrs['model'])
                     else:
                         if isinstance(browser, list):
@@ -209,7 +209,7 @@ class document(object):
                             obj = browser._table
 
                     # get the ids
-                    if attrs.has_key('ids'):
+                    if 'ids' in attrs:
                         ids = self.eval(browser, attrs['ids'])
                     else:
                         if isinstance(browser, list):

From 7675d45c2c10e833bc5d5f0b3f905f1cca652a3d Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Wed, 8 Feb 2012 18:04:56 +0100
Subject: [PATCH 013/999] [REF] openerp.report: fix weird indentation, not
 multiple of four.

bzr revid: florent.xicluna@gmail.com-20120208170456-ak1ykpy6yel71ylc
---
 openerp/report/interface.py                |  2 +-
 openerp/report/print_xml.py                |  2 +-
 openerp/report/printscreen/ps_form.py      |  2 +-
 openerp/report/render/rml2html/rml2html.py | 16 ++++++++--------
 openerp/report/render/rml2pdf/trml2pdf.py  |  2 +-
 openerp/report/render/rml2txt/rml2txt.py   |  4 ++--
 openerp/report/render/simple.py            |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/openerp/report/interface.py b/openerp/report/interface.py
index 69474a18433..17dc0973d7e 100644
--- a/openerp/report/interface.py
+++ b/openerp/report/interface.py
@@ -181,7 +181,7 @@ class report_rml(report_int):
 
     def create_pdf(self, rml, localcontext = None, logo=None, title=None):
         if not localcontext:
-           localcontext={}
+            localcontext = {}
         localcontext.update({'internal_header':self.internal_header})
         if logo:
             self.bin_datas['logo'] = logo
diff --git a/openerp/report/print_xml.py b/openerp/report/print_xml.py
index 2137eabee79..c2af0984c2e 100644
--- a/openerp/report/print_xml.py
+++ b/openerp/report/print_xml.py
@@ -228,7 +228,7 @@ class document(object):
                                 if not isinstance(datas[atr['value']], (str, unicode)):
                                     txt = str(datas[atr['value']])
                                 else:
-                                     txt = datas[atr['value']]
+                                    txt = datas[atr['value']]
                                 el.text = txt
                             else:
                                 for el_cld in node:
diff --git a/openerp/report/printscreen/ps_form.py b/openerp/report/printscreen/ps_form.py
index 8e3823e6b03..cf6d77cbe26 100644
--- a/openerp/report/printscreen/ps_form.py
+++ b/openerp/report/printscreen/ps_form.py
@@ -120,7 +120,7 @@ class report_printscreen_list(report_int):
                     line[f]=round(line[f],precision)
                 col = etree.SubElement(node_line, 'col', tree='no')
                 if line[f] != None:
-                     col.text = tools.ustr(line[f] or '')
+                    col.text = tools.ustr(line[f] or '')
                 else:
                     col.text = '/'
 
diff --git a/openerp/report/render/rml2html/rml2html.py b/openerp/report/render/rml2html/rml2html.py
index a26f6eadaa6..17ed2e3103e 100644
--- a/openerp/report/render/rml2html/rml2html.py
+++ b/openerp/report/render/rml2html/rml2html.py
@@ -232,7 +232,7 @@ class _rml_stylesheet(object):
             attr = {}
             attrs = ps.attrib
             for key, val in attrs.items():
-                 attr[key] = val
+                attr[key] = val
             attrs = []
             for a in attr:
                 if a in self._tags:
@@ -296,13 +296,13 @@ class _rml_template(object):
                 frames[(posy,posx,tmpl.get('id'))] = _rml_tmpl_frame(posx, utils.unit_get(tmpl.get('width')))
             for tmpl in pt.findall('pageGraphics'):
                 for n in tmpl:
-                        if n.tag == 'image':
-                           self.data = rc + utils._process_text(self, n.text)
-                        if n.tag in self._tags:
-                            t = self._tags[n.tag](n, self.style,self.localcontext)
-                            frames[(t.posy,t.posx,n.tag)] = t
-                        else:
-                            self.style.update(n)
+                    if n.tag == 'image':
+                        self.data = rc + utils._process_text(self, n.text)
+                    if n.tag in self._tags:
+                        t = self._tags[n.tag](n, self.style,self.localcontext)
+                        frames[(t.posy,t.posx,n.tag)] = t
+                    else:
+                        self.style.update(n)
             keys = frames.keys()
             keys.sort()
             keys.reverse()
diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py
index 58457993142..a17c03b40cb 100644
--- a/openerp/report/render/rml2pdf/trml2pdf.py
+++ b/openerp/report/render/rml2pdf/trml2pdf.py
@@ -82,7 +82,7 @@ class NumberedCanvas(canvas.Canvas):
     def showPage(self):
         self._currentPage +=1
         if not self._flag:
-           self._pageCount += 1
+            self._pageCount += 1
         else:
             self.pages.update({self._currentPage:self._pageCount})
         self._codes.append({'code': self._code, 'stack': self._codeStack})
diff --git a/openerp/report/render/rml2txt/rml2txt.py b/openerp/report/render/rml2txt/rml2txt.py
index 4a30e0d2345..8a8c1b7f3c7 100755
--- a/openerp/report/render/rml2txt/rml2txt.py
+++ b/openerp/report/render/rml2txt/rml2txt.py
@@ -336,8 +336,8 @@ class _rml_stylesheet(object):
             attr = {}
             attrs = ps.attributes
             for i in range(attrs.length):
-                 name = attrs.item(i).localName
-                 attr[name] = ps.get(name)
+                name = attrs.item(i).localName
+                attr[name] = ps.get(name)
             attrs = []
             for a in attr:
                 if a in self._tags:
diff --git a/openerp/report/render/simple.py b/openerp/report/render/simple.py
index 4ce10991924..49d1adf148e 100644
--- a/openerp/report/render/simple.py
+++ b/openerp/report/render/simple.py
@@ -82,7 +82,7 @@ if __name__=='__main__':
         </author-list>
     </test>'''
     if s.render():
-	print s.get()
+        print s.get()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 6312fd9426d6ccdbbfdada88763961f4b29d5c06 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Wed, 8 Feb 2012 18:07:00 +0100
Subject: [PATCH 014/999] [REF] openerp.report: remove unused imports and vars,
 simplify logging.

bzr revid: florent.xicluna@gmail.com-20120208170700-csx9jb3nwmvq3dzj
---
 openerp/report/custom.py                             | 3 ---
 openerp/report/render/html2html/html2html.py         | 2 --
 openerp/report/render/makohtml2html/makohtml2html.py | 8 +++-----
 openerp/report/render/odt2odt/odt2odt.py             | 1 -
 openerp/report/render/rml2html/rml2html.py           | 2 +-
 openerp/report/render/rml2txt/rml2txt.py             | 2 --
 openerp/report/render/rml2txt/utils.py               | 1 -
 openerp/report/render/simple.py                      | 1 -
 8 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/openerp/report/custom.py b/openerp/report/custom.py
index b33065fcdee..80dd9462175 100644
--- a/openerp/report/custom.py
+++ b/openerp/report/custom.py
@@ -21,7 +21,6 @@
 
 import os
 import time
-import openerp.netsvc as netsvc
 
 import openerp.tools as tools
 from openerp.tools.safe_eval import safe_eval as eval
@@ -67,7 +66,6 @@ class report_custom(report_int):
     #
     def _row_get(self, cr, uid, objs, fields, conditions, row_canvas=None, group_by=None):
         result = []
-        tmp = []
         for obj in objs:
             tobreak = False
             for cond in conditions:
@@ -365,7 +363,6 @@ class report_custom(report_int):
         order_date['Y'] = lambda x : x
 
         abscissa = []
-        tmp = {}
         
         idx = 0 
         date_idx = None
diff --git a/openerp/report/render/html2html/html2html.py b/openerp/report/render/html2html/html2html.py
index 181c7f7ba67..09d7ad5e825 100644
--- a/openerp/report/render/html2html/html2html.py
+++ b/openerp/report/render/html2html/html2html.py
@@ -20,9 +20,7 @@
 ##############################################################################
 
 from openerp.report.render.rml2pdf import utils
-from lxml import etree
 import copy
-import openerp.pooler  as pooler
 import base64
 import cStringIO
 import re
diff --git a/openerp/report/render/makohtml2html/makohtml2html.py b/openerp/report/render/makohtml2html/makohtml2html.py
index 57e57bd8d63..dbb3327a105 100644
--- a/openerp/report/render/makohtml2html/makohtml2html.py
+++ b/openerp/report/render/makohtml2html/makohtml2html.py
@@ -23,8 +23,7 @@ import mako
 from lxml import etree
 from mako.template import Template
 from mako.lookup import TemplateLookup
-import openerp.netsvc as netsvc
-import traceback, sys, os
+import os
 
 _logger = logging.getLogger(__name__)
 
@@ -126,9 +125,8 @@ class makohtml2html(object):
             final_html += self.format_header(etree_obj)
             final_html += self.format_body(etree_obj)
             return final_html
-        except Exception,e:
-            tb_s = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
-            _logger.error('report :\n%s\n%s\n', tb_s, str(e))
+        except Exception:
+            _logger.exception('report :')
 
 def parseNode(html, localcontext = {}):
     r = makohtml2html(html, localcontext)
diff --git a/openerp/report/render/odt2odt/odt2odt.py b/openerp/report/render/odt2odt/odt2odt.py
index d077207f4d7..b9713943dc8 100644
--- a/openerp/report/render/odt2odt/odt2odt.py
+++ b/openerp/report/render/odt2odt/odt2odt.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 from openerp.report.render.rml2pdf import utils
-from lxml import etree
 import copy
 
 class odt2odt(object):
diff --git a/openerp/report/render/rml2html/rml2html.py b/openerp/report/render/rml2html/rml2html.py
index 17ed2e3103e..90bd58af99a 100644
--- a/openerp/report/render/rml2html/rml2html.py
+++ b/openerp/report/render/rml2html/rml2html.py
@@ -39,7 +39,7 @@ import sys
 import cStringIO
 from lxml import etree
 import copy
-import utils
+
 from openerp.report.render.rml2pdf import utils
 
 class _flowable(object):
diff --git a/openerp/report/render/rml2txt/rml2txt.py b/openerp/report/render/rml2txt/rml2txt.py
index 8a8c1b7f3c7..ab1930d81ba 100755
--- a/openerp/report/render/rml2txt/rml2txt.py
+++ b/openerp/report/render/rml2txt/rml2txt.py
@@ -22,9 +22,7 @@
 
 import sys
 import StringIO
-import copy
 from lxml import etree
-import base64
 
 import utils
 
diff --git a/openerp/report/render/rml2txt/utils.py b/openerp/report/render/rml2txt/utils.py
index 95e99c32ce1..2bf66925527 100644
--- a/openerp/report/render/rml2txt/utils.py
+++ b/openerp/report/render/rml2txt/utils.py
@@ -22,7 +22,6 @@
 import re
 import reportlab
 import reportlab.lib.units
-from lxml import etree
 from openerp.tools.safe_eval import safe_eval as eval
 
 _regex = re.compile('\[\[(.+?)\]\]')
diff --git a/openerp/report/render/simple.py b/openerp/report/render/simple.py
index 49d1adf148e..cb3831c141f 100644
--- a/openerp/report/render/simple.py
+++ b/openerp/report/render/simple.py
@@ -66,7 +66,6 @@ class simple(render.render):
         return self.result.getvalue()
 
 if __name__=='__main__':
-    import time
     s = simple()
     s.xml = '''<test>
         <author-list>

From 69a5eca5b48740c44e35ac5b0285e22a17c5dd8d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 8 Feb 2012 18:39:32 +0100
Subject: [PATCH 015/999] [IMP] Give precedence to module directories instead
 of zips while locating resources

The previous behavior gave the precedence to zipped
modules, without any apparent reason, and this is
sub-optimal for several reasons:

1. The default is to have regular modules, not
zipped modules, so looking first for a regular
module is more efficient.
2. Keeping a zipped module next to a regular
module with the same name is not a documented
or supported feature.
3. Even if you were relying on this behavior
having the extracted module take precedence
is more practical: you could simply extract
the zipped module to test a quick fix.

We have another issue related to this feature
because the code looking for zipped modules
escapes the addons paths chroot and goes
up to the filesystem root looking for a zip
module at each step. This is described in
bug 928376 and a fix for it should follow.

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

bzr revid: odo@openerp.com-20120208173932-pwhz53vxxdzbo8ja
---
 openerp/modules/module.py | 25 ++++++++++++++-----------
 openerp/tools/misc.py     | 24 +++++++++++++++---------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index 58a4547ff07..3d3bc0d9adf 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -280,25 +280,28 @@ def get_module_as_zip(modulename, b64enc=True, src=True):
 def get_module_resource(module, *args):
     """Return the full path of a resource of the given module.
 
-    @param module: the module
-    @param args: the resource path components
+    :param module: module name
+    :param list(str) args: resource path components within module
 
-    @return: absolute path to the resource
+    :rtype: str
+    :return: absolute path to the resource
 
     TODO name it get_resource_path
     TODO make it available inside on osv object (self.get_resource_path)
     """
-    a = get_module_path(module)
-    if not a: return False
-    resource_path = opj(a, *args)
-    if zipfile.is_zipfile( a +'.zip') :
-        zip = zipfile.ZipFile( a + ".zip")
+    mod_path = get_module_path(module)
+    if not mod_path: return False
+    resource_path = opj(mod_path, *args)
+    if os.path.isdir(mod_path):
+        # the module is a directory - ignore zip behavior
+        if os.path.exists(resource_path):
+            return resource_path
+    elif zipfile.is_zipfile(mod_path + '.zip'):
+        zip = zipfile.ZipFile( mod_path + ".zip")
         files = ['/'.join(f.split('/')[1:]) for f in zip.namelist()]
         resource_path = '/'.join(args)
         if resource_path in files:
-            return opj(a, resource_path)
-    elif os.path.exists(resource_path):
-        return resource_path
+            return opj(mod_path, resource_path)
     return False
 
 def get_module_icon(module):
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index a5c72900fc7..e0be5ffaef9 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -175,10 +175,22 @@ def file_open(name, mode="r", subdir='addons', pathinfo=False):
 
     name = os.path.normpath(name)
 
-    # Check for a zipfile in the path
+    # Give higher priority to module directories, which is
+    # a more common case than zipped modules.
+    if os.path.isfile(name):
+        fo = file(name, mode)
+        if pathinfo:
+            return fo, name
+        return fo
+
+    # Support for loading modules in zipped form.
+    # This will not work for zipped modules that are sitting
+    # outside of known addons paths. 
     head = name
     zipname = False
-    name2 = False
+    # FIXME: implement chrooting inside addons paths and fix
+    # for incorrect path_info behavior. Work in progress by
+    # Florent X linked to bug 928376
     while True:
         head, tail = os.path.split(head)
         if not tail:
@@ -200,14 +212,8 @@ def file_open(name, mode="r", subdir='addons', pathinfo=False):
                     return fo, name
                 return fo
             except Exception:
-                name2 = os.path.normpath(os.path.join(head + '.zip', zipname))
                 pass
-    for i in (name2, name):
-        if i and os.path.isfile(i):
-            fo = file(i, mode)
-            if pathinfo:
-                return fo, i
-            return fo
+
     if os.path.splitext(name)[1] == '.rml':
         raise IOError, 'Report %s doesn\'t exist or deleted : ' %str(name)
     raise IOError, 'File not found : %s' % name

From ab9db3f6227789fabf3fdfcd2eda016b996bfd28 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Wed, 8 Feb 2012 22:33:13 +0100
Subject: [PATCH 016/999] [REM] more unused imports.

bzr revid: florent.xicluna@gmail.com-20120208213313-1v0dugc59ch1fnnu
---
 openerp/service/http_server.py             | 2 --
 openerp/tests/addons/test_limits/models.py | 1 -
 2 files changed, 3 deletions(-)

diff --git a/openerp/service/http_server.py b/openerp/service/http_server.py
index 07e31ea9c7d..63e0d08fc92 100644
--- a/openerp/service/http_server.py
+++ b/openerp/service/http_server.py
@@ -44,10 +44,8 @@ import posixpath
 import urllib
 import os
 import logging
-from SimpleXMLRPCServer import SimpleXMLRPCDispatcher
 
 from websrv_lib import *
-import openerp.netsvc as netsvc
 import openerp.tools as tools
 
 try:
diff --git a/openerp/tests/addons/test_limits/models.py b/openerp/tests/addons/test_limits/models.py
index 5240acd23ab..32e2a9a16f4 100644
--- a/openerp/tests/addons/test_limits/models.py
+++ b/openerp/tests/addons/test_limits/models.py
@@ -27,7 +27,6 @@ class m(openerp.osv.osv.Model):
         return True
 
     def consume_cpu_time(self, cr, uid, seconds, context=None):
-        import os
         t0 = time.clock()
         t1 = time.clock()
         while t1 - t0 < seconds:

From d52e838455be4b038064bd9a1d972869b13257c1 Mon Sep 17 00:00:00 2001
From: Bogdan Stanciu <bogdanovidiu.stanciu@gmail.com>
Date: Sun, 12 Feb 2012 12:45:09 +0100
Subject: [PATCH 017/999] [IMP] some English corrections & 'encoding' into
 'coding' for several py files. No code change.

bzr revid: bogdanovidiu.stanciu@gmail.com-20120212114509-yrw86zewyv70dow7
---
 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/base.pot      |  4 +-
 openerp/addons/base/i18n/bg.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      |  6 +-
 openerp/addons/base/i18n/es.po         |  4 +-
 openerp/addons/base/i18n/es_AR.po      |  2 +-
 openerp/addons/base/i18n/es_CL.po      |  4 +-
 openerp/addons/base/i18n/es_CR.po      |  4 +-
 openerp/addons/base/i18n/es_EC.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         |  8 +--
 openerp/addons/base/i18n/gl.po         |  4 +-
 openerp/addons/base/i18n/he.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/kk.po         |  4 +-
 openerp/addons/base/i18n/ko.po         |  4 +-
 openerp/addons/base/i18n/lt.po         |  4 +-
 openerp/addons/base/i18n/lt_LT.po      |  2 +-
 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         | 91 ++++++++++++--------------
 openerp/addons/base/i18n/nl_BE.po      |  4 +-
 openerp/addons/base/i18n/nl_NL.po      |  2 +-
 openerp/addons/base/i18n/pl.po         |  4 +-
 openerp/addons/base/i18n/pt.po         |  4 +-
 openerp/addons/base/i18n/pt_BR.po      |  8 +--
 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/uk_UA.po      |  2 +-
 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 +-
 openerp/addons/base/ir/ir_actions.py   |  4 +-
 openerp/addons/base/res/res_country.py |  5 +-
 openerp/release.py                     |  2 +-
 openerp/service/http_server.py         |  4 +-
 openerp/service/websrv_lib.py          |  4 +-
 openerp/tools/yaml_import.py           |  2 +-
 70 files changed, 181 insertions(+), 185 deletions(-)

diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index 750498c192f..10b7c035815 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -775,7 +775,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5461,7 +5461,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index c1e1faad680..3214ddec3a7 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -775,7 +775,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5461,7 +5461,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 72c254eedb6..5912643d3c0 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -795,7 +795,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5545,7 +5545,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "رمز الولاية (ثلاثة حروف).\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/base.pot b/openerp/addons/base/i18n/base.pot
index 357319afe91..c1ca9862e96 100644
--- a/openerp/addons/base/i18n/base.pot
+++ b/openerp/addons/base/i18n/base.pot
@@ -727,7 +727,7 @@ msgstr ""
 #: help:ir.actions.todo,type:0
 msgid "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets automatically to Done."
+"Launch Manually Once: after having been launched manually, it sets automatically to Done."
 msgstr ""
 
 #. module: base
@@ -5037,7 +5037,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 ""
 msgstr ""
 
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index b44b49136f9..5f070859688 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -797,7 +797,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5552,7 +5552,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Кодът на държавата в три букви.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index 8b489f353b9..f4a109a9f86 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -783,7 +783,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5469,7 +5469,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index e9e3c958f8f..dbcc9dd3c31 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -807,7 +807,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5641,7 +5641,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "El codi de la província de 3 caràcters.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index 9d7f5fd42da..08924e330d5 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -806,7 +806,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5635,7 +5635,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Kód státu ve třech znacích.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index fc56fd78eba..d4fdbe01cc4 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -775,7 +775,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5461,7 +5461,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 401ede6d3f9..13f9e6f19da 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -813,7 +813,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr "Manuell: manuell gestartet"
 
@@ -5678,7 +5678,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Der 3 stellige Staatencode\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index eca0eba1ee5..9f1dc8937e1 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -795,7 +795,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5589,7 +5589,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Ο κωδικός κατάστασης με 3 χαρακτήρες\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index ba564da1057..2c9d775d610 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -802,7 +802,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5618,8 +5618,8 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
-msgstr "The state code in three chars.\n"
+msgid "The state code in max. three chars."
+msgstr "The state code in max. three chars."
 
 #. module: base
 #: model:res.country,name:base.sj
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 697adbf8dd3..4548e2692b8 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -842,7 +842,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5726,7 +5726,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "El código de la provincia de 3 caracteres.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po
index 5f2d8cb3305..e0a1569cffe 100644
--- a/openerp/addons/base/i18n/es_AR.po
+++ b/openerp/addons/base/i18n/es_AR.po
@@ -5583,7 +5583,7 @@ msgstr "STOCK_MEDIA_PAUSE"
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "El código de la provincia de 3 caracteres.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index 9f432778665..e3ff1de6ef3 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -811,7 +811,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5652,7 +5652,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "El código de la provincia de 3 caracteres.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index e5e6a7f4e3f..a4d9a8129d5 100644
--- a/openerp/addons/base/i18n/es_CR.po
+++ b/openerp/addons/base/i18n/es_CR.po
@@ -879,7 +879,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 "Manual: Lanzado manualmente.\n"
@@ -6736,7 +6736,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "El código de la provincia de 3 caracteres.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index dfd3f325733..dadcd9c0e46 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -807,7 +807,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5642,7 +5642,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "El código de la provincia de 3 caracteres.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index 0ad14eaff39..7552ae0719b 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -788,7 +788,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5499,7 +5499,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Maakonna kolmekohaline kood.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index f63e1b6dc4f..378c973a0eb 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -775,7 +775,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5461,7 +5461,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 5e55e009c97..a465ce96c3c 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -786,7 +786,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5502,7 +5502,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "کد استان در ۳ نویسه‌ای.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index 2b467ff72d1..e3d0389fe01 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -775,7 +775,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5461,7 +5461,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index a68401483b1..a6cb99831fb 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -799,7 +799,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5620,7 +5620,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Osavaltion koodi kolmella kirjaimella.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index c94296d2cbd..b47d352f885 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -815,7 +815,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5653,7 +5653,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Le code état en trois caractères.\n"
 
 #. module: base
@@ -11276,7 +11276,7 @@ msgstr "Séquences"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
 msgid "Mss"
-msgstr "Mme"
+msgstr "Mlle"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
@@ -11404,7 +11404,7 @@ msgstr "Filtre"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
 msgid "Ms."
-msgstr "Mlle"
+msgstr "Mme"
 
 #. module: base
 #: view:base.module.import:0
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index e166e224d57..804c17bad22 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -808,7 +808,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5635,7 +5635,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "O código de estado en tres caracteres.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index 191882068f0..49655e7ae5c 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -785,7 +785,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5487,7 +5487,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "ביטוי הקוד בשלוש תוים.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index 65fab4e5c30..bead1791bdc 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -840,7 +840,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5646,7 +5646,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Troznamenkasta šifra države/pokrajine/županije.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index 6894d272558..d8a699102bf 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -804,7 +804,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5625,7 +5625,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Az állam kódja három karakterben.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index 11c3cd40faf..b7e53816cae 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -775,7 +775,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5461,7 +5461,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index a62ce35ff65..323819ab4a5 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -779,7 +779,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5465,7 +5465,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index 87a31071d27..fb292a07512 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -775,7 +775,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5461,7 +5461,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index c5928215769..64f7a787c29 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -808,7 +808,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5645,7 +5645,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Il codice dello stato in 3 caratteri\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 84f3f3d2c55..3b727699679 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -818,7 +818,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 "手動：手動起動\n"
@@ -6134,7 +6134,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index 0205a66a540..de3a57e6e0f 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.po
@@ -775,7 +775,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5461,7 +5461,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index c5026451183..a4141f5d609 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -784,7 +784,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5518,7 +5518,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "3문자의 상태 코드\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index 66ff76f538c..8e0ae0d384e 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -778,7 +778,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5483,7 +5483,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Savivaldybės kodas iš trijų simbolių.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/lt_LT.po b/openerp/addons/base/i18n/lt_LT.po
index eb5c33417cd..409e6fe1bb7 100644
--- a/openerp/addons/base/i18n/lt_LT.po
+++ b/openerp/addons/base/i18n/lt_LT.po
@@ -5407,7 +5407,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 ""
 msgstr ""
 
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index eedaf5de4fb..9f52a9bcaf8 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -786,7 +786,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5514,7 +5514,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Stāvokļa kods, sastāvošs no trīs burtiem.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 0544dbb6017..e5293173930 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -786,7 +786,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5472,7 +5472,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index b3f470baadd..7e7ce75c2ed 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -789,7 +789,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5537,7 +5537,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Мужийн код гурван тэмдэгтээр.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 42f7fd2da30..4d21f12d3c6 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -795,7 +795,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5533,7 +5533,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Koden til staten med tre karakterer.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index 2b9799e8fa1..32a85ba06c4 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-02-12 19:08+0000\n"
+"PO-Revision-Date: 2012-02-11 08:55+0000\n"
 "Last-Translator: Mario Gielissen <Unknown>\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: 2012-02-13 04:49+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-02-12 04:41+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -275,7 +275,7 @@ msgstr "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
 #: model:ir.module.category,name:base.module_category_sales_management
 #: model:ir.module.module,shortdesc:base.module_sale
 msgid "Sales Management"
-msgstr "Verkoopbeheer"
+msgstr ""
 
 #. module: base
 #: view:res.partner:0
@@ -371,7 +371,7 @@ msgstr "Naam assistent"
 #. module: base
 #: model:res.groups,name:base.group_partner_manager
 msgid "Partner Manager"
-msgstr "Partner beheer"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_customer_relationship_management
@@ -392,7 +392,7 @@ msgstr "Ongeldige group_by"
 #. module: base
 #: field:ir.module.category,child_ids:0
 msgid "Child Applications"
-msgstr "Child applicaties"
+msgstr ""
 
 #. module: base
 #: field:res.partner,credit_limit:0
@@ -402,7 +402,7 @@ msgstr "Kredietlimiet"
 #. module: base
 #: model:ir.module.module,description:base.module_web_graph
 msgid "Openerp web graph view"
-msgstr "Openerp web grafiek view"
+msgstr ""
 
 #. module: base
 #: field:ir.model.data,date_update:0
@@ -412,7 +412,7 @@ msgstr "Wijzigingsdatum"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_action_rule
 msgid "Automated Action Rules"
-msgstr "Automatische aktie regels"
+msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
@@ -573,7 +573,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_layout
 msgid "Sales Orders Print Layout"
-msgstr "Verkooporder Afdruk Layout"
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -752,7 +752,7 @@ msgstr "Eritrea"
 #. module: base
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr "De naam van het bedrijf moet uniek zijn!"
+msgstr ""
 
 #. module: base
 #: view:res.config:0
@@ -790,7 +790,7 @@ msgstr ""
 #. module: base
 #: view:ir.mail_server:0
 msgid "Security and Authentication"
-msgstr "Beveiliging en Authenticatie"
+msgstr ""
 
 #. module: base
 #: view:base.language.export:0
@@ -808,7 +808,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -881,7 +881,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_webdav
 msgid "Shared Repositories (WebDAV)"
-msgstr "Gedeelde Repositories (WebDAV)"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_import_google
@@ -1105,7 +1105,7 @@ msgstr ""
 #: code:addons/base/ir/ir_mail_server.py:192
 #, python-format
 msgid "Connection test failed!"
-msgstr "Verbindings test mislukt!"
+msgstr ""
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -1227,12 +1227,12 @@ msgstr "Spaans (GT) / Spanje (GT)"
 #. module: base
 #: field:ir.mail_server,smtp_port:0
 msgid "SMTP Port"
-msgstr "SMTP poort"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_import_sugarcrm
 msgid "SugarCRM Import"
-msgstr "SugarCRM Import"
+msgstr ""
 
 #. module: base
 #: view:res.lang:0
@@ -1249,12 +1249,12 @@ msgstr ""
 #: code:addons/base/module/wizard/base_language_install.py:55
 #, python-format
 msgid "Language Pack"
-msgstr "Taalpakket"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_tests
 msgid "Tests"
-msgstr "Testen"
+msgstr ""
 
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
@@ -1315,7 +1315,7 @@ msgstr ""
 #. module: base
 #: field:ir.module.category,parent_id:0
 msgid "Parent Application"
-msgstr "Parent applicatie"
+msgstr ""
 
 #. module: base
 #: code:addons/base/res/res_users.py:222
@@ -1332,7 +1332,7 @@ msgstr "Om een taal te exporteren, geen taal kiezen."
 #: model:ir.module.module,shortdesc:base.module_document
 #: model:ir.module.module,shortdesc:base.module_knowledge
 msgid "Document Management System"
-msgstr "Document Beheer Systeem"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_claim
@@ -1596,7 +1596,7 @@ msgstr "Drijvende comma"
 #: model:ir.module.category,name:base.module_category_warehouse_management
 #: model:ir.module.module,shortdesc:base.module_stock
 msgid "Warehouse Management"
-msgstr "Magazijnbeheer"
+msgstr ""
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_link
@@ -1769,8 +1769,6 @@ msgid ""
 "simplified payment mode encoding, automatic picking lists generation and "
 "more."
 msgstr ""
-"Helpt u het meeste te halen uit uw kassa's met snelle codering, eenvoudige "
-"betaalmethode codering, automatische piklijst generatie en meer."
 
 #. module: base
 #: model:res.country,name:base.mv
@@ -1806,28 +1804,27 @@ msgstr "Dagen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_rpc
 msgid "OpenERP Web web"
-msgstr "OpenERP Web"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_html_view
 msgid "Html View"
-msgstr "Html weergave"
+msgstr ""
 
 #. module: base
 #: field:res.currency,position:0
 msgid "Symbol position"
-msgstr "Symbool positie"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_process
 msgid "Enterprise Process"
-msgstr "Bedrijfsprocessen"
+msgstr ""
 
 #. module: base
 #: help:ir.cron,function:0
 msgid "Name of the method to be called when this job is processed."
 msgstr ""
-"Naam van de methode die wordt aangeroepen als deze taak wordt uitgevoerd."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_evaluation
@@ -1849,7 +1846,7 @@ msgstr " (kopie)"
 #. module: base
 #: field:res.company,rml_footer1:0
 msgid "General Information Footer"
-msgstr "Algemene Info Voettekst"
+msgstr ""
 
 #. module: base
 #: view:res.lang:0
@@ -1956,7 +1953,7 @@ msgstr "%s (kopie)"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_chart
 msgid "Template of Charts of Accounts"
-msgstr "Grootboekschema template"
+msgstr ""
 
 #. module: base
 #: field:res.partner.address,type:0
@@ -2043,12 +2040,12 @@ msgstr "Finland"
 #: code:addons/base/res/res_company.py:156
 #, python-format
 msgid "Website: "
-msgstr "Website: "
+msgstr ""
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration
 msgid "Settings"
-msgstr "Voorkeuren"
+msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window,view_type:0
@@ -2080,8 +2077,6 @@ msgid ""
 "Display this bank account on the footer of printed documents like invoices "
 "and sales orders."
 msgstr ""
-"Laat dit bankrekeningnummer zien in de voettekst van ieder afgedrukte "
-"document zoals facturen en verkooporders."
 
 #. module: base
 #: view:base.language.import:0
@@ -2190,7 +2185,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_subscription
 msgid "Recurring Documents"
-msgstr "Herhalende documenten"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.bs
@@ -2229,7 +2224,7 @@ msgstr "Aantal bijgewerkte modules"
 #. module: base
 #: field:ir.cron,function:0
 msgid "Method"
-msgstr "Methode"
+msgstr ""
 
 #. module: base
 #: view:res.partner.event:0
@@ -2253,7 +2248,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_setup
 msgid "Initial Setup Tools"
-msgstr "Initiële Installatie Tools"
+msgstr ""
 
 #. module: base
 #: field:ir.actions.act_window,groups_id:0
@@ -2315,7 +2310,7 @@ msgstr "Beginpagina componenten beheer"
 #. module: base
 #: field:res.company,rml_header1:0
 msgid "Report Header / Company Slogan"
-msgstr "Rapporthoofd / Bedrijfs slogan"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.pl
@@ -2368,7 +2363,7 @@ msgstr ""
 #. module: base
 #: field:ir.mail_server,smtp_debug:0
 msgid "Debugging"
-msgstr "Fouten opsporen"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_helpdesk
@@ -2478,12 +2473,12 @@ msgstr "Huidige koers"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_idea
 msgid "Ideas"
-msgstr "Ideeën"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_crm
 msgid "Opportunity to Quotation"
-msgstr "Verkoopkans naar offerte"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_analytic_plans
@@ -2510,7 +2505,7 @@ msgstr ""
 #. module: base
 #: model:ir.actions.report.xml,name:base.report_ir_model_overview
 msgid "Model Overview"
-msgstr "Model Overzicht"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_margin
@@ -2520,7 +2515,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_invoiced
 msgid "Invoicing"
-msgstr "Facturering"
+msgstr ""
 
 #. module: base
 #: field:ir.ui.view_sc,name:0
@@ -2561,7 +2556,7 @@ msgstr ""
 #: field:ir.model.data,res_id:0
 #: field:ir.values,res_id:0
 msgid "Record ID"
-msgstr "Record-id"
+msgstr ""
 
 #. module: base
 #: field:ir.actions.server,email:0
@@ -2645,7 +2640,7 @@ msgstr "Fout tijdens communicatie met de uitgevers garantie server."
 #: model:res.groups,name:base.group_sale_manager
 #: model:res.groups,name:base.group_tool_manager
 msgid "Manager"
-msgstr "Beheer"
+msgstr ""
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
@@ -2682,7 +2677,7 @@ msgstr "IDs opschonen"
 #. module: base
 #: view:res.groups:0
 msgid "Inherited"
-msgstr "Overgeërfd"
+msgstr ""
 
 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
@@ -2705,7 +2700,7 @@ msgstr "%y - Jaar zonder eeuw [00,99]."
 #: code:addons/base/res/res_company.py:155
 #, python-format
 msgid "Fax: "
-msgstr "Fax: "
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.si
@@ -5644,7 +5639,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "De provinciecode in drie karakters.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index 526625a6597..7b720f4511d 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -790,7 +790,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5476,7 +5476,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nl_NL.po b/openerp/addons/base/i18n/nl_NL.po
index 216dc70bd16..061a453645b 100644
--- a/openerp/addons/base/i18n/nl_NL.po
+++ b/openerp/addons/base/i18n/nl_NL.po
@@ -5598,7 +5598,7 @@ msgstr "STOCK_MEDIA_PAUSE"
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "De provinciecode in drie karakters.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index f78e5733b36..e7bd3ec9b14 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -793,7 +793,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5578,7 +5578,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Trzyliterowy kod regionu\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index edec4cffb17..fe6b53693cb 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -802,7 +802,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5567,7 +5567,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "O código do estado com três caracteres\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index 6f1dc01c7da..8eec70f77b6 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.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: 2012-02-13 04:49+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-02-12 04:42+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -840,7 +840,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 "Manual: Iniciado manualmente\n"
@@ -5850,7 +5850,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "O código de situação com 3 caracteres.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index 3e947cbbfc9..27ff3506cea 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -811,7 +811,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5649,7 +5649,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Codul statului, din trei caractere.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index 62c4e6698cd..835efe3fa58 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -806,7 +806,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5628,7 +5628,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Код области из трёх букв.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index 46f537ae09e..c4fb21e7f70 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -792,7 +792,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5574,7 +5574,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Kód štátu na 3 znaky.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index a344ffba70b..0de03559923 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -801,7 +801,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5617,7 +5617,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Koda zvezne države v treh znakih.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index 38896cd6a56..297d3f37ea9 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -774,7 +774,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5460,7 +5460,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index ad02d9eec00..65f02a38fce 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -795,7 +795,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5561,7 +5561,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Šifra države u ti karaktera.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 6435154a90a..92ba916bf1a 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -837,7 +837,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 "Ručno: Pokrenuto ručno.\n"
@@ -5644,7 +5644,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index ddb985cb2a8..c9d0a27b8c9 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -797,7 +797,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5583,7 +5583,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Landskod, tre tecken\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 5dc4e9d0386..0951f766fca 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -775,7 +775,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5461,7 +5461,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index b2500e94c1e..1c087b508eb 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -774,7 +774,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5460,7 +5460,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index 49dea1a9448..b9d1bb2a7c5 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -806,7 +806,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5662,7 +5662,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Üç karakterden oluşan eyalet kodu.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index 8a22baa55ba..1ded396d476 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -796,7 +796,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5507,7 +5507,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "Код області довжиною в три букви.\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/uk_UA.po b/openerp/addons/base/i18n/uk_UA.po
index a33cdf8b473..87fbfe76e2b 100644
--- a/openerp/addons/base/i18n/uk_UA.po
+++ b/openerp/addons/base/i18n/uk_UA.po
@@ -5424,7 +5424,7 @@ msgstr "STOCK_MEDIA_PAUSE"
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 ""
 msgstr ""
 
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index b9467f4518a..a45da1f2dad 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -775,7 +775,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5461,7 +5461,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index d12ece2051f..d8e03b80386 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -799,7 +799,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5490,7 +5490,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index fe7a5cc0aaa..7b618b1e0e5 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -821,7 +821,7 @@ msgstr "OpenERP的翻译在Launchpad.net网站上进行，OpenERP项目本身也
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 "手动：手动执行\n"
@@ -5895,7 +5895,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "三个字符的省／州代码\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index 30dc4956d39..06a099c2196 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.po
@@ -775,7 +775,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5461,7 +5461,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index cacb85a6f34..5b6c6c37767 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -779,7 +779,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after hacing been launched manually, it sets "
+"Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 
@@ -5470,7 +5470,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in three chars.\n"
+msgid "The state code in max. three chars."
 msgstr "三個字元之省或州代碼\n"
 
 #. module: base
diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 236c6af7119..0a282503570 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -619,7 +619,7 @@ class actions_server(osv.osv):
     #   ids : original ids
     #   id  : current id of the object
     # OUT:
-    #   False : Finnished correctly
+    #   False : Finished correctly
     #   ACTION_ID : Action to launch
 
     # FIXME: refactor all the eval() calls in run()!
@@ -831,7 +831,7 @@ class ir_actions_todo(osv.osv):
         'type': fields.selection(TODO_TYPES, 'Type', required=True,
             help="""Manual: Launched manually.
 Automatic: Runs whenever the system is reconfigured.
-Launch Manually Once: after hacing been launched manually, it sets automatically to Done."""),
+Launch Manually Once: after having been launched manually, it sets automatically to Done."""),
         'groups_id': fields.many2many('res.groups', 'res_groups_action_rel', 'uid', 'gid', 'Groups'),
         'note': fields.text('Text', translate=True),
         'category_id': fields.many2one('ir.actions.todo.category','Category'),
diff --git a/openerp/addons/base/res/res_country.py b/openerp/addons/base/res/res_country.py
index f240784dc47..d0269dd4df1 100644
--- a/openerp/addons/base/res/res_country.py
+++ b/openerp/addons/base/res/res_country.py
@@ -86,9 +86,10 @@ class CountryState(osv.osv):
     _columns = {
         'country_id': fields.many2one('res.country', 'Country',
             required=True),
-        'name': fields.char('State Name', size=64, required=True),
+        'name': fields.char('State Name', size=64, required=True, 
+                            help='Administrative divisions of a country. E.g. Fed. State, Departement, Canton'),
         'code': fields.char('State Code', size=3,
-            help='The state code in three chars.\n', required=True),
+            help='The state code in max. three chars.', required=True),
     }
     def name_search(self, cr, user, name='', args=None, operator='ilike',
             context=None, limit=100):
diff --git a/openerp/release.py b/openerp/release.py
index bd3935713b9..1f573c54814 100644
--- a/openerp/release.py
+++ b/openerp/release.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
diff --git a/openerp/service/http_server.py b/openerp/service/http_server.py
index 07e31ea9c7d..5fb46b42ffc 100644
--- a/openerp/service/http_server.py
+++ b/openerp/service/http_server.py
@@ -5,10 +5,10 @@
 #
 #
 # WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
+# programmers who take the whole responsibility of assessing all potential
 # consequences resulting from its eventual inadequacies and bugs
 # End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
+# guarantees and support are strongly advised to contract a Free Software
 # Service Company
 #
 # This program is Free Software; you can redistribute it and/or
diff --git a/openerp/service/websrv_lib.py b/openerp/service/websrv_lib.py
index 4da6536ed51..d9f654f4edb 100644
--- a/openerp/service/websrv_lib.py
+++ b/openerp/service/websrv_lib.py
@@ -3,10 +3,10 @@
 # Copyright P. Christeas <p_christ@hol.gr> 2008-2010
 #
 # WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
+# programmers who take the whole responsibility of assessing all potential
 # consequences resulting from its eventual inadequacies and bugs
 # End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
+# guarantees and support are strongly advised to contract a Free Software
 # Service Company
 #
 # This program is Free Software; you can redistribute it and/or
diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index c36376ba1b7..1c676e3a1c6 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 import threading
 import types
 import time # used to eval time.strftime expressions

From 0ea407eb5ab51e604ad5550d8d0672bd659a3a73 Mon Sep 17 00:00:00 2001
From: Bogdan Stanciu <bogdanovidiu.stanciu@gmail.com>
Date: Sun, 12 Feb 2012 12:48:12 +0100
Subject: [PATCH 018/999] [IMP] added two address formats (CH and RO)

bzr revid: bogdanovidiu.stanciu@gmail.com-20120212114812-dbt4jy0jxisn55x8
---
 openerp/addons/base/base_data.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 03e62dd6ba6..1c4e7fc639b 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -197,6 +197,7 @@
         <record id="ch" model="res.country">
             <field name="name">Switzerland</field>
             <field name="code">ch</field>
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
         </record>
         <record id="ci" model="res.country">
             <field name="name">Ivory Coast (Cote D'Ivoire)</field>
@@ -767,6 +768,7 @@
         <record id="ro" model="res.country">
             <field name="name">Romania</field>
             <field name="code">ro</field>
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(state_code)s\n%(country_name)s'" />            
         </record>
         <record id="ru" model="res.country">
             <field name="name">Russian Federation</field>

From 434af1f37af3267797a08b65b4c39ce132bbad4e Mon Sep 17 00:00:00 2001
From: Bogdan Stanciu <bogdanovidiu.stanciu@gmail.com>
Date: Sun, 12 Feb 2012 13:25:57 +0100
Subject: [PATCH 019/999] [IMP] corrected a few titles vs. "shortcuts" and
 added three titles to res.partner.title

bzr revid: bogdanovidiu.stanciu@gmail.com-20120212122557-6od8yipxs6bp31ht
---
 openerp/addons/base/i18n/af.po               |  6 ++--
 openerp/addons/base/i18n/am.po               |  6 ++--
 openerp/addons/base/i18n/ar.po               |  6 ++--
 openerp/addons/base/i18n/base.pot            | 35 ++++++++++++++++++--
 openerp/addons/base/i18n/bg.po               |  8 ++---
 openerp/addons/base/i18n/bs.po               |  6 ++--
 openerp/addons/base/i18n/ca.po               |  6 ++--
 openerp/addons/base/i18n/cs.po               |  8 ++---
 openerp/addons/base/i18n/da.po               |  6 ++--
 openerp/addons/base/i18n/de.po               |  6 ++--
 openerp/addons/base/i18n/el.po               |  6 ++--
 openerp/addons/base/i18n/en_GB.po            | 12 +++----
 openerp/addons/base/i18n/es.po               |  6 ++--
 openerp/addons/base/i18n/es_CL.po            |  6 ++--
 openerp/addons/base/i18n/es_CR.po            |  6 ++--
 openerp/addons/base/i18n/es_EC.po            | 10 +++---
 openerp/addons/base/i18n/et.po               |  6 ++--
 openerp/addons/base/i18n/eu.po               |  6 ++--
 openerp/addons/base/i18n/fa.po               |  6 ++--
 openerp/addons/base/i18n/fa_AF.po            |  6 ++--
 openerp/addons/base/i18n/fi.po               |  8 ++---
 openerp/addons/base/i18n/fr.po               |  6 ++--
 openerp/addons/base/i18n/gl.po               | 10 +++---
 openerp/addons/base/i18n/he.po               |  6 ++--
 openerp/addons/base/i18n/hr.po               |  6 ++--
 openerp/addons/base/i18n/hu.po               | 10 +++---
 openerp/addons/base/i18n/hy.po               |  6 ++--
 openerp/addons/base/i18n/id.po               |  6 ++--
 openerp/addons/base/i18n/is.po               |  6 ++--
 openerp/addons/base/i18n/it.po               | 10 +++---
 openerp/addons/base/i18n/ja.po               |  6 ++--
 openerp/addons/base/i18n/kk.po               |  6 ++--
 openerp/addons/base/i18n/ko.po               |  6 ++--
 openerp/addons/base/i18n/lt.po               |  6 ++--
 openerp/addons/base/i18n/lv.po               |  6 ++--
 openerp/addons/base/i18n/mk.po               |  6 ++--
 openerp/addons/base/i18n/mn.po               |  8 ++---
 openerp/addons/base/i18n/nb.po               |  8 ++---
 openerp/addons/base/i18n/nl.po               |  6 ++--
 openerp/addons/base/i18n/nl_BE.po            |  6 ++--
 openerp/addons/base/i18n/pl.po               |  6 ++--
 openerp/addons/base/i18n/pt.po               |  6 ++--
 openerp/addons/base/i18n/pt_BR.po            |  8 ++---
 openerp/addons/base/i18n/ro.po               |  6 ++--
 openerp/addons/base/i18n/ru.po               |  6 ++--
 openerp/addons/base/i18n/sk.po               |  6 ++--
 openerp/addons/base/i18n/sl.po               |  6 ++--
 openerp/addons/base/i18n/sq.po               |  6 ++--
 openerp/addons/base/i18n/sr.po               | 12 +++----
 openerp/addons/base/i18n/sr@latin.po         |  6 ++--
 openerp/addons/base/i18n/sv.po               |  8 ++---
 openerp/addons/base/i18n/th.po               |  6 ++--
 openerp/addons/base/i18n/tlh.po              |  6 ++--
 openerp/addons/base/i18n/tr.po               |  8 ++---
 openerp/addons/base/i18n/uk.po               |  6 ++--
 openerp/addons/base/i18n/ur.po               |  6 ++--
 openerp/addons/base/i18n/vi.po               |  6 ++--
 openerp/addons/base/i18n/zh_CN.po            |  8 ++---
 openerp/addons/base/i18n/zh_HK.po            |  6 ++--
 openerp/addons/base/i18n/zh_TW.po            |  6 ++--
 openerp/addons/base/res/res_partner_data.xml | 21 ++++++++++--
 61 files changed, 250 insertions(+), 206 deletions(-)

diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index 10b7c035815..5b00d0558af 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -3682,7 +3682,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index 3214ddec3a7..b1e142e769b 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -3682,7 +3682,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 5912643d3c0..98baaf19bf1 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -3745,7 +3745,7 @@ msgstr "GPL-2 أو إصدار أحدث"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11110,7 +11110,7 @@ msgstr "المتواليات"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11233,7 +11233,7 @@ msgstr "مرشح الفرز"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "السيدة"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/base.pot b/openerp/addons/base/i18n/base.pot
index c1ca9862e96..0a97521219b 100644
--- a/openerp/addons/base/i18n/base.pot
+++ b/openerp/addons/base/i18n/base.pot
@@ -3430,7 +3430,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Sir"
 msgstr ""
 
 #. module: base
@@ -10134,7 +10134,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -10249,7 +10249,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
@@ -11306,6 +11306,35 @@ msgstr ""
 msgid "Madam"
 msgstr ""
 
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_mister
+msgid "Mister"
+msgstr ""
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_doctor
+msgid "Doctor"
+msgstr ""
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_prof
+msgid "Professor"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_mister
+msgid "Mr."
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_doctor
+msgid "Dr."
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_prof
+msgid "Prof."
+msgstr ""
+
+
 #. module: base
 #: model:res.country,name:base.ee
 msgid "Estonia"
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index 5f070859688..327c1e65c8a 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -3751,8 +3751,8 @@ msgstr "GPL версия 2 или по-нова"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
-msgstr "M."
+msgid "Mr."
+msgstr "Mr."
 
 #. module: base
 #: code:addons/base/module/module.py:519
@@ -11115,7 +11115,7 @@ msgstr "Последователност"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11235,7 +11235,7 @@ msgstr "Филтър"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Г-жа"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index f4a109a9f86..bdf09238918 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -3690,7 +3690,7 @@ msgstr "GPL-2 ili novija verzija"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11003,7 +11003,7 @@ msgstr "Sekvence"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11123,7 +11123,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index dbcc9dd3c31..f4d57a65484 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -3805,7 +3805,7 @@ msgstr "GPL-2 o versió posterior"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr "Sr."
 
 #. module: base
@@ -11259,7 +11259,7 @@ msgstr "Seqüències"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "Sra."
 
 #. module: base
@@ -11385,7 +11385,7 @@ msgstr "Filtre"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Sra."
 
 #. module: base
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index 08924e330d5..a72e16f34dc 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -3822,8 +3822,8 @@ msgstr "GPL-2 nebo pozdější verze"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
-msgstr "M."
+msgid "Mr."
+msgstr "Mr."
 
 #. module: base
 #: code:addons/base/module/module.py:519
@@ -11233,7 +11233,7 @@ msgstr "Posloupnosti"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "Paní"
 
 #. module: base
@@ -11355,7 +11355,7 @@ msgstr "Filtr"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Pan"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index d4fdbe01cc4..53663056459 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -3682,7 +3682,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -10995,7 +10995,7 @@ msgstr "Sekvenser"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 13f9e6f19da..40bcd5b9b72 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -3835,7 +3835,7 @@ msgstr "GPL-2 oder höher"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr "Hr."
 
 #. module: base
@@ -11360,7 +11360,7 @@ msgstr "Sequenzen"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "Frau"
 
 #. module: base
@@ -11485,7 +11485,7 @@ msgstr "Filter"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Frau"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 9f1dc8937e1..22febb8de85 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -3776,7 +3776,7 @@ msgstr "GPL-2 ή μεταγενέστερη έκδοση"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11159,7 +11159,7 @@ msgstr "Ιεραρχήσεις"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11281,7 +11281,7 @@ msgstr "Φίλτρο"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Κα/Δς"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 2c9d775d610..bc509103502 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -3790,8 +3790,8 @@ msgstr "GPL-2 or later version"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
-msgstr "M."
+msgid "Mr."
+msgstr "Mr."
 
 #. module: base
 #: code:addons/base/module/module.py:519
@@ -11221,8 +11221,8 @@ msgstr "Sequences"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
-msgstr "Mss"
+msgid "Miss"
+msgstr "Miss"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
@@ -11346,8 +11346,8 @@ msgstr "Filter"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
-msgstr "Ms."
+msgid "Mrs."
+msgstr "Mrs."
 
 #. module: base
 #: view:base.module.import:0
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 4548e2692b8..5ebd7d1a0dc 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -3887,7 +3887,7 @@ msgstr "GPL-2 o versión posterior"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr "Sr."
 
 #. module: base
@@ -11344,7 +11344,7 @@ msgstr "Secuencias"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "Sra."
 
 #. module: base
@@ -11471,7 +11471,7 @@ msgstr "Filtro"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Sra."
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index e3ff1de6ef3..c87eb21ac41 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -3813,7 +3813,7 @@ msgstr "GPL-2 o versión posterior"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr "Sr."
 
 #. module: base
@@ -11270,7 +11270,7 @@ msgstr "Secuencias"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "Sra."
 
 #. module: base
@@ -11397,7 +11397,7 @@ msgstr "Filtro"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Sra."
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index a4d9a8129d5..913775326c7 100644
--- a/openerp/addons/base/i18n/es_CR.po
+++ b/openerp/addons/base/i18n/es_CR.po
@@ -4442,7 +4442,7 @@ msgstr "GPL-2 o versión posterior"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr "Sr."
 
 #. module: base
@@ -13818,7 +13818,7 @@ msgstr "Secuencias"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "Sra."
 
 #. module: base
@@ -13945,7 +13945,7 @@ msgstr "Filtro"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Sra."
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index dadcd9c0e46..e81781da452 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -3805,8 +3805,8 @@ msgstr "GPL-2 o versión posterior"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
-msgstr "M."
+msgid "Mr."
+msgstr "Mr."
 
 #. module: base
 #: code:addons/base/module/module.py:519
@@ -11264,8 +11264,8 @@ msgstr "Secuencias"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
-msgstr "Mss"
+msgid "Miss"
+msgstr "Miss"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
@@ -11391,7 +11391,7 @@ msgstr "Filtro"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Sra."
 
 #. module: base
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index 7552ae0719b..f2457c654a4 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -3713,7 +3713,7 @@ msgstr "GPL-2 või hilisem versioon"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11043,7 +11043,7 @@ msgstr "Jadad"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11163,7 +11163,7 @@ msgstr "Filter"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index 378c973a0eb..92667018edb 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -3682,7 +3682,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index a465ce96c3c..c1a94fc9ce1 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -3715,7 +3715,7 @@ msgstr "مجوز GPL-2 یا نگارش بالاتر"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11048,7 +11048,7 @@ msgstr "دنباله‌ها"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11168,7 +11168,7 @@ msgstr "پالایه"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index e3d0389fe01..27e99d07a6c 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -3682,7 +3682,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index a6cb99831fb..3b27c52ae46 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -3793,7 +3793,7 @@ msgstr "GPL-2 tai myöhäisempi versio"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11226,7 +11226,7 @@ msgstr "Jaksot"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11352,8 +11352,8 @@ msgstr "Suodin"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
-msgstr "Ms."
+msgid "Mrs."
+msgstr "Mrs."
 
 #. module: base
 #: view:base.module.import:0
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index b47d352f885..975b97a543f 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -3817,7 +3817,7 @@ msgstr "GPL-2 ou version supérieure"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr "M."
 
 #. module: base
@@ -11275,7 +11275,7 @@ msgstr "Séquences"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "Mlle"
 
 #. module: base
@@ -11403,7 +11403,7 @@ msgstr "Filtre"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Mme"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index 804c17bad22..66b56a02246 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -3805,8 +3805,8 @@ msgstr "GPL-2 ou versión posterior"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
-msgstr "M."
+msgid "Mr."
+msgstr "Mr."
 
 #. module: base
 #: code:addons/base/module/module.py:519
@@ -11245,8 +11245,8 @@ msgstr "Secuencias"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
-msgstr "MSS"
+msgid "Miss"
+msgstr "Miss"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
@@ -11372,7 +11372,7 @@ msgstr "Filtro"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Ms"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index 49655e7ae5c..6d1a3501066 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -3702,7 +3702,7 @@ msgstr "גרסא GPL-2 או מאוחרת יותר."
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11030,7 +11030,7 @@ msgstr "רציפות"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11150,7 +11150,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index bead1791bdc..4460921847e 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -3835,7 +3835,7 @@ msgstr "GPL-2 ili novija verzija"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr "g."
 
 #. module: base
@@ -11218,7 +11218,7 @@ msgstr "Sekvence"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "gđica"
 
 #. module: base
@@ -11344,7 +11344,7 @@ msgstr "Filter"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "gđa."
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index d8a699102bf..5d20eb6f771 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -3792,7 +3792,7 @@ msgstr "GPL-2 vagy korábbi verzió"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr "Úr"
 
 #. module: base
@@ -11243,8 +11243,8 @@ msgstr "Sorszámok"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
-msgstr "Mss"
+msgid "Miss"
+msgstr "Miss"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
@@ -11372,8 +11372,8 @@ msgstr "Szűrő"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
-msgstr "Ms."
+msgid "Mrs."
+msgstr "Mrs."
 
 #. module: base
 #: view:base.module.import:0
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index b7e53816cae..9984f2c03f4 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -3682,7 +3682,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index 323819ab4a5..cc5113f856f 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -3686,7 +3686,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -10999,7 +10999,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11119,7 +11119,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index fb292a07512..425ea2516db 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -3682,7 +3682,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index 64f7a787c29..40f6a45e2ff 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -3810,8 +3810,8 @@ msgstr "GPL-2 o successiva"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
-msgstr "M."
+msgid "Mr."
+msgstr "Mr."
 
 #. module: base
 #: code:addons/base/module/module.py:519
@@ -11265,8 +11265,8 @@ msgstr "Sequenze"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
-msgstr "Mss"
+msgid "Miss"
+msgstr "Miss"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
@@ -11392,7 +11392,7 @@ msgstr "Filtro"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Sig.ra"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 3b727699679..00064377974 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -4096,7 +4096,7 @@ msgstr "GPL-2 またはそれ以降のバージョン"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11674,7 +11674,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11794,7 +11794,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index de3a57e6e0f..70c941b9aa6 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.po
@@ -3682,7 +3682,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11115,7 +11115,7 @@ msgstr "Сүзгі"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "миссис"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index a4141f5d609..8fd9331052c 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -3729,7 +3729,7 @@ msgstr "GPL-2 또는 이후 버젼"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11056,7 +11056,7 @@ msgstr "시퀀스"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11176,7 +11176,7 @@ msgstr "필터"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index 8e0ae0d384e..821b0705ff5 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -3694,7 +3694,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11029,7 +11029,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11149,7 +11149,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Ponia"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index 9f52a9bcaf8..1402da79c00 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -3717,7 +3717,7 @@ msgstr "GPL-2 vai vēlāka versija"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11063,7 +11063,7 @@ msgstr "Sērijas"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11183,7 +11183,7 @@ msgstr "Filtrs"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index e5293173930..83994f31964 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -3693,7 +3693,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11006,7 +11006,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11126,7 +11126,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index 7e7ce75c2ed..1f58def2e90 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -3746,8 +3746,8 @@ msgstr "GPL-2 болон дараагийн хувилбар"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
-msgstr "M."
+msgid "Mr."
+msgstr "Mr."
 
 #. module: base
 #: code:addons/base/module/module.py:519
@@ -11086,7 +11086,7 @@ msgstr "Дараалал"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "Хатагтай"
 
 #. module: base
@@ -11207,7 +11207,7 @@ msgstr "Шүүлт"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Хатагтай."
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 4d21f12d3c6..91fa3298775 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -3734,8 +3734,8 @@ msgstr "GPL-2 eller senere versjon"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
-msgstr "M."
+msgid "Mr."
+msgstr "Mr."
 
 #. module: base
 #: code:addons/base/module/module.py:519
@@ -11081,7 +11081,7 @@ msgstr "Sekvenser"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11201,7 +11201,7 @@ msgstr "Filter"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index 32a85ba06c4..311d04e0a54 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -3800,7 +3800,7 @@ msgstr "GPL-2 of latere versie"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr "Hr."
 
 #. module: base
@@ -11252,7 +11252,7 @@ msgstr "Reeksen"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "Mej."
 
 #. module: base
@@ -11379,7 +11379,7 @@ msgstr "Filter"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Mw."
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index 7b720f4511d..d9fcfaa86af 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -3697,7 +3697,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11010,7 +11010,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11130,7 +11130,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index e7bd3ec9b14..5e6569da9d7 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -3761,7 +3761,7 @@ msgstr "GPL-2 lub wersja późniejsza"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11159,7 +11159,7 @@ msgstr "Numeracje"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11281,7 +11281,7 @@ msgstr "Filtr"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Pani"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index fe6b53693cb..92315dee4ef 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -3757,7 +3757,7 @@ msgstr "GPL-2 ou version anterior"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11162,7 +11162,7 @@ msgstr "Sequências"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11284,7 +11284,7 @@ msgstr "Filtro"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Srª."
 
 #. module: base
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index 8eec70f77b6..51e34a6e9be 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -3975,8 +3975,8 @@ msgstr "GPL-2 ou versão superior"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
-msgstr "M."
+msgid "Mr."
+msgstr "Mr."
 
 #. module: base
 #: code:addons/base/module/module.py:519
@@ -11709,7 +11709,7 @@ msgstr "Seqüências"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "Sra"
 
 #. module: base
@@ -11836,7 +11836,7 @@ msgstr "Filtro"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Sra."
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index 27ff3506cea..2cbc45fb22d 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -3812,7 +3812,7 @@ msgstr "GPL-2 sau versiune mai nouă"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr "Dl."
 
 #. module: base
@@ -11271,7 +11271,7 @@ msgstr "Secvențe"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "D-ra"
 
 #. module: base
@@ -11399,7 +11399,7 @@ msgstr "Filtru"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Dna."
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index 835efe3fa58..57ac744865d 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -3794,7 +3794,7 @@ msgstr "GPL версии 2 или более поздней"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr "Г-н"
 
 #. module: base
@@ -11243,7 +11243,7 @@ msgstr "Нумерация"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "Г-жа"
 
 #. module: base
@@ -11369,7 +11369,7 @@ msgstr "Фильтр"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Г-жа"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index c4fb21e7f70..c8f621a6ed8 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -3760,7 +3760,7 @@ msgstr "GPL-2 alebo novšia verzia"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr "pán"
 
 #. module: base
@@ -11163,7 +11163,7 @@ msgstr "Postupnosti"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "slečna"
 
 #. module: base
@@ -11290,7 +11290,7 @@ msgstr "Filter"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "pani"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index 0de03559923..45d82a64cd1 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -3789,7 +3789,7 @@ msgstr "GPL-2 ali naslednja verzija"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr "G."
 
 #. module: base
@@ -11220,7 +11220,7 @@ msgstr "Zaporedja"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "Gospodična"
 
 #. module: base
@@ -11348,7 +11348,7 @@ msgstr "Filter"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Ga."
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index 297d3f37ea9..6637361df72 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -3681,7 +3681,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -10994,7 +10994,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11114,7 +11114,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index 65f02a38fce..61d5fa09aff 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -3758,8 +3758,8 @@ msgstr "GPL-2  ili novija verzija"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
-msgstr "M."
+msgid "Mr."
+msgstr "Mr."
 
 #. module: base
 #: code:addons/base/module/module.py:519
@@ -11139,8 +11139,8 @@ msgstr "Sekvence"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
-msgstr "Mss"
+msgid "Miss"
+msgstr "Miss"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
@@ -11259,8 +11259,8 @@ msgstr "Filter"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
-msgstr "Ms."
+msgid "Mrs."
+msgstr "Mrs."
 
 #. module: base
 #: view:base.module.import:0
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 92ba916bf1a..114337effd1 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -3865,7 +3865,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11178,7 +11178,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11298,7 +11298,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index c9d0a27b8c9..352e6ba4513 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -3768,8 +3768,8 @@ msgstr "GPL-2 eller senare version"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
-msgstr "M."
+msgid "Mr."
+msgstr "Mr."
 
 #. module: base
 #: code:addons/base/module/module.py:519
@@ -11176,7 +11176,7 @@ msgstr "Nummerserier"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "Fru"
 
 #. module: base
@@ -11300,7 +11300,7 @@ msgstr "Filtrera"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Frk."
 
 #. module: base
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 0951f766fca..d91bddb206b 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -3682,7 +3682,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -10995,7 +10995,7 @@ msgstr "ลำดับ"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index 1c087b508eb..60cf53c393f 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -3681,7 +3681,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -10994,7 +10994,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11114,7 +11114,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index b9d1bb2a7c5..9ec92ff00cd 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -3824,8 +3824,8 @@ msgstr "GPL-2 veya sonraki sürümü"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
-msgstr "M."
+msgid "Mr."
+msgstr "Mr."
 
 #. module: base
 #: code:addons/base/module/module.py:519
@@ -11280,7 +11280,7 @@ msgstr "Silsileler"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr "Bayan"
 
 #. module: base
@@ -11404,7 +11404,7 @@ msgstr "Süzgeç"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "Bayan"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index 1ded396d476..f42d5e2d0e1 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -3717,7 +3717,7 @@ msgstr "GPL-2 або пізніша версія"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11046,7 +11046,7 @@ msgstr "Послідовності"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11166,7 +11166,7 @@ msgstr "Фільтр"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index a45da1f2dad..582ee6bd2c5 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -3682,7 +3682,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index d8e03b80386..35e1c2cc32f 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -3709,7 +3709,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11028,7 +11028,7 @@ msgstr "Sequences"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11150,7 +11150,7 @@ msgstr "Bộ lọc"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 7b618b1e0e5..8a1ffd6136a 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -4081,7 +4081,7 @@ msgstr "GPL-2 或更新版本"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr "先生"
 
 #. module: base
@@ -11468,8 +11468,8 @@ msgstr "序列"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
-msgstr "Mss"
+msgid "Miss"
+msgstr "Miss"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
@@ -11588,7 +11588,7 @@ msgstr "过滤"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "女士"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index 06a099c2196..78232e87ecf 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.po
@@ -3682,7 +3682,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index 5b6c6c37767..116eca54d8d 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -3687,7 +3687,7 @@ msgstr "GPL-2 或更新版本"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "M."
+msgid "Mr."
 msgstr ""
 
 #. module: base
@@ -11013,7 +11013,7 @@ msgstr "序列"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Mss"
+msgid "Miss"
 msgstr ""
 
 #. module: base
@@ -11133,7 +11133,7 @@ msgstr "過濾器"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Ms."
+msgid "Mrs."
 msgstr "女士"
 
 #. module: base
diff --git a/openerp/addons/base/res/res_partner_data.xml b/openerp/addons/base/res/res_partner_data.xml
index 138e44176f0..5bcb65a0461 100644
--- a/openerp/addons/base/res/res_partner_data.xml
+++ b/openerp/addons/base/res/res_partner_data.xml
@@ -20,17 +20,32 @@
         <record id="res_partner_title_madam" model="res.partner.title">
             <field name="domain">contact</field>
             <field name="name">Madam</field>
-            <field name="shortcut">Ms.</field>
+            <field name="shortcut">Mrs.</field>
         </record>
         <record id="res_partner_title_miss" model="res.partner.title">
             <field name="domain">contact</field>
             <field name="name">Miss</field>
-            <field name="shortcut">Mss</field>
+            <field name="shortcut">Miss</field>
         </record>
         <record id="res_partner_title_sir" model="res.partner.title">
             <field name="domain">contact</field>
             <field name="name">Sir</field>
-            <field name="shortcut">M.</field>
+            <field name="shortcut">Sir</field>
+        </record>
+        <record id="res_partner_title_mister" model="res.partner.title">
+            <field name="domain">contact</field>
+            <field name="name">Mister</field>
+            <field name="shortcut">Mr.</field>
+        </record>
+        <record id="res_partner_title_doctor" model="res.partner.title">
+            <field name="domain">contact</field>
+            <field name="name">Doctor</field>
+            <field name="shortcut">Dr.</field>
+        </record>
+        <record id="res_partner_title_prof" model="res.partner.title">
+            <field name="domain">contact</field>
+            <field name="name">Professor</field>
+            <field name="shortcut">Prof.</field>
         </record>
 
         <!-- Default bank account description -->

From 55e7b8167e9705ddaabf388e8c95d15666a81827 Mon Sep 17 00:00:00 2001
From: "Vaibhav (OpenERP)" <vda@tinyerp.com>
Date: Fri, 6 Apr 2012 11:43:30 +0530
Subject: [PATCH 020/999] [IMP] Web addon for SignIn/Out.

bzr revid: vda@tinyerp.com-20120406061330-n80vyxgkr309ykba
---
 addons/hr_attendance/__openerp__.py           |   4 +
 .../static/src/img/emp-in-disable.png         | Bin 0 -> 1135 bytes
 .../hr_attendance/static/src/img/emp-in.png   | Bin 0 -> 2153 bytes
 .../static/src/img/emp-out-disable.png        | Bin 0 -> 1110 bytes
 .../hr_attendance/static/src/img/emp-out.png  | Bin 0 -> 2062 bytes
 addons/hr_attendance/static/src/img/icon.png  | Bin 0 -> 5938 bytes
 .../static/src/js/sign_in_out.js              |  82 ++++++++++++++++++
 .../static/src/xml/sign_in_out.xml            |  28 ++++++
 .../wizard/hr_attendance_sign_in_out.py       |   1 +
 .../wizard/hr_attendance_sign_in_out_view.xml |  11 +--
 10 files changed, 121 insertions(+), 5 deletions(-)
 create mode 100644 addons/hr_attendance/static/src/img/emp-in-disable.png
 create mode 100644 addons/hr_attendance/static/src/img/emp-in.png
 create mode 100644 addons/hr_attendance/static/src/img/emp-out-disable.png
 create mode 100644 addons/hr_attendance/static/src/img/emp-out.png
 create mode 100644 addons/hr_attendance/static/src/img/icon.png
 create mode 100644 addons/hr_attendance/static/src/js/sign_in_out.js
 create mode 100644 addons/hr_attendance/static/src/xml/sign_in_out.xml

diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index c903a87abc4..b25047638c8 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -54,5 +54,9 @@ actions(Sign in/Sign out) performed by them.
     'installable': True,
     'auto_install': False,
     'certificate': '0063495605613',
+    
+    #web
+    "js": ["static/src/js/sign_in_out.js"],
+    'qweb' : ["static/src/xml/sign_in_out.xml"],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/static/src/img/emp-in-disable.png b/addons/hr_attendance/static/src/img/emp-in-disable.png
new file mode 100644
index 0000000000000000000000000000000000000000..1968e0de46434949ddb12393f4f21895270a334c
GIT binary patch
literal 1135
zcmV-#1d#iQP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb&2sa_Q
z3&GR?00Z+$L_t(Y$BmR*Y*b|s$A5Fq>Dk@ZQkF#u6eyrrg9t^agh&iZ;K55`)F3_(
zUwsf`AjlK77^_l~#=GH35^rGS#XuiSj3(Zt2oDqqAxgypEiK({yW8Ef=ljNoJ-yh{
zmYJO7<jc%|{@=`hKA6JZ0^s1%*Veze4B(9^;=HK<Z1t<}taxTF3Gy7_!dLPVUEI1I
zc;TpC*Fl@ntPW|;_Ukb{u=keJn_m7wZ)l%pG^csZYgPv|V}H{FO_O6~;z0{$&An$D
z6!GyW!$S!P2|(NB^v1zon`f&3_UUW-ulDE-&1g;o4K$}2?bB}U)%VU%jCLj-yuSR-
z`htRuJfw)hq9}Q-t7~30EkG0Yu^Nn&k_{n6LP87%i;)`aqcZ@Q`3aqvJ_eCcyJ!X-
zNEnJBfa2gpe<eVJh2a@`;GRoI!Qmt~^ox7Gb$SNo*k$HvD5d%(e2qAuof12;dwK?q
z#g31yXvCm6t_vX|=RVt;o4|Oo4r+(<J6BOeu~B7<MJeYSKHbutn?Z?<&uutdspn)X
z0TvJxaPaw-1=`VZ`<h<6Z|W;F?t1F*Cg#X8zNV8H349X7xXf{ub2rc5Gt{|{mZ=!L
z^2p;S?ocB|dg$jey?FQpgv?_xb4g+pj-K7K8g|qAe}E>!vitH6I{_{Z0XG;RM}XoG
zqXLHvedJKJl0I2zEPl7Y@GM`9HSv44eXyfpI1-OfCFPV;Nfk+wWVuK;Llg)kz^(C~
zh*hsXc_>#l{t9inUX8dojC`Pga*1|=(l%fL2gR}G^Q*fKrXvPlvhwLI+Ytw_xCkH!
z4nmrCvXMGd)MFUHQ5<KbpIP@yG==ThwR04NZoFvjrFxdX7>sry#e=M40ftZv)^m57
zg`-lA&k<3s<70493?LW+x+C&Q9$+!;v@wK>i=*CM+&>DC@3lDm!&(%J0~iD$OBThD
zU=vFTFl@#nPX~R1<JFA<WY6}JA%$W`H6}oSQs8e^u>_@z^*C4p0tz@1%o+jkT7TL|
zEh!9cB;gVRmpm7^M#%4Mz;cRS;)D#4#A>F0L<c?#J=xq)p(+v$ue8X*DgLAk!xfUu
zCr<}G6!0m>4f@}AN4GM0_FCn#`XyC_=%|A*$OVKrAy=tl5y~*LsnmoN{<zrcj(b{W
z{oLM_HY+r4@hB1!P@qVH9tQB$myka4q=_+`B$B_<-16g?664IHnsS2L>Xo(e+r}0}
zNYuoibgE;TkP5AmBq>cvMR4ieLro{L<F~Pl1U@qPjes2+=I-$tV&xUgVm3(=?@E94
z$%n@?+${L!_F~H4=06l$T;U}K<V;`N{?nyC{|5!z>#RZAZ;Jo`002ovPDHLkV1o9X
B3oQTu

literal 0
HcmV?d00001

diff --git a/addons/hr_attendance/static/src/img/emp-in.png b/addons/hr_attendance/static/src/img/emp-in.png
new file mode 100644
index 0000000000000000000000000000000000000000..26e3c01556b290949b104240e73fe43dc27b1229
GIT binary patch
literal 2153
zcmV-v2$uJWP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb&
z2sbNP-YCid00-$wL_t(o!?jjxY*fb;{$}pI`!ZfX)(?yg=3ySj2~Pu|YSU6vRJEv)
zC?#!GRJE$qRs|K&qzDMX7+hKsSxQuuKYfs@q{RxfjT;bZQV<Cw#ek`>4H#5l*MM1r
z*ZaD=d*^ZbW0y4q2#=^Ejpk}J_ndFObIx}Lc+9b_ZCn1kbw|tit*u)cTYuF$;r8D4
z?b{#Ap82={Oerh3Y}@qO<hm)(mj}w>@p_R?XYl7eyV2Ko{w;912EbMPKSp!Qrd4~|
z-=x8tHz*#D=~ygA$z+@oi8$GILPsJ)^w!>XYHoSy#YeSiJnF&CTQ>f@>5Gfo7C!SC
zFfee=m}#0Y3=^Ci&{{JhLfynkR8(BDq-NY0cKFbd!w<8|9(G{+D_cQ|X3lte*6DeT
z^9W$f<+5O!7Az~f5)q^nkW#>L1OQDZPM%;VyG|{P#iJkna@#8pw9g*~VEv1m;PrZU
zHO_5>5P~sAAj(dy30f-<>D*rSA1M`^JEsw&3JP|8lJiFjLF+GCCf3(CY%dFx5$B9C
z#*v*2j4==ql+w^zLF?PAg5wC%n#!iuPu_dzy~E)rVxYOX8JhIcn(AsOC0W)%)`?OI
zQVIwma`a0mC81Onh*FAGSJ!|vef5)kJQRRbYP8qup*wFl;#}rqFQv?ZP<cjtUJog)
zYd)0@aK@yRiruCh$kNWa0nT-954oHe0hnb%fdQ!}W&i*TgZB<chjWHClp4A1$nC{_
zn2;EXM3`Y1=i1uZo}2-e)_X&t5Gu;bNlM9x3~)~1T!V9#ujG-+$g%)13SJ2^!)^X$
z?b@|Z&cMc&7SY|^{Rd6Nh%}TMxw#PXjwHOB1;)U7&-Luy@WM;>r&huV<Hx7$baLfW
z4NpS|C$9lSx2s}g5)pj90v!D3LHzMgyPLuTVf#}l;ik>&zq?@m!d?EtBI-SRhJ9)A
z5;%^NqZxTE007Q8TrM}>``5du8eL7@y=QuA3(IGQ;<xm=bsHW(1TSyiu=?xEzOn0b
zpM4gkrKN1b_(}MC$J@9PybQP74X@V+mn*xv-5vx(A#}Xcfr%69Fm2j2{P>4IX$XtN
zm38YjV8@Qu$75hq^M<c{ZRvCG)J>`*r8E;lARG=O5{V$xAHv|^4Oo^5%jJe}90(y%
zQBjH7v9%~G3!t#n4@WyhAhfsd>0ZBP;|u_J_4{pj;rDAF44}EW87Y;p=FeG>Zd$aM
zJ5C0MVSsZ3j^kixXb91047P2<ah#kcaJbzr_<RL$+zx{2egua@h^CX!P{g!mx1vLx
zAr^djh(`_`UwJHpO#rq&fPrnT%{y1GTJs~@PQoyZJOINmKtxC;ld$a+gb;ZEre)$n
z{31H9c463#K_~%93JMAu8X&-7P9lTU8)t5HZRuUrJqY&$0PH`|L5*`8Nh!@nobx;g
z&Us!Dfo%PsyxxTaJ?|o&$v|ia5*m(nAhd*H8r<N}Ab^w3ko{)p#>Lg0KkXd8s|?%Q
z+cCXi%JQbB#VbHyS)l>6CKv`sR&`mf69SwwaAx3I;yU*C97NPkK#+hSiImP@Oz~)Z
zdFm1f2!v8sp-oMaNe+`uH(X}SwFDpDRRt?ntbo*Nc4<j~00LtSH*SPsnnteoBVYUZ
zuBRnVhPp767=|PPK>}$?qq?{X-<k7GEPZMTYRktW%HoJ1#-c2aI7^w@WvnzD-<W%(
z*z56>G6qIO7#zF_m&<}uDi?nZrC7fHl_I1>3YTtOg3t<rBph;3<*&lGW-Z6`swvoa
zwgb(bJ1~$5!!!(-+=R(Z@))iuE`#RZ10bEw+|*iwbB<szh}pAe=QW=5taK=)@{f|?
zbOh0K0+JLQE#UX~@$Fg5F{8QxX_1Db1y;}e0W8BpLfGiIvLAiPi%c-aT`p_tJpgRm
z?jF2(6Y*FSfj}Tf`JE>SoHH;+VBkm#2Z|JIVWacfDKynRi-xLt5E0y_8_VmTgTb;P
zObLOQ97ec*02Z^Dk%Ir@0L->mUpu<+nT4nwHy(jNX^#GEB4+b~L#bR6GJ?fSBpn+c
zT|SQUkv>FO3=4Y~;Q5ASkXm71-`{XPaS;WU4;gZB(donJqB1};$_P91@n+-#Fvc)B
z`@-iJ%_}JI5fQPh-Xm9X*%bgZX&8*-?Q;ik<iE!NH$$99aXfMwwWDe<t#m5lnH2Vg
z{)$t{6A04)OgB*IDS*qcoaD{;uZ{b3$CB<dJp+Y)--Ma7W{)c>DuR?U*Y9<{@88w{
z&J2X@Fy8O~H>9BeuYnli_)nw<<GkZAt85-5Ik-+iRQgL%T2MrVULTWbb*le-u+4bD
zBgKF0=!YlzuZD(|R+EXyqe;WGEC@$JND1KxWHJJda8TkZ#<^%8g7!7Q!^v{Fm<<~j
z5*H8^!?>6^3+|PuC=8&ys00?w^gw^O^~lEeKe(R~dH_@as082x;MCTRt*mdDUhDIC
zM%~@YST--falK-&y0`lBvZ&XtG~Fioy#>tg^HJHT5;nTH6jdb^R9#%gO1wqR<x8R0
z-`KgQ`PT1lB_GrcEdbtJPOwLLHvmA@nwkZvTKr6T*gUt(@)h|C5g6r1xxWOXivp_1
z<-3|5vUl$L?LU4quxl`eM>YI7V{BVZ03P2G!)+|`xZPv@z5=t@T^O~<I2|1v-v7b(
fj&|j<7{LDkWu~9l%$1!#00000NkvXXu0mjf7?AlN

literal 0
HcmV?d00001

diff --git a/addons/hr_attendance/static/src/img/emp-out-disable.png b/addons/hr_attendance/static/src/img/emp-out-disable.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7099e44529f554318fb555aac6abc1718fc5e20
GIT binary patch
literal 1110
zcmV-c1gZOpP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb&2sjvF
zmQ@n~00Y`dL_t(Y$BmWSPh3?L#((>qGs6rmVyHlY77$yT-l%P$MxPq7@z%anf{BSS
zQ4@WriI<>n2q>jW($x9~s0l_SHYO&LXrhf82ojP~Q?Qb>USNbN!vKTK<;*#I`7mcF
z9USQ1ImyY+THpTG+TXV~<QY8xykGlX!`XWQy7R<Y`2ciz=ZCwWxrZQ0`k4Guy+(*T
zA04N^kU3e_F<Fs+C9W6bqI9(0aeDh(KTA~RB_?r6N>Wy2Nn-jJ>1bact8y1Uz&&(u
ztWi*YEPPl94h}ZRsJi^n@^IH?`=7r&E7NjQq7sw1*kVguVlppbiO5ISa-)shg)?=#
z9!LpjZ#txL(Fj6P_U!38upvM@`a~73$|Souq;YU?anZP{3jNe30Pgmn<fh+(2#VgZ
zi4K(GD1`z91H=2v0J>;MY|;aBV$lnB)=ifMWnMeCF$4GF6lLP5%>EgC@i-uVse-;Y
zHfGS49{*S?@ff7nbiqNXiO*W&IgHoqpeB)g?f_{7?d`152!(t{Z&NtFi4xnMfAEtc
znNY{E(SSk#13%wWA>-qvha&pz`~YpQK7FB<DMC!Jmt7cW3^X_Rjf2!mDW8T;@65~K
zohMIzbDy{>%}o}VB7%h<8;5d&M3`Y#Y@*Y%uM7>W18B$b9Z5c7*q9jDL|Gz^jbLDM
z1D7b%%n~LcO8KrQntvU;?G)MxTxc?~DhX0aHPzHmLlqJ3rw9`Z6BDIemg|hs`X_Qq
z7?1{Wm5D+213@tWSVWj%4nM=hNux=NKV49*!`?CWv#+_S1!Vvl69p&~24Q~0W|>76
zXygTIxRmjxvQ4AzO21b^3;J-0fFg|Lox8>bMu-q1#4HQ^fWzaQC1ZAQP8}^??LnYK
zDPayjE+F0=pt(wj8A7<2r04;T)8naQFFP7my^xG(4F2XYg2n(`6pDYC!{QV#d7{;5
z9;1~m_Ok`2aus0ZYJ?cu5cH}|6fO=+C`Nb~fE4wZ*o;$;9|Ka^60CEBSI}(3_4F^E
z|0_sgGfE51oa86`xO8$I3j-g~$*h_DR9fm-;}#K>sZTt@0sf?jVoE6GSzgDclL;&=
zOz}th-^?-)^ygpq4%%v~*TU@FPX&Gg1n{9*;$1J@AgE&9Ywc`t*U)Ha(cLWpjYS#<
zn-mUZOp*{3{J~eu<HN!rfIHaxa@86o1}LMPLhPFIeKmotw`6KcbZ7aCNgt@JN+qDu
zL%%;NiQ(Ja=p%?9wf>Gk*KI%2U2wtx41B1_@|nK#M`h&yE|mP^?&4z&g_V+uPJTNE
cRo-L$A96_I2bkv;asU7T07*qoM6N<$f|Dll%>V!Z

literal 0
HcmV?d00001

diff --git a/addons/hr_attendance/static/src/img/emp-out.png b/addons/hr_attendance/static/src/img/emp-out.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2a6cbb50137c404d3f188151bb64024c082b75a
GIT binary patch
literal 2062
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

literal 0
HcmV?d00001

diff --git a/addons/hr_attendance/static/src/img/icon.png b/addons/hr_attendance/static/src/img/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..297dc71c85c5fdd8deafabfbb46093e04adc32d1
GIT binary patch
literal 5938
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
HtLXm&e3x``

literal 0
HcmV?d00001

diff --git a/addons/hr_attendance/static/src/js/sign_in_out.js b/addons/hr_attendance/static/src/js/sign_in_out.js
new file mode 100644
index 00000000000..0a0174d0a89
--- /dev/null
+++ b/addons/hr_attendance/static/src/js/sign_in_out.js
@@ -0,0 +1,82 @@
+openerp.hr_attendance = function(openerp) {
+    
+    openerp.hr_attendance.SignIn = openerp.web.Widget.extend({
+        template: 'SignInNotifier',
+        start: function() {
+            this.$element.on('click', '.sign_in', this.getParent().on_sign_in_out);
+        }
+    });
+    
+    openerp.hr_attendance.SignOut = openerp.web.Widget.extend({
+        template: 'SignOutNotifier',
+        
+        start: function() {
+            this.$element.on('click', '.sign_out', this.getParent().on_sign_in_out);
+        }
+    });
+    
+    openerp.hr_attendance.SignInOut = openerp.web.Widget.extend({
+        template: "SignInOutNotifier",
+        init: function() {
+            this._super.apply(this, arguments);
+            this.dataset = new openerp.web.DataSetSearch(
+                this,
+                'hr.employee',
+                this.session.user_context,
+                [['user_id','=', this.session.uid]]);
+        },
+        
+        start: function() {
+            return this.dataset.read_slice(['state']).done(this.do_sign_in_out);
+        },
+        
+        do_sign_in_out: function(user) {
+            if(_.isEmpty(user)) return;
+            if(user[0]['state'] === 'present') {
+                this.sign_out = new openerp.hr_attendance.SignOut(this);
+                this.sign_out.appendTo(this.$element);
+            } else {
+                this.sign_in = new openerp.hr_attendance.SignIn(this);
+                this.sign_in.appendTo(this.$element);
+            }
+        },
+        
+        on_sign_in_out: function(evt) {
+            var self = this;
+            new openerp.web.DataSetSearch(
+                this, 
+                'ir.actions.act_window',
+                {},
+                [['res_model', '=', 'hr.sign.in.out']])
+            .read_slice().done(function(action) {
+                action = action[0];
+                action.context = JSON.parse(action.context);
+                var action_manager = new openerp.web.ActionManager(self);
+                action_manager.do_action(action, self.on_close);
+            });
+        },
+        
+        on_close: function() {
+            if(this.sign_in) {
+                this.sign_in.destroy();
+                this.sign_out = new openerp.hr_attendance.SignOut(this);
+                this.sign_out.appendTo(this.$element);
+            } else if(this.sign_out) {
+                this.sign_out.destroy();
+                this.sign_in = new openerp.hr_attendance.SignIn(this);
+                this.sign_in.appendTo(this.$element);
+            }
+        }
+    });
+    
+    openerp.web.UserMenu.include({
+        do_update: function() {
+            var self = this;
+            this._super();
+            this.update_promise.then(function() {
+                self.hr_sign_in_out = new openerp.hr_attendance.SignInOut(self);
+                self.hr_sign_in_out.appendTo(openerp.webclient.$element.find('.oe_systray'))
+            });
+        }
+    });
+}
diff --git a/addons/hr_attendance/static/src/xml/sign_in_out.xml b/addons/hr_attendance/static/src/xml/sign_in_out.xml
new file mode 100644
index 00000000000..e28b93dfa6c
--- /dev/null
+++ b/addons/hr_attendance/static/src/xml/sign_in_out.xml
@@ -0,0 +1,28 @@
+<template>
+    <t t-name="SignInOutNotifier">
+        <div>
+            
+        </div>
+    </t>
+    <t t-name="SignInNotifier">
+        <div class="oe_hr_sign_in" title="SignIn">
+            <a class="sign_in" href="#">
+                <img 
+                    src='/hr_attendance/static/src/img/emp-in.png'
+                    width="30"
+                    height="30"/>
+            </a>
+        </div>
+    </t>
+    
+    <t t-name="SignOutNotifier">
+        <div class="oe_hr_sign_out" title="SignOut">
+            <a class="sign_out" href="#">
+                <img 
+                    src='/hr_attendance/static/src/img/emp-out.png'
+                    width="30"
+                    height="30"/>
+            </a>
+        </div>
+    </t>
+</template>
\ No newline at end of file
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
index 55edb1406e8..15e8783d660 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -69,6 +69,7 @@ class hr_sign_in_out(osv.osv_memory):
     _columns = {
         'name': fields.char('Employees name', size=32, required=True, readonly=True),
         'state': fields.char('Current state', size=32, required=True, readonly=True),
+        'date': fields.datetime('Date'),
         'emp_id': fields.many2one('hr.employee', 'Empoyee ID', readonly=True),
                 }
 
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index 5121a2d18a0..b729dd85e5b 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -10,15 +10,16 @@
                     <separator colspan="4" string="Sign in / Sign out"/>
                     <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
                     <newline/>
-                    <group colspan="4" >
-                    <field name="name" />
-                    <field name="state" />
+                    <group colspan="4" col="6">
+                        <field name="date"/>
+                        <field name="name" />
+                        <field name="state" />
                     </group>
                     <separator colspan="4"/>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object"/>
-                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object"/>
+                        <button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object" attrs="{'invisible':[('state','=','present')]}"/>
+                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" attrs="{'invisible':[('state','=','absent')]}"/>
                    </group>
                </form>
             </field>

From 19e40a27ff82857e81c1058ee57bcb849c3edcb5 Mon Sep 17 00:00:00 2001
From: "Vaibhav (OpenERP)" <vda@tinyerp.com>
Date: Mon, 9 Apr 2012 14:18:44 +0530
Subject: [PATCH 021/999] [FIX] fix.

bzr revid: vda@tinyerp.com-20120409084844-vioo6i2sfgerwozd
---
 addons/hr_attendance/__openerp__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index b25047638c8..1c4f38342ca 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -57,6 +57,7 @@ actions(Sign in/Sign out) performed by them.
     
     #web
     "js": ["static/src/js/sign_in_out.js"],
+    "css":[],
     'qweb' : ["static/src/xml/sign_in_out.xml"],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 0abfbfdef72bf4421e63945dea6c053f866edd83 Mon Sep 17 00:00:00 2001
From: "Vaibhav (OpenERP)" <vda@tinyerp.com>
Date: Tue, 10 Apr 2012 12:06:53 +0530
Subject: [PATCH 022/999] [FIX] Toggle SignIn/Out button.

bzr revid: vda@tinyerp.com-20120410063653-y5s0rcpxhxiw0utz
---
 addons/hr_attendance/static/src/js/sign_in_out.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/hr_attendance/static/src/js/sign_in_out.js b/addons/hr_attendance/static/src/js/sign_in_out.js
index 0a0174d0a89..e68857bea17 100644
--- a/addons/hr_attendance/static/src/js/sign_in_out.js
+++ b/addons/hr_attendance/static/src/js/sign_in_out.js
@@ -52,16 +52,18 @@ openerp.hr_attendance = function(openerp) {
                 action = action[0];
                 action.context = JSON.parse(action.context);
                 var action_manager = new openerp.web.ActionManager(self);
-                action_manager.do_action(action, self.on_close);
+                action_manager.do_action(action, function() {
+                    self.on_close($(evt.currentTarget).attr('class'));
+                });
             });
         },
         
-        on_close: function() {
-            if(this.sign_in) {
+        on_close: function(target) {
+            if(target === 'sign_in') {
                 this.sign_in.destroy();
                 this.sign_out = new openerp.hr_attendance.SignOut(this);
                 this.sign_out.appendTo(this.$element);
-            } else if(this.sign_out) {
+            } else if(target === 'sign_out') {
                 this.sign_out.destroy();
                 this.sign_in = new openerp.hr_attendance.SignIn(this);
                 this.sign_in.appendTo(this.$element);

From 1e60a8da8865c8bcd6885c491ddf03bb8467ac34 Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Thu, 19 Apr 2012 16:24:35 +0530
Subject: [PATCH 023/999] [FIX]account: Improve code

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

bzr revid: amb@tinyerp.com-20120419105435-cy21chpu633xouhl
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 75bfc891980..a91e4817242 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1386,7 +1386,7 @@ class account_move(osv.osv):
                 if not l[0]:
                     l[2].update({
                         'reconcile_id':False,
-                        'reconcil_partial_id':False,
+                        'reconcile_partial_id':False,
                         'analytic_lines':False,
                         'invoice':False,
                         'ref':False,

From 76066c62c5cad89f25ea42e8f466c746540aa07a Mon Sep 17 00:00:00 2001
From: "Amit (OpenERP)" <amp@tinyerp.com>
Date: Wed, 25 Apr 2012 12:54:09 +0530
Subject: [PATCH 024/999] [FIX] hr : Fixes the problem on copy method of hr
 department object

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

bzr revid: amp@tinyerp.com-20120425072409-ohl0xr62lszadhnm
---
 addons/hr/hr.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index bd0c730d92d..891da9d0d9e 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -283,7 +283,14 @@ class hr_department(osv.osv):
         'manager_id': fields.many2one('hr.employee', 'Manager'),
         'member_ids': fields.one2many('hr.employee', 'department_id', 'Members', readonly=True),
     }
-
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({'member_ids': []})
+        return super(hr_department, self).copy(cr, uid, id, default, context=context)
+    
 hr_department()
 
 

From 05fa2790ef6a2755e316d1db09cf10afa54e0acb Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 2 May 2012 19:04:11 +0530
Subject: [PATCH 025/999] [IMP]icon change on button click in form view

bzr revid: dhr@tinyerp.com-20120502133411-7l0xlcda0j2wfydb
---
 addons/hr_attendance/hr_attendance_view.xml   |  4 +-
 .../static/src/js/sign_in_out.js              | 60 ++++++++++++++-----
 .../wizard/hr_attendance_sign_in_out_view.xml |  9 ++-
 .../hr_timesheet_sheet_view.xml               |  4 +-
 4 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 258177bfd5e..b29ea0202c3 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -130,8 +130,8 @@
                 <field name="coach_id" position="after">
                     <group colspan="2">
                         <field name="state"/>
-                        <button name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
-                        <button name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
+                        <button name="attendance_action_change" states="present" string="Sign Out" type="object" widget="att_button" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
+                        <button name="attendance_action_change" states="absent" string="Sign In" type="object" widget="att_button" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
                     </group>
                 </field>
             </field>
diff --git a/addons/hr_attendance/static/src/js/sign_in_out.js b/addons/hr_attendance/static/src/js/sign_in_out.js
index e68857bea17..78606b614f8 100644
--- a/addons/hr_attendance/static/src/js/sign_in_out.js
+++ b/addons/hr_attendance/static/src/js/sign_in_out.js
@@ -1,18 +1,47 @@
 openerp.hr_attendance = function(openerp) {
+	
+	openerp.hr.Attrs_Button  =  openerp.web.form.WidgetButton.extend({
+		init: function(view, node) {
+        	this._super(view, node);
+		},
+    	on_click: function() {
+    		var self=this;
+    		this._super();
+    	  	var state = this.node.attrs.states
+    			if (this.string === 'Sign Out'){
+         	  		openerp.webclient.user_menu.hr_sign_out.replace(openerp.webclient.$element.find('.oe_systray').children())
+    			}
+    			if (this.string === "Sign In"){
+                    openerp.webclient.user_menu.hr_sign_in.replace(openerp.webclient.$element.find('.oe_systray').children());
+        	  	}	
+    }
+    });
+    openerp.web.form.tags.add('att_button', 'openerp.hr.Attrs_Button');
     
     openerp.hr_attendance.SignIn = openerp.web.Widget.extend({
         template: 'SignInNotifier',
+        init : function(parent, event){
+    		this._super(parent)
+    		this.event = event
+    	},
+    	
         start: function() {
-            this.$element.on('click', '.sign_in', this.getParent().on_sign_in_out);
-        }
+            this.$element.on('click',   this.event);
+        },
     });
     
     openerp.hr_attendance.SignOut = openerp.web.Widget.extend({
         template: 'SignOutNotifier',
         
-        start: function() {
-            this.$element.on('click', '.sign_out', this.getParent().on_sign_in_out);
-        }
+        init : function(parent, event){
+			this._super(parent)
+			this.event = event
+		},
+		
+		start: function() {
+            this.$element.on('click',   this.event);
+        },
+       
     });
     
     openerp.hr_attendance.SignInOut = openerp.web.Widget.extend({
@@ -27,16 +56,17 @@ openerp.hr_attendance = function(openerp) {
         },
         
         start: function() {
+        	var self = this;
             return this.dataset.read_slice(['state']).done(this.do_sign_in_out);
         },
         
         do_sign_in_out: function(user) {
             if(_.isEmpty(user)) return;
             if(user[0]['state'] === 'present') {
-                this.sign_out = new openerp.hr_attendance.SignOut(this);
+                this.sign_out = new openerp.hr_attendance.SignOut(this, this.on_sign_in_out);
                 this.sign_out.appendTo(this.$element);
             } else {
-                this.sign_in = new openerp.hr_attendance.SignIn(this);
+                this.sign_in = new openerp.hr_attendance.SignIn(this, this.on_sign_in_out);
                 this.sign_in.appendTo(this.$element);
             }
         },
@@ -52,18 +82,16 @@ openerp.hr_attendance = function(openerp) {
                 action = action[0];
                 action.context = JSON.parse(action.context);
                 var action_manager = new openerp.web.ActionManager(self);
-                action_manager.do_action(action, function() {
-                    self.on_close($(evt.currentTarget).attr('class'));
-                });
+                action_manager.do_action(action, self.on_close);
             });
         },
         
-        on_close: function(target) {
-            if(target === 'sign_in') {
+        on_close: function() {
+        	    if(this.sign_in) {
                 this.sign_in.destroy();
                 this.sign_out = new openerp.hr_attendance.SignOut(this);
                 this.sign_out.appendTo(this.$element);
-            } else if(target === 'sign_out') {
+        	    } else if(this.sign_out) {
                 this.sign_out.destroy();
                 this.sign_in = new openerp.hr_attendance.SignIn(this);
                 this.sign_in.appendTo(this.$element);
@@ -71,12 +99,16 @@ openerp.hr_attendance = function(openerp) {
         }
     });
     
+    
     openerp.web.UserMenu.include({
         do_update: function() {
             var self = this;
             this._super();
             this.update_promise.then(function() {
-                self.hr_sign_in_out = new openerp.hr_attendance.SignInOut(self);
+            	self.hr_sign_in_out = new openerp.hr_attendance.SignInOut(self);
+            	var event = self.hr_sign_in_out.on_sign_in_out
+            	self.hr_sign_in = new openerp.hr_attendance.SignIn(self, event)
+            	self.hr_sign_out = new openerp.hr_attendance.SignOut(self, event )
                 self.hr_sign_in_out.appendTo(openerp.webclient.$element.find('.oe_systray'))
             });
         }
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index b729dd85e5b..de57ede7d77 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -7,7 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign in / Sign out">
-                    <separator colspan="4" string="Sign in / Sign out"/>
                     <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
                     <newline/>
                     <group colspan="4" col="6">
@@ -18,8 +17,8 @@
                     <separator colspan="4"/>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object" attrs="{'invisible':[('state','=','present')]}"/>
-                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" attrs="{'invisible':[('state','=','absent')]}"/>
+                        <button icon="terp-gtk-jump-to-ltr" string="Sign in" widget="att_button" name="si_check" type="object" attrs="{'invisible':[('state','=','present')]}"/>
+                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" widget="att_button" name="so_check" type="object" attrs="{'invisible':[('state','=','absent')]}"/>
                    </group>
                </form>
             </field>
@@ -66,7 +65,7 @@
                     <separator colspan="4" />
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-back" string="Sign in" name="sign_in" type="object"/>
+                        <button icon="gtk-go-back" string="Sign in" name="sign_in" widget="att_button" type="object"/>
                    </group>
                </form>
             </field>
@@ -86,7 +85,7 @@
                     <separator colspan="4" />
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-back" string="Sign out" name="sign_out" type="object"/>
+                        <button icon="gtk-go-back" string="Sign out" name="sign_out" widget="att_button" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index d822f10d944..21d47fae848 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -91,8 +91,8 @@
                             </field>
                             <group col="4" colspan="1">
                                 <field name="state_attendance"/>
-                                <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
-                                <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
+                                <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr" widget="att_button"/>
+                                <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl" widget="att_button"/>
                                 <field name="total_attendance_day" widget="float_time" colspan="4"/>
                             </group>
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">

From 5f34ed93fbca6c5e71702289095280ba7e8152ee Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Fri, 4 May 2012 18:51:19 +0530
Subject: [PATCH 026/999] [IMP]changing icon on basis of state of user

bzr revid: dhr@tinyerp.com-20120504132119-0vc01xawt325w0nc
---
 .../static/src/js/sign_in_out.js              | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/addons/hr_attendance/static/src/js/sign_in_out.js b/addons/hr_attendance/static/src/js/sign_in_out.js
index 78606b614f8..b1262fa01d2 100644
--- a/addons/hr_attendance/static/src/js/sign_in_out.js
+++ b/addons/hr_attendance/static/src/js/sign_in_out.js
@@ -24,7 +24,6 @@ openerp.hr_attendance = function(openerp) {
     		this._super(parent)
     		this.event = event
     	},
-    	
         start: function() {
             this.$element.on('click',   this.event);
         },
@@ -57,13 +56,15 @@ openerp.hr_attendance = function(openerp) {
         
         start: function() {
         	var self = this;
+        	//console.log('stttarrrttttt',this.dataset)
             return this.dataset.read_slice(['state']).done(this.do_sign_in_out);
         },
         
         do_sign_in_out: function(user) {
             if(_.isEmpty(user)) return;
+            this.$element.html("");
             if(user[0]['state'] === 'present') {
-                this.sign_out = new openerp.hr_attendance.SignOut(this, this.on_sign_in_out);
+                this.sign_out = new openerp.hr_attendance.SignOut(this, this.on_sign_in_out);                
                 this.sign_out.appendTo(this.$element);
             } else {
                 this.sign_in = new openerp.hr_attendance.SignIn(this, this.on_sign_in_out);
@@ -79,24 +80,15 @@ openerp.hr_attendance = function(openerp) {
                 {},
                 [['res_model', '=', 'hr.sign.in.out']])
             .read_slice().done(function(action) {
+            	console.log('action',action);
                 action = action[0];
                 action.context = JSON.parse(action.context);
                 var action_manager = new openerp.web.ActionManager(self);
-                action_manager.do_action(action, self.on_close);
+                action_manager.do_action(action, function() { 
+                	self.dataset.read_slice(['state']).done(self.do_sign_in_out);
+                	});
             });
         },
-        
-        on_close: function() {
-        	    if(this.sign_in) {
-                this.sign_in.destroy();
-                this.sign_out = new openerp.hr_attendance.SignOut(this);
-                this.sign_out.appendTo(this.$element);
-        	    } else if(this.sign_out) {
-                this.sign_out.destroy();
-                this.sign_in = new openerp.hr_attendance.SignIn(this);
-                this.sign_in.appendTo(this.$element);
-            }
-        }
     });
     
     

From b528bcb380bdfd939302eba6f652cd54c3f4fe25 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 7 May 2012 19:17:44 +0530
Subject: [PATCH 027/999] [REVIEW] code review

bzr revid: hmo@tinyerp.com-20120507134744-bwxdsmqd92hl0o20
---
 addons/hr_attendance/__openerp__.py           |   6 +-
 addons/hr_attendance/hr_attendance_view.xml   |   4 +-
 .../static/src/css/attendance.css             |   4 +
 .../hr_attendance/static/src/js/attendance.js |  57 +++++++++
 .../static/src/js/sign_in_out.js              | 108 ------------------
 .../static/src/xml/attendance.xml             |  11 ++
 .../static/src/xml/sign_in_out.xml            |  28 -----
 .../wizard/hr_attendance_sign_in_out.py       |   1 -
 .../wizard/hr_attendance_sign_in_out_view.xml |   9 +-
 .../hr_timesheet_sheet_view.xml               |   4 +-
 10 files changed, 83 insertions(+), 149 deletions(-)
 create mode 100644 addons/hr_attendance/static/src/css/attendance.css
 create mode 100644 addons/hr_attendance/static/src/js/attendance.js
 delete mode 100644 addons/hr_attendance/static/src/js/sign_in_out.js
 create mode 100644 addons/hr_attendance/static/src/xml/attendance.xml
 delete mode 100644 addons/hr_attendance/static/src/xml/sign_in_out.xml

diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index 1c4f38342ca..0947f208be6 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -56,8 +56,8 @@ actions(Sign in/Sign out) performed by them.
     'certificate': '0063495605613',
     
     #web
-    "js": ["static/src/js/sign_in_out.js"],
-    "css":[],
-    'qweb' : ["static/src/xml/sign_in_out.xml"],
+    "js": ["static/src/js/attendance.js"],
+    "css":["static/src/css/attendance.css"],
+    'qweb' : ["static/src/xml/attendance.xml"],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index b29ea0202c3..258177bfd5e 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -130,8 +130,8 @@
                 <field name="coach_id" position="after">
                     <group colspan="2">
                         <field name="state"/>
-                        <button name="attendance_action_change" states="present" string="Sign Out" type="object" widget="att_button" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
-                        <button name="attendance_action_change" states="absent" string="Sign In" type="object" widget="att_button" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
+                        <button name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
+                        <button name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
                     </group>
                 </field>
             </field>
diff --git a/addons/hr_attendance/static/src/css/attendance.css b/addons/hr_attendance/static/src/css/attendance.css
new file mode 100644
index 00000000000..5300129b54b
--- /dev/null
+++ b/addons/hr_attendance/static/src/css/attendance.css
@@ -0,0 +1,4 @@
+.oe_attendance_button {
+    cursor: 'pointer';
+}
+
diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
new file mode 100644
index 00000000000..c1a4ef341a6
--- /dev/null
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -0,0 +1,57 @@
+openerp.hr_attendance = function(instance) {	
+    var QWeb = instance.web.qweb;
+    instance.hr_attendance.AttendanceNotifier = instance.web.Widget.extend({
+        template: 'AttendanceNotifier',
+        
+        init: function(attendance_status){
+          console.log('nnnnnn',this)
+          this.attendance_status = attendance_status;
+        },
+        renderElement: function() {
+            console.log('render',this)
+            if (this.attendance_status == 'present'){
+                action_type = 'sign_out';
+            }
+            else{
+                action_type = 'sign_in';
+            }
+            this.$element = $(QWeb.render(this.template, {'action':action_type}));
+            console.log('element',this.$element)
+            this.$element.click(this.on_attendance);
+        },
+        
+        
+        
+        on_attendance: function(event) {
+            var self = this;
+            console.log('eventtt',event)
+            action = new instance.web.DataSetSearch(this, 'ir.actions.act_window', {}, [['res_model', '=', 'hr.sign.in.out']]);
+            action.read_slice().done(function(action) {
+                action = action[0];
+                action.context = JSON.parse(action.context);
+                var action_manager = new instance.web.ActionManager(self);
+                action_manager.do_action(action, function(){
+                    window.location.reload();                   
+                });
+            });
+        },
+    });
+    
+    
+    instance.web.UserMenu.include({
+        do_update: function() {
+            var self = this;
+            this._super();
+            this.update_promise.then(function() {
+                self.employee = new instance.web.DataSetSearch(self, 'hr.employee', self.session.user_context, [['user_id','=', self.session.uid]]);
+                self.employee.read_slice(['state']).done(self.do_update_attendance_status);
+            });
+        },
+        do_update_attendance_status: function(employee) {
+            if(_.isEmpty(employee)) return;
+            attendance_status = employee[0]['state']
+            self.attendance = new instance.hr_attendance.AttendanceNotifier(attendance_status);
+            self.attendance.appendTo(instance.webclient.$element.find('.oe_systray'))
+        },
+    });
+}
diff --git a/addons/hr_attendance/static/src/js/sign_in_out.js b/addons/hr_attendance/static/src/js/sign_in_out.js
deleted file mode 100644
index b1262fa01d2..00000000000
--- a/addons/hr_attendance/static/src/js/sign_in_out.js
+++ /dev/null
@@ -1,108 +0,0 @@
-openerp.hr_attendance = function(openerp) {
-	
-	openerp.hr.Attrs_Button  =  openerp.web.form.WidgetButton.extend({
-		init: function(view, node) {
-        	this._super(view, node);
-		},
-    	on_click: function() {
-    		var self=this;
-    		this._super();
-    	  	var state = this.node.attrs.states
-    			if (this.string === 'Sign Out'){
-         	  		openerp.webclient.user_menu.hr_sign_out.replace(openerp.webclient.$element.find('.oe_systray').children())
-    			}
-    			if (this.string === "Sign In"){
-                    openerp.webclient.user_menu.hr_sign_in.replace(openerp.webclient.$element.find('.oe_systray').children());
-        	  	}	
-    }
-    });
-    openerp.web.form.tags.add('att_button', 'openerp.hr.Attrs_Button');
-    
-    openerp.hr_attendance.SignIn = openerp.web.Widget.extend({
-        template: 'SignInNotifier',
-        init : function(parent, event){
-    		this._super(parent)
-    		this.event = event
-    	},
-        start: function() {
-            this.$element.on('click',   this.event);
-        },
-    });
-    
-    openerp.hr_attendance.SignOut = openerp.web.Widget.extend({
-        template: 'SignOutNotifier',
-        
-        init : function(parent, event){
-			this._super(parent)
-			this.event = event
-		},
-		
-		start: function() {
-            this.$element.on('click',   this.event);
-        },
-       
-    });
-    
-    openerp.hr_attendance.SignInOut = openerp.web.Widget.extend({
-        template: "SignInOutNotifier",
-        init: function() {
-            this._super.apply(this, arguments);
-            this.dataset = new openerp.web.DataSetSearch(
-                this,
-                'hr.employee',
-                this.session.user_context,
-                [['user_id','=', this.session.uid]]);
-        },
-        
-        start: function() {
-        	var self = this;
-        	//console.log('stttarrrttttt',this.dataset)
-            return this.dataset.read_slice(['state']).done(this.do_sign_in_out);
-        },
-        
-        do_sign_in_out: function(user) {
-            if(_.isEmpty(user)) return;
-            this.$element.html("");
-            if(user[0]['state'] === 'present') {
-                this.sign_out = new openerp.hr_attendance.SignOut(this, this.on_sign_in_out);                
-                this.sign_out.appendTo(this.$element);
-            } else {
-                this.sign_in = new openerp.hr_attendance.SignIn(this, this.on_sign_in_out);
-                this.sign_in.appendTo(this.$element);
-            }
-        },
-        
-        on_sign_in_out: function(evt) {
-            var self = this;
-            new openerp.web.DataSetSearch(
-                this, 
-                'ir.actions.act_window',
-                {},
-                [['res_model', '=', 'hr.sign.in.out']])
-            .read_slice().done(function(action) {
-            	console.log('action',action);
-                action = action[0];
-                action.context = JSON.parse(action.context);
-                var action_manager = new openerp.web.ActionManager(self);
-                action_manager.do_action(action, function() { 
-                	self.dataset.read_slice(['state']).done(self.do_sign_in_out);
-                	});
-            });
-        },
-    });
-    
-    
-    openerp.web.UserMenu.include({
-        do_update: function() {
-            var self = this;
-            this._super();
-            this.update_promise.then(function() {
-            	self.hr_sign_in_out = new openerp.hr_attendance.SignInOut(self);
-            	var event = self.hr_sign_in_out.on_sign_in_out
-            	self.hr_sign_in = new openerp.hr_attendance.SignIn(self, event)
-            	self.hr_sign_out = new openerp.hr_attendance.SignOut(self, event )
-                self.hr_sign_in_out.appendTo(openerp.webclient.$element.find('.oe_systray'))
-            });
-        }
-    });
-}
diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml
new file mode 100644
index 00000000000..104a30530b8
--- /dev/null
+++ b/addons/hr_attendance/static/src/xml/attendance.xml
@@ -0,0 +1,11 @@
+<template>
+    <t t-name="AttendanceNotifier">
+        <t t-if="action=='sign_in'">
+            <img src="/hr_attendance/static/src/img/emp-in.png" class="oe_attendance_button"></img>
+        </t>
+        <t t-if="action=='sign_out'">
+            <img src="/hr_attendance/static/src/img/emp-out.png" class="oe_attendance_button"></img>
+        </t>    
+        
+    </t>
+</template>
diff --git a/addons/hr_attendance/static/src/xml/sign_in_out.xml b/addons/hr_attendance/static/src/xml/sign_in_out.xml
deleted file mode 100644
index e28b93dfa6c..00000000000
--- a/addons/hr_attendance/static/src/xml/sign_in_out.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-    <t t-name="SignInOutNotifier">
-        <div>
-            
-        </div>
-    </t>
-    <t t-name="SignInNotifier">
-        <div class="oe_hr_sign_in" title="SignIn">
-            <a class="sign_in" href="#">
-                <img 
-                    src='/hr_attendance/static/src/img/emp-in.png'
-                    width="30"
-                    height="30"/>
-            </a>
-        </div>
-    </t>
-    
-    <t t-name="SignOutNotifier">
-        <div class="oe_hr_sign_out" title="SignOut">
-            <a class="sign_out" href="#">
-                <img 
-                    src='/hr_attendance/static/src/img/emp-out.png'
-                    width="30"
-                    height="30"/>
-            </a>
-        </div>
-    </t>
-</template>
\ No newline at end of file
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
index 15e8783d660..55edb1406e8 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -69,7 +69,6 @@ class hr_sign_in_out(osv.osv_memory):
     _columns = {
         'name': fields.char('Employees name', size=32, required=True, readonly=True),
         'state': fields.char('Current state', size=32, required=True, readonly=True),
-        'date': fields.datetime('Date'),
         'emp_id': fields.many2one('hr.employee', 'Empoyee ID', readonly=True),
                 }
 
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index de57ede7d77..8d4b9ff0123 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -10,15 +10,14 @@
                     <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
                     <newline/>
                     <group colspan="4" col="6">
-                        <field name="date"/>
                         <field name="name" />
                         <field name="state" />
                     </group>
                     <separator colspan="4"/>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-jump-to-ltr" string="Sign in" widget="att_button" name="si_check" type="object" attrs="{'invisible':[('state','=','present')]}"/>
-                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" widget="att_button" name="so_check" type="object" attrs="{'invisible':[('state','=','absent')]}"/>
+                        <button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object" attrs="{'invisible':[('state','=','present')]}"/>
+                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" attrs="{'invisible':[('state','=','absent')]}"/>
                    </group>
                </form>
             </field>
@@ -65,7 +64,7 @@
                     <separator colspan="4" />
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-back" string="Sign in" name="sign_in" widget="att_button" type="object"/>
+                        <button icon="gtk-go-back" string="Sign in" name="sign_in"  type="object"/>
                    </group>
                </form>
             </field>
@@ -85,7 +84,7 @@
                     <separator colspan="4" />
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-back" string="Sign out" name="sign_out" widget="att_button" type="object"/>
+                        <button icon="gtk-go-back" string="Sign out" name="sign_out"  type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 21d47fae848..c577e33f9c6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -91,8 +91,8 @@
                             </field>
                             <group col="4" colspan="1">
                                 <field name="state_attendance"/>
-                                <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr" widget="att_button"/>
-                                <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl" widget="att_button"/>
+                                <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr" />
+                                <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl" />
                                 <field name="total_attendance_day" widget="float_time" colspan="4"/>
                             </group>
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">

From a7d14378890a764687df645ded1c042f8bde5417 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 8 May 2012 11:20:04 +0530
Subject: [PATCH 028/999] [REVIEW] code review

bzr revid: hmo@tinyerp.com-20120508055004-z7up5zzzg2vpqu47
---
 .../hr_attendance/static/src/js/attendance.js | 51 ++++++++++---------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index c1a4ef341a6..778a2fb5546 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -1,14 +1,14 @@
-openerp.hr_attendance = function(instance) {	
+openerp.hr_attendance = function(instance) {
     var QWeb = instance.web.qweb;
     instance.hr_attendance.AttendanceNotifier = instance.web.Widget.extend({
         template: 'AttendanceNotifier',
-        
-        init: function(attendance_status){
-          console.log('nnnnnn',this)
-          this.attendance_status = attendance_status;
+        init: function(parent){
+              this._super(parent);
+              this.session = parent.session;
+              this.employee = new instance.web.DataSetSearch(this, 'hr.employee', this.session.user_context, [['user_id','=', this.session.uid]]);
         },
         renderElement: function() {
-            console.log('render',this)
+            var self = this;
             if (this.attendance_status == 'present'){
                 action_type = 'sign_out';
             }
@@ -16,42 +16,47 @@ openerp.hr_attendance = function(instance) {
                 action_type = 'sign_in';
             }
             this.$element = $(QWeb.render(this.template, {'action':action_type}));
-            console.log('element',this.$element)
-            this.$element.click(this.on_attendance);
+            element = $('.oe_attendance_button')
+            if (element.length != 0){
+                element.attr('src', this.$element.attr('src'));
+            }
+            else{
+                this.$element.appendTo($('.oe_systray'));
+                this.$element.click(self.on_click);
+            }
         },
-        
-        
-        
-        on_attendance: function(event) {
+
+        on_click: function() {
             var self = this;
-            console.log('eventtt',event)
             action = new instance.web.DataSetSearch(this, 'ir.actions.act_window', {}, [['res_model', '=', 'hr.sign.in.out']]);
             action.read_slice().done(function(action) {
                 action = action[0];
                 action.context = JSON.parse(action.context);
                 var action_manager = new instance.web.ActionManager(self);
                 action_manager.do_action(action, function(){
-                    window.location.reload();                   
+                    self.employee.read_slice(['state']).done(function(employee) {
+                        if(_.isEmpty(employee)) return;
+                        self.attendance_status = employee[0]['state'];
+                        self.renderElement();
+                    });
                 });
             });
         },
     });
-    
+
     
     instance.web.UserMenu.include({
         do_update: function() {
             var self = this;
             this._super();
             this.update_promise.then(function() {
-                self.employee = new instance.web.DataSetSearch(self, 'hr.employee', self.session.user_context, [['user_id','=', self.session.uid]]);
-                self.employee.read_slice(['state']).done(self.do_update_attendance_status);
+                attendance = new instance.hr_attendance.AttendanceNotifier(self);
+                attendance.employee.read_slice(['state']).done(function(employee) {
+                    if(_.isEmpty(employee)) return;
+                    attendance.attendance_status = employee[0]['state'];
+                    attendance.renderElement();
+                });
             });
         },
-        do_update_attendance_status: function(employee) {
-            if(_.isEmpty(employee)) return;
-            attendance_status = employee[0]['state']
-            self.attendance = new instance.hr_attendance.AttendanceNotifier(attendance_status);
-            self.attendance.appendTo(instance.webclient.$element.find('.oe_systray'))
-        },
     });
 }

From 6651be584bde739160574fd87225e3a735acba93 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 8 May 2012 18:27:45 +0530
Subject: [PATCH 029/999] [IMP]code cleaning in web and server side

bzr revid: dhr@tinyerp.com-20120508125745-ctyts4mqre4b8rnk
---
 addons/hr_attendance/hr_attendance_view.xml   |  4 +-
 .../static/src/css/attendance.css             |  2 +-
 .../hr_attendance/static/src/js/attendance.js | 46 +++++++++++--------
 .../wizard/hr_attendance_sign_in_out.py       | 14 +++++-
 .../wizard/hr_attendance_sign_in_out_view.xml |  4 +-
 .../hr_timesheet_sheet_view.xml               |  4 +-
 6 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 258177bfd5e..7c29ff8c404 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -130,8 +130,8 @@
                 <field name="coach_id" position="after">
                     <group colspan="2">
                         <field name="state"/>
-                        <button name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
-                        <button name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
+                        <button name="%(action_hr_attendance_sigh_in_out)d" states="present" type="action" string="Sign Out" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
+                        <button name="%(action_hr_attendance_sigh_in_out)d" states="absent" type="action" string="Sign In" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
                     </group>
                 </field>
             </field>
diff --git a/addons/hr_attendance/static/src/css/attendance.css b/addons/hr_attendance/static/src/css/attendance.css
index 5300129b54b..48de536f59c 100644
--- a/addons/hr_attendance/static/src/css/attendance.css
+++ b/addons/hr_attendance/static/src/css/attendance.css
@@ -1,4 +1,4 @@
 .oe_attendance_button {
-    cursor: 'pointer';
+    cursor:pointer;
 }
 
diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 778a2fb5546..e447ca1dc7e 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -2,11 +2,6 @@ openerp.hr_attendance = function(instance) {
     var QWeb = instance.web.qweb;
     instance.hr_attendance.AttendanceNotifier = instance.web.Widget.extend({
         template: 'AttendanceNotifier',
-        init: function(parent){
-              this._super(parent);
-              this.session = parent.session;
-              this.employee = new instance.web.DataSetSearch(this, 'hr.employee', this.session.user_context, [['user_id','=', this.session.uid]]);
-        },
         renderElement: function() {
             var self = this;
             if (this.attendance_status == 'present'){
@@ -33,29 +28,44 @@ openerp.hr_attendance = function(instance) {
                 action = action[0];
                 action.context = JSON.parse(action.context);
                 var action_manager = new instance.web.ActionManager(self);
-                action_manager.do_action(action, function(){
-                    self.employee.read_slice(['state']).done(function(employee) {
-                        if(_.isEmpty(employee)) return;
-                        self.attendance_status = employee[0]['state'];
-                        self.renderElement();
-                    });
-                });
+                action_manager.do_action(action);
             });
         },
     });
 
+    instance.hr_attendance.AttendanceStatus = instance.web.Class.extend({
+    	init: function(parent){
+    		this.session = parent.session;
+	    	attendance = new instance.hr_attendance.AttendanceNotifier(self);
+			employee = new instance.web.DataSetSearch(this, 'hr.employee', this.session.user_context, [['user_id','=', this.session.uid]]);
+	        employee.read_slice(['state']).done(function(employee) {
+	            if(_.isEmpty(employee)) return;
+	            attendance.attendance_status = employee[0]['state'];
+	            attendance.renderElement();
+	        });
+    	},
+    });
+    
+    instance.web.ActionManager.include({
+    	do_action: function(action, on_close) {
+    		var self = this;
+    		if (action.res_model == "hr.sign.in.out"){
+    			var old_close = on_close; 
+    			on_close = function(){
+    					if(old_close){old_close();}
+    					new instance.hr_attendance.AttendanceStatus(self);
+    			}
+    		}
+    		this._super(action, on_close);
+    	},
+    });
     
     instance.web.UserMenu.include({
         do_update: function() {
             var self = this;
             this._super();
             this.update_promise.then(function() {
-                attendance = new instance.hr_attendance.AttendanceNotifier(self);
-                attendance.employee.read_slice(['state']).done(function(employee) {
-                    if(_.isEmpty(employee)) return;
-                    attendance.attendance_status = employee[0]['state'];
-                    attendance.renderElement();
-                });
+            	new instance.hr_attendance.AttendanceStatus(self);
             });
         },
     });
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
index 55edb1406e8..08bf9031b72 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -71,7 +71,16 @@ class hr_sign_in_out(osv.osv_memory):
         'state': fields.char('Current state', size=32, required=True, readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Empoyee ID', readonly=True),
                 }
-
+#    def set_name(self,cr,uid,id,context=None):
+#        act_obj=self.pool.get('ir.actions.act_window')
+#        action_id = act_obj.search(cr, uid, [('res_model','=','hr.sign.in.out')],context=context)
+#        action = act_obj.browse(cr, uid, action_id[0], context=context)
+#        #data = self.read(cr, uid, id, [], context=context)[0]
+#        if data['state']=='present':
+#            name = act_obj.write(cr, uid, action_id[0], {'name':'Sign Out'}, context=context)
+#        if data['state']=='absent':
+#            name = act_obj.write(cr, uid, action_id[0], {'name':'Sign In'}, context=context)
+        
     def _get_empid(self, cr, uid, context=None):
         emp_id = context.get('emp_id', self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context))
         if emp_id:
@@ -80,6 +89,7 @@ class hr_sign_in_out(osv.osv_memory):
         return {}
 
     def default_get(self, cr, uid, fields_list, context=None):
+        #self.set_name(cr, uid, uid, context)
         res = super(hr_sign_in_out, self).default_get(cr, uid, fields_list, context=context)
         res_emp = self._get_empid(cr, uid, context=context)
         res.update(res_emp)
@@ -102,7 +112,7 @@ class hr_sign_in_out(osv.osv_memory):
             model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_attendance_so_ask')], context=context)
             resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
             return {
-                'name': _('Sign in / Sign out'),
+                'name': _('Sign in '),
                 'view_type': 'form',
                 'view_mode': 'tree,form',
                 'res_model': 'hr.sign.in.out.ask',
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index 8d4b9ff0123..b3cffa9ab02 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -38,7 +38,7 @@
         </record>
 
         <record id="action_hr_attendance_sigh_in_out" model="ir.actions.act_window">
-            <field name="name">Sign in / Sign out</field>
+            <field name="name">Sign In / Sign Out</field>
             <field name="res_model">hr.sign.in.out</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -47,8 +47,6 @@
            <field name="help">Sign in / Sign out. In some companies, staff have to sign in when they arrive at work and sign out again at the end of the day. If each employee has been linked to a system user, then they can encode their time with this action button.</field>
         </record>
 
-        <menuitem action="action_hr_attendance_sigh_in_out" id="menu_hr_attendance_sigh_in_out"
-            parent="menu_hr_attendance" sequence="4"/>
 
        <record id="view_hr_attendance_so_ask" model="ir.ui.view">
             <field name="name">hr.sign.in.out.ask.form</field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index c577e33f9c6..f325113bc21 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -91,8 +91,8 @@
                             </field>
                             <group col="4" colspan="1">
                                 <field name="state_attendance"/>
-                                <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr" />
-                                <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl" />
+                                <button name="%(hr_attendance.action_hr_attendance_sigh_in_out)d" type="action" string="Sign In" attrs="{'invisible':[('state_attendance','=','present')]}" icon="terp-gtk-jump-to-ltr" />
+                                <button name="%(hr_attendance.action_hr_attendance_sigh_in_out)d" type="action" string="Sign Out" attrs="{'invisible':[('state_attendance','=','absent')]}" icon="terp-gtk-jump-to-rtl" />
                                 <field name="total_attendance_day" widget="float_time" colspan="4"/>
                             </group>
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">

From ecb5df6fdcf4e9920ba4514465f65b692246fd0b Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 8 May 2012 18:45:53 +0530
Subject: [PATCH 030/999] [IMP]changing form title on basis of attendance
 status

bzr revid: dhr@tinyerp.com-20120508131553-4mlznby2u768xf6t
---
 .../wizard/hr_attendance_sign_in_out.py         | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
index 08bf9031b72..6ed02deb86c 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -71,15 +71,6 @@ class hr_sign_in_out(osv.osv_memory):
         'state': fields.char('Current state', size=32, required=True, readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Empoyee ID', readonly=True),
                 }
-#    def set_name(self,cr,uid,id,context=None):
-#        act_obj=self.pool.get('ir.actions.act_window')
-#        action_id = act_obj.search(cr, uid, [('res_model','=','hr.sign.in.out')],context=context)
-#        action = act_obj.browse(cr, uid, action_id[0], context=context)
-#        #data = self.read(cr, uid, id, [], context=context)[0]
-#        if data['state']=='present':
-#            name = act_obj.write(cr, uid, action_id[0], {'name':'Sign Out'}, context=context)
-#        if data['state']=='absent':
-#            name = act_obj.write(cr, uid, action_id[0], {'name':'Sign In'}, context=context)
         
     def _get_empid(self, cr, uid, context=None):
         emp_id = context.get('emp_id', self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context))
@@ -89,9 +80,15 @@ class hr_sign_in_out(osv.osv_memory):
         return {}
 
     def default_get(self, cr, uid, fields_list, context=None):
-        #self.set_name(cr, uid, uid, context)
         res = super(hr_sign_in_out, self).default_get(cr, uid, fields_list, context=context)
         res_emp = self._get_empid(cr, uid, context=context)
+        act_obj=self.pool.get('ir.actions.act_window')
+        action_id = act_obj.search(cr, uid, [('res_model','=','hr.sign.in.out')],context=context)
+        action = act_obj.browse(cr, uid, action_id[0], context=context)
+        if res_emp['state']=='present':
+            name = act_obj.write(cr, uid, action_id[0], {'name':'Sign Out'}, context=context)
+        if res_emp['state']=='absent':
+            name = act_obj.write(cr, uid, action_id[0], {'name':'Sign In'}, context=context)
         res.update(res_emp)
         return res
 

From d6df3fb47f520ed4859b71eaae3da5979243efe8 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 11 May 2012 11:17:11 +0530
Subject: [PATCH 031/999] [IMP] hr_attendance - remove wizards
 'hr.sign.in.out.ask' and 'hr.sign.in.out' for simply Attendance action. -
 code clean of 'attendance_action_change' of hr.employee. - code clean of
 AttendanceNotifier widget and also overrides methods of DataSet widget to
 update AttendanceNotifier widget base on employee attendance.

bzr revid: hmo@tinyerp.com-20120511054711-uah7h2af9bbx7nch
---
 addons/hr_attendance/__openerp__.py           |   2 -
 addons/hr_attendance/hr_attendance.py         |  39 ++--
 addons/hr_attendance/hr_attendance_view.xml   |   6 +-
 .../static/src/css/attendance.css             |   4 -
 .../src/img/{emp-in.png => emp-absent.png}    | Bin
 .../static/src/img/emp-in-disable.png         | Bin 1135 -> 0 bytes
 .../static/src/img/emp-out-disable.png        | Bin 1110 -> 0 bytes
 .../src/img/{emp-out.png => emp-present.png}  | Bin
 addons/hr_attendance/static/src/img/icon.png  | Bin 5938 -> 0 bytes
 .../hr_attendance/static/src/js/attendance.js | 102 ++++++----
 .../static/src/xml/attendance.xml             |  10 +-
 addons/hr_attendance/wizard/__init__.py       |   3 +-
 .../wizard/hr_attendance_sign_in_out.py       | 191 ------------------
 .../wizard/hr_attendance_sign_in_out_view.xml |  92 ---------
 .../hr_timesheet_sheet_view.xml               |   2 -
 15 files changed, 84 insertions(+), 367 deletions(-)
 delete mode 100644 addons/hr_attendance/static/src/css/attendance.css
 rename addons/hr_attendance/static/src/img/{emp-in.png => emp-absent.png} (100%)
 delete mode 100644 addons/hr_attendance/static/src/img/emp-in-disable.png
 delete mode 100644 addons/hr_attendance/static/src/img/emp-out-disable.png
 rename addons/hr_attendance/static/src/img/{emp-out.png => emp-present.png} (100%)
 delete mode 100644 addons/hr_attendance/static/src/img/icon.png
 delete mode 100644 addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
 delete mode 100644 addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml

diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index 0947f208be6..eec95887bb8 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -44,7 +44,6 @@ actions(Sign in/Sign out) performed by them.
         'wizard/hr_attendance_bymonth_view.xml',
         'wizard/hr_attendance_byweek_view.xml',
         'wizard/hr_attendance_error_view.xml',
-        'wizard/hr_attendance_sign_in_out_view.xml',
     ],
     'demo_xml': ['hr_attendance_demo.xml'],
     'test': [
@@ -57,7 +56,6 @@ actions(Sign in/Sign out) performed by them.
     
     #web
     "js": ["static/src/js/attendance.js"],
-    "css":["static/src/css/attendance.css"],
     'qweb' : ["static/src/xml/attendance.xml"],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 08323ce7847..e3ba69ba437 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -122,30 +122,25 @@ class hr_employee(osv.osv):
         res = cr.fetchone()
         return not (res and (res[0]>=(dt or time.strftime('%Y-%m-%d %H:%M:%S'))))
 
-    def attendance_action_change(self, cr, uid, ids, type='action', context=None, dt=False, *args):
-        obj_attendance = self.pool.get('hr.attendance')
-        id = False
-        warning_sign = 'sign'
-        res = {}
+    def attendance_action_change(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        action_date = context.get('action_date', False)
+        action = context.get('action', False)
+        hr_attendance = self.pool.get('hr.attendance')
+        warning_sign = {'sign_in': _('Sign In'), 'sign_out': _('Sign Out')}
+        for employee in self.browse(cr, uid, ids, context=context):
+            if not action:
+                if employee.state == 'present': action = 'sign_out'
+                if employee.state == 'absent': action = 'sign_in'
 
-        #Special case when button calls this method: type=context
-        if isinstance(type, dict):
-            type = type.get('type','action')
-        if type == 'sign_in':
-            warning_sign = "Sign In"
-        elif type == 'sign_out':
-            warning_sign = "Sign Out"
-        for emp in self.read(cr, uid, ids, ['id'], context=context):
-            if not self._action_check(cr, uid, emp['id'], dt, context):
-                raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,))
+            if not self._action_check(cr, uid, employee.id, action_date, context):
+                raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the HR Manager to correct attendances.')%(warning_sign[action],))
 
-            res = {'action': type, 'employee_id': emp['id']}
-            if dt:
-                res['name'] = dt
-        id = obj_attendance.create(cr, uid, res, context=context)
-
-        if type != 'action':
-            return id
+            vals = {'action': action, 'employee_id': employee.id}
+            if action_date:
+                vals['name'] = action_date
+            hr_attendance.create(cr, uid, vals, context=context)
         return True
 
 hr_employee()
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 7c29ff8c404..9fc554472e9 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -130,8 +130,8 @@
                 <field name="coach_id" position="after">
                     <group colspan="2">
                         <field name="state"/>
-                        <button name="%(action_hr_attendance_sigh_in_out)d" states="present" type="action" string="Sign Out" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
-                        <button name="%(action_hr_attendance_sigh_in_out)d" states="absent" type="action" string="Sign In" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
+                        <button name="attendance_action_change" states="present" type="object" string="Sign Out" icon="gtk-go-forward" groups="base.group_hr_manager"/>
+                        <button name="attendance_action_change" states="absent" type="object" string="Sign In" icon="gtk-go-back" groups="base.group_hr_manager"/>
                     </group>
                 </field>
             </field>
@@ -139,3 +139,5 @@
 
     </data>
 </openerp>
+
+
diff --git a/addons/hr_attendance/static/src/css/attendance.css b/addons/hr_attendance/static/src/css/attendance.css
deleted file mode 100644
index 48de536f59c..00000000000
--- a/addons/hr_attendance/static/src/css/attendance.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.oe_attendance_button {
-    cursor:pointer;
-}
-
diff --git a/addons/hr_attendance/static/src/img/emp-in.png b/addons/hr_attendance/static/src/img/emp-absent.png
similarity index 100%
rename from addons/hr_attendance/static/src/img/emp-in.png
rename to addons/hr_attendance/static/src/img/emp-absent.png
diff --git a/addons/hr_attendance/static/src/img/emp-in-disable.png b/addons/hr_attendance/static/src/img/emp-in-disable.png
deleted file mode 100644
index 1968e0de46434949ddb12393f4f21895270a334c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1135
zcmV-#1d#iQP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb&2sa_Q
z3&GR?00Z+$L_t(Y$BmR*Y*b|s$A5Fq>Dk@ZQkF#u6eyrrg9t^agh&iZ;K55`)F3_(
zUwsf`AjlK77^_l~#=GH35^rGS#XuiSj3(Zt2oDqqAxgypEiK({yW8Ef=ljNoJ-yh{
zmYJO7<jc%|{@=`hKA6JZ0^s1%*Veze4B(9^;=HK<Z1t<}taxTF3Gy7_!dLPVUEI1I
zc;TpC*Fl@ntPW|;_Ukb{u=keJn_m7wZ)l%pG^csZYgPv|V}H{FO_O6~;z0{$&An$D
z6!GyW!$S!P2|(NB^v1zon`f&3_UUW-ulDE-&1g;o4K$}2?bB}U)%VU%jCLj-yuSR-
z`htRuJfw)hq9}Q-t7~30EkG0Yu^Nn&k_{n6LP87%i;)`aqcZ@Q`3aqvJ_eCcyJ!X-
zNEnJBfa2gpe<eVJh2a@`;GRoI!Qmt~^ox7Gb$SNo*k$HvD5d%(e2qAuof12;dwK?q
z#g31yXvCm6t_vX|=RVt;o4|Oo4r+(<J6BOeu~B7<MJeYSKHbutn?Z?<&uutdspn)X
z0TvJxaPaw-1=`VZ`<h<6Z|W;F?t1F*Cg#X8zNV8H349X7xXf{ub2rc5Gt{|{mZ=!L
z^2p;S?ocB|dg$jey?FQpgv?_xb4g+pj-K7K8g|qAe}E>!vitH6I{_{Z0XG;RM}XoG
zqXLHvedJKJl0I2zEPl7Y@GM`9HSv44eXyfpI1-OfCFPV;Nfk+wWVuK;Llg)kz^(C~
zh*hsXc_>#l{t9inUX8dojC`Pga*1|=(l%fL2gR}G^Q*fKrXvPlvhwLI+Ytw_xCkH!
z4nmrCvXMGd)MFUHQ5<KbpIP@yG==ThwR04NZoFvjrFxdX7>sry#e=M40ftZv)^m57
zg`-lA&k<3s<70493?LW+x+C&Q9$+!;v@wK>i=*CM+&>DC@3lDm!&(%J0~iD$OBThD
zU=vFTFl@#nPX~R1<JFA<WY6}JA%$W`H6}oSQs8e^u>_@z^*C4p0tz@1%o+jkT7TL|
zEh!9cB;gVRmpm7^M#%4Mz;cRS;)D#4#A>F0L<c?#J=xq)p(+v$ue8X*DgLAk!xfUu
zCr<}G6!0m>4f@}AN4GM0_FCn#`XyC_=%|A*$OVKrAy=tl5y~*LsnmoN{<zrcj(b{W
z{oLM_HY+r4@hB1!P@qVH9tQB$myka4q=_+`B$B_<-16g?664IHnsS2L>Xo(e+r}0}
zNYuoibgE;TkP5AmBq>cvMR4ieLro{L<F~Pl1U@qPjes2+=I-$tV&xUgVm3(=?@E94
z$%n@?+${L!_F~H4=06l$T;U}K<V;`N{?nyC{|5!z>#RZAZ;Jo`002ovPDHLkV1o9X
B3oQTu

diff --git a/addons/hr_attendance/static/src/img/emp-out-disable.png b/addons/hr_attendance/static/src/img/emp-out-disable.png
deleted file mode 100644
index b7099e44529f554318fb555aac6abc1718fc5e20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1110
zcmV-c1gZOpP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb&2sjvF
zmQ@n~00Y`dL_t(Y$BmWSPh3?L#((>qGs6rmVyHlY77$yT-l%P$MxPq7@z%anf{BSS
zQ4@WriI<>n2q>jW($x9~s0l_SHYO&LXrhf82ojP~Q?Qb>USNbN!vKTK<;*#I`7mcF
z9USQ1ImyY+THpTG+TXV~<QY8xykGlX!`XWQy7R<Y`2ciz=ZCwWxrZQ0`k4Guy+(*T
zA04N^kU3e_F<Fs+C9W6bqI9(0aeDh(KTA~RB_?r6N>Wy2Nn-jJ>1bact8y1Uz&&(u
ztWi*YEPPl94h}ZRsJi^n@^IH?`=7r&E7NjQq7sw1*kVguVlppbiO5ISa-)shg)?=#
z9!LpjZ#txL(Fj6P_U!38upvM@`a~73$|Souq;YU?anZP{3jNe30Pgmn<fh+(2#VgZ
zi4K(GD1`z91H=2v0J>;MY|;aBV$lnB)=ifMWnMeCF$4GF6lLP5%>EgC@i-uVse-;Y
zHfGS49{*S?@ff7nbiqNXiO*W&IgHoqpeB)g?f_{7?d`152!(t{Z&NtFi4xnMfAEtc
znNY{E(SSk#13%wWA>-qvha&pz`~YpQK7FB<DMC!Jmt7cW3^X_Rjf2!mDW8T;@65~K
zohMIzbDy{>%}o}VB7%h<8;5d&M3`Y#Y@*Y%uM7>W18B$b9Z5c7*q9jDL|Gz^jbLDM
z1D7b%%n~LcO8KrQntvU;?G)MxTxc?~DhX0aHPzHmLlqJ3rw9`Z6BDIemg|hs`X_Qq
z7?1{Wm5D+213@tWSVWj%4nM=hNux=NKV49*!`?CWv#+_S1!Vvl69p&~24Q~0W|>76
zXygTIxRmjxvQ4AzO21b^3;J-0fFg|Lox8>bMu-q1#4HQ^fWzaQC1ZAQP8}^??LnYK
zDPayjE+F0=pt(wj8A7<2r04;T)8naQFFP7my^xG(4F2XYg2n(`6pDYC!{QV#d7{;5
z9;1~m_Ok`2aus0ZYJ?cu5cH}|6fO=+C`Nb~fE4wZ*o;$;9|Ka^60CEBSI}(3_4F^E
z|0_sgGfE51oa86`xO8$I3j-g~$*h_DR9fm-;}#K>sZTt@0sf?jVoE6GSzgDclL;&=
zOz}th-^?-)^ygpq4%%v~*TU@FPX&Gg1n{9*;$1J@AgE&9Ywc`t*U)Ha(cLWpjYS#<
zn-mUZOp*{3{J~eu<HN!rfIHaxa@86o1}LMPLhPFIeKmotw`6KcbZ7aCNgt@JN+qDu
zL%%;NiQ(Ja=p%?9wf>Gk*KI%2U2wtx41B1_@|nK#M`h&yE|mP^?&4z&g_V+uPJTNE
cRo-L$A96_I2bkv;asU7T07*qoM6N<$f|Dll%>V!Z

diff --git a/addons/hr_attendance/static/src/img/emp-out.png b/addons/hr_attendance/static/src/img/emp-present.png
similarity index 100%
rename from addons/hr_attendance/static/src/img/emp-out.png
rename to addons/hr_attendance/static/src/img/emp-present.png
diff --git a/addons/hr_attendance/static/src/img/icon.png b/addons/hr_attendance/static/src/img/icon.png
deleted file mode 100644
index 297dc71c85c5fdd8deafabfbb46093e04adc32d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5938
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
HtLXm&e3x``

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index e447ca1dc7e..a1184532f08 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -1,71 +1,87 @@
 openerp.hr_attendance = function(instance) {
     var QWeb = instance.web.qweb;
+    instance.hr_attendance.attendancestatus = false,
+    instance.hr_attendance.checkstatus = function(){
+        attendance = instance.hr_attendance.currentstatus;
+        if (!attendance){
+        	attendance = new instance.hr_attendance.AttendanceNotifier(self);
+            instance.hr_attendance.currentstatus = attendance;
+        }
+        attendance.renderElement();
+    },
+    instance.hr_attendance.callback = function(callback){
+        var old_callback = callback;
+	    callback = function(result){
+			    if(old_callback){old_callback(result);}
+			    instance.hr_attendance.checkstatus();
+	    }
+        return callback;
+    },
     instance.hr_attendance.AttendanceNotifier = instance.web.Widget.extend({
         template: 'AttendanceNotifier',
         renderElement: function() {
             var self = this;
-            if (this.attendance_status == 'present'){
-                action_type = 'sign_out';
-            }
-            else{
-                action_type = 'sign_in';
-            }
-            this.$element = $(QWeb.render(this.template, {'action':action_type}));
+            employee = new instance.web.DataSetSearch(this, 'hr.employee', this.session.user_context, [['user_id','=', this.session.uid]]);
+	        employee.read_slice(['id','name','state']).done(function(employee) {
+	            if(_.isEmpty(employee)) return;
+                self.employee = employee[0];
+	            self.do_update_notifier();
+	        });
+        },
+        do_update_notifier: function(){
+            var self = this;
+            this.$element = $(QWeb.render(this.template, {'employee':this.employee}));
+            this.$element.click(self.on_click);
             element = $('.oe_attendance_button')
             if (element.length != 0){
-                element.attr('src', this.$element.attr('src'));
+                element.replaceWith(this.$element);
             }
             else{
                 this.$element.appendTo($('.oe_systray'));
-                this.$element.click(self.on_click);
+
             }
         },
 
         on_click: function() {
             var self = this;
-            action = new instance.web.DataSetSearch(this, 'ir.actions.act_window', {}, [['res_model', '=', 'hr.sign.in.out']]);
-            action.read_slice().done(function(action) {
-                action = action[0];
-                action.context = JSON.parse(action.context);
-                var action_manager = new instance.web.ActionManager(self);
-                action_manager.do_action(action);
-            });
+            hr_employee = new instance.web.DataSet(self, 'hr.employee');
+            hr_employee.call('attendance_action_change', [[self.employee.id]]).done(function(result){self.renderElement()});
         },
     });
-
-    instance.hr_attendance.AttendanceStatus = instance.web.Class.extend({
-    	init: function(parent){
-    		this.session = parent.session;
-	    	attendance = new instance.hr_attendance.AttendanceNotifier(self);
-			employee = new instance.web.DataSetSearch(this, 'hr.employee', this.session.user_context, [['user_id','=', this.session.uid]]);
-	        employee.read_slice(['state']).done(function(employee) {
-	            if(_.isEmpty(employee)) return;
-	            attendance.attendance_status = employee[0]['state'];
-	            attendance.renderElement();
-	        });
-    	},
-    });
-    
-    instance.web.ActionManager.include({
-    	do_action: function(action, on_close) {
-    		var self = this;
-    		if (action.res_model == "hr.sign.in.out"){
-    			var old_close = on_close; 
-    			on_close = function(){
-    					if(old_close){old_close();}
-    					new instance.hr_attendance.AttendanceStatus(self);
-    			}
+    instance.web.DataSet.include({
+        create: function(data, callback, error_callback) {
+            if (this._model.name == "hr.attendance"){
+    			callback = instance.hr_attendance.callback(callback);
     		}
-    		this._super(action, on_close);
-    	},
+            return this._super(data, callback, error_callback);
+        },
+        write: function (id, data, options, callback, error_callback) {
+            if (this._model.name == "hr.attendance"){
+    			callback = instance.hr_attendance.callback(callback);
+    		}
+            return this._super(id, data, options, callback, error_callback);
+        },
+  	    unlink: function(ids, callback, error_callback) {
+            if (this._model.name == "hr.attendance"){
+    			callback = instance.hr_attendance.callback(callback);
+    		}
+            return this._super(ids, callback, error_callback);
+        },
+        call_button: function (method, args, callback, error_callback) {
+            if (this._model.name == "hr.employee" && method == "attendance_action_change"){
+    			callback = instance.hr_attendance.callback(callback);
+    		}
+            return this._super(method, args, callback, error_callback);
+        },
+
     });
-    
+
     instance.web.UserMenu.include({
         do_update: function() {
             var self = this;
             this._super();
             this.update_promise.then(function() {
-            	new instance.hr_attendance.AttendanceStatus(self);
+                instance.hr_attendance.checkstatus();
             });
         },
     });
diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml
index 104a30530b8..e4190720262 100644
--- a/addons/hr_attendance/static/src/xml/attendance.xml
+++ b/addons/hr_attendance/static/src/xml/attendance.xml
@@ -1,11 +1,7 @@
 <template>
     <t t-name="AttendanceNotifier">
-        <t t-if="action=='sign_in'">
-            <img src="/hr_attendance/static/src/img/emp-in.png" class="oe_attendance_button"></img>
-        </t>
-        <t t-if="action=='sign_out'">
-            <img src="/hr_attendance/static/src/img/emp-out.png" class="oe_attendance_button"></img>
-        </t>    
-        
+        <a href="#" class="oe_attendance_button" t-attf-title="You are #{employee.state}">
+            <img t-attf-src="/hr_attendance/static/src/img/emp-#{employee.state}.png" ></img>
+        </a>
     </t>
 </template>
diff --git a/addons/hr_attendance/wizard/__init__.py b/addons/hr_attendance/wizard/__init__.py
index a414c9a8798..6269c507d8c 100644
--- a/addons/hr_attendance/wizard/__init__.py
+++ b/addons/hr_attendance/wizard/__init__.py
@@ -19,9 +19,8 @@
 #
 ##############################################################################
 
-import hr_attendance_sign_in_out
 import hr_attendance_error
 import hr_attendance_byweek
 import hr_attendance_bymonth
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
deleted file mode 100644
index 6ed02deb86c..00000000000
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ /dev/null
@@ -1,191 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 time
-
-from osv import osv, fields
-from tools.translate import _
-
-class hr_si_so_ask(osv.osv_memory):
-    _name = 'hr.sign.in.out.ask'
-    _description = 'Ask for Sign In Out'
-    _columns = {
-        'name': fields.char('Employees name', size=32, required=True, readonly=True),
-        'last_time': fields.datetime('Your last sign out', required=True),
-        'emp_id': fields.many2one('hr.employee', 'Empoyee ID', readonly=True),
-        }
-
-    def _get_empname(self, cr, uid, context=None):
-        emp_id = context.get('emp_id', self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context))
-        if emp_id:
-            employee = self.pool.get('hr.employee').browse(cr, uid, emp_id, context=context)[0].name
-            return employee
-        return ''
-
-    def _get_empid(self, cr, uid, context=None):
-        emp_id = context.get('emp_id', self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context))
-        if emp_id:
-            return emp_id[0]
-        return False
-
-    _defaults = {
-         'name': _get_empname,
-         'emp_id': _get_empid,
-                 }
-
-    def sign_in(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        data['emp_id'] = data['emp_id'] and data['emp_id'][0]
-        return self.pool.get('hr.sign.in.out').sign_in(cr, uid, data, context)
-
-    def sign_out(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        data['emp_id'] = data['emp_id'] and data['emp_id'][0]
-        return self.pool.get('hr.sign.in.out').sign_out(cr, uid, data, context)
-
-hr_si_so_ask()
-
-class hr_sign_in_out(osv.osv_memory):
-    _name = 'hr.sign.in.out'
-    _description = 'Sign In Sign Out'
-
-    _columns = {
-        'name': fields.char('Employees name', size=32, required=True, readonly=True),
-        'state': fields.char('Current state', size=32, required=True, readonly=True),
-        'emp_id': fields.many2one('hr.employee', 'Empoyee ID', readonly=True),
-                }
-        
-    def _get_empid(self, cr, uid, context=None):
-        emp_id = context.get('emp_id', self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context))
-        if emp_id:
-            employee = self.pool.get('hr.employee').browse(cr, uid, emp_id, context=context)[0]
-            return {'name': employee.name, 'state': employee.state, 'emp_id': emp_id[0]}
-        return {}
-
-    def default_get(self, cr, uid, fields_list, context=None):
-        res = super(hr_sign_in_out, self).default_get(cr, uid, fields_list, context=context)
-        res_emp = self._get_empid(cr, uid, context=context)
-        act_obj=self.pool.get('ir.actions.act_window')
-        action_id = act_obj.search(cr, uid, [('res_model','=','hr.sign.in.out')],context=context)
-        action = act_obj.browse(cr, uid, action_id[0], context=context)
-        if res_emp['state']=='present':
-            name = act_obj.write(cr, uid, action_id[0], {'name':'Sign Out'}, context=context)
-        if res_emp['state']=='absent':
-            name = act_obj.write(cr, uid, action_id[0], {'name':'Sign In'}, context=context)
-        res.update(res_emp)
-        return res
-
-    def si_check(self, cr, uid, ids, context=None):
-        obj_model = self.pool.get('ir.model.data')
-        att_obj = self.pool.get('hr.attendance')
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        data['emp_id'] = data['emp_id'] and data['emp_id'][0]
-        emp_id = data['emp_id']
-        att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id)], limit=1, order='name desc')
-        last_att = att_obj.browse(cr, uid, att_id, context=context)
-        if last_att:
-            last_att = last_att[0]
-        cond = not last_att or last_att.action == 'sign_out'
-        if cond:
-            return self.sign_in(cr, uid, data, context)
-        else:
-            model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_attendance_so_ask')], context=context)
-            resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-            return {
-                'name': _('Sign in '),
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'hr.sign.in.out.ask',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'context': context,
-                'target': 'new',
-            }
-
-    def so_check(self, cr, uid, ids, context=None):
-        obj_model = self.pool.get('ir.model.data')
-        att_obj = self.pool.get('hr.attendance')
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        data['emp_id'] = data['emp_id'] and data['emp_id'][0]
-        emp_id = data['emp_id']
-        att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id),('action', '!=', 'action')], limit=1, order='name desc')
-        last_att = att_obj.browse(cr, uid, att_id, context=context)
-        if last_att:
-            last_att = last_att[0]
-        if not att_id and not last_att:
-            model_data_ids = obj_model.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_hr_attendance_message')], context=context)
-            resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-            return {
-                'name': _('Sign in / Sign out'),
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'hr.sign.in.out',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'context': context,
-                'target': 'new',
-            }
-
-        cond = last_att and last_att['action'] == 'sign_in'
-        if cond:
-            return self.sign_out(cr, uid, data, context)
-        else:
-            model_data_ids = obj_model.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_hr_attendance_si_ask')], context=context)
-            resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-            return {
-                'name': _('Sign in / Sign out'),
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'hr.sign.in.out.ask',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-            }
-
-    def sign_in(self, cr, uid, data, context=None):
-        if context is None:
-            context = {}
-        emp_id = data['emp_id']
-        if 'last_time' in data:
-            if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
-                raise osv.except_osv(_('UserError'), _('The sign-out date must be in the past'))
-            self.pool.get('hr.attendance').create(cr, uid, {'name': data['last_time'], 'action': 'sign_out',
-                'employee_id': emp_id}, context=context)
-        try:
-            self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in')
-        except:
-            raise osv.except_osv(_('UserError'), _('A sign-in must be right after a sign-out !'))
-        return {'type': 'ir.actions.act_window_close'} # To do: Return Success message
-
-    def sign_out(self, cr, uid, data, context=None):
-        emp_id = data['emp_id']
-        if 'last_time' in data:
-            if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
-                raise osv.except_osv(_('UserError'), _('The Sign-in date must be in the past'))
-            self.pool.get('hr.attendance').create(cr, uid, {'name':data['last_time'], 'action':'sign_in',  'employee_id':emp_id}, context=context)
-        try:
-            self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_out')
-        except:
-            raise osv.except_osv(_('UserError'), _('A sign-out must be right after a sign-in !'))
-        return {'type': 'ir.actions.act_window_close'} # To do: Return Success message
-
-hr_sign_in_out()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
deleted file mode 100644
index b3cffa9ab02..00000000000
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_hr_attendance_sigh_in_out" model="ir.ui.view">
-            <field name="name">hr.sign.in.out.form</field>
-            <field name="model">hr.sign.in.out</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Sign in / Sign out">
-                    <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
-                    <newline/>
-                    <group colspan="4" col="6">
-                        <field name="name" />
-                        <field name="state" />
-                    </group>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object" attrs="{'invisible':[('state','=','present')]}"/>
-                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" attrs="{'invisible':[('state','=','absent')]}"/>
-                   </group>
-               </form>
-            </field>
-        </record>
-
-       <record id="view_hr_attendance_message" model="ir.ui.view">
-            <field name="name">hr.sign.in.out.form</field>
-            <field name="model">hr.sign.in.out</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Sign in / Sign out">
-                    <separator string="Sign-Out Entry must follow Sign-In." colspan="4" />
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Ok"/>
-                   </group>
-               </form>
-            </field>
-        </record>
-
-        <record id="action_hr_attendance_sigh_in_out" model="ir.actions.act_window">
-            <field name="name">Sign In / Sign Out</field>
-            <field name="res_model">hr.sign.in.out</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_hr_attendance_sigh_in_out"/>
-           <field name="target">new</field>
-           <field name="help">Sign in / Sign out. In some companies, staff have to sign in when they arrive at work and sign out again at the end of the day. If each employee has been linked to a system user, then they can encode their time with this action button.</field>
-        </record>
-
-
-       <record id="view_hr_attendance_so_ask" model="ir.ui.view">
-            <field name="name">hr.sign.in.out.ask.form</field>
-            <field name="model">hr.sign.in.out.ask</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="hr.sign.out.ask">
-                    <group colspan="4" >
-                    <separator string="You did not sign out the last time. Please enter the date and time you signed out." colspan="4" />
-                    <field name="name" />
-                    <field name="last_time" string="Your last sign out" />
-                    </group>
-                    <separator colspan="4" />
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-back" string="Sign in" name="sign_in"  type="object"/>
-                   </group>
-               </form>
-            </field>
-        </record>
-
-       <record id="view_hr_attendance_si_ask" model="ir.ui.view">
-            <field name="name">hr.sign.in.out.ask.form</field>
-            <field name="model">hr.sign.in.out.ask</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="hr.sign.in.out.ask">
-                    <group colspan="4" >
-                    <separator string="You did not sign in the last time. Please enter the date and time you signed in." colspan="4" />
-                    <field name="name" />
-                    <field name="last_time" string="Your last sign in" />
-                    </group>
-                    <separator colspan="4" />
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-back" string="Sign out" name="sign_out"  type="object"/>
-                   </group>
-               </form>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index f325113bc21..54ef27ef8c7 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -91,8 +91,6 @@
                             </field>
                             <group col="4" colspan="1">
                                 <field name="state_attendance"/>
-                                <button name="%(hr_attendance.action_hr_attendance_sigh_in_out)d" type="action" string="Sign In" attrs="{'invisible':[('state_attendance','=','present')]}" icon="terp-gtk-jump-to-ltr" />
-                                <button name="%(hr_attendance.action_hr_attendance_sigh_in_out)d" type="action" string="Sign Out" attrs="{'invisible':[('state_attendance','=','absent')]}" icon="terp-gtk-jump-to-rtl" />
                                 <field name="total_attendance_day" widget="float_time" colspan="4"/>
                             </group>
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">

From 9f9b3276c10b1f5d4fe8865b6538076cc1fddb49 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 11 May 2012 11:51:27 +0530
Subject: [PATCH 032/999] [FIX] hr_attendance: fix yml

bzr revid: hmo@tinyerp.com-20120511062127-c1ak373ml0h7ojvt
---
 addons/hr_attendance/test/attendance_process.yml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/addons/hr_attendance/test/attendance_process.yml b/addons/hr_attendance/test/attendance_process.yml
index 4ad765d65df..7902bf11d9d 100644
--- a/addons/hr_attendance/test/attendance_process.yml
+++ b/addons/hr_attendance/test/attendance_process.yml
@@ -1,16 +1,8 @@
 -
   In order to test attendance process in OpenERP, I entry of SignIn of employee.
 -
-  !python {model: hr.sign.in.out}: |
-    context.update({'emp_id': [ref('hr.employee_al')]}) #TOFIX: emp_ids instead of 'emp_id'
--
-  !record {model: hr.sign.in.out, id: employee_sign_in}:
-    {}
--
-  Employee Signs In.
--
-  !python {model: hr.sign.in.out}: |
-    self.si_check(cr, uid, [ref("employee_sign_in")], context=context)
+  !python {model: hr.employee}: |
+    self.attendance_action_change(cr, uid, [ref("hr.employee_al")], context=context)
 -
   I check that Employee is "Present".
 -
@@ -19,10 +11,10 @@
 -
   After few seconds, employee sign's out.
 -
-  !python {model: hr.sign.in.out}: |
+  !python {model: hr.employee}: |
     import time
     time.sleep(2)
-    self.so_check(cr, uid, [ref("employee_sign_in")], context=context)
+    self.attendance_action_change(cr, uid, [ref("hr.employee_al")], context=context)
 -
   I check that Employee is "Absent".
 -

From 80ef7b58dd3c0f293ab1a2bee3dc260aad1aeeb6 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 11 May 2012 13:03:20 +0530
Subject: [PATCH 033/999] [IMP] hr_timesheet_sheet: improve API to
 signin/signout with new method 'attendance_action_change'

bzr revid: hmo@tinyerp.com-20120511073320-ilnxqtenca01l563
---
 .../hr_attendance/static/src/js/attendance.js |  2 +-
 .../hr_timesheet_sheet/hr_timesheet_sheet.py  | 31 +++++--------------
 .../hr_timesheet_sheet_demo.xml               |  4 +--
 .../hr_timesheet_sheet_view.xml               |  2 ++
 .../test/test_hr_timesheet_sheet.yml          |  2 +-
 5 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index a1184532f08..ae044475813 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -68,7 +68,7 @@ openerp.hr_attendance = function(instance) {
             return this._super(ids, callback, error_callback);
         },
         call_button: function (method, args, callback, error_callback) {
-            if (this._model.name == "hr.employee" && method == "attendance_action_change"){
+            if (method == "attendance_action_change"){
     			callback = instance.hr_attendance.callback(callback);
     		}
             return this._super(method, args, callback, error_callback);
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 3e0f3963ad5..870dd0bc413 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -312,31 +312,14 @@ class hr_timesheet_sheet(osv.osv):
                 self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}, context=context)
         return True
 
-    def check_sign(self, cr, uid, ids, typ, context=None):
-        sheet = self.browse(cr, uid, ids, context=context)[0]
-        if not sheet.date_current == time.strftime('%Y-%m-%d'):
-            raise osv.except_osv(_('Error !'), _('You cannot sign in/sign out from an other date than today'))
-        return True
+    
+    def attendance_action_change(self, cr, uid, ids, context=None):
+        hr_employee = self.pool.get('hr.employee')
+        employee_ids = []
+        for sheet in self.browse(cr, uid, ids, context=context):
+            if sheet.employee_id.id not in employee_ids: employee_ids.append(sheet.employee_id.id)
+        return hr_employee.attendance_action_change(cr, uid, employee_ids, context=context)
 
-    def sign(self, cr, uid, ids, typ, context=None):
-        self.check_sign(cr, uid, ids, typ, context=context)
-        sign_obj = self.pool.get('hr.sign.in.out')
-        sheet = self.browse(cr, uid, ids, context=context)[0]
-        context['emp_id'] = [sheet.employee_id.id]
-        sign_id = sign_obj.create(cr, uid, {}, context=context)
-        methods = {'sign_in': sign_obj.si_check,
-                   'sign_out': sign_obj.so_check}
-        wizard_result = methods[typ](cr, uid, [sign_id], context=context)
-        if wizard_result.get('type', False) == 'ir.actions.act_window_close':
-            return True  # ensure we do not close the main window !
-        wizard_result['nodestroy'] = True  # do not destroy the main window !
-        return wizard_result
-
-    def sign_in(self, cr, uid, ids, context=None):
-        return self.sign(cr, uid, ids, 'sign_in', context=context)
-
-    def sign_out(self, cr, uid, ids, context=None):
-        return self.sign(cr, uid, ids, 'sign_out', context=context)
 
     _columns = {
         'name': fields.char('Note', size=64, select=1,
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index a73bbb3050e..42497eb537e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -2,12 +2,12 @@
 <openerp>
     <data noupdate="1">
         
-        <record id="sheet1" model="hr_timesheet_sheet.sheet">
+<!--        <record id="sheet1" model="hr_timesheet_sheet.sheet">
             <field name="name">Sheet 1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="employee_id" ref="hr.employee_fp" />
             <field eval="time.strftime('%Y-%m-%d')" name="date_current"/>
         </record>
-
+-->
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 54ef27ef8c7..91b61969ca8 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -91,6 +91,8 @@
                             </field>
                             <group col="4" colspan="1">
                                 <field name="state_attendance"/>
+                                <button name="attendance_action_change" attrs="{'invisible': ['|', ('state_attendance','=',False), ('state_attendance', '=', 'absent')]}" type="object" string="Sign Out" icon="gtk-go-forward" groups="base.group_hr_manager"/>
+                        <button name="attendance_action_change" attrs="{'invisible': [('state_attendance', '=', 'present')]}" type="object" string="Sign In" icon="gtk-go-back" groups="base.group_hr_manager"/>
                                 <field name="total_attendance_day" widget="float_time" colspan="4"/>
                             </group>
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
index e38ad31ea12..c2ab7cb5ac0 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -26,7 +26,7 @@
   Now, at the time of login, I create Attendances and perform "Sign In" action.
 -
   !python {model: hr_timesheet_sheet.sheet}: |
-    self.sign_in(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {})
+    self.attendance_action_change(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {})
     task_work = self.search(cr, uid, [("name","=","Quentin Paolinon")],context)[0]
     task_ids = self.browse(cr, uid, task_work, context)
     assert task_ids.state == "draft", "I State In Timesheet"

From 79bfa8e45c053722a30c36fb83aa113255500fc6 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 11 May 2012 13:56:14 +0530
Subject: [PATCH 034/999] [FIX] hr_timesheet: In hr.sign.in.project, correct
 args in attendance_action_change

bzr revid: hmo@tinyerp.com-20120511082614-4iitswji8dgwsbst
---
 addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py | 6 +++---
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index e3f7f0c7acb..d7bd43e5d92 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -91,7 +91,7 @@ class hr_so_project(osv.osv_memory):
         emp_obj = self.pool.get('hr.employee')
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
-            emp_obj.attendance_action_change(cr, uid, [emp_id], type='sign_out', dt=data.date)
+            emp_obj.attendance_action_change(cr, uid, [emp_id], {'action':'sign_out', 'action_date':data.date})
             self._write(cr, uid, data, emp_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
@@ -99,7 +99,7 @@ class hr_so_project(osv.osv_memory):
         emp_obj = self.pool.get('hr.employee')
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
-            emp_obj.attendance_action_change(cr, uid, [emp_id], type='action', dt=data.date)
+            emp_obj.attendance_action_change(cr, uid, [emp_id], {'action':'action', 'action_date':data.date})
             self._write(cr, uid, data, emp_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
@@ -156,7 +156,7 @@ class hr_si_project(osv.osv_memory):
         emp_obj = self.pool.get('hr.employee')
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
-            emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data.date or False)
+            emp_obj.attendance_action_change(cr, uid, [emp_id], {'action':'sign_in', 'action_date':data.date})
         return {'type': 'ir.actions.act_window_close'}
 
     def default_get(self, cr, uid, fields_list, context=None):
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 91b61969ca8..d9071d639ea 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -92,7 +92,7 @@
                             <group col="4" colspan="1">
                                 <field name="state_attendance"/>
                                 <button name="attendance_action_change" attrs="{'invisible': ['|', ('state_attendance','=',False), ('state_attendance', '=', 'absent')]}" type="object" string="Sign Out" icon="gtk-go-forward" groups="base.group_hr_manager"/>
-                        <button name="attendance_action_change" attrs="{'invisible': [('state_attendance', '=', 'present')]}" type="object" string="Sign In" icon="gtk-go-back" groups="base.group_hr_manager"/>
+                                <button name="attendance_action_change" attrs="{'invisible': [('state_attendance', '=', 'present')]}" type="object" string="Sign In" icon="gtk-go-back" groups="base.group_hr_manager"/>
                                 <field name="total_attendance_day" widget="float_time" colspan="4"/>
                             </group>
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">

From 28bcc5d3aa40b2d1fbffa41b1a3b85ef35436d47 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 11 May 2012 14:47:41 +0530
Subject: [PATCH 035/999] [IMP] hr_attendance: improve template of
 attendancenotifier widget

bzr revid: hmo@tinyerp.com-20120511091741-dps9po5hqqmfqeof
---
 addons/hr_attendance/static/src/xml/attendance.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml
index e4190720262..bfa5514b538 100644
--- a/addons/hr_attendance/static/src/xml/attendance.xml
+++ b/addons/hr_attendance/static/src/xml/attendance.xml
@@ -1,7 +1,5 @@
 <template>
     <t t-name="AttendanceNotifier">
-        <a href="#" class="oe_attendance_button" t-attf-title="You are #{employee.state}">
-            <img t-attf-src="/hr_attendance/static/src/img/emp-#{employee.state}.png" ></img>
-        </a>
+        <img style="cursor: pointer;" t-attf-src="/hr_attendance/static/src/img/emp-#{employee.state}.png" class="oe_attendance_button" t-attf-title="You are #{employee.state}"></img>
     </t>
 </template>

From a98de2cea4989171e6e3bb85960dafc380c6a409 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 15 May 2012 11:01:45 +0530
Subject: [PATCH 036/999] [FIX] hr_attendance: fix problem of current_date
 field in search view of attedance and reload page after click on
 attendancenotifier widget to update current page/list/kanban of employee,
 timesheet , attendance

bzr revid: hmo@tinyerp.com-20120515053145-9dpzju1u07v2xe26
---
 addons/hr_attendance/hr_attendance_view.xml      | 2 +-
 addons/hr_attendance/static/src/js/attendance.js | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 9fc554472e9..2e674de7985 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -52,7 +52,7 @@
                 <search string="Hr Attendance Search">
                     <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
+                    <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',time.strftime('%%Y-%%m-%%d')),('name','&lt;=',time.strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/>
                     <field name="employee_id"/>
                     <field name="name"/>
diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index ae044475813..a7c3a7f9790 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -45,7 +45,10 @@ openerp.hr_attendance = function(instance) {
         on_click: function() {
             var self = this;
             hr_employee = new instance.web.DataSet(self, 'hr.employee');
-            hr_employee.call('attendance_action_change', [[self.employee.id]]).done(function(result){self.renderElement()});
+            hr_employee.call('attendance_action_change', [[self.employee.id]]).done(function(result){
+                window.location.reload();
+                //self.renderElement()
+            });
         },
     });
     instance.web.DataSet.include({

From d1d4b1554c2336b6ef22f7cee3ecce050dd8800f Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 15 May 2012 13:12:24 +0530
Subject: [PATCH 037/999] [IMP] hr_attendance: remove icons in SignIn/SignOut
 buttons and also put reverse img for present/absent in attendancenotifier

bzr revid: hmo@tinyerp.com-20120515074224-bcvnr8s201tw33uc
---
 addons/hr_attendance/hr_attendance_view.xml      |   4 ++--
 .../hr_attendance/static/src/img/emp-present.png | Bin 2062 -> 0 bytes
 .../hr_timesheet_sheet_view.xml                  |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 addons/hr_attendance/static/src/img/emp-present.png

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 2e674de7985..7130f55df6c 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -130,8 +130,8 @@
                 <field name="coach_id" position="after">
                     <group colspan="2">
                         <field name="state"/>
-                        <button name="attendance_action_change" states="present" type="object" string="Sign Out" icon="gtk-go-forward" groups="base.group_hr_manager"/>
-                        <button name="attendance_action_change" states="absent" type="object" string="Sign In" icon="gtk-go-back" groups="base.group_hr_manager"/>
+                        <button name="attendance_action_change" states="present" type="object" string="Sign Out"  groups="base.group_hr_manager"/>
+                        <button name="attendance_action_change" states="absent" type="object" string="Sign In" groups="base.group_hr_manager"/>
                     </group>
                 </field>
             </field>
diff --git a/addons/hr_attendance/static/src/img/emp-present.png b/addons/hr_attendance/static/src/img/emp-present.png
deleted file mode 100644
index d2a6cbb50137c404d3f188151bb64024c082b75a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2062
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

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index d9071d639ea..8ddb783df84 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -91,8 +91,8 @@
                             </field>
                             <group col="4" colspan="1">
                                 <field name="state_attendance"/>
-                                <button name="attendance_action_change" attrs="{'invisible': ['|', ('state_attendance','=',False), ('state_attendance', '=', 'absent')]}" type="object" string="Sign Out" icon="gtk-go-forward" groups="base.group_hr_manager"/>
-                                <button name="attendance_action_change" attrs="{'invisible': [('state_attendance', '=', 'present')]}" type="object" string="Sign In" icon="gtk-go-back" groups="base.group_hr_manager"/>
+                                <button name="attendance_action_change" attrs="{'invisible': ['|', ('state_attendance','=',False), ('state_attendance', '=', 'absent')]}" type="object" string="Sign Out" groups="base.group_hr_manager"/>
+                                <button name="attendance_action_change" attrs="{'invisible': [('state_attendance', '=', 'present')]}" type="object" string="Sign In" groups="base.group_hr_manager"/>
                                 <field name="total_attendance_day" widget="float_time" colspan="4"/>
                             </group>
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">

From 2c935c1c5697d67280d6d01b9f2ce1978cbdf2a8 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 15 May 2012 14:11:29 +0530
Subject: [PATCH 038/999] [IMP/ADD]added l10_in_hr_payroll.changes in module
 descrpition and added notes in salary rules.

bzr revid: kbh@tinyerp.com-20120515084129-uu7aroc0izfb0zk5
---
 addons/hr_payroll/hr_payroll_demo.xml         |   8 +
 addons/l10n_in_hr_payroll/__init__.py         |  26 ++
 addons/l10n_in_hr_payroll/__openerp__.py      |  55 +++
 .../data/hr.salary.rule.csv                   |  12 +
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  |  34 ++
 .../l10n_in_hr_payroll_data.xml               | 425 ++++++++++++++++++
 .../l10n_in_hr_payroll_demo.xml               |  16 +
 .../l10n_in_hr_payroll_report.xml             |  14 +
 .../l10n_in_hr_payroll_view.xml               |  21 +
 addons/l10n_in_hr_payroll/report/__init__.py  |  27 ++
 .../report/report_payslip_details.py          |  38 ++
 .../report/report_payslip_details.rml         | 372 +++++++++++++++
 .../security/hr.salary.rule.csv               |   3 +
 13 files changed, 1051 insertions(+)
 create mode 100644 addons/l10n_in_hr_payroll/__init__.py
 create mode 100644 addons/l10n_in_hr_payroll/__openerp__.py
 create mode 100644 addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
 create mode 100644 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
 create mode 100644 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
 create mode 100644 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
 create mode 100644 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
 create mode 100644 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
 create mode 100644 addons/l10n_in_hr_payroll/report/__init__.py
 create mode 100644 addons/l10n_in_hr_payroll/report/report_payslip_details.py
 create mode 100644 addons/l10n_in_hr_payroll/report/report_payslip_details.rml
 create mode 100644 addons/l10n_in_hr_payroll/security/hr.salary.rule.csv

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 36ac3e23a7b..33b345591eb 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -31,6 +31,12 @@
             <field name="register_id" ref="hr_houserent_register"/>
             <field name="name">House Rent Allowance</field>
             <field name="sequence" eval="5"/>
+            <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.Income tax exemption for HRA will be least of following:
+                1. The actual amount of HRA received as a part of salary.
+                2. 40% (if living in non-metro area) or 50% (if living in metro area) of (basic salary+Dearness allowance (DA)).
+                3. Rent paid minus 10% of (basic salary+DA).
+                Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1upoomH73
+            </field>
         </record>
 
         <record id="hr_salary_rule_convanceallowance1" model="hr.salary.rule">
@@ -50,6 +56,8 @@
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="register_id" ref="hr_professional_tax_register"/>
             <field name="name">Professional Tax</field>
+            <field name="note">Professional tax deducted from salary by employer should be removed from taxable salary before computation of income tax.
+            Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uugbJcaM</field>
         </record>
 
         <record id="hr_salary_rule_providentfund1" model="hr.salary.rule">
diff --git a/addons/l10n_in_hr_payroll/__init__.py b/addons/l10n_in_hr_payroll/__init__.py
new file mode 100644
index 00000000000..dd0fa2330b7
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/__init__.py
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 hr_payroll
+import l10n_in_hr_payroll
+import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
new file mode 100644
index 00000000000..27528fbddcf
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -0,0 +1,55 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+{
+    'name': 'India payroll',
+    'category': 'Localization',
+    'init_xml': [],
+    'author': 'OpenERP SA',
+    'website':'http://www.openerp.com',
+    'depends': ['hr_payroll'],
+    'version': '1.0',
+    'description': """
+Indian Payroll Rules.
+=======================
+
+    * Employee Details
+    * Employee Contracts
+    * Passport based Contract
+    * Allowances / Deductions
+    * Allow to configure Basic / Grows / Net Salary
+    * Employee PaySlip
+    * Monthly Payroll Register
+    * Integrated with Holiday Management
+    * Medical Allowance, Travel Allowance, Child Allowance, ...
+    """,
+
+    'active': False,
+    'update_xml': [
+         'l10n_in_hr_payroll_view.xml',
+         'l10n_in_hr_payroll_data.xml',
+         'data/hr.salary.rule.csv',
+         'l10n_in_hr_payroll_report.xml',
+     ],
+    'demo_xml': ['l10n_in_hr_payroll_demo.xml'],
+    'installable': True
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
new file mode 100644
index 00000000000..0d62cf670e0
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
@@ -0,0 +1,12 @@
+"id","amount_select","condition_range_min","condition_range_max","amount_percentage","amount_fix","name","category_id","sequence","code","parent_rule_id/id","condition_select","condition_range","amount_percentage_base"
+1,"fix",1,1,,50,"Education Allowance","Child Education Allowance",23,"CHEA","hr_payroll_rule_child1","range","employee.children",
+2,"fix",2,2,,100,"Education Allowance","Child Education Allowance",24,"CHEA","hr_payroll_rule_child1","range","employee.children",
+,,,,,,,,,,,,,
+3,"fix",1,1,,150,"Education Allowance with Hostel","Child Education Allowance",26,"CHEAH","hr_payroll_rule_child2","range","employee.children",
+4,"fix",2,2,,300,"Education Allowance with Hostel","Child Education Allowance",27,"CHEAH","hr_payroll_rule_child2","range","employee.children",
+,,,,,,,,,,,,,
+5,"fix",0,2999,,0,"Professional Tax for Gujarat","Deduction",121,"PT0","hr_payslip_line_professionaltax_guj","range","categories.GROSS",
+6,"fix",3000,5999,,-20,"Professional Tax for Gujarat","Deduction",121,"PT20","hr_payslip_line_professionaltax_guj","range","categories.GROSS",
+7,"fix",6000,8999,,-80,"Professional Tax for Gujarat","Deduction",121,"PT80","hr_payslip_line_professionaltax_guj","range","categories.GROSS",
+8,"fix",9000,11999,,-150,"Professional Tax for Gujarat","Deduction",121,"PT150","hr_payslip_line_professionaltax_guj","range","categories.GROSS",
+9,"fix",12000,1000000,,-200,"Professional Tax for Gujarat","Deduction",121,"PT200","hr_payslip_line_professionaltax_guj","range","categories.GROSS",
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
new file mode 100644
index 00000000000..dc075b0be36
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -0,0 +1,34 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    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 osv import fields, osv
+import decimal_precision as dp
+
+class hr_contract_in(osv.osv):
+    _inherit = 'hr.contract'
+
+    _columns = {
+        'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll')),
+    }
+
+hr_contract_in()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
new file mode 100644
index 00000000000..6edee15874f
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -0,0 +1,425 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Hr Salary Rules Categories-->
+
+        <record id="CEA" model="hr.salary.rule.category">
+            <field name="name">Child Education Allowance</field>
+            <field name="code">CEA</field>
+            <field name="parent_id" ref="hr_payroll.ALW"/>
+        </record>
+
+        <!-- Hr Salary Rules-->
+
+        <record id="hr_salary_rule_da" model="hr.salary.rule">
+            <field name="code">DA</field>
+            <field name="name">Dearness Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">percentage</field>
+            <field name="amount_percentage_base">contract.wage</field>
+            <field name="amount_percentage" eval="51"/>
+            <field name="sequence" eval="20"/>
+             <field name="note">DA is calculated in % 
+                for more details:http://www.citehr.com/26809-how-calculate-dearness-allowance-da.html</field>
+        </record>
+
+        <record id="hr_payroll_rule_child_edu" model="hr.salary.rule">
+            <field name="code">CEA</field>
+            <field name="name">Child Education Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field name="condition_select">none</field>
+            <field name="sequence" eval="21"/>
+            <field name="note"> Per school going child 1200 per annum is non-taxable. Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
+        </record>
+
+        <record id="hr_payroll_rule_child1" model="hr.salary.rule">
+            <field name="code">CHEA</field>
+            <field name="name">Education Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="parent_rule_id" ref="hr_payroll_rule_child_edu"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(employee.children)</field>
+            <field name="amount_select">fix</field>
+            <field name="note">Education allowance of Rs. 50 per month per child for up to 2 children of the employee is exempted.</field>
+            <field name="sequence" eval="22"/>
+        </record>
+
+        <record id="hr_payroll_rule_child2" model="hr.salary.rule">
+            <field name="code">CHEAH</field>
+            <field name="name">Education Allowance with Hostel</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="parent_rule_id" ref="hr_payroll_rule_child_edu"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(employee.children)</field>
+            <field name="amount_select">fix</field>
+            <field name="note">In case the children are in hostel, the exemption available is Rs.150 per month per child for up to 2 children.</field>
+            <field name="sequence" eval="25"/>
+        </record>
+
+        <record id="hr_salary_rule_special" model="hr.salary.rule">
+            <field name="code">MGMTA</field>
+            <field name="name">Grade/Special/Management/Supplementary Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="100.0" name="amount_fix"/>
+            <field name="sequence" eval="28"/>
+            <field name="note">This allowance is normally given as an additional benefit to employees and is fully taxable.
+                for more details : http://www.rupeetalk.com/finance-basics/income-tax-basics/income-tax-guides/tax-implications-of-salary-components.php</field>
+        </record>
+
+        <record id="hr_salary_rule_city" model="hr.salary.rule">
+            <field name="code">CCA</field>
+            <field name="name">City Compensatory Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="100.0" name="amount_fix"/>
+            <field name="sequence" eval="29"/>
+            <field name="note">10% of basic+da is the maximum.
+                for more details :http://www.citehr.com/250071-what-cca-allowance.html</field>
+        </record>
+
+        <record id="hr_salary_rule_arrears" model="hr.salary.rule">
+            <field name="code">ARRE</field>
+            <field name="name">Arrears</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="100.0" name="amount_fix"/>
+            <field name="sequence" eval="30"/>
+             <field name="note">Generally arrears are fully taxable, but employee may claim exemption u/s 89(1). 
+              One would need to compute income tax on the arrears if it would have been received in actual year.
+              Now difference of income tax between payment year and actual year would be allowed for deduction.
+                Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uurtGGGd</field>
+        </record>
+
+        <record id="hr_salary_rule_gratuity" model="hr.salary.rule">
+            <field name="code">GRA</field>
+            <field name="name">Gratuity</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">none</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (categories.NET/26) * 15 * 5</field>
+            <field name="sequence" eval="500"/>
+            <field name="note">Covered under the Payment of Gratuity Act, 1971: (Last drawn monthly basic salary + dearness allowance)/26 x 15 days x number of years of service (date of joining – date of retirement/leaving job)
+            </field>
+        </record>
+
+        <record id="hr_salary_rule_lta" model="hr.salary.rule">
+            <field name="code">LTA</field>
+            <field name="name">Leave Travel Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">percentage</field>
+            <field name="amount_percentage_base">contract.wage</field>
+            <field name="amount_percentage" eval="0.0833"/>
+            <field name="sequence" eval="32"/>
+            <field name="note">As per Income tax rules of India, if transport bills for LTA are not provided,
+            the amount will be taxed. E.g. If an employee has LTA allowance as Rs 50,000 in his CTC(cost to company),
+            and he provides proofs of Rs 40,000 (boarding pass, air tickets, taxi vouchers) then income tax will be 
+            deducted for rest of the Rs 10,000. Does not matter whats the amount of LTA in an employee’s package, 
+            income tax laws only permits domestic air tickets only for LTA claim.
+            Read more: http://www.pankajbatra.com/news/lta-proof-reimbursement-to-employer-not-required-supreme-court-india-ruling/#ixzz1uutlHSez</field>
+        </record>
+
+        <record id="hr_salary_rule_le" model="hr.salary.rule">
+            <field name="code">LE</field>
+            <field name="name">Leave Encashment</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">none</field>
+            <field name="amount_select">fix</field>
+            <field name="amount_fix">0.0</field>
+            <field name="sequence" eval="33"/>
+            <field name="note">Payment by way of leave encashment received by Central & State Govt.
+              employees at the time of retirement in respect of the period of earned 
+              leave at credit is fully exempt. In case of other employees, the exemption 
+              is to be limited to minimum of all below:
+                1.The actual amount received
+                2.The cash equivalent of leave balance (max 30 days per year of service)
+                3.Maximum of 10 months of leave encashment, based on last 10 months average salary
+                4.Rs. 3 Lakh
+                Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuunHwjE</field>
+        </record>
+
+        <record id="hr_salary_rule_bonus" model="hr.salary.rule">
+            <field name="code">PI</field>
+            <field name="name">Performance Incentive/Bonus</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="5000.0" name="amount_fix"/>
+            <field name="sequence" eval="34"/>
+            <field name="note">This would be fully taxable based on incentive.</field>
+        </record>
+
+        <record id="hr_salary_rule_medical" model="hr.salary.rule">
+            <field name="code">MEDA</field>
+            <field name="name">Medical Reimbursement</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="2500.0" name="amount_fix"/>
+            <field name="sequence" eval="35"/>
+            <field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
+        </record>
+
+        <record id="hr_salary_rule_journals" model="hr.salary.rule">
+            <field name="code">PERJ</field>
+            <field name="name">Periodical Journals</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="5000.0" name="amount_fix"/>
+            <field name="sequence" eval="36"/>
+            <field name="note">Some employers may provide component for buying magazines, 
+                journals and books as a part of knowledge enhancement for business growth. 
+                This part would become non taxable on providing original bills.</field>
+        </record>
+
+        <record id="hr_salary_rule_uniform" model="hr.salary.rule">
+            <field name="code">UNIF</field>
+            <field name="name">Uniform/Dress Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="500.0" name="amount_fix"/>
+            <field name="sequence" eval="37"/>
+            <field name="note">Some sections of employees mat get allowance for purchase of office dress/uniform.
+                 In such case, the component would become non-taxable.</field>
+        </record>
+
+        <record id="hr_salary_rule_telephone" model="hr.salary.rule">
+            <field name="code">TELR</field>
+            <field name="name">Telephone Reimbursement</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="500.0" name="amount_fix"/>
+            <field name="sequence" eval="38"/>
+            <field name="note"></field>In some of the cases, companies may provide a component for telephone bills.
+            Employees may provide actual phone usage bills to reimburse this component and make it non-taxable.
+            Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuvaUK7A</note>
+        </record>
+
+        <record id="hr_payroll_rule_car" model="hr.salary.rule">
+            <field name="code">CAR</field>
+            <field name="name">Car Expenses Reimbursement</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="500.0" name="amount_fix"/>
+            <field name="sequence" eval="39"/>
+            <field name="note">In case company provides component for this and employee use self owned car for official 
+            and personal purposes, Rs 1800 per month would be non-taxable on showing bills for fuel or
+            can maintenance. This amount would be Rs 2400 in case car is more capacity than 1600cc.
+            Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuw12Cjj</field>
+        </record>
+
+        <record id="hr_salary_rule_internet" model="hr.salary.rule">
+            <field name="code">INT</field>
+            <field name="name">Internet Expense</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="500.0" name="amount_fix"/>
+            <field name="sequence" eval="40"/>
+            <field name="note">Employer may also provide reimbursement of internet expenses and thus this would become non taxable.</field>
+        </record>
+
+        <record id="hr_salary_rule_driver" model="hr.salary.rule">
+            <field name="code">DRI</field>
+            <field name="name">Driver Salary</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="500.0" name="amount_fix"/>
+            <field name="sequence" eval="41"/>
+             <field name="note">Rs. 900 per month (non taxable)</field>
+        </record>
+
+        <record id="hr_salary_rule_Gift_nr" model="hr.salary.rule">
+            <field name="code">GFNR</field>
+            <field name="name">Gifts From Non-Relatives</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="5000.0" name="amount_fix"/>
+            <field name="sequence" eval="42"/>
+            <field name="note"> gift  gift is from non relatives person worth more than Rs.50000, 
+                one is liable to pay the tax what ever he received excess of the limit or Rs 50,000.</field>
+        </record>
+
+        <record id="hr_salary_rule_Gift_r" model="hr.salary.rule">
+            <field name="code">GFR</field>
+            <field name="name">Gifts From Relatives</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="5000.0" name="amount_fix"/>
+            <field name="sequence" eval="43"/>
+            <field name="note"> gift is from relaives whould be non taxable with no limits.</field>
+        </record>
+
+        <record id="hr_salary_rule_hri" model="hr.salary.rule">
+            <field name="code">HRI</field>
+            <field name="name">House Rent Income</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="5000.0" name="amount_fix"/>
+            <field name="note">Income from house property</field>
+            <field name="sequence" eval="44"/>
+            <field name="note">30% of the rental income can be reduced as a standard deduction</field>
+        </record>
+
+        <record id="hr_salary_rule_Other" model="hr.salary.rule">
+            <field name="code">OTI</field>
+            <field name="name">Other Income</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.others)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = contract.others</field>
+            <field name="note">Bank account/NSC/Post Office/SCSS interest</field>
+            <field name="sequence" eval="45"/>
+        </record>
+
+        <record id="hr_salary_rule_st_gains" model="hr.salary.rule">
+            <field name="code">STG</field>
+            <field name="name">Short Term Gains from Share Trading/Equity MFs</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="5000.0" name="amount_fix"/>
+            <field name="sequence" eval="46"/>
+            <field name="note">if stocks/equity mutual funds are sold before one year, 
+                15% tax would be payable on such gains. STT should have been on transaction.
+            Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuwSxEvI</field>
+        </record>
+
+        <record id="hr_salary_rule_lt_gains" model="hr.salary.rule">
+            <field name="code">LTG</field>
+            <field name="name">Long Term Gains from Share Trading/Equity MFs</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="5000.0" name="amount_fix"/>
+            <field name="sequence" eval="47"/>
+            <field name="note">If stocks/equity mutual funds are kept for more than a year before sale,
+                 it would be long term gains and such gains would be fully exempt from income tax. 
+                 Securities transaction tax (STT) must have been paid on transactions for availing 
+                 this exemption.
+                 Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuwtRkCT</field>
+        </record>
+
+        <!--Deductions -->
+        <record id="hr_payslip_line_professionaltax_guj" model="hr.salary.rule">
+            <field name="code">PTG</field>
+            <field name="name">Professional Tax for Gujarat</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="120" name="sequence"/>
+            <field eval="-0.0" name="amount_fix"/>
+            <field eval="False" name="appears_on_payslip"/>
+            <field name="note">
+            PROFESSIONAL TAX FOR COMPANY SHOULD BE PAID ON OR BEFORE 30TH SEPT, 
+            THE AMOUNT IS Rs. 2000 PER YEAR. THERE IS NO PAYMENT FORM TO BE FLLED.
+            Attribution: http://www.citehr.com/249518-companys-professional-tax-gujarat.html#ixzz1uuyvgt2L</field>
+        </record>
+
+        <record id="hr_payslip_rule_tds" model="hr.salary.rule">
+            <field name="code">TDS</field>
+            <field name="name">Tax Deducted at Source</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.tds)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = -(contract.tds)</field>
+            <field name="sequence" eval="140"/>
+            <field name="note">As per income tax rules, all payment which are taxable in nature should be 
+            done after deduction of taxes at the source itself. Hence employer compute 
+            income tax on salary payment and deduct it every month. This TDS is based 
+            on employee’s saving/investment declaration at the start of year. If 
+            investments for tax saving is not done, large amount may be deducted in last few months.
+            Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uv0gPhgQ</field>
+        </record>
+
+        <record id="hr_payslip_rule_vpf" model="hr.salary.rule">
+            <field name="code">VPF</field>
+            <field name="name">Voluntarily Provident Fund Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="-200.0" name="amount_fix"/>
+            <field name="sequence" eval="130"/>
+            <field name="note">
+             VPF is a safe option wherein you can contribute more than the PF ceiling of 12% 
+             that has been mandated by the government. This additional amount enjoys all the 
+             benefits of PF except that the employer is not liable to contribute any extra amount 
+             apart from 12%. An added advantage is that the interest rate is equal to the interest 
+             rate of PF and the withdrawal is tax free. Please note that the maximum contribution 
+             towards VPF is 100% of your Basic. The highest rate of interest (close to 9%) makes 
+             it a very attractive saving scheme. Because of these advantages many  employees chose 
+             not to close their PF account even after getting employment else where other than India. 
+             Employees also get a major tax break on their entire contribution to the fund up to a 
+             ceiling of Rs. 70,000/-
+             for more details:http://www.dotcominfoway.com/blog/vpf-or-voluntary-provident-fund-special-benefits-for-employees</field>
+        </record>
+
+        <record id="hr_payslip_rule_cpt" model="hr.salary.rule">
+            <field name="code">CPT</field>
+            <field name="name">Dedution for Company Provided Transport</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="-1800.0" name="amount_fix"/>
+            <field name="sequence" eval="155"/>
+        </record>
+
+        <record id="hr_payslip_rule_lwf" model="hr.salary.rule">
+            <field name="code">LWF</field>
+            <field name="name">Dedution Towards State Labour Welfare Fund</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="-3.0" name="amount_fix"/>
+            <field name="sequence" eval="160"/>
+            <field name="note">The LWF is applicable to all the members of the organisation except the 
+            Management staff (Staffs having authority to sign on the cheque/official 
+            documents on behalf of the organisation) 
+                Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 
+                Total Rs 9.00 and deposited to the LWF office.
+                It is half yearly contribution (June and December) 
+                Attribution: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.html</field>
+        </record>
+
+        <record id="hr_payslip_rule_cgti" model="hr.salary.rule">
+            <field name="code">CGTI</field>
+            <field name="name">Dedution Towards Company Provided Group Term Insurance</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="-200.0" name="amount_fix"/>
+            <field name="sequence" eval="167"/>
+        </record>
+
+        <record id="hr_payslip_rule_dla" model="hr.salary.rule">
+            <field name="code">DLA</field>
+            <field name="name">Dedution Towards Leave Availed</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="-200.0" name="amount_fix"/>
+            <field name="sequence" eval="170"/>
+        </record>
+
+        <record id="hr_payslip_rule_cmt" model="hr.salary.rule">
+            <field name="code">CMT</field>
+            <field name="name">Dedution Towards Company Provided Medical Insurance</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="-50.0" name="amount_fix"/>
+            <field name="sequence" eval="172"/>
+        </record>
+
+        <record id="hr_payslip_rule_ode" model="hr.salary.rule">
+            <field name="code">ODE</field>
+            <field name="name">Other Dedution from Employer</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="-200.0" name="amount_fix"/>
+            <field name="sequence" eval="175"/>
+        </record>
+
+        <record id="hr_payslip_rule_epc" model="hr.salary.rule">
+            <field name="code">EPC</field>
+            <field name="name">Employer's PF Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (rules.PF.amount_percentage * contract.wage)/100</field>
+            <field name="sequence" eval="122"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
new file mode 100644
index 00000000000..3160e238a6f
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Hr Salary structure-->
+
+        <record id="hr_payroll_salary_structure_emp_ind" model="hr.payroll.structure">
+            <field name="code">IND</field>
+            <field name="name">Indian Employee</field>
+            <field eval="[(6, 0, [ref('hr_salary_rule_medical'),ref('hr_salary_rule_lta'),ref('hr_salary_rule_telephone'), ref('hr_salary_rule_internet'),ref('hr_payroll_rule_child_edu'),ref('hr_salary_rule_gratuity')])]" name="rule_ids"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="parent_id" ref="hr_payroll.structure_base"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
new file mode 100644
index 00000000000..e3fff82fc38
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <report
+            auto="False"
+            id="payslip_details_report"
+            model="hr.payslip"
+            name="paylip.details.in"
+            rml="l10n_in_hr_payroll/report/report_payslip_details.rml"
+            string="PaySlip Details" />
+
+    </data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
new file mode 100644
index 00000000000..cb9a2d93a81
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="hr_contract_form_in_inherit" model="ir.ui.view">
+            <field name="name">hr.contract.form.in.inherit</field>
+            <field name="model">hr.contract</field>
+            <field name="type">form</field>
+            <field name="priority">20</field>
+            <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
+            <field name="arch" type="xml">
+            <data>
+                 <xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
+                    <field name="tds"/>
+                 </xpath>
+            </data>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py
new file mode 100644
index 00000000000..c90599352c2
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/__init__.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    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 report_payslip_details
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.py b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
new file mode 100644
index 00000000000..cfd29f8afba
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    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 report import report_sxw
+from hr_payroll import report
+
+class payslip_details_report_in(report.report_payslip_details.payslip_details_report):
+
+    def __init__(self, cr, uid, name, context):
+        super(payslip_details_report_in, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'get_details_by_rule_category': self.get_details_by_rule_category,
+        })
+
+report_sxw.report_sxw('report.paylip.details.in', 'hr.payslip', 'l10n_in_hr_payroll/report/report_payslip_details.rml', parser=payslip_details_report_in)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.rml b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml
new file mode 100644
index 00000000000..a7ab3db3185
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml
@@ -0,0 +1,372 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table10">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table11">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table12">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table16">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table13">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="2.0" leading="3"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="2.0" leading="3"/>
+    <paraStyle name="P3" rightIndent="-56.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" rightIndent="-56.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P19" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT"/>
+    <paraStyle name="P20" fontName="Helvetica" fontSize="2.0" leading="3"/>
+    <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P22" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_space" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="payslip_adj" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="P3">[[repeatIn(objects,'o')]]</para>
+    <blockTable colWidths="539.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P8">Pay Slip Details</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_header_Centre">
+      <font face="Helvetica" size="6.0">[[o.credit_note==False and removeParentNode('para')]]</font>
+      <font face="Helvetica-Bold" size="14.0">Credit</font>
+      <font face="Helvetica" size="14.0"/>
+      <font face="Helvetica-Bold" size="14.0">Note</font>
+    </para>
+    <para style="P9">([[o.name or removeParentNode('para')]])</para>
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P16">Name</para>
+        </td>
+        <td>
+          <para style="P16">[[o.employee_id.name]]</para>
+        </td>
+        <td>
+          <para style="P16">Designation </para>
+        </td>
+        <td>
+          <para style="P5">[[ o.employee_id.job_id.name or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="63.0,476.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_8">
+            <font face="Helvetica">Address </font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table4">
+      <tr>
+        <td>
+          <para style="P16">Email</para>
+        </td>
+        <td>
+          <para style="P5">[[ o.employee_id.work_email or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_8">
+            <font face="Helvetica">Identification No</font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">[[ o.employee_id.identification_id or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table5">
+      <tr>
+        <td>
+          <para style="P16">Reference</para>
+        </td>
+        <td>
+          <para style="P5">[[ o.number or '' ]]</para>
+        </td>
+        <td>
+          <para style="P16">Bank Account</para>
+        </td>
+        <td>
+          <para style="P5">[[ o.employee_id.otherid or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table6">
+      <tr>
+        <td>
+          <para style="P16">Date From</para>
+        </td>
+        <td>
+          <para style="P5">[[ o.date_from or '']]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_8">
+            <font face="Helvetica" size="8.0">Date To</font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">[[ o.date_to or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P7"/>
+    <para style="P11">
+      <font color="white"> </font>
+    </para>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table10">
+      <tr>
+        <td>
+          <para style="P10">Details by Salary Rule Category: </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="54.0,388.0,97.0" style="Table11">
+      <tr>
+        <td>
+          <para style="P15">Code</para>
+        </td>
+        <td>
+          <para style="P15">Salary Rule Category</para>
+        </td>
+        <td>
+          <para style="P14">Total</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P16">[[repeatIn(get_details_by_rule_category(o.details_by_salary_rule_category),'h') ]]</para>
+      <blockTable colWidths="54.0,388.0,97.0" style="Table12">
+        <tr>
+          <td>
+            <para style="P16">
+              <font face="Helvetica">[[ h['code'] ]]</font>
+              <font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]]</font>
+            </para>
+          </td>
+          <td>
+            <para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para>
+          </td>
+          <td>
+            <para style="P6">[[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+
+    <blockTable colWidths="269.0,269.0" style="Table13">
+      <tr>
+        <td>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+          <para style="P12">Authorized Signature </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
new file mode 100644
index 00000000000..f18a77cd01b
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_salary_head","hr.salary.head","model_hr_salary_head","base.group_hr_user",1,1,1,1
+"access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_user",1,1,1,1

From c34e57aaf632ef45df11cbeb36e1d02f3d2c52e1 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 15 May 2012 16:54:43 +0530
Subject: [PATCH 039/999] [IMP]improved child allowance rule for employee.

bzr revid: kbh@tinyerp.com-20120515112443-h79ixtb311xs7sdt
---
 .../data/hr.salary.rule.csv                   |  6 ++---
 .../l10n_in_hr_payroll_data.xml               | 23 ++++++-------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
index 0d62cf670e0..c7a257e8675 100644
--- a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
+++ b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
@@ -1,9 +1,7 @@
 "id","amount_select","condition_range_min","condition_range_max","amount_percentage","amount_fix","name","category_id","sequence","code","parent_rule_id/id","condition_select","condition_range","amount_percentage_base"
-1,"fix",1,1,,50,"Education Allowance","Child Education Allowance",23,"CHEA","hr_payroll_rule_child1","range","employee.children",
-2,"fix",2,2,,100,"Education Allowance","Child Education Allowance",24,"CHEA","hr_payroll_rule_child1","range","employee.children",
+1,"fix",1,1,,1200,"Education Allowance","Child Education Allowance",23,"CHEA","hr_payroll_rule_child1","range","employee.children",
+2,"fix",2,2,,2400,"Education Allowance","Child Education Allowance",24,"CHEA","hr_payroll_rule_child1","range","employee.children",
 ,,,,,,,,,,,,,
-3,"fix",1,1,,150,"Education Allowance with Hostel","Child Education Allowance",26,"CHEAH","hr_payroll_rule_child2","range","employee.children",
-4,"fix",2,2,,300,"Education Allowance with Hostel","Child Education Allowance",27,"CHEAH","hr_payroll_rule_child2","range","employee.children",
 ,,,,,,,,,,,,,
 5,"fix",0,2999,,0,"Professional Tax for Gujarat","Deduction",121,"PT0","hr_payslip_line_professionaltax_guj","range","categories.GROSS",
 6,"fix",3000,5999,,-20,"Professional Tax for Gujarat","Deduction",121,"PT20","hr_payslip_line_professionaltax_guj","range","categories.GROSS",
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index 6edee15874f..e5286409100 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -42,21 +42,10 @@
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(employee.children)</field>
             <field name="amount_select">fix</field>
-            <field name="note">Education allowance of Rs. 50 per month per child for up to 2 children of the employee is exempted.</field>
+            <field name="note">Per school going child 1200 per annum is non-taxable. Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
             <field name="sequence" eval="22"/>
         </record>
 
-        <record id="hr_payroll_rule_child2" model="hr.salary.rule">
-            <field name="code">CHEAH</field>
-            <field name="name">Education Allowance with Hostel</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="parent_rule_id" ref="hr_payroll_rule_child_edu"/>
-            <field name="condition_select">python</field>
-            <field name="condition_python">result = bool(employee.children)</field>
-            <field name="amount_select">fix</field>
-            <field name="note">In case the children are in hostel, the exemption available is Rs.150 per month per child for up to 2 children.</field>
-            <field name="sequence" eval="25"/>
-        </record>
 
         <record id="hr_salary_rule_special" model="hr.salary.rule">
             <field name="code">MGMTA</field>
@@ -129,7 +118,7 @@
             <field name="amount_select">fix</field>
             <field name="amount_fix">0.0</field>
             <field name="sequence" eval="33"/>
-            <field name="note">Payment by way of leave encashment received by Central & State Govt.
+            <field name="note"> Payment by way of leave encashment received by Central and State Govt.
               employees at the time of retirement in respect of the period of earned 
               leave at credit is fully exempt. In case of other employees, the exemption 
               is to be limited to minimum of all below:
@@ -137,7 +126,8 @@
                 2.The cash equivalent of leave balance (max 30 days per year of service)
                 3.Maximum of 10 months of leave encashment, based on last 10 months average salary
                 4.Rs. 3 Lakh
-                Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuunHwjE</field>
+                Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuunHwjE
+                </field>
         </record>
 
         <record id="hr_salary_rule_bonus" model="hr.salary.rule">
@@ -190,9 +180,10 @@
             <field name="amount_select">fix</field>
             <field eval="500.0" name="amount_fix"/>
             <field name="sequence" eval="38"/>
-            <field name="note"></field>In some of the cases, companies may provide a component for telephone bills.
+            <field name="note">In some of the cases, companies may provide a component for telephone bills.
             Employees may provide actual phone usage bills to reimburse this component and make it non-taxable.
-            Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuvaUK7A</note>
+            Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuvaUK7A
+            </field>
         </record>
 
         <record id="hr_payroll_rule_car" model="hr.salary.rule">

From 0752cc0fe9bef22a448ae2fec7b52a68cb634335 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 16 May 2012 10:37:16 +0530
Subject: [PATCH 040/999] [IMP]improved child allowance rule for employee.

bzr revid: kbh@tinyerp.com-20120516050716-kprn03ib238h5tua
---
 addons/l10n_in_hr_payroll/data/hr.salary.rule.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
index c7a257e8675..2b6b4fbd847 100644
--- a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
+++ b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
@@ -1,6 +1,6 @@
 "id","amount_select","condition_range_min","condition_range_max","amount_percentage","amount_fix","name","category_id","sequence","code","parent_rule_id/id","condition_select","condition_range","amount_percentage_base"
-1,"fix",1,1,,1200,"Education Allowance","Child Education Allowance",23,"CHEA","hr_payroll_rule_child1","range","employee.children",
-2,"fix",2,2,,2400,"Education Allowance","Child Education Allowance",24,"CHEA","hr_payroll_rule_child1","range","employee.children",
+1,"fix",1,1,,1200,"Education Allowance","Child Education Allowance",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
+2,"fix",2,10,,2400,"Education Allowance","Child Education Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
 ,,,,,,,,,,,,,
 ,,,,,,,,,,,,,
 5,"fix",0,2999,,0,"Professional Tax for Gujarat","Deduction",121,"PT0","hr_payslip_line_professionaltax_guj","range","categories.GROSS",

From 38bc8ca8f0cb2dd98c7f98446df9b1ba8c5b96ec Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 17 May 2012 17:33:35 +0530
Subject: [PATCH 041/999] [IMP]improved rules(HRA,DA,city allowance,driver
 salary,transport allowance).

bzr revid: kbh@tinyerp.com-20120517120335-inov2l3rsfraix96
---
 addons/hr_payroll/hr_payroll_demo.xml         |  67 ++++--
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  |   2 +
 .../l10n_in_hr_payroll_data.xml               | 222 +++++++++++-------
 .../l10n_in_hr_payroll_view.xml               |   1 +
 4 files changed, 185 insertions(+), 107 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 33b345591eb..d3826773e7d 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -16,29 +16,48 @@
             <field name="name">Professional Tax Register</field>
         </record>
 
-        <record id="hr_meal_voucher_register" model="hr.contribution.register">
-            <field name="name">Meal Voucher Register</field>
+        <record id="hr_food_coupon_register" model="hr.contribution.register">
+            <field name="name">Food coupon Register</field>
         </record>
 
         <!-- Salary Rules -->
 
-        <record id="hr_salary_rule_houserentallowance1" model="hr.salary.rule">
-            <field name="amount_select">percentage</field>
-            <field eval="40.0" name="amount_percentage"/>
-            <field name="amount_percentage_base">contract.wage</field>
-            <field name="code">HRA</field>
+        <record id="hr_salary_rule_houserentallowancemetro" model="hr.salary.rule">
+            <field name="code">HRA_M</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (contract.wage + DA) * 0.50</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="register_id" ref="hr_houserent_register"/>
-            <field name="name">House Rent Allowance</field>
-            <field name="sequence" eval="5"/>
-            <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.Income tax exemption for HRA will be least of following:
-                1. The actual amount of HRA received as a part of salary.
-                2. 40% (if living in non-metro area) or 50% (if living in metro area) of (basic salary+Dearness allowance (DA)).
-                3. Rent paid minus 10% of (basic salary+DA).
-                Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1upoomH73
+            <field name="name">House Rent Allowance for metro city</field>
+            <field name="sequence" eval="80"/>
+            <field name="note">
+Rent receipts can be shown for taking tax benefit for living in a rented house.
+Income tax exemption for HRA will be least of following:
+    1. The actual amount of HRA received as a part of salary.
+    2. 40% (if living in non-metro area).
+    3. Rent paid minus 10% of (basic salary+DA).
+    Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1upoomH73
             </field>
         </record>
 
+        <record id="hr_salary_rule_houserentallowancenonmetro" model="hr.salary.rule">
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (contract.wage + DA) * 0.40</field>
+            <field name="code">HRA_NONM</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="register_id" ref="hr_houserent_register"/>
+            <field name="name">House Rent Allowance for non metro city</field>
+            <field name="sequence" eval="79"/>
+            <field name="note">
+Rent receipts can be shown for taking tax benefit for living in a rented house.
+Income tax exemption for HRA will be least of following:
+    1. The actual amount of HRA received as a part of salary.
+    2. 50% (if living in metro area) of (basic salary+Dearness allowance (DA)).
+    3. Rent paid minus 10% of (basic salary+DA).
+    Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1upoomH73
+             </field>
+         </record>
+
         <record id="hr_salary_rule_convanceallowance1" model="hr.salary.rule">
             <field name="amount_select">fix</field>
             <field eval="800.0" name="amount_fix"/>
@@ -56,8 +75,9 @@
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="register_id" ref="hr_professional_tax_register"/>
             <field name="name">Professional Tax</field>
-            <field name="note">Professional tax deducted from salary by employer should be removed from taxable salary before computation of income tax.
-            Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uugbJcaM</field>
+            <field name="note">
+Professional tax deducted from salary by employer should be removed from taxable salary before computation of income tax.
+Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uugbJcaM</field>
         </record>
 
         <record id="hr_salary_rule_providentfund1" model="hr.salary.rule">
@@ -80,14 +100,17 @@
             <field name="sequence" eval="15"/>
         </record>
 
-        <record id="hr_salary_rule_meal_voucher" model="hr.salary.rule">
-            <field name="amount_select">fix</field>
+        <record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
+            <field name="amount_select">code</field>
             <field eval="10" name="amount_fix"/>
             <field name="quantity">worked_days.WORK100.number_of_days</field>
-            <field name="code">MA</field>
+            <field name="code">FC</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="register_id" ref="hr_meal_voucher_register"/>
-            <field name="name">Meal Voucher</field>
+            <field name="register_id" ref="hr_food_coupon_register"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.food_coupon_amount)</field>
+            <field name="name">Food Coupons</field>
+            <field name="amount_python_compute">result = worked_days.WORK100.number_of_days * contract.food_coupon_amount</field>
             <field name="sequence" eval="16"/>
          </record>
 
@@ -98,7 +121,7 @@
             <field name="name">Get 1% of sales</field>
             <field name="sequence" eval="17"/>
             <field name="amount_python_compute">result = (inputs.SALEURO.amount + inputs.SALASIA.amount) * 0.01</field>
-         </record>
+        </record>
 
         <!-- Rule Inputs -->
 
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index dc075b0be36..f7505257537 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -27,6 +27,8 @@ class hr_contract_in(osv.osv):
 
     _columns = {
         'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll')),
+        'food_coupon_amount': fields.float('Food Coupons ', digits_compute=dp.get_precision('Payroll')),
+
     }
 
 hr_contract_in()
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index e5286409100..19500c73e48 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -18,10 +18,11 @@
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">percentage</field>
             <field name="amount_percentage_base">contract.wage</field>
-            <field name="amount_percentage" eval="51"/>
+            <field name="amount_percentage" eval="50"/>
             <field name="sequence" eval="20"/>
-             <field name="note">DA is calculated in % 
-                for more details:http://www.citehr.com/26809-how-calculate-dearness-allowance-da.html</field>
+             <field name="note">
+DA is calculated in % 
+for more details:http://www.citehr.com/26809-how-calculate-dearness-allowance-da.html</field>
         </record>
 
         <record id="hr_payroll_rule_child_edu" model="hr.salary.rule">
@@ -31,7 +32,9 @@
             <field name="amount_select">fix</field>
             <field name="condition_select">none</field>
             <field name="sequence" eval="21"/>
-            <field name="note"> Per school going child 1200 per annum is non-taxable. Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
+            <field name="note"> 
+Per school going child 1200 per annum is non-taxable. 
+ Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
         </record>
 
         <record id="hr_payroll_rule_child1" model="hr.salary.rule">
@@ -42,7 +45,6 @@
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(employee.children)</field>
             <field name="amount_select">fix</field>
-            <field name="note">Per school going child 1200 per annum is non-taxable. Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
             <field name="sequence" eval="22"/>
         </record>
 
@@ -54,19 +56,40 @@
             <field name="amount_select">fix</field>
             <field eval="100.0" name="amount_fix"/>
             <field name="sequence" eval="28"/>
-            <field name="note">This allowance is normally given as an additional benefit to employees and is fully taxable.
-                for more details : http://www.rupeetalk.com/finance-basics/income-tax-basics/income-tax-guides/tax-implications-of-salary-components.php</field>
+            <field name="note">
+This allowance is normally given as an additional benefit to employees and is fully taxable.
+for more details : http://www.rupeetalk.com/finance-basics/income-tax-basics/income-tax-guides/tax-implications-of-salary-components.php</field>
         </record>
 
-        <record id="hr_salary_rule_city" model="hr.salary.rule">
-            <field name="code">CCA</field>
+        <record id="hr_payroll_rule_city1" model="hr.salary.rule">
+            <field name="code">CBDA</field>
             <field name="name">City Compensatory Allowance</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">none</field>
+            <field name="sequence" eval="50"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (contract.wage + DA) * 0.10</field>
+        </record>
+
+        
+        <record id="hr_payroll_rule_metrocity" model="hr.salary.rule">
+            <field name="code">CMETRO</field>
+            <field name="name">City Allowance for Metro city</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">none</field>
+            <field name="sequence" eval="51"/>
             <field name="amount_select">fix</field>
-            <field eval="100.0" name="amount_fix"/>
-            <field name="sequence" eval="29"/>
-            <field name="note">10% of basic+da is the maximum.
-                for more details :http://www.citehr.com/250071-what-cca-allowance.html</field>
+            <field name="amount_fix">850.0</field>
+        </record>
+
+        <record id="hr_payroll_rule_nonmetrocity" model="hr.salary.rule">
+            <field name="code">CNMETRO</field>
+            <field name="name">City Allowance for Non Metro city</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">none</field>
+            <field name="sequence" eval="52"/>
+            <field name="amount_select">fix</field>
+            <field name="amount_fix">800.0</field>
         </record>
 
         <record id="hr_salary_rule_arrears" model="hr.salary.rule">
@@ -76,10 +99,11 @@
             <field name="amount_select">fix</field>
             <field eval="100.0" name="amount_fix"/>
             <field name="sequence" eval="30"/>
-             <field name="note">Generally arrears are fully taxable, but employee may claim exemption u/s 89(1). 
-              One would need to compute income tax on the arrears if it would have been received in actual year.
-              Now difference of income tax between payment year and actual year would be allowed for deduction.
-                Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uurtGGGd</field>
+             <field name="note">
+Generally arrears are fully taxable, but employee may claim exemption u/s 89(1). 
+One would need to compute income tax on the arrears if it would have been received in actual year.
+Now difference of income tax between payment year and actual year would be allowed for deduction.
+Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uurtGGGd</field>
         </record>
 
         <record id="hr_salary_rule_gratuity" model="hr.salary.rule">
@@ -90,7 +114,10 @@
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = (categories.NET/26) * 15 * 5</field>
             <field name="sequence" eval="500"/>
-            <field name="note">Covered under the Payment of Gratuity Act, 1971: (Last drawn monthly basic salary + dearness allowance)/26 x 15 days x number of years of service (date of joining – date of retirement/leaving job)
+            <field name="note">
+Covered under the Payment of Gratuity Act, 1971: 
+(Last drawn monthly basic salary + dearness allowance)/26 x 15 days x 
+number of years of service (date of joining – date of retirement/leaving job)
             </field>
         </record>
 
@@ -102,12 +129,14 @@
             <field name="amount_percentage_base">contract.wage</field>
             <field name="amount_percentage" eval="0.0833"/>
             <field name="sequence" eval="32"/>
-            <field name="note">As per Income tax rules of India, if transport bills for LTA are not provided,
-            the amount will be taxed. E.g. If an employee has LTA allowance as Rs 50,000 in his CTC(cost to company),
-            and he provides proofs of Rs 40,000 (boarding pass, air tickets, taxi vouchers) then income tax will be 
-            deducted for rest of the Rs 10,000. Does not matter whats the amount of LTA in an employee’s package, 
-            income tax laws only permits domestic air tickets only for LTA claim.
-            Read more: http://www.pankajbatra.com/news/lta-proof-reimbursement-to-employer-not-required-supreme-court-india-ruling/#ixzz1uutlHSez</field>
+            <field name="note">
+As per Income tax rules of India, if transport bills for LTA are not provided,
+the amount will be taxed. E.g. If an employee has LTA allowance as Rs 50,000 
+in his CTC(cost to company),and he provides proofs of Rs 40,000 (boarding pass,
+air tickets, taxi vouchers) then income tax will be deducted for rest of the 
+Rs 10,000. Does not matter whats the amount of LTA in an employee’s package, 
+income tax laws only permits domestic air tickets only for LTA claim.
+Read more: http://www.pankajbatra.com/news/lta-proof-reimbursement-to-employer-not-required-supreme-court-india-ruling/#ixzz1uutlHSez</field>
         </record>
 
         <record id="hr_salary_rule_le" model="hr.salary.rule">
@@ -118,15 +147,16 @@
             <field name="amount_select">fix</field>
             <field name="amount_fix">0.0</field>
             <field name="sequence" eval="33"/>
-            <field name="note"> Payment by way of leave encashment received by Central and State Govt.
-              employees at the time of retirement in respect of the period of earned 
-              leave at credit is fully exempt. In case of other employees, the exemption 
-              is to be limited to minimum of all below:
-                1.The actual amount received
-                2.The cash equivalent of leave balance (max 30 days per year of service)
-                3.Maximum of 10 months of leave encashment, based on last 10 months average salary
-                4.Rs. 3 Lakh
-                Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuunHwjE
+            <field name="note"> 
+Payment by way of leave encashment received by Central and State Govt.
+employees at the time of retirement in respect of the period of earned 
+leave at credit is fully exempt. In case of other employees, the exemption 
+is to be limited to minimum of all below:
+    1.The actual amount received
+    2.The cash equivalent of leave balance (max 30 days per year of service)
+    3.Maximum of 10 months of leave encashment, based on last 10 months average salary
+    4.Rs. 3 Lakh
+    Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuunHwjE
                 </field>
         </record>
 
@@ -155,11 +185,12 @@
             <field name="name">Periodical Journals</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
-            <field eval="5000.0" name="amount_fix"/>
+            <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="36"/>
-            <field name="note">Some employers may provide component for buying magazines, 
-                journals and books as a part of knowledge enhancement for business growth. 
-                This part would become non taxable on providing original bills.</field>
+            <field name="note">
+Some employers may provide component for buying magazines, 
+journals and books as a part of knowledge enhancement for 
+business growth.This part would become non taxable on providing original bills.</field>
         </record>
 
         <record id="hr_salary_rule_uniform" model="hr.salary.rule">
@@ -169,8 +200,9 @@
             <field name="amount_select">fix</field>
             <field eval="500.0" name="amount_fix"/>
             <field name="sequence" eval="37"/>
-            <field name="note">Some sections of employees mat get allowance for purchase of office dress/uniform.
-                 In such case, the component would become non-taxable.</field>
+            <field name="note">
+Some sections of employees mat get allowance for purchase of office dress/uniform.
+In such case, the component would become non-taxable.</field>
         </record>
 
         <record id="hr_salary_rule_telephone" model="hr.salary.rule">
@@ -180,9 +212,11 @@
             <field name="amount_select">fix</field>
             <field eval="500.0" name="amount_fix"/>
             <field name="sequence" eval="38"/>
-            <field name="note">In some of the cases, companies may provide a component for telephone bills.
-            Employees may provide actual phone usage bills to reimburse this component and make it non-taxable.
-            Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuvaUK7A
+            <field name="note">
+In some of the cases, companies may provide a component for telephone bills.
+Employees may provide actual phone usage bills to reimburse this component 
+and make it non-taxable.
+Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuvaUK7A
             </field>
         </record>
 
@@ -193,10 +227,11 @@
             <field name="amount_select">fix</field>
             <field eval="500.0" name="amount_fix"/>
             <field name="sequence" eval="39"/>
-            <field name="note">In case company provides component for this and employee use self owned car for official 
-            and personal purposes, Rs 1800 per month would be non-taxable on showing bills for fuel or
-            can maintenance. This amount would be Rs 2400 in case car is more capacity than 1600cc.
-            Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuw12Cjj</field>
+            <field name="note">
+In case company provides component for this and employee use self owned car for official 
+and personal purposes, Rs 1800 per month would be non-taxable on showing bills for fuel or
+can maintenance. This amount would be Rs 2400 in case car is more capacity than 1600cc.
+Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuw12Cjj</field>
         </record>
 
         <record id="hr_salary_rule_internet" model="hr.salary.rule">
@@ -214,7 +249,10 @@
             <field name="name">Driver Salary</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
-            <field eval="500.0" name="amount_fix"/>
+            <field eval="900.0" name="amount_fix"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(employee.vehicle)</field>
+
             <field name="sequence" eval="41"/>
              <field name="note">Rs. 900 per month (non taxable)</field>
         </record>
@@ -226,8 +264,9 @@
             <field name="amount_select">fix</field>
             <field eval="5000.0" name="amount_fix"/>
             <field name="sequence" eval="42"/>
-            <field name="note"> gift  gift is from non relatives person worth more than Rs.50000, 
-                one is liable to pay the tax what ever he received excess of the limit or Rs 50,000.</field>
+            <field name="note">
+gift  gift is from non relatives person worth more than Rs.50000, 
+one is liable to pay the tax what ever he received excess of the limit or Rs 50,000.</field>
         </record>
 
         <record id="hr_salary_rule_Gift_r" model="hr.salary.rule">
@@ -251,6 +290,15 @@
             <field name="note">30% of the rental income can be reduced as a standard deduction</field>
         </record>
 
+        <record id="hr_salary_trans_allownce" model="hr.salary.rule">
+            <field name="code">TA</field>
+            <field name="name">Transport/Conveyance Allownace</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="800.0" name="amount_fix"/>
+            <field name="sequence" eval="48"/>
+        </record>
+
         <record id="hr_salary_rule_Other" model="hr.salary.rule">
             <field name="code">OTI</field>
             <field name="name">Other Income</field>
@@ -270,9 +318,10 @@
             <field name="amount_select">fix</field>
             <field eval="5000.0" name="amount_fix"/>
             <field name="sequence" eval="46"/>
-            <field name="note">if stocks/equity mutual funds are sold before one year, 
-                15% tax would be payable on such gains. STT should have been on transaction.
-            Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuwSxEvI</field>
+            <field name="note">
+If stocks/equity mutual funds are sold before one year, 
+15% tax would be payable on such gains. STT should have been on transaction.
+Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuwSxEvI</field>
         </record>
 
         <record id="hr_salary_rule_lt_gains" model="hr.salary.rule">
@@ -282,11 +331,12 @@
             <field name="amount_select">fix</field>
             <field eval="5000.0" name="amount_fix"/>
             <field name="sequence" eval="47"/>
-            <field name="note">If stocks/equity mutual funds are kept for more than a year before sale,
-                 it would be long term gains and such gains would be fully exempt from income tax. 
-                 Securities transaction tax (STT) must have been paid on transactions for availing 
-                 this exemption.
-                 Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuwtRkCT</field>
+            <field name="note">
+If stocks/equity mutual funds are kept for more than a year before sale,
+it would be long term gains and such gains would be fully exempt from income tax. 
+Securities transaction tax (STT) must have been paid on transactions for availing 
+this exemption.
+Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuwtRkCT</field>
         </record>
 
         <!--Deductions -->
@@ -299,9 +349,9 @@
             <field eval="-0.0" name="amount_fix"/>
             <field eval="False" name="appears_on_payslip"/>
             <field name="note">
-            PROFESSIONAL TAX FOR COMPANY SHOULD BE PAID ON OR BEFORE 30TH SEPT, 
-            THE AMOUNT IS Rs. 2000 PER YEAR. THERE IS NO PAYMENT FORM TO BE FLLED.
-            Attribution: http://www.citehr.com/249518-companys-professional-tax-gujarat.html#ixzz1uuyvgt2L</field>
+Professional tax for company should be paid on or before 30th sept,
+The amount is Rs.2000 per year.There is no payment form to be filled. 
+Read more: http://www.citehr.com/249518-companys-professional-tax-gujarat.html#ixzz1uuyvgt2L</field>
         </record>
 
         <record id="hr_payslip_rule_tds" model="hr.salary.rule">
@@ -313,12 +363,13 @@
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = -(contract.tds)</field>
             <field name="sequence" eval="140"/>
-            <field name="note">As per income tax rules, all payment which are taxable in nature should be 
-            done after deduction of taxes at the source itself. Hence employer compute 
-            income tax on salary payment and deduct it every month. This TDS is based 
-            on employee’s saving/investment declaration at the start of year. If 
-            investments for tax saving is not done, large amount may be deducted in last few months.
-            Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uv0gPhgQ</field>
+            <field name="note">
+As per income tax rules, all payment which are taxable in nature should be 
+done after deduction of taxes at the source itself. Hence employer compute 
+income tax on salary payment and deduct it every month. This TDS is based 
+on employee’s saving/investment declaration at the start of year. If investments 
+for tax saving is not done, large amount may be deducted in last few months.
+Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uv0gPhgQ</field>
         </record>
 
         <record id="hr_payslip_rule_vpf" model="hr.salary.rule">
@@ -329,17 +380,17 @@
             <field eval="-200.0" name="amount_fix"/>
             <field name="sequence" eval="130"/>
             <field name="note">
-             VPF is a safe option wherein you can contribute more than the PF ceiling of 12% 
-             that has been mandated by the government. This additional amount enjoys all the 
-             benefits of PF except that the employer is not liable to contribute any extra amount 
-             apart from 12%. An added advantage is that the interest rate is equal to the interest 
-             rate of PF and the withdrawal is tax free. Please note that the maximum contribution 
-             towards VPF is 100% of your Basic. The highest rate of interest (close to 9%) makes 
-             it a very attractive saving scheme. Because of these advantages many  employees chose 
-             not to close their PF account even after getting employment else where other than India. 
-             Employees also get a major tax break on their entire contribution to the fund up to a 
-             ceiling of Rs. 70,000/-
-             for more details:http://www.dotcominfoway.com/blog/vpf-or-voluntary-provident-fund-special-benefits-for-employees</field>
+VPF is a safe option wherein you can contribute more than the PF ceiling of 12% 
+that has been mandated by the government. This additional amount enjoys all the 
+benefits of PF except that the employer is not liable to contribute any extra amount 
+apart from 12%. An added advantage is that the interest rate is equal to the interest 
+rate of PF and the withdrawal is tax free. Please note that the maximum contribution 
+towards VPF is 100% of your Basic. The highest rate of interest (close to 9%) makes 
+it a very attractive saving scheme. Because of these advantages many  employees chose 
+not to close their PF account even after getting employment else where other than India. 
+Employees also get a major tax break on their entire contribution to the fund up to a 
+ceiling of Rs. 70,000/-
+read more: more:http://www.dotcominfoway.com/blog/vpf-or-voluntary-provident-fund-special-benefits-for-employees</field>
         </record>
 
         <record id="hr_payslip_rule_cpt" model="hr.salary.rule">
@@ -347,7 +398,7 @@
             <field name="name">Dedution for Company Provided Transport</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
-            <field eval="-1800.0" name="amount_fix"/>
+            <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="155"/>
         </record>
 
@@ -358,13 +409,14 @@
             <field name="amount_select">fix</field>
             <field eval="-3.0" name="amount_fix"/>
             <field name="sequence" eval="160"/>
-            <field name="note">The LWF is applicable to all the members of the organisation except the 
-            Management staff (Staffs having authority to sign on the cheque/official 
-            documents on behalf of the organisation) 
-                Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 
-                Total Rs 9.00 and deposited to the LWF office.
-                It is half yearly contribution (June and December) 
-                Attribution: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.html</field>
+            <field name="note">
+The LWF is applicable to all the members of the organisation except the 
+Management staff (Staffs having authority to sign on the cheque/official 
+documents on behalf of the organisation). 
+for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 
+Total Rs 9.00 and deposited to the LWF office.
+It is half yearly contribution (June and December) 
+read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.html</field>
         </record>
 
         <record id="hr_payslip_rule_cgti" model="hr.salary.rule">
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index cb9a2d93a81..939dc0b3b79 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -12,6 +12,7 @@
             <data>
                  <xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
                     <field name="tds"/>
+                    <field name="food_coupon_amount"/>
                  </xpath>
             </data>
             </field>

From 4661fb71d202390f0bf55c1f92073d3fce24878f Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 18 May 2012 12:03:48 +0530
Subject: [PATCH 042/999] [FIX] account: set ondelete='cascade' on payment_id
 for allow to delete payment term.

bzr revid: tpa@tinyerp.com-20120518063348-1lm9oyy0kw5pkwdy
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 26af7a5f9bd..8d0fb8eb818 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -106,7 +106,7 @@ class account_payment_term_line(osv.osv):
         'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
             "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
         'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
-        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True),
+        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True, ondelete='cascade'),
     }
     _defaults = {
         'value': 'balance',

From 3a3a10ef465cec721332a067ae2059e2362d93b7 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 18 May 2012 19:14:39 +0530
Subject: [PATCH 043/999] Improvement in hr-attendance absent/present widget
 with usermenu

bzr revid: tta@openerp.com-20120518134439-icg8i0uad64ewv4d
---
 .../static/src/img/emp-absent.png             | Bin 2153 -> 756 bytes
 .../static/src/img/emp-present.png            | Bin 0 -> 930 bytes
 .../hr_attendance/static/src/js/attendance.js |  72 +++++++++++++++---
 .../static/src/xml/attendance.xml             |  18 ++++-
 4 files changed, 79 insertions(+), 11 deletions(-)
 create mode 100644 addons/hr_attendance/static/src/img/emp-present.png

diff --git a/addons/hr_attendance/static/src/img/emp-absent.png b/addons/hr_attendance/static/src/img/emp-absent.png
index 26e3c01556b290949b104240e73fe43dc27b1229..89dad31c60aeca478b10cd0131033cc04b3e73ad 100644
GIT binary patch
delta 733
zcmV<30wVqC5cCC*BYy(BNkl<Zc-rliOGq106ozkz!4xDb*BW0@6Lpg4B0drXQK^D1
zl%llKS_EAxqONq|t|+>aR>XzSu6!UCS|~yh>H}MATcotKvGvtdr)uhR(m40;nMuJ#
zX*U^n^TP+Tnfd>7?zv|e)1^z7E?v5G>C#xwCMK}f*N5-T&3`y3E9D11A76AiH&-o|
zimNrAoyDvEeuR2@fTkv(xEMS+8Qf&T561YHm>BrY=FiKFIj<zZ`tUF?H3d!~(9!~w
zmI5{#U^e5BF?=FkQjiss>0;4nysoMF=IAIeGz5%{0KL6HV<S*r4qjai9vh1TGXF@d
z5Kk$@g251a&VN{pCg!_-KSFfgyt5PN>WWlfRRs(T0HTPqu`vV;2D~Tp<wyWLB3?5#
zsY!sH;RirvB~V)%p`rpjKOZP401pI!a2SU)nC~dWJQ>gY3Gl>dgeC#@?%W3KcJSQX
z2xVn}&j;D<hE!9d22do9k7JfXP}z7$1Zh6}c6&+G0e^x;Mc@_-5FZb@yIVEnxD=OV
zK!M~R9K<x4pC=^&E*C^WXo$*OJo*Wd+I>nN4H3tMg^-q(RL+Q#xjFFjbMT7`K$0L*
zN95F0aEAlP%R@jAZbTR0a35Q@ZepFxH;7F_dHz7WCAK;`B3&SJURMXCq=08;0@>N%
z6n52Wjel+@?Cu8eb#feGs!B>s#A!l;ie$AS+}{3|InvWrb6F7hiPyWQ$q;UAZ6H`q
zgGV7$17-Qpv)tMWzP}H-zW&lYD+_Qs)f=)c2yL1zqBk?s2-BI$Rx4NAtUw)sf)Xqv
z<I>#Y!I8)Ff?hLdx()9MIrpWUoL_3SifLL}q*iKW;FPvIog8%TL62vCfw5~>@;|s6
z7nk+T;dmTUDy2Q3R!p7Y)beAmSKM~H+cdBIU-H{*C8EpKpj@@J|4jRDm=XrYm7SND
P00000NkvXXu0mjf^^R1M

delta 2141
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
T%$1!#00000NkvXXu0mjfay$Nn

diff --git a/addons/hr_attendance/static/src/img/emp-present.png b/addons/hr_attendance/static/src/img/emp-present.png
new file mode 100644
index 0000000000000000000000000000000000000000..a00718fa7f88ef1a833e324374c995378b4881c7
GIT binary patch
literal 930
zcmV;T16}-yP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000ANNkl<Zc-rli
zYe<t(9EV?{C`fXwENX^YmST}2DI=3^cGKFNMOxFeoNcDd3+ZN>S$Vg+c2m@7ZSUr0
zsjFNB)uvQRnVNHjE0VN~z64R0+umQV^{ubI^=S_r&iQiqJ?DRJ1mVPq6DLlbIB~)-
z?Isf}17-}5zQ>ypD`g!Sq>9fL_5C-2j@}NaI@Kt<SBcz~LgX~(Q}SDR5H*OqHaA3U
z@wwnL{htI|-&oPsW59_!rO49eLaIKD6fzSB$U_j3X%MN>5U&({-K7*((-Q8C3m6AY
zkT(|~LnA{f9V{l(u}_(TI7Kpc-$;Uxq<d0?SoMB~Koz41JR8VjZuOt6C~7N1Ivsvc
zorPqT6!AC2$h}>N);<FY@0TG;Erg&kjuL3&5T)B=3s*$Sh-1VQMg%m^v~=0!NSz2L
z>2PH-<aD_C!z)k}g@zs_)@gWHr{!b4j*sx0(b%Bj_4|~s@L)us>|O<=n(W{EouCpU
zM_+*6;eG%Vng&|nSsQ@q)$=j)vIpF*dVyWDnBvs=k9%J5i=K4&>k$im+6$0EuRf99
zb7@mHdfxY8g0b;2ko`KG>Z-!|=T}ht^bEL~aIovW;9l=z_p0&BowPvjyI%UL<sm^K
zfq!`jEpQk%yX|-BCz{RiXKc4S@OA75WE}-qq+X7t>OhBoeL(4?1qO!9NNvo7@5vw#
zS+3wz_(9dDg~Q>%Pun<1b0Z2nOHkQ;4n@x^u;W22R<*6gs@rSrLDxfa7&!y64GC~b
zp9Mljw-c^dcy$?cmS&9G>}VhA0^bmWP{SH*HEu)n<7n)7yc3ZRd1EVUS4J=*P;RKi
z44FHKBeXy%3&c4Ve6I)NrsXb1zkI{xm)8*0AwW`3B2vv_D$OE6j47tmyV!dkBLb!u
zMub&w1aZ_2L^+F^Ry7x{H5_nt8*sey6eLfi*xM~cjx__tAM>fBZ?nG(TKOV+stY3m
z0s%jdD+#^ic9Jvda+-~)RqoX6I&XNX{Hb95YHV-kA^Bwzb$nQk^Pfw8W^_p^iFjfr
z)35Q|dC~>jS!X;RxnA=4Hm7b87Lx%8(T5?@$ix2bM0=+B;E=?aC}#`Vv;Ns{$SL8>
zUU+fIZqHi38ec^~TX0k8{Z0DKx(IzlKDVA5^mo~R0Zb|UL6Op$cK`qY07*qoM6N<$
Ef+fPYZ~y=R

literal 0
HcmV?d00001

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index a7c3a7f9790..ab2721f1d8b 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -1,5 +1,5 @@
 openerp.hr_attendance = function(instance) {
-    var QWeb = instance.web.qweb;
+   /** var QWeb = instance.web.qweb;
     instance.hr_attendance.attendancestatus = false,
     instance.hr_attendance.checkstatus = function(){
         attendance = instance.hr_attendance.currentstatus;
@@ -27,9 +27,24 @@ openerp.hr_attendance = function(instance) {
                 self.employee = employee[0];
 	            self.do_update_notifier();
 	        });
+	        var el = $("div.presence_slider");
+            el.click(function(){
+                    if(self.employee.state == 'present'){                        
+                        el.animate({"left": "48px"}, "slow");                        
+                        self.on_click();
+                    }else{                        
+                        el.animate({"left": "-8px"}, "slow");
+                        
+                    }
+             });
         },
         do_update_notifier: function(){
             var self = this;
+            var el = $('img.oe_topbar_avatar');
+
+
+            
+
             this.$element = $(QWeb.render(this.template, {'employee':this.employee}));
             this.$element.click(self.on_click);
             element = $('.oe_attendance_button')
@@ -46,12 +61,12 @@ openerp.hr_attendance = function(instance) {
             var self = this;
             hr_employee = new instance.web.DataSet(self, 'hr.employee');
             hr_employee.call('attendance_action_change', [[self.employee.id]]).done(function(result){
-                window.location.reload();
-                //self.renderElement()
+               //window.location.reload();
+                self.renderElement()
             });
         },
     });
-    instance.web.DataSet.include({
+    /* instance.web.DataSet.include({
         create: function(data, callback, error_callback) {
             if (this._model.name == "hr.attendance"){
     			callback = instance.hr_attendance.callback(callback);
@@ -76,16 +91,55 @@ openerp.hr_attendance = function(instance) {
     		}
             return this._super(method, args, callback, error_callback);
         },
+        callback: function()
+        {
+            this.__super();
+            
+                .....
+        }
 
-    });
+    }); */
 
     instance.web.UserMenu.include({
-        do_update: function() {
+        do_update_attendance: function() {
             var self = this;
-            this._super();
-            this.update_promise.then(function() {
-                instance.hr_attendance.checkstatus();
+            console.log("click.........",self);
+            hr_employee = new instance.web.DataSet(self, 'hr.employee');
+            hr_employee.call('attendance_action_change', [[self.employee.id]]).done(function(result){
+                if (!result) return;
+                if(self.employee.state == 'present')
+                    self.employee.state = 'absent';
+                else
+                    self.employee.state = 'present';
+                self.do_slide(self.employee.state);                
             });
         },
+        do_slide:function(attendance_state)
+        {
+            if(attendance_state == 'present')
+                this.oe_attendance_slider.animate({"left": "48px"}, "slow");                                               
+            else                        
+                this.oe_attendance_slider.animate({"left": "-8px"}, "slow");
+        },
+        check_attendance: function(){
+            var self = this;
+            var employee = new instance.web.DataSetSearch(self, 'hr.employee', self.session.user_context, [['user_id','=', self.session.uid]]);
+            return employee.read_slice(['id','name','state']).pipe(function(res) {
+                if(_.isEmpty(res)) return;
+                self.employee = res[0];
+                self.do_slide(self.employee.state);
+            });
+        },
+        do_update: function () {
+            this._super();
+            var self = this;
+            var fct = function() {
+                self.oe_attendance_slider = self.$element.find('.oe_attendance_slider');
+                self.oe_attendance_slider.click(self.do_update_attendance);
+                return self.check_attendance();
+                
+            };
+            this.update_promise = this.update_promise.pipe(fct, fct);
+        },
     });
 }
diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml
index bfa5514b538..a61bbb539f7 100644
--- a/addons/hr_attendance/static/src/xml/attendance.xml
+++ b/addons/hr_attendance/static/src/xml/attendance.xml
@@ -1,5 +1,19 @@
 <template>
-    <t t-name="AttendanceNotifier">
-        <img style="cursor: pointer;" t-attf-src="/hr_attendance/static/src/img/emp-#{employee.state}.png" class="oe_attendance_button" t-attf-title="You are #{employee.state}"></img>
+    <t t-extend="UserMenu">
+        <t t-jquery="li.oe_dropdown" t-operation="before" >  
+             <li>
+                   <div class="oe_attendance_status" style="height:20px;width:100px;background-color:white;padding: 5px 10px 7px;margin:3px;">
+                        <div class="oe_attendance_present" style="float:left;">Present</div>
+                        <div class="oe_attendance_absent" style="float:right">Absent</div>
+                        <div class="oe_attendance_slider" style="cursor:pointer;width: 60px;background-color: gray;position: relative;top: -4px;left: -8px;height: 30px;-webkit-border-radius:4px;"><span  style="visibility:hidden;">slider</span></div>
+                   </div>
+             </li>
+        </t>
     </t>
+    
 </template>
+
+
+
+
+

From 00dd3743f8d1c39b7388078564b9f66acac61c68 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 21 May 2012 12:36:43 +0530
Subject: [PATCH 044/999] [IMP]improved rules for
 gratuity,leave,uniform,telephone,proffessional developement. And implement
 method for gratuity rule.

bzr revid: kbh@tinyerp.com-20120521070643-523rov1a8v63f13p
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 37 +++++++++++++++++++
 .../l10n_in_hr_payroll_data.xml               | 19 +++++++---
 .../l10n_in_hr_payroll_view.xml               |  1 +
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index f7505257537..ee373b20f3c 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -22,12 +22,49 @@
 from osv import fields, osv
 import decimal_precision as dp
 
+import time
+from datetime import datetime
+from datetime import timedelta
+from datetime import date
+from calendar import isleap
+from dateutil.relativedelta import relativedelta
+
 class hr_contract_in(osv.osv):
     _inherit = 'hr.contract'
+    
+    def _compute_year(self, cr, uid, ids, fields, args, context=None):
+        """
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Openday’s IDs
+        @return: No. of years of experience.
+        @param context: A standard dictionary for contextual values
+        """
+        res = {}
+        for contract in self.browse(cr, uid, ids, context=context):
+            c_date = time.strftime('%Y-%m-%d')
+            DATETIME_FORMAT = "%Y-%m-%d"
+            date_start = datetime.strptime(contract.date_start, DATETIME_FORMAT)
+            current_date = datetime.strptime(c_date,DATETIME_FORMAT)
+            diffyears = current_date.year - date_start.year
+            difference  = current_date - date_start.replace(current_date.year)
+            days_in_year = isleap(current_date.year) and 366 or 365
+            difference_in_years = diffyears + (difference.days + difference.seconds/86400.0)/days_in_year
+            years = relativedelta(current_date, date_start).years
+            months = relativedelta(current_date, date_start).months
+            mnth = months * 0.01
+            if months < 10:
+                year_month= float(mnth) + float(years)
+                res[contract.id] = year_month
+            else:
+                year_months = float(mnth) + float(years)
+                res[contract.id] = year_months
+        return res
 
     _columns = {
         'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll')),
         'food_coupon_amount': fields.float('Food Coupons ', digits_compute=dp.get_precision('Payroll')),
+        'No_of_year':fields.function(_compute_year, string='No. of Years of service',type="float",readonly=True),
 
     }
 
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index 19500c73e48..101877a9d3b 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -97,7 +97,7 @@ for more details : http://www.rupeetalk.com/finance-basics/income-tax-basics/inc
             <field name="name">Arrears</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
-            <field eval="100.0" name="amount_fix"/>
+            <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="30"/>
              <field name="note">
 Generally arrears are fully taxable, but employee may claim exemption u/s 89(1). 
@@ -112,7 +112,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="condition_select">none</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = (categories.NET/26) * 15 * 5</field>
+             <field name="amount_python_compute">result = (contract.wage + DA) * 15 * contract.No_of_year / worked_days.WORK100.number_of_days</field>
             <field name="sequence" eval="500"/>
             <field name="note">
 Covered under the Payment of Gratuity Act, 1971: 
@@ -165,7 +165,7 @@ is to be limited to minimum of all below:
             <field name="name">Performance Incentive/Bonus</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
-            <field eval="5000.0" name="amount_fix"/>
+            <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="34"/>
             <field name="note">This would be fully taxable based on incentive.</field>
         </record>
@@ -198,7 +198,7 @@ business growth.This part would become non taxable on providing original bills.<
             <field name="name">Uniform/Dress Allowance</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
-            <field eval="500.0" name="amount_fix"/>
+            <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="37"/>
             <field name="note">
 Some sections of employees mat get allowance for purchase of office dress/uniform.
@@ -210,7 +210,7 @@ In such case, the component would become non-taxable.</field>
             <field name="name">Telephone Reimbursement</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
-            <field eval="500.0" name="amount_fix"/>
+            <field eval="18000.0" name="amount_fix"/>
             <field name="sequence" eval="38"/>
             <field name="note">
 In some of the cases, companies may provide a component for telephone bills.
@@ -220,6 +220,15 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             </field>
         </record>
 
+        <record id="hr_salary_rule_prof_develope" model="hr.salary.rule">
+            <field name="code">PDA</field>
+            <field name="name">Professional Development Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="0.0" name="amount_fix"/>
+            <field name="sequence" eval="49"/>
+        </record>
+
         <record id="hr_payroll_rule_car" model="hr.salary.rule">
             <field name="code">CAR</field>
             <field name="name">Car Expenses Reimbursement</field>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 939dc0b3b79..f09c326bff1 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -13,6 +13,7 @@
                  <xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
                     <field name="tds"/>
                     <field name="food_coupon_amount"/>
+                    <field name="No_of_year"/>
                  </xpath>
             </data>
             </field>

From 390842adc4e7cf7e22aa87b89267fff6fa66efff Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 21 May 2012 13:29:22 +0530
Subject: [PATCH 045/999] Code improvement.

bzr revid: tta@openerp.com-20120521075922-o7nqzuhz67i62tzj
---
 addons/hr_attendance/__openerp__.py           |   1 +
 .../hr_attendance/static/src/js/attendance.js | 169 +++++++-----------
 .../static/src/xml/attendance.xml             |  20 +--
 3 files changed, 70 insertions(+), 120 deletions(-)

diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index eec95887bb8..6be8f3c2021 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -57,5 +57,6 @@ actions(Sign in/Sign out) performed by them.
     #web
     "js": ["static/src/js/attendance.js"],
     'qweb' : ["static/src/xml/attendance.xml"],
+    'css' : ["static/src/css/slider.css"],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index ab2721f1d8b..2bb06f95014 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -1,109 +1,28 @@
 openerp.hr_attendance = function(instance) {
-   /** var QWeb = instance.web.qweb;
-    instance.hr_attendance.attendancestatus = false,
-    instance.hr_attendance.checkstatus = function(){
-        attendance = instance.hr_attendance.currentstatus;
-        if (!attendance){
-        	attendance = new instance.hr_attendance.AttendanceNotifier(self);
-            instance.hr_attendance.currentstatus = attendance;
-        }
-        attendance.renderElement();
-    },
-    instance.hr_attendance.callback = function(callback){
-        var old_callback = callback;
-	    callback = function(result){
-			    if(old_callback){old_callback(result);}
-			    instance.hr_attendance.checkstatus();
-	    }
-        return callback;
-    },
-    instance.hr_attendance.AttendanceNotifier = instance.web.Widget.extend({
-        template: 'AttendanceNotifier',
-        renderElement: function() {
-            var self = this;
-            employee = new instance.web.DataSetSearch(this, 'hr.employee', this.session.user_context, [['user_id','=', this.session.uid]]);
-	        employee.read_slice(['id','name','state']).done(function(employee) {
-	            if(_.isEmpty(employee)) return;
-                self.employee = employee[0];
-	            self.do_update_notifier();
-	        });
-	        var el = $("div.presence_slider");
-            el.click(function(){
-                    if(self.employee.state == 'present'){                        
-                        el.animate({"left": "48px"}, "slow");                        
-                        self.on_click();
-                    }else{                        
-                        el.animate({"left": "-8px"}, "slow");
-                        
-                    }
-             });
+    var QWeb = instance.web.qweb;
+    _t = instance.web._t;
+    
+    instance.web.currentform = false;
+    instance.web.attendanceslider = false;
+    
+    instance.hr_attendance.AttendanceSlider = instance.web.Widget.extend({
+        template: 'AttendanceSlider',
+        init: function(parent){
+            this.titles = {'present' :_t("Present"),
+                             'absent' :_t("Absent")          
+                            }
+            this._super(parent);
+            this.session = parent.session;
+            this.parent_element = parent.$element ;            
         },
-        do_update_notifier: function(){
-            var self = this;
-            var el = $('img.oe_topbar_avatar');
-
-
-            
-
-            this.$element = $(QWeb.render(this.template, {'employee':this.employee}));
-            this.$element.click(self.on_click);
-            element = $('.oe_attendance_button')
-            if (element.length != 0){
-                element.replaceWith(this.$element);
-            }
-            else{
-                this.$element.appendTo($('.oe_systray'));
-
-            }
+        renderElement: function(){
+            this.$element = $(QWeb.render(this.template,this.titles));            
+            this.parent_element.prepend(this.$element);            
+            this.$oe_attendance_slider = this.$element.find(".oe_attendance_slider");
+            this.$oe_attendance_slider.click(this.do_update_attendance);
         },
-
-        on_click: function() {
-            var self = this;
-            hr_employee = new instance.web.DataSet(self, 'hr.employee');
-            hr_employee.call('attendance_action_change', [[self.employee.id]]).done(function(result){
-               //window.location.reload();
-                self.renderElement()
-            });
-        },
-    });
-    /* instance.web.DataSet.include({
-        create: function(data, callback, error_callback) {
-            if (this._model.name == "hr.attendance"){
-    			callback = instance.hr_attendance.callback(callback);
-    		}
-            return this._super(data, callback, error_callback);
-        },
-        write: function (id, data, options, callback, error_callback) {
-            if (this._model.name == "hr.attendance"){
-    			callback = instance.hr_attendance.callback(callback);
-    		}
-            return this._super(id, data, options, callback, error_callback);
-        },
-  	    unlink: function(ids, callback, error_callback) {
-            if (this._model.name == "hr.attendance"){
-    			callback = instance.hr_attendance.callback(callback);
-    		}
-            return this._super(ids, callback, error_callback);
-        },
-        call_button: function (method, args, callback, error_callback) {
-            if (method == "attendance_action_change"){
-    			callback = instance.hr_attendance.callback(callback);
-    		}
-            return this._super(method, args, callback, error_callback);
-        },
-        callback: function()
-        {
-            this.__super();
-            
-                .....
-        }
-
-    }); */
-
-    instance.web.UserMenu.include({
         do_update_attendance: function() {
             var self = this;
-            console.log("click.........",self);
             hr_employee = new instance.web.DataSet(self, 'hr.employee');
             hr_employee.call('attendance_action_change', [[self.employee.id]]).done(function(result){
                 if (!result) return;
@@ -111,15 +30,20 @@ openerp.hr_attendance = function(instance) {
                     self.employee.state = 'absent';
                 else
                     self.employee.state = 'present';
-                self.do_slide(self.employee.state);                
+                self.do_slide(self.employee.state);
+                if(instance.web.currentform){
+                    instance.web.currentform.reload();
+                
+                }
             });
         },
         do_slide:function(attendance_state)
         {
             if(attendance_state == 'present')
-                this.oe_attendance_slider.animate({"left": "48px"}, "slow");                                               
+                this.$oe_attendance_slider.animate({"left": "48px"}, "slow");                                               
             else                        
-                this.oe_attendance_slider.animate({"left": "-8px"}, "slow");
+                this.$oe_attendance_slider.animate({"left": "-8px"}, "slow");
+
         },
         check_attendance: function(){
             var self = this;
@@ -130,14 +54,41 @@ openerp.hr_attendance = function(instance) {
                 self.do_slide(self.employee.state);
             });
         },
+    });
+    
+    instance.web.ListView.include({
+        init:function(parent, dataset, view_id, options)
+        {
+            this._super(parent, dataset, view_id, options);
+            if (this.model == 'hr.employee' || this.model == 'hr.attendance')
+                instance.web.currentform = this;
+        }
+    });
+    
+    
+    instance.web.FormView.include({
+        init: function(parent, dataset, view_id, options) {
+            this._super(parent, dataset, view_id, options);
+            if (this.model == 'hr.employee' || this.model == 'hr.attendance')
+                instance.web.currentform = this;
+        },
+        reload: function(){
+            var re = this._super();
+            if (!instance.web.attendanceslider) return re;
+            if (this.model == 'hr.employee' || this.model == 'hr.attendance')
+                instance.web.attendanceslider.check_attendance();            
+            return re;            
+        },                
+    }),
+    
+    instance.web.UserMenu.include({
         do_update: function () {
             this._super();
             var self = this;
-            var fct = function() {
-                self.oe_attendance_slider = self.$element.find('.oe_attendance_slider');
-                self.oe_attendance_slider.click(self.do_update_attendance);
-                return self.check_attendance();
-                
+            var fct = function() {                
+                instance.web.attendanceslider = new instance.hr_attendance.AttendanceSlider(self);
+                instance.web.attendanceslider.renderElement();
+                return instance.web.attendanceslider.check_attendance();                
             };
             this.update_promise = this.update_promise.pipe(fct, fct);
         },
diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml
index a61bbb539f7..5670545e26c 100644
--- a/addons/hr_attendance/static/src/xml/attendance.xml
+++ b/addons/hr_attendance/static/src/xml/attendance.xml
@@ -1,16 +1,14 @@
 <template>
-    <t t-extend="UserMenu">
-        <t t-jquery="li.oe_dropdown" t-operation="before" >  
-             <li>
-                   <div class="oe_attendance_status" style="height:20px;width:100px;background-color:white;padding: 5px 10px 7px;margin:3px;">
-                        <div class="oe_attendance_present" style="float:left;">Present</div>
-                        <div class="oe_attendance_absent" style="float:right">Absent</div>
-                        <div class="oe_attendance_slider" style="cursor:pointer;width: 60px;background-color: gray;position: relative;top: -4px;left: -8px;height: 30px;-webkit-border-radius:4px;"><span  style="visibility:hidden;">slider</span></div>
-                   </div>
-             </li>
-        </t>
-    </t>
     
+    <t t-name="AttendanceSlider">
+         <li>
+               <div class="oe_attendance_status">
+                    <div class="oe_attendance_present"><t t-esc="present"/></div>
+                    <div class="oe_attendance_absent"><t t-esc="absent"/></div>
+                    <div class="oe_attendance_slider"><span  class="oe_attendance_text">slider</span></div>
+               </div>
+         </li>
+    </t>   
 </template>
 
 

From 67eab70b80a82cb6fcd961dd512691eae68203b4 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 21 May 2012 13:41:16 +0530
Subject: [PATCH 046/999] css : apply color

bzr revid: tta@openerp.com-20120521081116-g79xfnf795vxaz0j
---
 .../hr_attendance/static/src/css/slider.css   | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 addons/hr_attendance/static/src/css/slider.css

diff --git a/addons/hr_attendance/static/src/css/slider.css b/addons/hr_attendance/static/src/css/slider.css
new file mode 100644
index 00000000000..31c0753e7ba
--- /dev/null
+++ b/addons/hr_attendance/static/src/css/slider.css
@@ -0,0 +1,32 @@
+.oe_attendance_status{
+    height:14px;
+    width:100px;
+    background-color:white;
+    padding: 5px 10px 7px;
+    margin:3px;
+    -webkit-border-radius:4px;
+}
+.oe_attendance_present{
+    float:left;
+    text-shadow: grey 0px 1px 0px;
+    color:green;
+}
+.oe_attendance_absent{
+    float:right;
+    text-shadow: grey 0px 1px 0px;
+    color:red;
+}
+.oe_attendance_slider{
+    cursor:pointer;
+    width: 60px;
+    background-color: gray;
+    position: relative;
+    top: -4px;
+    left: -8px;
+    height: 24px;
+    -webkit-border-radius:4px;
+}
+.oe_attendance_text{
+    visibility:hidden;
+}
+

From cf28ac19188994335b59ea50d88d394cd9c1a1d5 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 21 May 2012 18:57:03 +0530
Subject: [PATCH 047/999] [IMP]improved salary rules for allowance and
 deduction.

bzr revid: kbh@tinyerp.com-20120521132703-m1q4s1ccxyp3nr0p
---
 .../data/hr.salary.rule.csv                   |   5 -
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  |  12 +-
 .../l10n_in_hr_payroll_data.xml               | 133 +++++++++++++-----
 .../l10n_in_hr_payroll_view.xml               |  19 ++-
 4 files changed, 127 insertions(+), 42 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
index 2b6b4fbd847..b41229965c8 100644
--- a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
+++ b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
@@ -3,8 +3,3 @@
 2,"fix",2,10,,2400,"Education Allowance","Child Education Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
 ,,,,,,,,,,,,,
 ,,,,,,,,,,,,,
-5,"fix",0,2999,,0,"Professional Tax for Gujarat","Deduction",121,"PT0","hr_payslip_line_professionaltax_guj","range","categories.GROSS",
-6,"fix",3000,5999,,-20,"Professional Tax for Gujarat","Deduction",121,"PT20","hr_payslip_line_professionaltax_guj","range","categories.GROSS",
-7,"fix",6000,8999,,-80,"Professional Tax for Gujarat","Deduction",121,"PT80","hr_payslip_line_professionaltax_guj","range","categories.GROSS",
-8,"fix",9000,11999,,-150,"Professional Tax for Gujarat","Deduction",121,"PT150","hr_payslip_line_professionaltax_guj","range","categories.GROSS",
-9,"fix",12000,1000000,,-200,"Professional Tax for Gujarat","Deduction",121,"PT200","hr_payslip_line_professionaltax_guj","range","categories.GROSS",
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index ee373b20f3c..1a2f25be562 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -63,9 +63,19 @@ class hr_contract_in(osv.osv):
 
     _columns = {
         'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll')),
+        'house_rent_income': fields.float('House Rent Income ', digits_compute=dp.get_precision('Payroll')),
+        'saving_bank_account': fields.float('Saving Bank Account Income ', digits_compute=dp.get_precision('Payroll')),
+        'other_income': fields.float('Other Income ', digits_compute=dp.get_precision('Payroll')),
+        'short_term_gain':fields.float('Short Term Gain from Share Trading/Equity MFs ', digits_compute=dp.get_precision('Payroll')),
+        'long_term_gain':fields.float('Long Term Gain from Share Trading/Equity MFs', digits_compute=dp.get_precision('Payroll')),
         'food_coupon_amount': fields.float('Food Coupons ', digits_compute=dp.get_precision('Payroll')),
+        'driver_salay': fields.boolean('Driver salary '),
+        'professional_tax': fields.float('Professional Tax ', digits_compute=dp.get_precision('Payroll')),
+        'leave_avail_dedution': fields.float('leave Avail deduction ', digits_compute=dp.get_precision('Payroll')),
         'No_of_year':fields.function(_compute_year, string='No. of Years of service',type="float",readonly=True),
-
+        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll')), 
+        'voluntarily_provident_fund': fields.float('Voluntarily Provident Fund', digits_compute=dp.get_precision('Payroll')), 
+        'company_transport': fields.float('Company provided transport', digits_compute=dp.get_precision('Payroll')), 
     }
 
 hr_contract_in()
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index 101877a9d3b..81cb1bcd725 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -54,7 +54,7 @@ Per school going child 1200 per annum is non-taxable.
             <field name="name">Grade/Special/Management/Supplementary Allowance</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
-            <field eval="100.0" name="amount_fix"/>
+            <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="28"/>
             <field name="note">
 This allowance is normally given as an additional benefit to employees and is fully taxable.
@@ -209,8 +209,8 @@ In such case, the component would become non-taxable.</field>
             <field name="code">TELR</field>
             <field name="name">Telephone Reimbursement</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="18000.0" name="amount_fix"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = 1500 *12</field>
             <field name="sequence" eval="38"/>
             <field name="note">
 In some of the cases, companies may provide a component for telephone bills.
@@ -233,8 +233,8 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="code">CAR</field>
             <field name="name">Car Expenses Reimbursement</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="500.0" name="amount_fix"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = 1800 * 12</field>
             <field name="sequence" eval="39"/>
             <field name="note">
 In case company provides component for this and employee use self owned car for official 
@@ -248,7 +248,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="name">Internet Expense</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
-            <field eval="500.0" name="amount_fix"/>
+            <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="40"/>
             <field name="note">Employer may also provide reimbursement of internet expenses and thus this would become non taxable.</field>
         </record>
@@ -257,11 +257,10 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="code">DRI</field>
             <field name="name">Driver Salary</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.driver_salay)</field>
             <field name="amount_select">fix</field>
             <field eval="900.0" name="amount_fix"/>
-            <field name="condition_select">python</field>
-            <field name="condition_python">result = bool(employee.vehicle)</field>
-
             <field name="sequence" eval="41"/>
              <field name="note">Rs. 900 per month (non taxable)</field>
         </record>
@@ -271,7 +270,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="name">Gifts From Non-Relatives</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
-            <field eval="5000.0" name="amount_fix"/>
+            <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="42"/>
             <field name="note">
 gift  gift is from non relatives person worth more than Rs.50000, 
@@ -283,7 +282,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="name">Gifts From Relatives</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
-            <field eval="5000.0" name="amount_fix"/>
+            <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="43"/>
             <field name="note"> gift is from relaives whould be non taxable with no limits.</field>
         </record>
@@ -293,10 +292,22 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="name">House Rent Income</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
-            <field eval="5000.0" name="amount_fix"/>
-            <field name="note">Income from house property</field>
+            <field eval="0.0" name="amount_fix"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.house_rent_income)</field>
             <field name="sequence" eval="44"/>
-            <field name="note">30% of the rental income can be reduced as a standard deduction</field>
+            <field name="note">Income from house property.30% of the rental income can be reduced as a standard deduction</field>
+        </record>
+
+        <record id="hr_salary_rule_saving_bank" model="hr.salary.rule">
+            <field name="code">SBAI</field>
+            <field name="name">Saving Bank Account Interest</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = contract.saving_bank_account</field>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.saving_bank_account)</field>
+            <field name="sequence" eval="31"/>
         </record>
 
         <record id="hr_salary_trans_allownce" model="hr.salary.rule">
@@ -313,19 +324,30 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="name">Other Income</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="condition_select">python</field>
-            <field name="condition_python">result = bool(contract.others)</field>
+            <field name="condition_python">result = bool(contract.other_income)</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = contract.others</field>
+            <field name="amount_python_compute">result = contract.other_income</field>
             <field name="note">Bank account/NSC/Post Office/SCSS interest</field>
             <field name="sequence" eval="45"/>
         </record>
 
+        <record id="hr_salary_rule_agricultural" model="hr.salary.rule">
+            <field name="code">AI</field>
+            <field name="name">Agricultural Income</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="0.0" name="amount_fix"/>
+            <field name="sequence" eval="23"/>
+        </record>
+
         <record id="hr_salary_rule_st_gains" model="hr.salary.rule">
             <field name="code">STG</field>
             <field name="name">Short Term Gains from Share Trading/Equity MFs</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="5000.0" name="amount_fix"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = contract.short_term_gain</field>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.short_term_gain)</field>
             <field name="sequence" eval="46"/>
             <field name="note">
 If stocks/equity mutual funds are sold before one year, 
@@ -337,8 +359,10 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="code">LTG</field>
             <field name="name">Long Term Gains from Share Trading/Equity MFs</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="5000.0" name="amount_fix"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = contract.long_term_gain</field>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.long_term_gain)</field>
             <field name="sequence" eval="47"/>
             <field name="note">
 If stocks/equity mutual funds are kept for more than a year before sale,
@@ -349,13 +373,15 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
         </record>
 
         <!--Deductions -->
-        <record id="hr_payslip_line_professionaltax_guj" model="hr.salary.rule">
-            <field name="code">PTG</field>
-            <field name="name">Professional Tax for Gujarat</field>
+        <record id="hr_payslip_line_professional_tax" model="hr.salary.rule">
+            <field name="code">PT</field>
+            <field name="name">Professional Tax</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="amount_select">fix</field>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.professional_tax)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = -(contract.professional_tax)</field>
             <field eval="120" name="sequence"/>
-            <field eval="-0.0" name="amount_fix"/>
             <field eval="False" name="appears_on_payslip"/>
             <field name="note">
 Professional tax for company should be paid on or before 30th sept,
@@ -385,8 +411,10 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="code">VPF</field>
             <field name="name">Voluntarily Provident Fund Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="amount_select">fix</field>
-            <field eval="-200.0" name="amount_fix"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.voluntarily_provident_fund)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = -(contract.voluntarily_provident_fund)</field>
             <field name="sequence" eval="130"/>
             <field name="note">
 VPF is a safe option wherein you can contribute more than the PF ceiling of 12% 
@@ -406,8 +434,10 @@ read more: more:http://www.dotcominfoway.com/blog/vpf-or-voluntary-provident-fun
             <field name="code">CPT</field>
             <field name="name">Dedution for Company Provided Transport</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.company_transport)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = -(contract.company_transport)</field>
             <field name="sequence" eval="155"/>
         </record>
 
@@ -416,7 +446,7 @@ read more: more:http://www.dotcominfoway.com/blog/vpf-or-voluntary-provident-fun
             <field name="name">Dedution Towards State Labour Welfare Fund</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
-            <field eval="-3.0" name="amount_fix"/>
+            <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="160"/>
             <field name="note">
 The LWF is applicable to all the members of the organisation except the 
@@ -433,7 +463,7 @@ read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.htm
             <field name="name">Dedution Towards Company Provided Group Term Insurance</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
-            <field eval="-200.0" name="amount_fix"/>
+            <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="167"/>
         </record>
 
@@ -441,8 +471,10 @@ read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.htm
             <field name="code">DLA</field>
             <field name="name">Dedution Towards Leave Availed</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="amount_select">fix</field>
-            <field eval="-200.0" name="amount_fix"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.leave_avail_dedution)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = -(contract.leave_avail_dedution)</field>
             <field name="sequence" eval="170"/>
         </record>
 
@@ -450,7 +482,10 @@ read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.htm
             <field name="code">CMT</field>
             <field name="name">Dedution Towards Company Provided Medical Insurance</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="amount_select">fix</field>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.medical_insurance)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = - (contract.medical_insurance)</field>
             <field eval="-50.0" name="amount_fix"/>
             <field name="sequence" eval="172"/>
         </record>
@@ -469,9 +504,37 @@ read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.htm
             <field name="name">Employer's PF Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = (rules.PF.amount_percentage * contract.wage)/100</field>
+            <field name="amount_python_compute">result = (contract.wage + DA) * 0.12</field>
             <field name="sequence" eval="122"/>
         </record>
+        
+        <record id="hr_payslip_rule_empPF" model="hr.salary.rule">
+            <field name="code">EPFC</field>
+            <field name="name">Employee's PF Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (contract.wage + DA) / 8.33</field>
+            <field name="sequence" eval="123"/>
+        </record>
+        
+        <record id="hr_payslip_rule_enpf" model="hr.salary.rule">
+            <field name="code">ENPC</field>
+            <field name="name">Employer's NPS Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (contract.wage + DA) * 0.10</field>
+            <field name="sequence" eval="126"/>
+        </record>
+        
+        <record id="hr_payslip_rule_empNPF" model="hr.salary.rule">
+            <field name="code">ENPFC</field>
+            <field name="name">Employee's NPS Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (contract.wage + DA) * 0.10</field>
+            <field name="sequence" eval="125"/>
+        </record>
+        
 
     </data>
 </openerp>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index f09c326bff1..b6096873748 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -11,9 +11,26 @@
             <field name="arch" type="xml">
             <data>
                  <xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
-                    <field name="tds"/>
                     <field name="food_coupon_amount"/>
                     <field name="No_of_year"/>
+                 <group col="2" colspan="2" name="right_column">
+                    <separator colspan="2" string="Allowance"/>
+                        <field name="short_term_gain"/>
+                        <field name="long_term_gain"/>
+                        <field name="saving_bank_account"/>
+                        <field name="house_rent_income"/>
+                        <field name="other_income"/>
+                        <field name="driver_salay"/>
+                 </group>
+                 <group col="2" colspan="2" name="left_column">
+                    <separator colspan="2" string="Deduction"/>
+                        <field name="professional_tax"/>
+                        <field name="tds"/>
+                        <field name="voluntarily_provident_fund"/>
+                        <field name="company_transport"/>
+                        <field name="leave_avail_dedution"/>
+                        <field name="medical_insurance"/>
+                 </group>
                  </xpath>
             </data>
             </field>

From d2d7cd1292c260a2aae4a459e85784d66e14b6dd Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 22 May 2012 11:19:59 +0530
Subject: [PATCH 048/999] [IMP]improved salary rules for VPF,LTA,medical
 Allowance,howse income.

bzr revid: kbh@tinyerp.com-20120522054959-s95pc1goslo28t38
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  |  2 +-
 .../l10n_in_hr_payroll_data.xml               | 32 +++++++++----------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 1a2f25be562..f093fefced3 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -74,7 +74,7 @@ class hr_contract_in(osv.osv):
         'leave_avail_dedution': fields.float('leave Avail deduction ', digits_compute=dp.get_precision('Payroll')),
         'No_of_year':fields.function(_compute_year, string='No. of Years of service',type="float",readonly=True),
         'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll')), 
-        'voluntarily_provident_fund': fields.float('Voluntarily Provident Fund', digits_compute=dp.get_precision('Payroll')), 
+        'voluntarily_provident_fund': fields.float('Voluntarily Provident Fund', digits_compute=dp.get_precision('Payroll'),help="it is computed as percentage.(%)"), 
         'company_transport': fields.float('Company provided transport', digits_compute=dp.get_precision('Payroll')), 
     }
 
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index 81cb1bcd725..0d8d18b5e80 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -125,9 +125,8 @@ number of years of service (date of joining – date of retirement/leaving job)
             <field name="code">LTA</field>
             <field name="name">Leave Travel Allowance</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">percentage</field>
-            <field name="amount_percentage_base">contract.wage</field>
-            <field name="amount_percentage" eval="0.0833"/>
+            <field name="amount_select">fix</field>
+            <field name="amount_fix">1666</field>
             <field name="sequence" eval="32"/>
             <field name="note">
 As per Income tax rules of India, if transport bills for LTA are not provided,
@@ -175,7 +174,7 @@ is to be limited to minimum of all below:
             <field name="name">Medical Reimbursement</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
-            <field eval="2500.0" name="amount_fix"/>
+            <field eval="1200.0" name="amount_fix"/>
             <field name="sequence" eval="35"/>
             <field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
         </record>
@@ -209,8 +208,8 @@ In such case, the component would become non-taxable.</field>
             <field name="code">TELR</field>
             <field name="name">Telephone Reimbursement</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = 1500 *12</field>
+            <field name="amount_select">fix</field>
+            <field name="amount_fix">1500</field>
             <field name="sequence" eval="38"/>
             <field name="note">
 In some of the cases, companies may provide a component for telephone bills.
@@ -233,8 +232,8 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="code">CAR</field>
             <field name="name">Car Expenses Reimbursement</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = 1800 * 12</field>
+            <field name="amount_select">fix</field>
+            <field name="amount_fix">1800</field>
             <field name="sequence" eval="39"/>
             <field name="note">
 In case company provides component for this and employee use self owned car for official 
@@ -291,10 +290,9 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="code">HRI</field>
             <field name="name">House Rent Income</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
-            <field name="condition_select">python</field>
-            <field name="condition_python">result = bool(contract.house_rent_income)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = contract.house_rent_income</field>
+            <field name="condition_select">none</field>
             <field name="sequence" eval="44"/>
             <field name="note">Income from house property.30% of the rental income can be reduced as a standard deduction</field>
         </record>
@@ -414,7 +412,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(contract.voluntarily_provident_fund)</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = -(contract.voluntarily_provident_fund)</field>
+            <field name="amount_python_compute">result = -(contract.wage + DA) * contract.voluntarily_provident_fund / 100 </field>
             <field name="sequence" eval="130"/>
             <field name="note">
 VPF is a safe option wherein you can contribute more than the PF ceiling of 12% 
@@ -504,7 +502,7 @@ read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.htm
             <field name="name">Employer's PF Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = (contract.wage + DA) * 0.12</field>
+            <field name="amount_python_compute">result = - (contract.wage + DA) * 0.12</field>
             <field name="sequence" eval="122"/>
         </record>
         
@@ -513,7 +511,7 @@ read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.htm
             <field name="name">Employee's PF Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = (contract.wage + DA) / 8.33</field>
+            <field name="amount_python_compute">result = - (contract.wage + DA) * 8.33 / 100</field>
             <field name="sequence" eval="123"/>
         </record>
         
@@ -522,7 +520,7 @@ read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.htm
             <field name="name">Employer's NPS Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = (contract.wage + DA) * 0.10</field>
+            <field name="amount_python_compute">result = - (contract.wage + DA) * 0.10</field>
             <field name="sequence" eval="126"/>
         </record>
         
@@ -531,7 +529,7 @@ read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.htm
             <field name="name">Employee's NPS Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = (contract.wage + DA) * 0.10</field>
+            <field name="amount_python_compute">result = - (contract.wage + DA) * 0.10</field>
             <field name="sequence" eval="125"/>
         </record>
         

From db4983a9c1db551c2a8043793a17a48513033af8 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 22 May 2012 14:23:39 +0530
Subject: [PATCH 049/999] [FIX] hr_attendance: add tooltip in signin/signout
 slider.

bzr revid: hmo@tinyerp.com-20120522085339-wz2id2nvfq91h0wf
---
 addons/hr_attendance/static/src/js/attendance.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 2bb06f95014..494d3e5aa84 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -39,10 +39,12 @@ openerp.hr_attendance = function(instance) {
         },
         do_slide:function(attendance_state)
         {
-            if(attendance_state == 'present')
-                this.$oe_attendance_slider.animate({"left": "48px"}, "slow");                                               
-            else                        
-                this.$oe_attendance_slider.animate({"left": "-8px"}, "slow");
+            if(attendance_state == 'present'){
+                this.$oe_attendance_slider.attr("title",_t("Sign Out"));
+                this.$oe_attendance_slider.animate({"left": "48px"}, "slow");}
+            else{
+                this.$oe_attendance_slider.attr("title",_t("Sign In"));
+                this.$oe_attendance_slider.animate({"left": "-8px"}, "slow");}
 
         },
         check_attendance: function(){
@@ -60,7 +62,7 @@ openerp.hr_attendance = function(instance) {
         init:function(parent, dataset, view_id, options)
         {
             this._super(parent, dataset, view_id, options);
-            if (this.model == 'hr.employee' || this.model == 'hr.attendance')
+            if (this.model == 'hr.employee' || this.model == 'hr.attendance' || this.model == 'hr_timesheet_sheet.sheet')
                 instance.web.currentform = this;
         }
     });
@@ -69,13 +71,13 @@ openerp.hr_attendance = function(instance) {
     instance.web.FormView.include({
         init: function(parent, dataset, view_id, options) {
             this._super(parent, dataset, view_id, options);
-            if (this.model == 'hr.employee' || this.model == 'hr.attendance')
+            if (this.model == 'hr.employee' || this.model == 'hr.attendance' || this.model == 'hr_timesheet_sheet.sheet')
                 instance.web.currentform = this;
         },
         reload: function(){
             var re = this._super();
             if (!instance.web.attendanceslider) return re;
-            if (this.model == 'hr.employee' || this.model == 'hr.attendance')
+            if (this.model == 'hr.employee' || this.model == 'hr.attendance' || this.model == 'hr_timesheet_sheet.sheet')
                 instance.web.attendanceslider.check_attendance();            
             return re;            
         },                

From 2ca479f04ae67dd63051f8eb08c516df32c6983b Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 22 May 2012 14:50:07 +0530
Subject: [PATCH 050/999] [IMP] hr_attendance: timesheet update on click
 attendance silder

bzr revid: hmo@tinyerp.com-20120522092007-4gtl15fjwj0nhesu
---
 addons/hr_attendance/static/src/js/attendance.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 494d3e5aa84..8ee6b4ee4ab 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -3,6 +3,7 @@ openerp.hr_attendance = function(instance) {
     _t = instance.web._t;
     
     instance.web.currentform = false;
+    instance.web.currentlist = false;
     instance.web.attendanceslider = false;
     
     instance.hr_attendance.AttendanceSlider = instance.web.Widget.extend({
@@ -31,9 +32,18 @@ openerp.hr_attendance = function(instance) {
                 else
                     self.employee.state = 'present';
                 self.do_slide(self.employee.state);
+                if(instance.web.currentlist){
+                    instance.web.currentlist.reload();
+                }
                 if(instance.web.currentform){
-                    instance.web.currentform.reload();
-                
+                    if (instance.web.currentform.model == 'hr_timesheet_sheet.sheet'){
+                        model = new instance.web.DataSet(self, instance.web.currentform.model);
+                        model.call('date_today', [instance.web.currentform.dataset.ids]).done(function(result){instance.web.currentform.reload();});
+                    }
+                    else{
+                        instance.web.currentform.reload();
+                    }
+                    
                 }
             });
         },
@@ -63,7 +73,7 @@ openerp.hr_attendance = function(instance) {
         {
             this._super(parent, dataset, view_id, options);
             if (this.model == 'hr.employee' || this.model == 'hr.attendance' || this.model == 'hr_timesheet_sheet.sheet')
-                instance.web.currentform = this;
+                instance.web.currentlist = this;
         }
     });
     

From cf88acabfa7c1e18f9f88c0497d8eec135ac7dbd Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 23 May 2012 11:15:19 +0530
Subject: [PATCH 051/999] [IMP]improved salary rules,descriptions for rules,
 fields tooltip,gratuity calculation method,code for rules.

bzr revid: kbh@tinyerp.com-20120523054519-bdrmcnryfvj30j99
---
 addons/hr_payroll/hr_payroll_demo.xml         |  17 ++-
 addons/hr_payroll/test/payslip.yml            |   4 +-
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  |  78 +++++++------
 .../l10n_in_hr_payroll_data.xml               | 107 ++++--------------
 .../l10n_in_hr_payroll_view.xml               |  16 ++-
 .../security/hr.salary.rule.csv               |   1 -
 6 files changed, 92 insertions(+), 131 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index d3826773e7d..7fd266c628b 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -23,15 +23,14 @@
         <!-- Salary Rules -->
 
         <record id="hr_salary_rule_houserentallowancemetro" model="hr.salary.rule">
-            <field name="code">HRA_M</field>
+            <field name="code">HRAM</field>
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = (contract.wage + DA) * 0.50</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="register_id" ref="hr_houserent_register"/>
             <field name="name">House Rent Allowance for metro city</field>
             <field name="sequence" eval="80"/>
-            <field name="note">
-Rent receipts can be shown for taking tax benefit for living in a rented house.
+            <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
 Income tax exemption for HRA will be least of following:
     1. The actual amount of HRA received as a part of salary.
     2. 40% (if living in non-metro area).
@@ -43,13 +42,12 @@ Income tax exemption for HRA will be least of following:
         <record id="hr_salary_rule_houserentallowancenonmetro" model="hr.salary.rule">
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = (contract.wage + DA) * 0.40</field>
-            <field name="code">HRA_NONM</field>
+            <field name="code">HRANM</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="register_id" ref="hr_houserent_register"/>
             <field name="name">House Rent Allowance for non metro city</field>
             <field name="sequence" eval="79"/>
-            <field name="note">
-Rent receipts can be shown for taking tax benefit for living in a rented house.
+            <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
 Income tax exemption for HRA will be least of following:
     1. The actual amount of HRA received as a part of salary.
     2. 50% (if living in metro area) of (basic salary+Dearness allowance (DA)).
@@ -75,8 +73,7 @@ Income tax exemption for HRA will be least of following:
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="register_id" ref="hr_professional_tax_register"/>
             <field name="name">Professional Tax</field>
-            <field name="note">
-Professional tax deducted from salary by employer should be removed from taxable salary before computation of income tax.
+            <field name="note">Professional tax deducted from salary by employer should be removed from taxable salary before computation of income tax.
 Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uugbJcaM</field>
         </record>
 
@@ -142,7 +139,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
          <record id="structure_001" model="hr.payroll.structure">
             <field name="code">ME</field>
             <field name="name">Marketing Executive</field>
-            <field eval="[(6, 0, [ref('hr_salary_rule_houserentallowance1'), ref('hr_salary_rule_convanceallowance1'),ref('hr_salary_rule_professionaltax1'),ref('hr_salary_rule_providentfund1')])]" name="rule_ids"/>
+            <field eval="[(6, 0, [ref('hr_salary_rule_houserentallowancemetro'), ref('hr_salary_rule_convanceallowance1'),ref('hr_salary_rule_professionaltax1'),ref('hr_salary_rule_providentfund1')])]" name="rule_ids"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="parent_id" ref="structure_base"/>
         </record>
@@ -150,7 +147,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
         <record id="structure_002" model="hr.payroll.structure">
             <field name="code">MEQP</field>
             <field name="name">Marketing Executive for Quentin Paolino</field>
-            <field eval="[(6, 0, [ref('hr_salary_rule_ca_paolino'), ref('hr_salary_rule_meal_voucher')])]" name="rule_ids"/>
+            <field eval="[(6, 0, [ref('hr_salary_rule_ca_paolino'), ref('hr_salary_rule_food_coupon')])]" name="rule_ids"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="parent_id" ref="structure_001"/>
         </record>
diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml
index c3ad3a1a85c..e44cfcaa325 100644
--- a/addons/hr_payroll/test/payslip.yml
+++ b/addons/hr_payroll/test/payslip.yml
@@ -17,11 +17,11 @@
     code: SD
     company_id: base.main_company
     rule_ids:
-      - hr_salary_rule_houserentallowance1
+      - hr_salary_rule_houserentallowancemetro
       - hr_salary_rule_convanceallowance1
       - hr_salary_rule_professionaltax1
       - hr_salary_rule_providentfund1
-      - hr_salary_rule_meal_voucher
+      - hr_salary_rule_food_coupon
       - hr_salary_rule_sales_commission
 -
   I create a contract for "Richard"
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index f093fefced3..3e3fcaa0006 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -23,11 +23,11 @@ from osv import fields, osv
 import decimal_precision as dp
 
 import time
-from datetime import datetime
-from datetime import timedelta
-from datetime import date
+from datetime import datetime, timedelta, date
 from calendar import isleap
 from dateutil.relativedelta import relativedelta
+from bsddb.dbtables import _columns
+from epsilon.hotfix import require
 
 class hr_contract_in(osv.osv):
     _inherit = 'hr.contract'
@@ -41,43 +41,53 @@ class hr_contract_in(osv.osv):
         @param context: A standard dictionary for contextual values
         """
         res = {}
-        for contract in self.browse(cr, uid, ids, context=context):
-            c_date = time.strftime('%Y-%m-%d')
-            DATETIME_FORMAT = "%Y-%m-%d"
-            date_start = datetime.strptime(contract.date_start, DATETIME_FORMAT)
-            current_date = datetime.strptime(c_date,DATETIME_FORMAT)
-            diffyears = current_date.year - date_start.year
-            difference  = current_date - date_start.replace(current_date.year)
-            days_in_year = isleap(current_date.year) and 366 or 365
-            difference_in_years = diffyears + (difference.days + difference.seconds/86400.0)/days_in_year
-            years = relativedelta(current_date, date_start).years
-            months = relativedelta(current_date, date_start).months
-            mnth = months * 0.01
-            if months < 10:
-                year_month= float(mnth) + float(years)
-                res[contract.id] = year_month
-            else:
-                year_months = float(mnth) + float(years)
-                res[contract.id] = year_months
+        c_date = time.strftime('%Y-%m-%d')
+        DATETIME_FORMAT = "%Y-%m-%d"
+        current_date = datetime.strptime(c_date,DATETIME_FORMAT)
+        employee_pool = self.pool.get('hr.employee')
+        for contract in self.browse(cr, uid, ids, context):
+            employee = employee_pool.browse(cr, uid, contract.employee_id.id, context=context)
+            if employee.join_date:
+                date_start = datetime.strptime(employee.join_date, DATETIME_FORMAT)
+                diffyears = current_date.year - date_start.year
+                difference  = current_date - date_start.replace(current_date.year)
+                days_in_year = isleap(current_date.year) and 366 or 365
+                difference_in_years = diffyears + (difference.days + difference.seconds/86400.0)/days_in_year
+                total_years = relativedelta(current_date, date_start).years
+                total_months = relativedelta(current_date, date_start).months
+                if total_months < 10:
+                     year_month= float(total_months)/10 + float(total_years)
+                     res[contract.id] = year_month
+                else:
+                         year_months = float(total_months)/100 + float(total_years)
+                         res[contract.id] = year_months
         return res
 
     _columns = {
         'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll')),
-        'house_rent_income': fields.float('House Rent Income ', digits_compute=dp.get_precision('Payroll')),
-        'saving_bank_account': fields.float('Saving Bank Account Income ', digits_compute=dp.get_precision('Payroll')),
-        'other_income': fields.float('Other Income ', digits_compute=dp.get_precision('Payroll')),
-        'short_term_gain':fields.float('Short Term Gain from Share Trading/Equity MFs ', digits_compute=dp.get_precision('Payroll')),
-        'long_term_gain':fields.float('Long Term Gain from Share Trading/Equity MFs', digits_compute=dp.get_precision('Payroll')),
-        'food_coupon_amount': fields.float('Food Coupons ', digits_compute=dp.get_precision('Payroll')),
-        'driver_salay': fields.boolean('Driver salary '),
-        'professional_tax': fields.float('Professional Tax ', digits_compute=dp.get_precision('Payroll')),
-        'leave_avail_dedution': fields.float('leave Avail deduction ', digits_compute=dp.get_precision('Payroll')),
-        'No_of_year':fields.function(_compute_year, string='No. of Years of service',type="float",readonly=True),
-        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll')), 
-        'voluntarily_provident_fund': fields.float('Voluntarily Provident Fund', digits_compute=dp.get_precision('Payroll'),help="it is computed as percentage.(%)"), 
-        'company_transport': fields.float('Company provided transport', digits_compute=dp.get_precision('Payroll')), 
+        'house_rent_income': fields.float('House Rent Income ', digits_compute=dp.get_precision('Payroll'),help="Income from house property."),
+        'saving_bank_account': fields.float('Saving Bank Account Income ', digits_compute=dp.get_precision('Payroll'),help="saving income for bank account."),
+        'other_income': fields.float('Other Income ', digits_compute=dp.get_precision('Payroll'),help="Other income of employee."),
+        'short_term_gain':fields.float('Short Term Gain from Share Trading/Equity MFs ', digits_compute=dp.get_precision('Payroll'),help="stocks/equity mutual funds are sold before one year."),
+        'long_term_gain':fields.float('Long Term Gain from Share Trading/Equity MFs', digits_compute=dp.get_precision('Payroll'),help="stocks/equity mutual funds are kept for more than a year."),
+        'food_coupon_amount': fields.float('Food Coupons ', digits_compute=dp.get_precision('Payroll'),help="amount of food coupon per day"),
+        'driver_salay': fields.boolean('Driver salary',help="if checked,driver get fixed salary per month."),
+        'professional_tax': fields.float('Professional Tax ', digits_compute=dp.get_precision('Payroll'),help="Professional tax deducted from salary"),
+        'leave_avail_dedution': fields.float('leave availed deduction ', digits_compute=dp.get_precision('Payroll'),help="emergency leave of employee"),
+        'number_of_year':fields.function(_compute_year, string='No. of Years of service',type="float",help="Total number of years and months of employee has work in company",store=True),
+        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'),help="Deduction towards company provided medical insurance"), 
+        'voluntarily_provident_fund': fields.float('Voluntarily Provident Fund', digits_compute=dp.get_precision('Payroll'),help="VPF computed as percentage.(%)"), 
+        'company_transport': fields.float('Company provided transport', digits_compute=dp.get_precision('Payroll'),help="Deduction for company provided transport."), 
     }
 
 hr_contract_in()
 
+
+class hr_employee(osv.osv):
+    _inherit = 'hr.employee'
+    _columns = {
+        'join_date': fields.date('Join date',help="join date of employee in company",required=True)
+                }
+hr_employee()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index 0d8d18b5e80..71ef017b838 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -9,7 +9,6 @@
             <field name="code">CEA</field>
             <field name="parent_id" ref="hr_payroll.ALW"/>
         </record>
-
         <!-- Hr Salary Rules-->
 
         <record id="hr_salary_rule_da" model="hr.salary.rule">
@@ -20,8 +19,7 @@
             <field name="amount_percentage_base">contract.wage</field>
             <field name="amount_percentage" eval="50"/>
             <field name="sequence" eval="20"/>
-             <field name="note">
-DA is calculated in % 
+             <field name="note">DA is calculated in % 
 for more details:http://www.citehr.com/26809-how-calculate-dearness-allowance-da.html</field>
         </record>
 
@@ -32,9 +30,8 @@ for more details:http://www.citehr.com/26809-how-calculate-dearness-allowance-da
             <field name="amount_select">fix</field>
             <field name="condition_select">none</field>
             <field name="sequence" eval="21"/>
-            <field name="note"> 
-Per school going child 1200 per annum is non-taxable. 
- Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
+            <field name="note">Per school going child 1200 per annum is non-taxable. 
+Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
         </record>
 
         <record id="hr_payroll_rule_child1" model="hr.salary.rule">
@@ -50,14 +47,13 @@ Per school going child 1200 per annum is non-taxable.
 
 
         <record id="hr_salary_rule_special" model="hr.salary.rule">
-            <field name="code">MGMTA</field>
+            <field name="code">SA</field>
             <field name="name">Grade/Special/Management/Supplementary Allowance</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="28"/>
-            <field name="note">
-This allowance is normally given as an additional benefit to employees and is fully taxable.
+            <field name="note">This allowance is normally given as an additional benefit to employees and is fully taxable.
 for more details : http://www.rupeetalk.com/finance-basics/income-tax-basics/income-tax-guides/tax-implications-of-salary-components.php</field>
         </record>
 
@@ -99,8 +95,7 @@ for more details : http://www.rupeetalk.com/finance-basics/income-tax-basics/inc
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="30"/>
-             <field name="note">
-Generally arrears are fully taxable, but employee may claim exemption u/s 89(1). 
+             <field name="note">Generally arrears are fully taxable, but employee may claim exemption u/s 89(1). 
 One would need to compute income tax on the arrears if it would have been received in actual year.
 Now difference of income tax between payment year and actual year would be allowed for deduction.
 Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uurtGGGd</field>
@@ -112,10 +107,9 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="condition_select">none</field>
             <field name="amount_select">code</field>
-             <field name="amount_python_compute">result = (contract.wage + DA) * 15 * contract.No_of_year / worked_days.WORK100.number_of_days</field>
+             <field name="amount_python_compute">result = (contract.wage + DA) * 15 * contract.number_of_year / worked_days.WORK100.number_of_days</field>
             <field name="sequence" eval="500"/>
-            <field name="note">
-Covered under the Payment of Gratuity Act, 1971: 
+            <field name="note">Covered under the Payment of Gratuity Act, 1971: 
 (Last drawn monthly basic salary + dearness allowance)/26 x 15 days x 
 number of years of service (date of joining – date of retirement/leaving job)
             </field>
@@ -128,13 +122,7 @@ number of years of service (date of joining – date of retirement/leaving job)
             <field name="amount_select">fix</field>
             <field name="amount_fix">1666</field>
             <field name="sequence" eval="32"/>
-            <field name="note">
-As per Income tax rules of India, if transport bills for LTA are not provided,
-the amount will be taxed. E.g. If an employee has LTA allowance as Rs 50,000 
-in his CTC(cost to company),and he provides proofs of Rs 40,000 (boarding pass,
-air tickets, taxi vouchers) then income tax will be deducted for rest of the 
-Rs 10,000. Does not matter whats the amount of LTA in an employee’s package, 
-income tax laws only permits domestic air tickets only for LTA claim.
+            <field name="note">As per Income tax rules of India, if transport bills for LTA are not provided,the amount will be taxed. E.g. If an employee has LTA allowance as Rs 50,000 in his CTC(cost to company),and he provides proofs of Rs 40,000 (boarding pass,air tickets, taxi vouchers) then income tax will be deducted for rest of the Rs 10,000. Does not matter whats the amount of LTA in an employee’s package, income tax laws only permits domestic air tickets only for LTA claim.
 Read more: http://www.pankajbatra.com/news/lta-proof-reimbursement-to-employer-not-required-supreme-court-india-ruling/#ixzz1uutlHSez</field>
         </record>
 
@@ -146,11 +134,7 @@ Read more: http://www.pankajbatra.com/news/lta-proof-reimbursement-to-employer-n
             <field name="amount_select">fix</field>
             <field name="amount_fix">0.0</field>
             <field name="sequence" eval="33"/>
-            <field name="note"> 
-Payment by way of leave encashment received by Central and State Govt.
-employees at the time of retirement in respect of the period of earned 
-leave at credit is fully exempt. In case of other employees, the exemption 
-is to be limited to minimum of all below:
+            <field name="note">Payment by way of leave encashment received by Central and State Govt.employees at the time of retirement in respect of the period of earned leave at credit is fully exempt. In case of other employees, the exemption is to be limited to minimum of all below:
     1.The actual amount received
     2.The cash equivalent of leave balance (max 30 days per year of service)
     3.Maximum of 10 months of leave encashment, based on last 10 months average salary
@@ -186,10 +170,7 @@ is to be limited to minimum of all below:
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="36"/>
-            <field name="note">
-Some employers may provide component for buying magazines, 
-journals and books as a part of knowledge enhancement for 
-business growth.This part would become non taxable on providing original bills.</field>
+            <field name="note">Some employers may provide component for buying magazines, journals and books as a part of knowledge enhancement for business growth.This part would become non taxable on providing original bills.</field>
         </record>
 
         <record id="hr_salary_rule_uniform" model="hr.salary.rule">
@@ -199,9 +180,7 @@ business growth.This part would become non taxable on providing original bills.<
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="37"/>
-            <field name="note">
-Some sections of employees mat get allowance for purchase of office dress/uniform.
-In such case, the component would become non-taxable.</field>
+            <field name="note">Some sections of employees mat get allowance for purchase of office dress/uniform.In such case, the component would become non-taxable.</field>
         </record>
 
         <record id="hr_salary_rule_telephone" model="hr.salary.rule">
@@ -211,10 +190,7 @@ In such case, the component would become non-taxable.</field>
             <field name="amount_select">fix</field>
             <field name="amount_fix">1500</field>
             <field name="sequence" eval="38"/>
-            <field name="note">
-In some of the cases, companies may provide a component for telephone bills.
-Employees may provide actual phone usage bills to reimburse this component 
-and make it non-taxable.
+            <field name="note">In some of the cases, companies may provide a component for telephone bills.Employees may provide actual phone usage bills to reimburse this component and make it non-taxable.
 Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuvaUK7A
             </field>
         </record>
@@ -235,10 +211,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="amount_select">fix</field>
             <field name="amount_fix">1800</field>
             <field name="sequence" eval="39"/>
-            <field name="note">
-In case company provides component for this and employee use self owned car for official 
-and personal purposes, Rs 1800 per month would be non-taxable on showing bills for fuel or
-can maintenance. This amount would be Rs 2400 in case car is more capacity than 1600cc.
+            <field name="note">In case company provides component for this and employee use self owned car for official and personal purposes, Rs 1800 per month would be non-taxable on showing bills for fuel or can maintenance. This amount would be Rs 2400 in case car is more capacity than 1600cc.
 Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuw12Cjj</field>
         </record>
 
@@ -271,8 +244,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="42"/>
-            <field name="note">
-gift  gift is from non relatives person worth more than Rs.50000, 
+            <field name="note">Gift is from non relatives person worth more than Rs.50000, 
 one is liable to pay the tax what ever he received excess of the limit or Rs 50,000.</field>
         </record>
 
@@ -294,7 +266,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="amount_python_compute">result = contract.house_rent_income</field>
             <field name="condition_select">none</field>
             <field name="sequence" eval="44"/>
-            <field name="note">Income from house property.30% of the rental income can be reduced as a standard deduction</field>
+            <field name="note">Income from house property.30% of the rental income can be reduced as a standard deduction.</field>
         </record>
 
         <record id="hr_salary_rule_saving_bank" model="hr.salary.rule">
@@ -309,7 +281,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
         </record>
 
         <record id="hr_salary_trans_allownce" model="hr.salary.rule">
-            <field name="code">TA</field>
+            <field name="code">TCA</field>
             <field name="name">Transport/Conveyance Allownace</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
@@ -347,9 +319,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(contract.short_term_gain)</field>
             <field name="sequence" eval="46"/>
-            <field name="note">
-If stocks/equity mutual funds are sold before one year, 
-15% tax would be payable on such gains. STT should have been on transaction.
+            <field name="note">If stocks/equity mutual funds are sold before one year, 15% tax would be payable on such gains. STT should have been on transaction.
 Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuwSxEvI</field>
         </record>
 
@@ -362,11 +332,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(contract.long_term_gain)</field>
             <field name="sequence" eval="47"/>
-            <field name="note">
-If stocks/equity mutual funds are kept for more than a year before sale,
-it would be long term gains and such gains would be fully exempt from income tax. 
-Securities transaction tax (STT) must have been paid on transactions for availing 
-this exemption.
+            <field name="note">If stocks/equity mutual funds are kept for more than a year before sale,it would be long term gains and such gains would be fully exempt from income tax. Securities transaction tax (STT) must have been paid on transactions for availing this exemption.
 Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuwtRkCT</field>
         </record>
 
@@ -381,9 +347,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="amount_python_compute">result = -(contract.professional_tax)</field>
             <field eval="120" name="sequence"/>
             <field eval="False" name="appears_on_payslip"/>
-            <field name="note">
-Professional tax for company should be paid on or before 30th sept,
-The amount is Rs.2000 per year.There is no payment form to be filled. 
+            <field name="note">Professional tax for company should be paid on or before 30th sept,The amount is Rs.2000 per year.There is no payment form to be filled. 
 Read more: http://www.citehr.com/249518-companys-professional-tax-gujarat.html#ixzz1uuyvgt2L</field>
         </record>
 
@@ -396,12 +360,7 @@ Read more: http://www.citehr.com/249518-companys-professional-tax-gujarat.html#i
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = -(contract.tds)</field>
             <field name="sequence" eval="140"/>
-            <field name="note">
-As per income tax rules, all payment which are taxable in nature should be 
-done after deduction of taxes at the source itself. Hence employer compute 
-income tax on salary payment and deduct it every month. This TDS is based 
-on employee’s saving/investment declaration at the start of year. If investments 
-for tax saving is not done, large amount may be deducted in last few months.
+            <field name="note">As per income tax rules, all payment which are taxable in nature should be done after deduction of taxes at the source itself. Hence employer compute income tax on salary payment and deduct it every month. This TDS is based on employee’s saving/investment declaration at the start of year. If investments for tax saving is not done, large amount may be deducted in last few months.
 Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uv0gPhgQ</field>
         </record>
 
@@ -414,17 +373,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = -(contract.wage + DA) * contract.voluntarily_provident_fund / 100 </field>
             <field name="sequence" eval="130"/>
-            <field name="note">
-VPF is a safe option wherein you can contribute more than the PF ceiling of 12% 
-that has been mandated by the government. This additional amount enjoys all the 
-benefits of PF except that the employer is not liable to contribute any extra amount 
-apart from 12%. An added advantage is that the interest rate is equal to the interest 
-rate of PF and the withdrawal is tax free. Please note that the maximum contribution 
-towards VPF is 100% of your Basic. The highest rate of interest (close to 9%) makes 
-it a very attractive saving scheme. Because of these advantages many  employees chose 
-not to close their PF account even after getting employment else where other than India. 
-Employees also get a major tax break on their entire contribution to the fund up to a 
-ceiling of Rs. 70,000/-
+            <field name="note">VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government.This additional amount enjoys all the benefits of PF except that the employer is not liable to contribute any extra amount apart from 12%.An added advantage is that the interest rate is equal to the interest rate of PF and he withdrawal is tax free. Please note that the maximum contribution towards VPF is 100% of your Basic.The highest rate of interest (close to 9%) makes it a very attractive saving scheme. Because of these advantages many employees chose not to close their PF account even after getting employment else where other than India.Employees also get a major tax break on their entire contribution to the fund up to a ceiling of Rs. 70,000/-
 read more: more:http://www.dotcominfoway.com/blog/vpf-or-voluntary-provident-fund-special-benefits-for-employees</field>
         </record>
 
@@ -446,13 +395,7 @@ read more: more:http://www.dotcominfoway.com/blog/vpf-or-voluntary-provident-fun
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="160"/>
-            <field name="note">
-The LWF is applicable to all the members of the organisation except the 
-Management staff (Staffs having authority to sign on the cheque/official 
-documents on behalf of the organisation). 
-for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 
-Total Rs 9.00 and deposited to the LWF office.
-It is half yearly contribution (June and December) 
+            <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December) 
 read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.html</field>
         </record>
 
@@ -498,7 +441,7 @@ read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.htm
         </record>
 
         <record id="hr_payslip_rule_epc" model="hr.salary.rule">
-            <field name="code">EPC</field>
+            <field name="code">EPF</field>
             <field name="name">Employer's PF Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
@@ -507,7 +450,7 @@ read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.htm
         </record>
         
         <record id="hr_payslip_rule_empPF" model="hr.salary.rule">
-            <field name="code">EPFC</field>
+            <field name="code">EPMF</field>
             <field name="name">Employee's PF Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index b6096873748..6e8ad07d37c 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -12,7 +12,7 @@
             <data>
                  <xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
                     <field name="food_coupon_amount"/>
-                    <field name="No_of_year"/>
+                    <field name="number_of_year"/>
                  <group col="2" colspan="2" name="right_column">
                     <separator colspan="2" string="Allowance"/>
                         <field name="short_term_gain"/>
@@ -35,6 +35,18 @@
             </data>
             </field>
         </record>
-
+        <record id="hr_employee_form_inherit" model="ir.ui.view">
+            <field name="name">hr.employee.form.inherit</field>
+            <field name="model">hr.employee</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+            <data>
+                 <xpath expr="//field[@name='job_id']" position="after">
+                    <field name="join_date"/>
+                 </xpath>
+            </data>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
index f18a77cd01b..0015ef665b0 100644
--- a/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
+++ b/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
@@ -1,3 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_salary_head","hr.salary.head","model_hr_salary_head","base.group_hr_user",1,1,1,1
 "access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_user",1,1,1,1

From 5f3e8f9c92c0c3b5db05fafd9db24ed36754afd9 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 23 May 2012 11:42:03 +0530
Subject: [PATCH 052/999] [IMP]improved salary rule for child hostel allowance.

bzr revid: kbh@tinyerp.com-20120523061203-rwgfx6opd07t1r9g
---
 addons/l10n_in_hr_payroll/data/hr.salary.rule.csv     |  3 +++
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py       |  4 ++--
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml | 11 +++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
index b41229965c8..8a563d762e4 100644
--- a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
+++ b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
@@ -2,4 +2,7 @@
 1,"fix",1,1,,1200,"Education Allowance","Child Education Allowance",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
 2,"fix",2,10,,2400,"Education Allowance","Child Education Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
 ,,,,,,,,,,,,,
+3,"fix",1,1,,300,"Child Hostel Allowance","Child Education Allowance",26,"CHOONE","hr_payroll_rule_child2","range","employee.children",
+4,"fix",2,10,,600,"Child Hostel Allowance","Child Education Allowance",27,"CHOTWO","hr_payroll_rule_child2","range","employee.children",
+
 ,,,,,,,,,,,,,
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 3e3fcaa0006..3ec0d50cf0a 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -59,8 +59,8 @@ class hr_contract_in(osv.osv):
                      year_month= float(total_months)/10 + float(total_years)
                      res[contract.id] = year_month
                 else:
-                         year_months = float(total_months)/100 + float(total_years)
-                         res[contract.id] = year_months
+                    year_months = float(total_months)/100 + float(total_years)
+                    res[contract.id] = year_months
         return res
 
     _columns = {
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index 71ef017b838..77124d8c419 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -45,6 +45,17 @@ Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
             <field name="sequence" eval="22"/>
         </record>
 
+        <record id="hr_payroll_rule_child2" model="hr.salary.rule">
+             <field name="code">CHEAH</field>
+             <field name="name">Child Hostel Allowance</field>
+             <field name="category_id" ref="hr_payroll.ALW"/>
+             <field name="parent_rule_id" ref="hr_payroll_rule_child_edu"/>
+             <field name="condition_select">python</field>
+             <field name="condition_python">result = bool(employee.children)</field>
+             <field name="amount_select">fix</field>
+             <field name="note">In case the children are in hostel, the exemption available is Rs.300 per month per child for up to 2 children.</field>
+             <field name="sequence" eval="25"/>
+         </record>
 
         <record id="hr_salary_rule_special" model="hr.salary.rule">
             <field name="code">SA</field>

From 48e4dd20ce7486251721e7182e24667026984924 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 23 May 2012 12:24:47 +0530
Subject: [PATCH 053/999] [IMP]removed unnecessary category of salary
 rule,changed category_id  for child allowance.

bzr revid: kbh@tinyerp.com-20120523065447-cl7f1xuav7z9p1uj
---
 addons/l10n_in_hr_payroll/data/hr.salary.rule.csv     | 8 ++++----
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml | 7 -------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
index 8a563d762e4..0877a73d02a 100644
--- a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
+++ b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
@@ -1,8 +1,8 @@
 "id","amount_select","condition_range_min","condition_range_max","amount_percentage","amount_fix","name","category_id","sequence","code","parent_rule_id/id","condition_select","condition_range","amount_percentage_base"
-1,"fix",1,1,,1200,"Education Allowance","Child Education Allowance",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
-2,"fix",2,10,,2400,"Education Allowance","Child Education Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
+1,"fix",1,1,,1200,"Education Allowance","Allowance",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
+2,"fix",2,10,,2400,"Education Allowance","Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
 ,,,,,,,,,,,,,
-3,"fix",1,1,,300,"Child Hostel Allowance","Child Education Allowance",26,"CHOONE","hr_payroll_rule_child2","range","employee.children",
-4,"fix",2,10,,600,"Child Hostel Allowance","Child Education Allowance",27,"CHOTWO","hr_payroll_rule_child2","range","employee.children",
+3,"fix",1,1,,300,"Child Hostel Allowance","Allowance",26,"CHOONE","hr_payroll_rule_child2","range","employee.children",
+4,"fix",2,10,,600,"Child Hostel Allowance","Allowance",27,"CHOTWO","hr_payroll_rule_child2","range","employee.children",
 
 ,,,,,,,,,,,,,
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index 77124d8c419..56d6f97f98c 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -2,13 +2,6 @@
 <openerp>
     <data>
 
-        <!-- Hr Salary Rules Categories-->
-
-        <record id="CEA" model="hr.salary.rule.category">
-            <field name="name">Child Education Allowance</field>
-            <field name="code">CEA</field>
-            <field name="parent_id" ref="hr_payroll.ALW"/>
-        </record>
         <!-- Hr Salary Rules-->
 
         <record id="hr_salary_rule_da" model="hr.salary.rule">

From c6410d12582767019039c4d0db072d3415112b79 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 23 May 2012 12:59:45 +0530
Subject: [PATCH 054/999] [IMP]improve method for gratuity rule.

bzr revid: kbh@tinyerp.com-20120523072945-2gtphj2fageseg7g
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 57 +++++++++----------
 .../l10n_in_hr_payroll_data.xml               |  2 +-
 .../l10n_in_hr_payroll_view.xml               |  2 +-
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 3ec0d50cf0a..e4b485a08aa 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -31,6 +31,28 @@ from epsilon.hotfix import require
 
 class hr_contract_in(osv.osv):
     _inherit = 'hr.contract'
+
+    _columns = {
+        'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll')),
+        'house_rent_income': fields.float('House Rent Income ', digits_compute=dp.get_precision('Payroll'),help="Income from house property."),
+        'saving_bank_account': fields.float('Saving Bank Account Income ', digits_compute=dp.get_precision('Payroll'),help="Saving income for bank account."),
+        'other_income': fields.float('Other Income ', digits_compute=dp.get_precision('Payroll'),help="Other income of employee."),
+        'short_term_gain':fields.float('Short Term Gain from Share Trading/Equity MFs ', digits_compute=dp.get_precision('Payroll'),help="Stocks/equity mutual funds are sold before one year."),
+        'long_term_gain':fields.float('Long Term Gain from Share Trading/Equity MFs', digits_compute=dp.get_precision('Payroll'),help="Stocks/equity mutual funds are kept for more than a year."),
+        'food_coupon_amount': fields.float('Food Coupons ', digits_compute=dp.get_precision('Payroll'),help="Amount of food coupon per day."),
+        'driver_salay': fields.boolean('Driver Salary',help="If checked,driver get fixed salary per month."),
+        'professional_tax': fields.float('Professional Tax ', digits_compute=dp.get_precision('Payroll'),help="Professional tax deducted from salary"),
+        'leave_avail_dedution': fields.float('Leave Availed Deduction ', digits_compute=dp.get_precision('Payroll'),help="Deduction for emergency leave of employee."),
+        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'),help="Deduction towards company provided medical insurance."), 
+        'voluntarily_provident_fund': fields.float('Voluntarily Provident Fund', digits_compute=dp.get_precision('Payroll'),help="VPF computed as percentage.(%)"), 
+        'company_transport': fields.float('Company Provided Transport', digits_compute=dp.get_precision('Payroll'),help="Deduction for company provided transport."), 
+    }
+
+hr_contract_in()
+
+
+class hr_employee(osv.osv):
+    _inherit = 'hr.employee'
     
     def _compute_year(self, cr, uid, ids, fields, args, context=None):
         """
@@ -44,9 +66,7 @@ class hr_contract_in(osv.osv):
         c_date = time.strftime('%Y-%m-%d')
         DATETIME_FORMAT = "%Y-%m-%d"
         current_date = datetime.strptime(c_date,DATETIME_FORMAT)
-        employee_pool = self.pool.get('hr.employee')
-        for contract in self.browse(cr, uid, ids, context):
-            employee = employee_pool.browse(cr, uid, contract.employee_id.id, context=context)
+        for employee in self.browse(cr, uid, ids, context):
             if employee.join_date:
                 date_start = datetime.strptime(employee.join_date, DATETIME_FORMAT)
                 diffyears = current_date.year - date_start.year
@@ -57,36 +77,15 @@ class hr_contract_in(osv.osv):
                 total_months = relativedelta(current_date, date_start).months
                 if total_months < 10:
                      year_month= float(total_months)/10 + float(total_years)
-                     res[contract.id] = year_month
+                     res[employee.id] = year_month
                 else:
                     year_months = float(total_months)/100 + float(total_years)
-                    res[contract.id] = year_months
+                    res[employee.id] = year_months
         return res
-
+    
     _columns = {
-        'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll')),
-        'house_rent_income': fields.float('House Rent Income ', digits_compute=dp.get_precision('Payroll'),help="Income from house property."),
-        'saving_bank_account': fields.float('Saving Bank Account Income ', digits_compute=dp.get_precision('Payroll'),help="saving income for bank account."),
-        'other_income': fields.float('Other Income ', digits_compute=dp.get_precision('Payroll'),help="Other income of employee."),
-        'short_term_gain':fields.float('Short Term Gain from Share Trading/Equity MFs ', digits_compute=dp.get_precision('Payroll'),help="stocks/equity mutual funds are sold before one year."),
-        'long_term_gain':fields.float('Long Term Gain from Share Trading/Equity MFs', digits_compute=dp.get_precision('Payroll'),help="stocks/equity mutual funds are kept for more than a year."),
-        'food_coupon_amount': fields.float('Food Coupons ', digits_compute=dp.get_precision('Payroll'),help="amount of food coupon per day"),
-        'driver_salay': fields.boolean('Driver salary',help="if checked,driver get fixed salary per month."),
-        'professional_tax': fields.float('Professional Tax ', digits_compute=dp.get_precision('Payroll'),help="Professional tax deducted from salary"),
-        'leave_avail_dedution': fields.float('leave availed deduction ', digits_compute=dp.get_precision('Payroll'),help="emergency leave of employee"),
-        'number_of_year':fields.function(_compute_year, string='No. of Years of service',type="float",help="Total number of years and months of employee has work in company",store=True),
-        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'),help="Deduction towards company provided medical insurance"), 
-        'voluntarily_provident_fund': fields.float('Voluntarily Provident Fund', digits_compute=dp.get_precision('Payroll'),help="VPF computed as percentage.(%)"), 
-        'company_transport': fields.float('Company provided transport', digits_compute=dp.get_precision('Payroll'),help="Deduction for company provided transport."), 
-    }
-
-hr_contract_in()
-
-
-class hr_employee(osv.osv):
-    _inherit = 'hr.employee'
-    _columns = {
-        'join_date': fields.date('Join date',help="join date of employee in company",required=True)
+        'join_date': fields.date('Join Date',help="joining date of employee "),
+        'number_of_year':fields.function(_compute_year, string='No. of Years of Service',type="float",help="Total years of work experience.",store=True),
                 }
 hr_employee()
 
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index 56d6f97f98c..03f4fc164f4 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -111,7 +111,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="condition_select">none</field>
             <field name="amount_select">code</field>
-             <field name="amount_python_compute">result = (contract.wage + DA) * 15 * contract.number_of_year / worked_days.WORK100.number_of_days</field>
+             <field name="amount_python_compute">result = (contract.wage + DA) * 15 * employee.number_of_year / worked_days.WORK100.number_of_days</field>
             <field name="sequence" eval="500"/>
             <field name="note">Covered under the Payment of Gratuity Act, 1971: 
 (Last drawn monthly basic salary + dearness allowance)/26 x 15 days x 
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 6e8ad07d37c..750965d09ce 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -12,7 +12,6 @@
             <data>
                  <xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
                     <field name="food_coupon_amount"/>
-                    <field name="number_of_year"/>
                  <group col="2" colspan="2" name="right_column">
                     <separator colspan="2" string="Allowance"/>
                         <field name="short_term_gain"/>
@@ -44,6 +43,7 @@
             <data>
                  <xpath expr="//field[@name='job_id']" position="after">
                     <field name="join_date"/>
+                    <field name="number_of_year"/>
                  </xpath>
             </data>
             </field>

From b7e6823cf6e0fc73a1b356a3821a1916e8365fb8 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 23 May 2012 14:33:31 +0530
Subject: [PATCH 055/999] [IMP]remove unnessesary import and variable.

bzr revid: kbh@tinyerp.com-20120523090331-gibnbltx5a5nvhli
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index e4b485a08aa..9e74c925d01 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -19,15 +19,12 @@
 #
 ##############################################################################
 
-from osv import fields, osv
-import decimal_precision as dp
-
 import time
 from datetime import datetime, timedelta, date
 from calendar import isleap
 from dateutil.relativedelta import relativedelta
-from bsddb.dbtables import _columns
-from epsilon.hotfix import require
+from osv import fields, osv
+import decimal_precision as dp
 
 class hr_contract_in(osv.osv):
     _inherit = 'hr.contract'
@@ -77,10 +74,9 @@ class hr_employee(osv.osv):
                 total_months = relativedelta(current_date, date_start).months
                 if total_months < 10:
                      year_month= float(total_months)/10 + float(total_years)
-                     res[employee.id] = year_month
                 else:
-                    year_months = float(total_months)/100 + float(total_years)
-                    res[employee.id] = year_months
+                    year_month = float(total_months)/100 + float(total_years)
+                res[employee.id] = year_month
         return res
     
     _columns = {

From 2672c529790c48faef2abb771640c6c03d1f60e8 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 23 May 2012 17:42:10 +0530
Subject: [PATCH 056/999] [IMP]improved method for gratuity,added House rent
 Allowance rule and food coupon rule,added Contribution Register.

bzr revid: kbh@tinyerp.com-20120523121210-qy0sv0xq2be1v7gw
---
 addons/hr_payroll/hr_payroll_demo.xml         | 56 -----------------
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 43 +++++++------
 .../l10n_in_hr_payroll_data.xml               | 62 ++++++++++++++++++-
 .../l10n_in_hr_payroll_view.xml               |  2 +-
 4 files changed, 85 insertions(+), 78 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 7fd266c628b..76189c85306 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -4,10 +4,6 @@
 
         <!-- Contribution Register -->
 
-        <record id="hr_houserent_register" model="hr.contribution.register">
-            <field name="name">House Rent Allowance Register</field>
-        </record>
-
         <record id="hr_provident_fund_register" model="hr.contribution.register">
             <field name="name">Provident Fund Register</field>
         </record>
@@ -16,46 +12,8 @@
             <field name="name">Professional Tax Register</field>
         </record>
 
-        <record id="hr_food_coupon_register" model="hr.contribution.register">
-            <field name="name">Food coupon Register</field>
-        </record>
-
         <!-- Salary Rules -->
 
-        <record id="hr_salary_rule_houserentallowancemetro" model="hr.salary.rule">
-            <field name="code">HRAM</field>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = (contract.wage + DA) * 0.50</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="register_id" ref="hr_houserent_register"/>
-            <field name="name">House Rent Allowance for metro city</field>
-            <field name="sequence" eval="80"/>
-            <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
-Income tax exemption for HRA will be least of following:
-    1. The actual amount of HRA received as a part of salary.
-    2. 40% (if living in non-metro area).
-    3. Rent paid minus 10% of (basic salary+DA).
-    Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1upoomH73
-            </field>
-        </record>
-
-        <record id="hr_salary_rule_houserentallowancenonmetro" model="hr.salary.rule">
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = (contract.wage + DA) * 0.40</field>
-            <field name="code">HRANM</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="register_id" ref="hr_houserent_register"/>
-            <field name="name">House Rent Allowance for non metro city</field>
-            <field name="sequence" eval="79"/>
-            <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
-Income tax exemption for HRA will be least of following:
-    1. The actual amount of HRA received as a part of salary.
-    2. 50% (if living in metro area) of (basic salary+Dearness allowance (DA)).
-    3. Rent paid minus 10% of (basic salary+DA).
-    Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1upoomH73
-             </field>
-         </record>
-
         <record id="hr_salary_rule_convanceallowance1" model="hr.salary.rule">
             <field name="amount_select">fix</field>
             <field eval="800.0" name="amount_fix"/>
@@ -97,20 +55,6 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="sequence" eval="15"/>
         </record>
 
-        <record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
-            <field name="amount_select">code</field>
-            <field eval="10" name="amount_fix"/>
-            <field name="quantity">worked_days.WORK100.number_of_days</field>
-            <field name="code">FC</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="register_id" ref="hr_food_coupon_register"/>
-            <field name="condition_select">python</field>
-            <field name="condition_python">result = bool(contract.food_coupon_amount)</field>
-            <field name="name">Food Coupons</field>
-            <field name="amount_python_compute">result = worked_days.WORK100.number_of_days * contract.food_coupon_amount</field>
-            <field name="sequence" eval="16"/>
-         </record>
-
         <record id="hr_salary_rule_sales_commission" model="hr.salary.rule">
             <field name="amount_select">code</field>
             <field name="code">SALE</field>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 9e74c925d01..bb149ba4b19 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -20,29 +20,31 @@
 ##############################################################################
 
 import time
-from datetime import datetime, timedelta, date
+from datetime import datetime, timedelta
 from calendar import isleap
 from dateutil.relativedelta import relativedelta
+
 from osv import fields, osv
 import decimal_precision as dp
 
 class hr_contract_in(osv.osv):
     _inherit = 'hr.contract'
-
+    _description = 'contract'
+    
     _columns = {
         'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll')),
-        'house_rent_income': fields.float('House Rent Income ', digits_compute=dp.get_precision('Payroll'),help="Income from house property."),
-        'saving_bank_account': fields.float('Saving Bank Account Income ', digits_compute=dp.get_precision('Payroll'),help="Saving income for bank account."),
-        'other_income': fields.float('Other Income ', digits_compute=dp.get_precision('Payroll'),help="Other income of employee."),
-        'short_term_gain':fields.float('Short Term Gain from Share Trading/Equity MFs ', digits_compute=dp.get_precision('Payroll'),help="Stocks/equity mutual funds are sold before one year."),
-        'long_term_gain':fields.float('Long Term Gain from Share Trading/Equity MFs', digits_compute=dp.get_precision('Payroll'),help="Stocks/equity mutual funds are kept for more than a year."),
-        'food_coupon_amount': fields.float('Food Coupons ', digits_compute=dp.get_precision('Payroll'),help="Amount of food coupon per day."),
-        'driver_salay': fields.boolean('Driver Salary',help="If checked,driver get fixed salary per month."),
-        'professional_tax': fields.float('Professional Tax ', digits_compute=dp.get_precision('Payroll'),help="Professional tax deducted from salary"),
-        'leave_avail_dedution': fields.float('Leave Availed Deduction ', digits_compute=dp.get_precision('Payroll'),help="Deduction for emergency leave of employee."),
-        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'),help="Deduction towards company provided medical insurance."), 
-        'voluntarily_provident_fund': fields.float('Voluntarily Provident Fund', digits_compute=dp.get_precision('Payroll'),help="VPF computed as percentage.(%)"), 
-        'company_transport': fields.float('Company Provided Transport', digits_compute=dp.get_precision('Payroll'),help="Deduction for company provided transport."), 
+        'house_rent_income': fields.float('House Rent Income ', digits_compute=dp.get_precision('Payroll'), help="Income from house property."),
+        'saving_bank_account': fields.float('Saving Bank Account Income ', digits_compute=dp.get_precision('Payroll'), help="Saving income for bank account."),
+        'other_income': fields.float('Other Income ', digits_compute=dp.get_precision('Payroll'), help="Other income of employee."),
+        'short_term_gain':fields.float('Short Term Gain from Share Trading/Equity MFs ', digits_compute=dp.get_precision('Payroll'), help="Stocks/equity mutual funds are sold before one year."),
+        'long_term_gain':fields.float('Long Term Gain from Share Trading/Equity MFs', digits_compute=dp.get_precision('Payroll'), help="Stocks/equity mutual funds are kept for more than a year."),
+        'food_coupon_amount': fields.float('Food Coupons ', digits_compute=dp.get_precision('Payroll'), help="Amount of food coupon per day."),
+        'driver_salay': fields.boolean('Driver Salary', help=" Allowance for company provided driver."),
+        'professional_tax': fields.float('Professional Tax ', digits_compute=dp.get_precision('Payroll'), help="Professional tax deducted from salary"),
+        'leave_avail_dedution': fields.float('Leave Availed Deduction ', digits_compute=dp.get_precision('Payroll'), help="Deduction for emergency leave of employee."),
+        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance."), 
+        'voluntary_provident_fund': fields.float('Voluntary Provident Fund', digits_compute=dp.get_precision('Payroll'), help="VPF computed as percentage.(%)"), 
+        'company_transport': fields.float('Company Provided Transport', digits_compute=dp.get_precision('Payroll'), help="Deduction for company provided transport."), 
     }
 
 hr_contract_in()
@@ -50,7 +52,8 @@ hr_contract_in()
 
 class hr_employee(osv.osv):
     _inherit = 'hr.employee'
-    
+    _description = 'employee'
+
     def _compute_year(self, cr, uid, ids, fields, args, context=None):
         """
         @param cr: the current row, from the database cursor,
@@ -63,7 +66,7 @@ class hr_employee(osv.osv):
         c_date = time.strftime('%Y-%m-%d')
         DATETIME_FORMAT = "%Y-%m-%d"
         current_date = datetime.strptime(c_date,DATETIME_FORMAT)
-        for employee in self.browse(cr, uid, ids, context):
+        for employee in self.browse(cr, uid, ids, context=context):
             if employee.join_date:
                 date_start = datetime.strptime(employee.join_date, DATETIME_FORMAT)
                 diffyears = current_date.year - date_start.year
@@ -73,15 +76,15 @@ class hr_employee(osv.osv):
                 total_years = relativedelta(current_date, date_start).years
                 total_months = relativedelta(current_date, date_start).months
                 if total_months < 10:
-                     year_month= float(total_months)/10 + float(total_years)
+                    year_month= float(total_months)/10 + total_years
                 else:
-                    year_month = float(total_months)/100 + float(total_years)
+                    year_month = float(total_months)/100 + total_years
                 res[employee.id] = year_month
         return res
     
     _columns = {
-        'join_date': fields.date('Join Date',help="joining date of employee "),
-        'number_of_year':fields.function(_compute_year, string='No. of Years of Service',type="float",help="Total years of work experience.",store=True),
+        'join_date': fields.date('Join Date', help="joining date of employee "),
+        'number_of_year':fields.function(_compute_year, string='No. of Years of Service', type="float", help="Total years of work experience."),
                 }
 hr_employee()
 
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index 03f4fc164f4..203a6a9c82d 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -1,9 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <!-- Contribution Register -->
+
+        <record id="hr_houserent_register" model="hr.contribution.register">
+            <field name="name">House Rent Allowance Register</field>
+        </record>
+
+        <record id="hr_food_coupon_register" model="hr.contribution.register">
+            <field name="name">Food coupon Register</field>
+        </record>
 
         <!-- Hr Salary Rules-->
 
+        <record id="hr_salary_rule_houserentallowancemetro" model="hr.salary.rule">
+            <field name="code">HRAM</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (contract.wage + DA) * 0.50</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="register_id" ref="hr_houserent_register"/>
+            <field name="name">House Rent Allowance for metro city</field>
+            <field name="sequence" eval="80"/>
+            <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
+Income tax exemption for HRA will be least of following:
+    1. The actual amount of HRA received as a part of salary.
+    2. 40% (if living in non-metro area).
+    3. Rent paid minus 10% of (basic salary+DA).
+    Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1upoomH73
+            </field>
+        </record>
+
+        <record id="hr_salary_rule_houserentallowancenonmetro" model="hr.salary.rule">
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (contract.wage + DA) * 0.40</field>
+            <field name="code">HRANM</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="register_id" ref="hr_houserent_register"/>
+            <field name="name">House Rent Allowance for non metro city</field>
+            <field name="sequence" eval="79"/>
+            <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
+Income tax exemption for HRA will be least of following:
+    1. The actual amount of HRA received as a part of salary.
+    2. 50% (if living in metro area) of (basic salary+Dearness allowance (DA)).
+    3. Rent paid minus 10% of (basic salary+DA).
+    Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1upoomH73
+             </field>
+         </record>
+
+        <record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
+            <field name="amount_select">code</field>
+            <field eval="10" name="amount_fix"/>
+            <field name="quantity">worked_days.WORK100.number_of_days</field>
+            <field name="code">FC</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="register_id" ref="hr_food_coupon_register"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.food_coupon_amount)</field>
+            <field name="name">Food Coupons</field>
+            <field name="amount_python_compute">result = worked_days.WORK100.number_of_days * contract.food_coupon_amount</field>
+            <field name="sequence" eval="16"/>
+         </record>
+
         <record id="hr_salary_rule_da" model="hr.salary.rule">
             <field name="code">DA</field>
             <field name="name">Dearness Allowance</field>
@@ -451,6 +508,7 @@ read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.htm
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = - (contract.wage + DA) * 0.12</field>
             <field name="sequence" eval="122"/>
+            <field name="note">Both the employees and employer contribute to the fund at the rate of 12% of the basic wages, dearness allowance and retaining allowance, if any, payable to employees per month.</field>
         </record>
         
         <record id="hr_payslip_rule_empPF" model="hr.salary.rule">
@@ -459,6 +517,7 @@ read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.htm
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = - (contract.wage + DA) * 8.33 / 100</field>
+            <field name= "note">Employer contribution does not become part of employee’s income and hence income tax is not payable on this part.</field>
             <field name="sequence" eval="123"/>
         </record>
         
@@ -469,6 +528,7 @@ read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.htm
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = - (contract.wage + DA) * 0.10</field>
             <field name="sequence" eval="126"/>
+            <field name= "note">Any amount contributed by your employer to your NPS account is treated as part of your salary and is included in your income but you can claim deduction under Section 80C for this too.thus, effectively making it exempt from tax within the limit of 10% of your basic salary. This is very useful and tax efficient for you particularly if you fall in the maximum tax.</field>
         </record>
         
         <record id="hr_payslip_rule_empNPF" model="hr.salary.rule">
@@ -478,8 +538,8 @@ read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.htm
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = - (contract.wage + DA) * 0.10</field>
             <field name="sequence" eval="125"/>
+            <field name="note">Employee can claim deduction even of employer's contribution to NPS.</field>
         </record>
-        
 
     </data>
 </openerp>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 750965d09ce..d6b8eb02724 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -25,7 +25,7 @@
                     <separator colspan="2" string="Deduction"/>
                         <field name="professional_tax"/>
                         <field name="tds"/>
-                        <field name="voluntarily_provident_fund"/>
+                        <field name="voluntary_provident_fund"/>
                         <field name="company_transport"/>
                         <field name="leave_avail_dedution"/>
                         <field name="medical_insurance"/>

From dc6e8fa90423afe2766355d2c2ed4f4f153ba102 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 23 May 2012 19:05:05 +0530
Subject: [PATCH 057/999] [IMP]improved method for gratuity,added House rent
 Allowance rule and food coupon rule,added Contribution Register.

bzr revid: kbh@tinyerp.com-20120523133505-v6pvrvo25q9ur5kv
---
 addons/hr_payroll/hr_payroll_demo.xml         | 27 +++++++-
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  |  2 +
 .../l10n_in_hr_payroll_data.xml               | 61 +++++--------------
 3 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 76189c85306..e7ab610b8bb 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -4,6 +4,10 @@
 
         <!-- Contribution Register -->
 
+        <record id="hr_houserent_register" model="hr.contribution.register">
+            <field name="name">House Rent Allowance Register</field>
+        </record>
+
         <record id="hr_provident_fund_register" model="hr.contribution.register">
             <field name="name">Provident Fund Register</field>
         </record>
@@ -12,8 +16,28 @@
             <field name="name">Professional Tax Register</field>
         </record>
 
+       <record id="hr_meal_voucher_register" model="hr.contribution.register">
+            <field name="name">Meal Voucher Register</field>
+        </record>
+
         <!-- Salary Rules -->
 
+        <record id="hr_salary_rule_houserentallowance1" model="hr.salary.rule">
+            <field name="name">House Rent Allowance</field>
+             <field name="amount_select">percentage</field>
+             <field eval="40.0" name="amount_percentage"/>
+             <field name="amount_percentage_base">contract.wage</field>
+             <field name="code">HRA</field>
+             <field name="category_id" ref="hr_payroll.ALW"/>
+             <field name="register_id" ref="hr_houserent_register"/>
+             <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
+Income tax exemption for HRA will be least of following:
+    1. The actual amount of HRA received as a part of salary.
+    2. 50% (if living in metro area) of (basic salary+Dearness allowance (DA)).
+    3. Rent paid minus 10% of (basic salary+DA).
+             </field>
+        </record>
+
         <record id="hr_salary_rule_convanceallowance1" model="hr.salary.rule">
             <field name="amount_select">fix</field>
             <field eval="800.0" name="amount_fix"/>
@@ -31,8 +55,7 @@
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="register_id" ref="hr_professional_tax_register"/>
             <field name="name">Professional Tax</field>
-            <field name="note">Professional tax deducted from salary by employer should be removed from taxable salary before computation of income tax.
-Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uugbJcaM</field>
+            <field name="note">Professional tax deducted from salary by employer should be removed from taxable salary before computation of income tax.</field>
         </record>
 
         <record id="hr_salary_rule_providentfund1" model="hr.salary.rule">
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index bb149ba4b19..9444afd74e0 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -80,6 +80,8 @@ class hr_employee(osv.osv):
                 else:
                     year_month = float(total_months)/100 + total_years
                 res[employee.id] = year_month
+            else:
+                res[employee.id] = 0.0
         return res
     
     _columns = {
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index 203a6a9c82d..7afd6eecba1 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- Contribution Register -->
-
-        <record id="hr_houserent_register" model="hr.contribution.register">
-            <field name="name">House Rent Allowance Register</field>
-        </record>
-
-        <record id="hr_food_coupon_register" model="hr.contribution.register">
-            <field name="name">Food coupon Register</field>
-        </record>
-
         <!-- Hr Salary Rules-->
 
         <record id="hr_salary_rule_houserentallowancemetro" model="hr.salary.rule">
@@ -18,7 +8,6 @@
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = (contract.wage + DA) * 0.50</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="register_id" ref="hr_houserent_register"/>
             <field name="name">House Rent Allowance for metro city</field>
             <field name="sequence" eval="80"/>
             <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
@@ -26,7 +15,6 @@ Income tax exemption for HRA will be least of following:
     1. The actual amount of HRA received as a part of salary.
     2. 40% (if living in non-metro area).
     3. Rent paid minus 10% of (basic salary+DA).
-    Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1upoomH73
             </field>
         </record>
 
@@ -35,7 +23,6 @@ Income tax exemption for HRA will be least of following:
             <field name="amount_python_compute">result = (contract.wage + DA) * 0.40</field>
             <field name="code">HRANM</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="register_id" ref="hr_houserent_register"/>
             <field name="name">House Rent Allowance for non metro city</field>
             <field name="sequence" eval="79"/>
             <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
@@ -43,20 +30,19 @@ Income tax exemption for HRA will be least of following:
     1. The actual amount of HRA received as a part of salary.
     2. 50% (if living in metro area) of (basic salary+Dearness allowance (DA)).
     3. Rent paid minus 10% of (basic salary+DA).
-    Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1upoomH73
              </field>
          </record>
 
+
         <record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
             <field name="amount_select">code</field>
             <field eval="10" name="amount_fix"/>
             <field name="quantity">worked_days.WORK100.number_of_days</field>
             <field name="code">FC</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="register_id" ref="hr_food_coupon_register"/>
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(contract.food_coupon_amount)</field>
-            <field name="name">Food Coupons</field>
+            <field name="name">Food Coupons Allowance</field>
             <field name="amount_python_compute">result = worked_days.WORK100.number_of_days * contract.food_coupon_amount</field>
             <field name="sequence" eval="16"/>
          </record>
@@ -69,8 +55,7 @@ Income tax exemption for HRA will be least of following:
             <field name="amount_percentage_base">contract.wage</field>
             <field name="amount_percentage" eval="50"/>
             <field name="sequence" eval="20"/>
-             <field name="note">DA is calculated in % 
-for more details:http://www.citehr.com/26809-how-calculate-dearness-allowance-da.html</field>
+             <field name="note">DA is calculated in %</field>
         </record>
 
         <record id="hr_payroll_rule_child_edu" model="hr.salary.rule">
@@ -114,8 +99,7 @@ Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="28"/>
-            <field name="note">This allowance is normally given as an additional benefit to employees and is fully taxable.
-for more details : http://www.rupeetalk.com/finance-basics/income-tax-basics/income-tax-guides/tax-implications-of-salary-components.php</field>
+            <field name="note">This allowance is normally given as an additional benefit to employees and is fully taxable.</field>
         </record>
 
         <record id="hr_payroll_rule_city1" model="hr.salary.rule">
@@ -156,10 +140,9 @@ for more details : http://www.rupeetalk.com/finance-basics/income-tax-basics/inc
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="30"/>
-             <field name="note">Generally arrears are fully taxable, but employee may claim exemption u/s 89(1). 
+            <field name="note">Generally arrears are fully taxable, but employee may claim exemption u/s 89(1). 
 One would need to compute income tax on the arrears if it would have been received in actual year.
-Now difference of income tax between payment year and actual year would be allowed for deduction.
-Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uurtGGGd</field>
+Now difference of income tax between payment year and actual year would be allowed for deduction.</field>
         </record>
 
         <record id="hr_salary_rule_gratuity" model="hr.salary.rule">
@@ -172,8 +155,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="sequence" eval="500"/>
             <field name="note">Covered under the Payment of Gratuity Act, 1971: 
 (Last drawn monthly basic salary + dearness allowance)/26 x 15 days x 
-number of years of service (date of joining – date of retirement/leaving job)
-            </field>
+number of years of service (date of joining – date of retirement/leaving job)</field>
         </record>
 
         <record id="hr_salary_rule_lta" model="hr.salary.rule">
@@ -183,8 +165,7 @@ number of years of service (date of joining – date of retirement/leaving job)
             <field name="amount_select">fix</field>
             <field name="amount_fix">1666</field>
             <field name="sequence" eval="32"/>
-            <field name="note">As per Income tax rules of India, if transport bills for LTA are not provided,the amount will be taxed. E.g. If an employee has LTA allowance as Rs 50,000 in his CTC(cost to company),and he provides proofs of Rs 40,000 (boarding pass,air tickets, taxi vouchers) then income tax will be deducted for rest of the Rs 10,000. Does not matter whats the amount of LTA in an employee’s package, income tax laws only permits domestic air tickets only for LTA claim.
-Read more: http://www.pankajbatra.com/news/lta-proof-reimbursement-to-employer-not-required-supreme-court-india-ruling/#ixzz1uutlHSez</field>
+            <field name="note">As per Income tax rules of India, if transport bills for LTA are not provided,the amount will be taxed. E.g. If an employee has LTA allowance as Rs 50,000 in his CTC(cost to company),and he provides proofs of Rs 40,000 (boarding pass,air tickets, taxi vouchers) then income tax will be deducted for rest of the Rs 10,000. Does not matter whats the amount of LTA in an employee’s package, income tax laws only permits domestic air tickets only for LTA claim.</field>
         </record>
 
         <record id="hr_salary_rule_le" model="hr.salary.rule">
@@ -199,9 +180,7 @@ Read more: http://www.pankajbatra.com/news/lta-proof-reimbursement-to-employer-n
     1.The actual amount received
     2.The cash equivalent of leave balance (max 30 days per year of service)
     3.Maximum of 10 months of leave encashment, based on last 10 months average salary
-    4.Rs. 3 Lakh
-    Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuunHwjE
-                </field>
+    4.Rs. 3 Lakh</field>
         </record>
 
         <record id="hr_salary_rule_bonus" model="hr.salary.rule">
@@ -252,7 +231,6 @@ Read more: http://www.pankajbatra.com/news/lta-proof-reimbursement-to-employer-n
             <field name="amount_fix">1500</field>
             <field name="sequence" eval="38"/>
             <field name="note">In some of the cases, companies may provide a component for telephone bills.Employees may provide actual phone usage bills to reimburse this component and make it non-taxable.
-Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuvaUK7A
             </field>
         </record>
 
@@ -272,8 +250,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="amount_select">fix</field>
             <field name="amount_fix">1800</field>
             <field name="sequence" eval="39"/>
-            <field name="note">In case company provides component for this and employee use self owned car for official and personal purposes, Rs 1800 per month would be non-taxable on showing bills for fuel or can maintenance. This amount would be Rs 2400 in case car is more capacity than 1600cc.
-Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuw12Cjj</field>
+            <field name="note">In case company provides component for this and employee use self owned car for official and personal purposes, Rs 1800 per month would be non-taxable on showing bills for fuel or can maintenance. This amount would be Rs 2400 in case car is more capacity than 1600cc.</field>
         </record>
 
         <record id="hr_salary_rule_internet" model="hr.salary.rule">
@@ -380,8 +357,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(contract.short_term_gain)</field>
             <field name="sequence" eval="46"/>
-            <field name="note">If stocks/equity mutual funds are sold before one year, 15% tax would be payable on such gains. STT should have been on transaction.
-Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuwSxEvI</field>
+            <field name="note">If stocks/equity mutual funds are sold before one year, 15% tax would be payable on such gains. STT should have been on transaction.</field>
         </record>
 
         <record id="hr_salary_rule_lt_gains" model="hr.salary.rule">
@@ -393,8 +369,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(contract.long_term_gain)</field>
             <field name="sequence" eval="47"/>
-            <field name="note">If stocks/equity mutual funds are kept for more than a year before sale,it would be long term gains and such gains would be fully exempt from income tax. Securities transaction tax (STT) must have been paid on transactions for availing this exemption.
-Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uuwtRkCT</field>
+            <field name="note">If stocks/equity mutual funds are kept for more than a year before sale,it would be long term gains and such gains would be fully exempt from income tax. Securities transaction tax (STT) must have been paid on transactions for availing this exemption.</field>
         </record>
 
         <!--Deductions -->
@@ -408,8 +383,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="amount_python_compute">result = -(contract.professional_tax)</field>
             <field eval="120" name="sequence"/>
             <field eval="False" name="appears_on_payslip"/>
-            <field name="note">Professional tax for company should be paid on or before 30th sept,The amount is Rs.2000 per year.There is no payment form to be filled. 
-Read more: http://www.citehr.com/249518-companys-professional-tax-gujarat.html#ixzz1uuyvgt2L</field>
+            <field name="note">Professional tax for company should be paid on or before 30th sept,The amount is Rs.2000 per year.There is no payment form to be filled.</field>
         </record>
 
         <record id="hr_payslip_rule_tds" model="hr.salary.rule">
@@ -421,8 +395,7 @@ Read more: http://www.citehr.com/249518-companys-professional-tax-gujarat.html#i
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = -(contract.tds)</field>
             <field name="sequence" eval="140"/>
-            <field name="note">As per income tax rules, all payment which are taxable in nature should be done after deduction of taxes at the source itself. Hence employer compute income tax on salary payment and deduct it every month. This TDS is based on employee’s saving/investment declaration at the start of year. If investments for tax saving is not done, large amount may be deducted in last few months.
-Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-2014/#ixzz1uv0gPhgQ</field>
+            <field name="note">As per income tax rules, all payment which are taxable in nature should be done after deduction of taxes at the source itself. Hence employer compute income tax on salary payment and deduct it every month. This TDS is based on employee’s saving/investment declaration at the start of year. If investments for tax saving is not done, large amount may be deducted in last few months.</field>
         </record>
 
         <record id="hr_payslip_rule_vpf" model="hr.salary.rule">
@@ -434,8 +407,7 @@ Read more: http://www.pankajbatra.com/finance/income-tax-calculator-2012-2013-20
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = -(contract.wage + DA) * contract.voluntarily_provident_fund / 100 </field>
             <field name="sequence" eval="130"/>
-            <field name="note">VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government.This additional amount enjoys all the benefits of PF except that the employer is not liable to contribute any extra amount apart from 12%.An added advantage is that the interest rate is equal to the interest rate of PF and he withdrawal is tax free. Please note that the maximum contribution towards VPF is 100% of your Basic.The highest rate of interest (close to 9%) makes it a very attractive saving scheme. Because of these advantages many employees chose not to close their PF account even after getting employment else where other than India.Employees also get a major tax break on their entire contribution to the fund up to a ceiling of Rs. 70,000/-
-read more: more:http://www.dotcominfoway.com/blog/vpf-or-voluntary-provident-fund-special-benefits-for-employees</field>
+            <field name="note">VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government.This additional amount enjoys all the benefits of PF except that the employer is not liable to contribute any extra amount apart from 12%.An added advantage is that the interest rate is equal to the interest rate of PF and he withdrawal is tax free. Please note that the maximum contribution towards VPF is 100% of your Basic.The highest rate of interest (close to 9%) makes it a very attractive saving scheme. Because of these advantages many employees chose not to close their PF account even after getting employment else where other than India.Employees also get a major tax break on their entire contribution to the fund up to a ceiling of Rs. 70,000/-</field>
         </record>
 
         <record id="hr_payslip_rule_cpt" model="hr.salary.rule">
@@ -456,8 +428,7 @@ read more: more:http://www.dotcominfoway.com/blog/vpf-or-voluntary-provident-fun
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="160"/>
-            <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December) 
-read more: http://www.citehr.com/270132-labour-welfare-fund-deduction-salary.html</field>
+            <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>
         </record>
 
         <record id="hr_payslip_rule_cgti" model="hr.salary.rule">

From c77d5a88e9d096a0bc6f38fffbebfae567aa01c0 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 24 May 2012 10:42:26 +0530
Subject: [PATCH 058/999] [IMP]added icon on module.

bzr revid: kbh@tinyerp.com-20120524051226-rrsq51grjcstmuyw
---
 .../l10n_in_hr_payroll/static/src/img/icon.png   | Bin 0 -> 2519 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 addons/l10n_in_hr_payroll/static/src/img/icon.png

diff --git a/addons/l10n_in_hr_payroll/static/src/img/icon.png b/addons/l10n_in_hr_payroll/static/src/img/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddaf38f8b6ddad86483eb34aa261ac964f444443
GIT binary patch
literal 2519
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
KYglREp7<AdFq5qS

literal 0
HcmV?d00001


From 2d9090c8f0428e85b10e90bd42a6182bce1155ce Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 24 May 2012 11:58:46 +0530
Subject: [PATCH 059/999] [IMP]removed changes from hr_payroll and changed code
 for Professional tax.

bzr revid: kbh@tinyerp.com-20120524062846-5had196y4n50fpli
---
 addons/hr_payroll/hr_payroll_demo.xml         | 39 +++++++++++--------
 .../l10n_in_hr_payroll_data.xml               |  2 +-
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index e7ab610b8bb..36ac3e23a7b 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -16,26 +16,21 @@
             <field name="name">Professional Tax Register</field>
         </record>
 
-       <record id="hr_meal_voucher_register" model="hr.contribution.register">
+        <record id="hr_meal_voucher_register" model="hr.contribution.register">
             <field name="name">Meal Voucher Register</field>
         </record>
 
         <!-- Salary Rules -->
 
         <record id="hr_salary_rule_houserentallowance1" model="hr.salary.rule">
+            <field name="amount_select">percentage</field>
+            <field eval="40.0" name="amount_percentage"/>
+            <field name="amount_percentage_base">contract.wage</field>
+            <field name="code">HRA</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="register_id" ref="hr_houserent_register"/>
             <field name="name">House Rent Allowance</field>
-             <field name="amount_select">percentage</field>
-             <field eval="40.0" name="amount_percentage"/>
-             <field name="amount_percentage_base">contract.wage</field>
-             <field name="code">HRA</field>
-             <field name="category_id" ref="hr_payroll.ALW"/>
-             <field name="register_id" ref="hr_houserent_register"/>
-             <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
-Income tax exemption for HRA will be least of following:
-    1. The actual amount of HRA received as a part of salary.
-    2. 50% (if living in metro area) of (basic salary+Dearness allowance (DA)).
-    3. Rent paid minus 10% of (basic salary+DA).
-             </field>
+            <field name="sequence" eval="5"/>
         </record>
 
         <record id="hr_salary_rule_convanceallowance1" model="hr.salary.rule">
@@ -55,7 +50,6 @@ Income tax exemption for HRA will be least of following:
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="register_id" ref="hr_professional_tax_register"/>
             <field name="name">Professional Tax</field>
-            <field name="note">Professional tax deducted from salary by employer should be removed from taxable salary before computation of income tax.</field>
         </record>
 
         <record id="hr_salary_rule_providentfund1" model="hr.salary.rule">
@@ -78,6 +72,17 @@ Income tax exemption for HRA will be least of following:
             <field name="sequence" eval="15"/>
         </record>
 
+        <record id="hr_salary_rule_meal_voucher" model="hr.salary.rule">
+            <field name="amount_select">fix</field>
+            <field eval="10" name="amount_fix"/>
+            <field name="quantity">worked_days.WORK100.number_of_days</field>
+            <field name="code">MA</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="register_id" ref="hr_meal_voucher_register"/>
+            <field name="name">Meal Voucher</field>
+            <field name="sequence" eval="16"/>
+         </record>
+
         <record id="hr_salary_rule_sales_commission" model="hr.salary.rule">
             <field name="amount_select">code</field>
             <field name="code">SALE</field>
@@ -85,7 +90,7 @@ Income tax exemption for HRA will be least of following:
             <field name="name">Get 1% of sales</field>
             <field name="sequence" eval="17"/>
             <field name="amount_python_compute">result = (inputs.SALEURO.amount + inputs.SALASIA.amount) * 0.01</field>
-        </record>
+         </record>
 
         <!-- Rule Inputs -->
 
@@ -106,7 +111,7 @@ Income tax exemption for HRA will be least of following:
          <record id="structure_001" model="hr.payroll.structure">
             <field name="code">ME</field>
             <field name="name">Marketing Executive</field>
-            <field eval="[(6, 0, [ref('hr_salary_rule_houserentallowancemetro'), ref('hr_salary_rule_convanceallowance1'),ref('hr_salary_rule_professionaltax1'),ref('hr_salary_rule_providentfund1')])]" name="rule_ids"/>
+            <field eval="[(6, 0, [ref('hr_salary_rule_houserentallowance1'), ref('hr_salary_rule_convanceallowance1'),ref('hr_salary_rule_professionaltax1'),ref('hr_salary_rule_providentfund1')])]" name="rule_ids"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="parent_id" ref="structure_base"/>
         </record>
@@ -114,7 +119,7 @@ Income tax exemption for HRA will be least of following:
         <record id="structure_002" model="hr.payroll.structure">
             <field name="code">MEQP</field>
             <field name="name">Marketing Executive for Quentin Paolino</field>
-            <field eval="[(6, 0, [ref('hr_salary_rule_ca_paolino'), ref('hr_salary_rule_food_coupon')])]" name="rule_ids"/>
+            <field eval="[(6, 0, [ref('hr_salary_rule_ca_paolino'), ref('hr_salary_rule_meal_voucher')])]" name="rule_ids"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="parent_id" ref="structure_001"/>
         </record>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index 7afd6eecba1..0d8d1664700 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -374,7 +374,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
 
         <!--Deductions -->
         <record id="hr_payslip_line_professional_tax" model="hr.salary.rule">
-            <field name="code">PT</field>
+            <field name="code">PTD</field>
             <field name="name">Professional Tax</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="condition_select">python</field>

From 4e3f8665b0c49b34ab56f32d9127cbb75342f88d Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 24 May 2012 12:09:48 +0530
Subject: [PATCH 060/999] [IMP]removed unnessary changes.

bzr revid: kbh@tinyerp.com-20120524063948-hj3waasxo0h15a2c
---
 addons/hr_payroll/test/payslip.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml
index e44cfcaa325..c3ad3a1a85c 100644
--- a/addons/hr_payroll/test/payslip.yml
+++ b/addons/hr_payroll/test/payslip.yml
@@ -17,11 +17,11 @@
     code: SD
     company_id: base.main_company
     rule_ids:
-      - hr_salary_rule_houserentallowancemetro
+      - hr_salary_rule_houserentallowance1
       - hr_salary_rule_convanceallowance1
       - hr_salary_rule_professionaltax1
       - hr_salary_rule_providentfund1
-      - hr_salary_rule_food_coupon
+      - hr_salary_rule_meal_voucher
       - hr_salary_rule_sales_commission
 -
   I create a contract for "Richard"

From 034a85428f8a93dcab1d5e259bc54450156fcf52 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 24 May 2012 16:54:12 +0530
Subject: [PATCH 061/999] [IMP]sequence changed for rules,update module
 descriptor,improved rule of gratuity and VPF.

bzr revid: kbh@tinyerp.com-20120524112412-8142nscbm8zl7zzr
---
 addons/l10n_in_hr_payroll/__openerp__.py      |   7 +-
 .../data/hr.salary.rule.csv                   |   9 +-
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  |   8 +-
 .../l10n_in_hr_payroll_data.xml               | 105 ++++++++----------
 .../l10n_in_hr_payroll_view.xml               |  10 +-
 5 files changed, 62 insertions(+), 77 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 27528fbddcf..c605756417e 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -30,12 +30,13 @@
 Indian Payroll Rules.
 =======================
 
-    * Employee Details
+    -Configuration of hr_payroll for India localization
+    -All main contributions rules for India payslip.
+    * New payslip report
     * Employee Contracts
-    * Passport based Contract
-    * Allowances / Deductions
     * Allow to configure Basic / Grows / Net Salary
     * Employee PaySlip
+    * Allowance / Deduction
     * Monthly Payroll Register
     * Integrated with Holiday Management
     * Medical Allowance, Travel Allowance, Child Allowance, ...
diff --git a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
index 0877a73d02a..04e265e136f 100644
--- a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
+++ b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
@@ -1,8 +1,7 @@
 "id","amount_select","condition_range_min","condition_range_max","amount_percentage","amount_fix","name","category_id","sequence","code","parent_rule_id/id","condition_select","condition_range","amount_percentage_base"
-1,"fix",1,1,,1200,"Education Allowance","Allowance",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
-2,"fix",2,10,,2400,"Education Allowance","Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
+1,"fix",1,1,,1200,"Education Allowance For One Child","Allowance",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
+2,"fix",2,10,,2400,"Education Allowance For Two Child","Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
 ,,,,,,,,,,,,,
-3,"fix",1,1,,300,"Child Hostel Allowance","Allowance",26,"CHOONE","hr_payroll_rule_child2","range","employee.children",
-4,"fix",2,10,,600,"Child Hostel Allowance","Allowance",27,"CHOTWO","hr_payroll_rule_child2","range","employee.children",
-
+3,"fix",1,1,,300,"Child Hostel Allowance For One Child","Allowance",26,"CHOONE","hr_payroll_rule_child2","range","employee.children",
+4,"fix",2,10,,600,"Child Hostel Allowance For Two Child","Allowance",27,"CHOTWO","hr_payroll_rule_child2","range","employee.children",
 ,,,,,,,,,,,,,
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 9444afd74e0..8d85ebbdf09 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 import time
-from datetime import datetime, timedelta
+from datetime import datetime
 from calendar import isleap
 from dateutil.relativedelta import relativedelta
 
@@ -58,13 +58,13 @@ class hr_employee(osv.osv):
         """
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of Openday’s IDs
+        @param ids: List of employee’s IDs
         @return: No. of years of experience.
         @param context: A standard dictionary for contextual values
         """
         res = {}
-        c_date = time.strftime('%Y-%m-%d')
         DATETIME_FORMAT = "%Y-%m-%d"
+        c_date = time.strftime(DATETIME_FORMAT)
         current_date = datetime.strptime(c_date,DATETIME_FORMAT)
         for employee in self.browse(cr, uid, ids, context=context):
             if employee.join_date:
@@ -86,7 +86,7 @@ class hr_employee(osv.osv):
     
     _columns = {
         'join_date': fields.date('Join Date', help="joining date of employee "),
-        'number_of_year':fields.function(_compute_year, string='No. of Years of Service', type="float", help="Total years of work experience."),
+        'number_of_year':fields.function(_compute_year, string='No. of Years of Service', type="float", store=True, help="Total years of work experience."),
                 }
 hr_employee()
 
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index 0d8d1664700..c21a1aed02b 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- Hr Salary Rules-->
+        <!-- Hr Salary Rules for allowance-->
 
         <record id="hr_salary_rule_houserentallowancemetro" model="hr.salary.rule">
             <field name="code">HRAM</field>
@@ -9,7 +9,7 @@
             <field name="amount_python_compute">result = (contract.wage + DA) * 0.50</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance for metro city</field>
-            <field name="sequence" eval="80"/>
+            <field name="sequence" eval="51"/>
             <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
 Income tax exemption for HRA will be least of following:
     1. The actual amount of HRA received as a part of salary.
@@ -24,7 +24,7 @@ Income tax exemption for HRA will be least of following:
             <field name="code">HRANM</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance for non metro city</field>
-            <field name="sequence" eval="79"/>
+            <field name="sequence" eval="52"/>
             <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
 Income tax exemption for HRA will be least of following:
     1. The actual amount of HRA received as a part of salary.
@@ -35,16 +35,13 @@ Income tax exemption for HRA will be least of following:
 
 
         <record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
-            <field name="amount_select">code</field>
-            <field eval="10" name="amount_fix"/>
-            <field name="quantity">worked_days.WORK100.number_of_days</field>
             <field name="code">FC</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="condition_select">python</field>
-            <field name="condition_python">result = bool(contract.food_coupon_amount)</field>
+            <field name="condition_select">none</field>
             <field name="name">Food Coupons Allowance</field>
+            <field name="amount_select">code</field>
             <field name="amount_python_compute">result = worked_days.WORK100.number_of_days * contract.food_coupon_amount</field>
-            <field name="sequence" eval="16"/>
+            <field name="sequence" eval="33"/>
          </record>
 
         <record id="hr_salary_rule_da" model="hr.salary.rule">
@@ -54,42 +51,30 @@ Income tax exemption for HRA will be least of following:
             <field name="amount_select">percentage</field>
             <field name="amount_percentage_base">contract.wage</field>
             <field name="amount_percentage" eval="50"/>
-            <field name="sequence" eval="20"/>
+            <field name="sequence" eval="13"/>
              <field name="note">DA is calculated in %</field>
         </record>
 
-        <record id="hr_payroll_rule_child_edu" model="hr.salary.rule">
-            <field name="code">CEA</field>
-            <field name="name">Child Education Allowance</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field name="condition_select">none</field>
-            <field name="sequence" eval="21"/>
-            <field name="note">Per school going child 1200 per annum is non-taxable. 
-Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
-        </record>
-
         <record id="hr_payroll_rule_child1" model="hr.salary.rule">
             <field name="code">CHEA</field>
-            <field name="name">Education Allowance</field>
+            <field name="name">Child Education Allowance</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="parent_rule_id" ref="hr_payroll_rule_child_edu"/>
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(employee.children)</field>
             <field name="amount_select">fix</field>
-            <field name="sequence" eval="22"/>
+            <field name="sequence" eval="18"/>
+            <field name="note">Per school going child 1200 per annum is non-taxable.Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
         </record>
 
         <record id="hr_payroll_rule_child2" model="hr.salary.rule">
              <field name="code">CHEAH</field>
              <field name="name">Child Hostel Allowance</field>
              <field name="category_id" ref="hr_payroll.ALW"/>
-             <field name="parent_rule_id" ref="hr_payroll_rule_child_edu"/>
              <field name="condition_select">python</field>
              <field name="condition_python">result = bool(employee.children)</field>
              <field name="amount_select">fix</field>
-             <field name="note">In case the children are in hostel, the exemption available is Rs.300 per month per child for up to 2 children.</field>
-             <field name="sequence" eval="25"/>
+             <field name="note">In case the children are in hostel, the exemption available for child.</field>
+             <field name="sequence" eval="19"/>
          </record>
 
         <record id="hr_salary_rule_special" model="hr.salary.rule">
@@ -98,7 +83,7 @@ Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="28"/>
+            <field name="sequence" eval="20"/>
             <field name="note">This allowance is normally given as an additional benefit to employees and is fully taxable.</field>
         </record>
 
@@ -107,7 +92,7 @@ Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
             <field name="name">City Compensatory Allowance</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="condition_select">none</field>
-            <field name="sequence" eval="50"/>
+            <field name="sequence" eval="21"/>
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = (contract.wage + DA) * 0.10</field>
         </record>
@@ -118,7 +103,7 @@ Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
             <field name="name">City Allowance for Metro city</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="condition_select">none</field>
-            <field name="sequence" eval="51"/>
+            <field name="sequence" eval="22"/>
             <field name="amount_select">fix</field>
             <field name="amount_fix">850.0</field>
         </record>
@@ -128,7 +113,7 @@ Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
             <field name="name">City Allowance for Non Metro city</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="condition_select">none</field>
-            <field name="sequence" eval="52"/>
+            <field name="sequence" eval="25"/>
             <field name="amount_select">fix</field>
             <field name="amount_fix">800.0</field>
         </record>
@@ -139,7 +124,7 @@ Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="30"/>
+            <field name="sequence" eval="28"/>
             <field name="note">Generally arrears are fully taxable, but employee may claim exemption u/s 89(1). 
 One would need to compute income tax on the arrears if it would have been received in actual year.
 Now difference of income tax between payment year and actual year would be allowed for deduction.</field>
@@ -164,7 +149,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field name="amount_fix">1666</field>
-            <field name="sequence" eval="32"/>
+            <field name="sequence" eval="29"/>
             <field name="note">As per Income tax rules of India, if transport bills for LTA are not provided,the amount will be taxed. E.g. If an employee has LTA allowance as Rs 50,000 in his CTC(cost to company),and he provides proofs of Rs 40,000 (boarding pass,air tickets, taxi vouchers) then income tax will be deducted for rest of the Rs 10,000. Does not matter whats the amount of LTA in an employee’s package, income tax laws only permits domestic air tickets only for LTA claim.</field>
         </record>
 
@@ -175,7 +160,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="condition_select">none</field>
             <field name="amount_select">fix</field>
             <field name="amount_fix">0.0</field>
-            <field name="sequence" eval="33"/>
+            <field name="sequence" eval="30"/>
             <field name="note">Payment by way of leave encashment received by Central and State Govt.employees at the time of retirement in respect of the period of earned leave at credit is fully exempt. In case of other employees, the exemption is to be limited to minimum of all below:
     1.The actual amount received
     2.The cash equivalent of leave balance (max 30 days per year of service)
@@ -189,7 +174,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="34"/>
+            <field name="sequence" eval="31"/>
             <field name="note">This would be fully taxable based on incentive.</field>
         </record>
 
@@ -199,7 +184,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field eval="1200.0" name="amount_fix"/>
-            <field name="sequence" eval="35"/>
+            <field name="sequence" eval="32"/>
             <field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
         </record>
 
@@ -209,7 +194,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="36"/>
+            <field name="sequence" eval="34"/>
             <field name="note">Some employers may provide component for buying magazines, journals and books as a part of knowledge enhancement for business growth.This part would become non taxable on providing original bills.</field>
         </record>
 
@@ -219,7 +204,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="37"/>
+            <field name="sequence" eval="35"/>
             <field name="note">Some sections of employees mat get allowance for purchase of office dress/uniform.In such case, the component would become non-taxable.</field>
         </record>
 
@@ -229,7 +214,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field name="amount_fix">1500</field>
-            <field name="sequence" eval="38"/>
+            <field name="sequence" eval="36"/>
             <field name="note">In some of the cases, companies may provide a component for telephone bills.Employees may provide actual phone usage bills to reimburse this component and make it non-taxable.
             </field>
         </record>
@@ -240,7 +225,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="49"/>
+            <field name="sequence" eval="37"/>
         </record>
 
         <record id="hr_payroll_rule_car" model="hr.salary.rule">
@@ -249,7 +234,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field name="amount_fix">1800</field>
-            <field name="sequence" eval="39"/>
+            <field name="sequence" eval="38"/>
             <field name="note">In case company provides component for this and employee use self owned car for official and personal purposes, Rs 1800 per month would be non-taxable on showing bills for fuel or can maintenance. This amount would be Rs 2400 in case car is more capacity than 1600cc.</field>
         </record>
 
@@ -259,7 +244,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="40"/>
+            <field name="sequence" eval="39"/>
             <field name="note">Employer may also provide reimbursement of internet expenses and thus this would become non taxable.</field>
         </record>
 
@@ -271,7 +256,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="condition_python">result = bool(contract.driver_salay)</field>
             <field name="amount_select">fix</field>
             <field eval="900.0" name="amount_fix"/>
-            <field name="sequence" eval="41"/>
+            <field name="sequence" eval="40"/>
              <field name="note">Rs. 900 per month (non taxable)</field>
         </record>
 
@@ -281,7 +266,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="42"/>
+            <field name="sequence" eval="41"/>
             <field name="note">Gift is from non relatives person worth more than Rs.50000, 
 one is liable to pay the tax what ever he received excess of the limit or Rs 50,000.</field>
         </record>
@@ -292,7 +277,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="43"/>
+            <field name="sequence" eval="42"/>
             <field name="note"> gift is from relaives whould be non taxable with no limits.</field>
         </record>
 
@@ -303,7 +288,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = contract.house_rent_income</field>
             <field name="condition_select">none</field>
-            <field name="sequence" eval="44"/>
+            <field name="sequence" eval="45"/>
             <field name="note">Income from house property.30% of the rental income can be reduced as a standard deduction.</field>
         </record>
 
@@ -315,7 +300,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="amount_python_compute">result = contract.saving_bank_account</field>
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(contract.saving_bank_account)</field>
-            <field name="sequence" eval="31"/>
+            <field name="sequence" eval="46"/>
         </record>
 
         <record id="hr_salary_trans_allownce" model="hr.salary.rule">
@@ -324,7 +309,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field eval="800.0" name="amount_fix"/>
-            <field name="sequence" eval="48"/>
+            <field name="sequence" eval="14"/>
         </record>
 
         <record id="hr_salary_rule_Other" model="hr.salary.rule">
@@ -336,7 +321,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = contract.other_income</field>
             <field name="note">Bank account/NSC/Post Office/SCSS interest</field>
-            <field name="sequence" eval="45"/>
+            <field name="sequence" eval="47"/>
         </record>
 
         <record id="hr_salary_rule_agricultural" model="hr.salary.rule">
@@ -345,7 +330,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="23"/>
+            <field name="sequence" eval="44"/>
         </record>
 
         <record id="hr_salary_rule_st_gains" model="hr.salary.rule">
@@ -356,7 +341,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="amount_python_compute">result = contract.short_term_gain</field>
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(contract.short_term_gain)</field>
-            <field name="sequence" eval="46"/>
+            <field name="sequence" eval="48"/>
             <field name="note">If stocks/equity mutual funds are sold before one year, 15% tax would be payable on such gains. STT should have been on transaction.</field>
         </record>
 
@@ -368,11 +353,11 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="amount_python_compute">result = contract.long_term_gain</field>
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(contract.long_term_gain)</field>
-            <field name="sequence" eval="47"/>
+            <field name="sequence" eval="49"/>
             <field name="note">If stocks/equity mutual funds are kept for more than a year before sale,it would be long term gains and such gains would be fully exempt from income tax. Securities transaction tax (STT) must have been paid on transactions for availing this exemption.</field>
         </record>
 
-        <!--Deductions -->
+        <!--hr salary rules for Deductions -->
         <record id="hr_payslip_line_professional_tax" model="hr.salary.rule">
             <field name="code">PTD</field>
             <field name="name">Professional Tax</field>
@@ -381,7 +366,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="condition_python">result = bool(contract.professional_tax)</field>
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = -(contract.professional_tax)</field>
-            <field eval="120" name="sequence"/>
+            <field eval="145" name="sequence"/>
             <field eval="False" name="appears_on_payslip"/>
             <field name="note">Professional tax for company should be paid on or before 30th sept,The amount is Rs.2000 per year.There is no payment form to be filled.</field>
         </record>
@@ -403,10 +388,10 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="name">Voluntarily Provident Fund Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="condition_select">python</field>
-            <field name="condition_python">result = bool(contract.voluntarily_provident_fund)</field>
+            <field name="condition_python">result = bool(contract.voluntary_provident_fund)</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = -(contract.wage + DA) * contract.voluntarily_provident_fund / 100 </field>
-            <field name="sequence" eval="130"/>
+            <field name="amount_python_compute">result = -(contract.wage + DA) * contract.voluntary_provident_fund / 100 </field>
+            <field name="sequence" eval="153"/>
             <field name="note">VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government.This additional amount enjoys all the benefits of PF except that the employer is not liable to contribute any extra amount apart from 12%.An added advantage is that the interest rate is equal to the interest rate of PF and he withdrawal is tax free. Please note that the maximum contribution towards VPF is 100% of your Basic.The highest rate of interest (close to 9%) makes it a very attractive saving scheme. Because of these advantages many employees chose not to close their PF account even after getting employment else where other than India.Employees also get a major tax break on their entire contribution to the fund up to a ceiling of Rs. 70,000/-</field>
         </record>
 
@@ -489,7 +474,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = - (contract.wage + DA) * 8.33 / 100</field>
             <field name= "note">Employer contribution does not become part of employee’s income and hence income tax is not payable on this part.</field>
-            <field name="sequence" eval="123"/>
+            <field name="sequence" eval="185"/>
         </record>
         
         <record id="hr_payslip_rule_enpf" model="hr.salary.rule">
@@ -498,7 +483,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = - (contract.wage + DA) * 0.10</field>
-            <field name="sequence" eval="126"/>
+            <field name="sequence" eval="180"/>
             <field name= "note">Any amount contributed by your employer to your NPS account is treated as part of your salary and is included in your income but you can claim deduction under Section 80C for this too.thus, effectively making it exempt from tax within the limit of 10% of your basic salary. This is very useful and tax efficient for you particularly if you fall in the maximum tax.</field>
         </record>
         
@@ -508,7 +493,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = - (contract.wage + DA) * 0.10</field>
-            <field name="sequence" eval="125"/>
+            <field name="sequence" eval="149"/>
             <field name="note">Employee can claim deduction even of employer's contribution to NPS.</field>
         </record>
 
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index d6b8eb02724..29323b458d5 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -11,20 +11,20 @@
             <field name="arch" type="xml">
             <data>
                  <xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
-                    <field name="food_coupon_amount"/>
                  <group col="2" colspan="2" name="right_column">
                     <separator colspan="2" string="Allowance"/>
+                        <field name="food_coupon_amount"/>
+                        <field name="house_rent_income"/>
+                        <field name="saving_bank_account"/>
+                        <field name="other_income"/>
                         <field name="short_term_gain"/>
                         <field name="long_term_gain"/>
-                        <field name="saving_bank_account"/>
-                        <field name="house_rent_income"/>
-                        <field name="other_income"/>
                         <field name="driver_salay"/>
                  </group>
                  <group col="2" colspan="2" name="left_column">
                     <separator colspan="2" string="Deduction"/>
-                        <field name="professional_tax"/>
                         <field name="tds"/>
+                        <field name="professional_tax"/>
                         <field name="voluntary_provident_fund"/>
                         <field name="company_transport"/>
                         <field name="leave_avail_dedution"/>

From d6fcf87a89be305b80323755e553f054282ec7b0 Mon Sep 17 00:00:00 2001
From: jir <jir@jir-desktop>
Date: Fri, 25 May 2012 12:15:47 +0530
Subject: [PATCH 062/999] [FIX] Problem of uses not defined [close] states in
 field in account_invoice.py

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

bzr revid: jir@jir-desktop-20120525064547-qtxq60s0aa2fijk2
---
 addons/account/account_invoice.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 9426d713188..dedc54a9a57 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -213,7 +213,7 @@ class account_invoice(osv.osv):
             \n* The \'Paid\' state is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled. \
             \n* The \'Cancelled\' state is used when user cancel invoice.'),
         'date_invoice': fields.date('Invoice Date', readonly=True, states={'draft':[('readonly',False)]}, select=True, help="Keep empty to use the current date"),
-        'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, select=True,
+        'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'cancel':[('readonly',True)]}, select=True,
             help="If you use payment terms, the due date will be computed automatically at the generation "\
                 "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."),
         'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}),
@@ -252,7 +252,7 @@ class account_invoice(osv.osv):
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'check_total': fields.float('Verification Total', digits_compute=dp.get_precision('Account'), states={'open':[('readonly',True)],'close':[('readonly',True)]}),
+        'check_total': fields.float('Verification Total', digits_compute=dp.get_precision('Account'), states={'open':[('readonly',True)],'cancel':[('readonly',True)],'paid':[('readonly',True)]}),
         'reconciled': fields.function(_reconciled, string='Paid/Reconciled', type='boolean',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?

From 405f134bd3e7bb430d25602b838af439bdf2630c Mon Sep 17 00:00:00 2001
From: "Amit (OpenERP)" <amp@tinyerp.com>
Date: Fri, 25 May 2012 12:17:09 +0530
Subject: [PATCH 063/999] [FIX] sale_margin : correction on super method
 parameter

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

bzr revid: amp@tinyerp.com-20120525064709-a918ieuh4zb298zo
---
 addons/sale_margin/sale_margin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 82a7150b6d1..64e07276c08 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -70,7 +70,7 @@ class sale_order(osv.osv):
         return result
 
     def _get_order(self, cr, uid, ids, context=None):
-        return super(self,sale_order)._get_order(cr, uid, ids, context=context)
+        return super(sale_order, self)._get_order(cr, uid, ids, context=context)
 
     _columns = {
         'margin': fields.function(_product_margin, string='Margin', help="It gives profitability by calculating the difference between the Unit Price and Cost Price.", store={

From 5ccbb93737e619ab6469df58bdfd779db28c1526 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 25 May 2012 14:27:59 +0530
Subject: [PATCH 064/999] [FIX] hr_attendance: invisible if user does not set
 for employee

bzr revid: hmo@tinyerp.com-20120525085759-oksbm44w4bgfdbwm
---
 addons/hr_attendance/static/src/js/attendance.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 8ee6b4ee4ab..cff8f159251 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -18,12 +18,13 @@ openerp.hr_attendance = function(instance) {
         },
         renderElement: function(){
             this.$element = $(QWeb.render(this.template,this.titles));            
-            this.parent_element.prepend(this.$element);            
+            this.parent_element.prepend(this.$element);
             this.$oe_attendance_slider = this.$element.find(".oe_attendance_slider");
             this.$oe_attendance_slider.click(this.do_update_attendance);
         },
         do_update_attendance: function() {
             var self = this;
+            if(!self.employee)return;
             hr_employee = new instance.web.DataSet(self, 'hr.employee');
             hr_employee.call('attendance_action_change', [[self.employee.id]]).done(function(result){
                 if (!result) return;
@@ -36,6 +37,7 @@ openerp.hr_attendance = function(instance) {
                     instance.web.currentlist.reload();
                 }
                 if(instance.web.currentform){
+                    //tofix: it should be in hr_timesheet_sheet module
                     if (instance.web.currentform.model == 'hr_timesheet_sheet.sheet'){
                         model = new instance.web.DataSet(self, instance.web.currentform.model);
                         model.call('date_today', [instance.web.currentform.dataset.ids]).done(function(result){instance.web.currentform.reload();});
@@ -59,9 +61,12 @@ openerp.hr_attendance = function(instance) {
         },
         check_attendance: function(){
             var self = this;
+            self.employee = false;
+            this.$element.find(".oe_attendance_status").hide();
             var employee = new instance.web.DataSetSearch(self, 'hr.employee', self.session.user_context, [['user_id','=', self.session.uid]]);
             return employee.read_slice(['id','name','state']).pipe(function(res) {
                 if(_.isEmpty(res)) return;
+                self.$element.find(".oe_attendance_status").show();
                 self.employee = res[0];
                 self.do_slide(self.employee.state);
             });

From c1c6205388a46e823ed97776643ddde8013fc4d1 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 28 May 2012 11:48:02 +0530
Subject: [PATCH 065/999] [IMP]changed sequence of salary rules.

bzr revid: kbh@tinyerp.com-20120528061802-rqijgqi3pbb4isjg
---
 .../l10n_in_hr_payroll_data.xml               | 191 +++++++++---------
 1 file changed, 95 insertions(+), 96 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index c21a1aed02b..a9e219c33a6 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -3,6 +3,17 @@
     <data>
         <!-- Hr Salary Rules for allowance-->
 
+        <record id="hr_salary_rule_da" model="hr.salary.rule">
+            <field name="code">DA</field>
+            <field name="name">Dearness Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">percentage</field>
+            <field name="amount_percentage_base">contract.wage</field>
+            <field name="amount_percentage" eval="50"/>
+            <field name="sequence" eval="13"/>
+             <field name="note">DA is calculated in %</field>
+        </record>
+
         <record id="hr_salary_rule_houserentallowancemetro" model="hr.salary.rule">
             <field name="code">HRAM</field>
             <field name="amount_select">code</field>
@@ -33,26 +44,23 @@ Income tax exemption for HRA will be least of following:
              </field>
          </record>
 
-
-        <record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
-            <field name="code">FC</field>
+        <record id="hr_salary_trans_allownce" model="hr.salary.rule">
+            <field name="code">TCA</field>
+            <field name="name">Transport/Conveyance Allownace</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="condition_select">none</field>
-            <field name="name">Food Coupons Allowance</field>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = worked_days.WORK100.number_of_days * contract.food_coupon_amount</field>
-            <field name="sequence" eval="33"/>
-         </record>
+            <field name="amount_select">fix</field>
+            <field eval="800.0" name="amount_fix"/>
+            <field name="sequence" eval="14"/>
+        </record>
 
-        <record id="hr_salary_rule_da" model="hr.salary.rule">
-            <field name="code">DA</field>
-            <field name="name">Dearness Allowance</field>
+        <record id="hr_salary_rule_special" model="hr.salary.rule">
+            <field name="code">SA</field>
+            <field name="name">Grade/Special/Management/Supplementary Allowance</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">percentage</field>
-            <field name="amount_percentage_base">contract.wage</field>
-            <field name="amount_percentage" eval="50"/>
-            <field name="sequence" eval="13"/>
-             <field name="note">DA is calculated in %</field>
+            <field name="amount_select">fix</field>
+            <field eval="0.0" name="amount_fix"/>
+            <field name="sequence" eval="20"/>
+            <field name="note">This allowance is normally given as an additional benefit to employees and is fully taxable.</field>
         </record>
 
         <record id="hr_payroll_rule_child1" model="hr.salary.rule">
@@ -77,16 +85,6 @@ Income tax exemption for HRA will be least of following:
              <field name="sequence" eval="19"/>
          </record>
 
-        <record id="hr_salary_rule_special" model="hr.salary.rule">
-            <field name="code">SA</field>
-            <field name="name">Grade/Special/Management/Supplementary Allowance</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="20"/>
-            <field name="note">This allowance is normally given as an additional benefit to employees and is fully taxable.</field>
-        </record>
-
         <record id="hr_payroll_rule_city1" model="hr.salary.rule">
             <field name="code">CBDA</field>
             <field name="name">City Compensatory Allowance</field>
@@ -97,7 +95,6 @@ Income tax exemption for HRA will be least of following:
             <field name="amount_python_compute">result = (contract.wage + DA) * 0.10</field>
         </record>
 
-        
         <record id="hr_payroll_rule_metrocity" model="hr.salary.rule">
             <field name="code">CMETRO</field>
             <field name="name">City Allowance for Metro city</field>
@@ -188,6 +185,16 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
         </record>
 
+        <record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
+            <field name="code">FC</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">none</field>
+            <field name="name">Food Coupons Allowance</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = worked_days.WORK100.number_of_days * contract.food_coupon_amount</field>
+            <field name="sequence" eval="33"/>
+         </record>
+
         <record id="hr_salary_rule_journals" model="hr.salary.rule">
             <field name="code">PERJ</field>
             <field name="name">Periodical Journals</field>
@@ -281,6 +288,15 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="note"> gift is from relaives whould be non taxable with no limits.</field>
         </record>
 
+        <record id="hr_salary_rule_agricultural" model="hr.salary.rule">
+            <field name="code">AI</field>
+            <field name="name">Agricultural Income</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="0.0" name="amount_fix"/>
+            <field name="sequence" eval="44"/>
+        </record>
+
         <record id="hr_salary_rule_hri" model="hr.salary.rule">
             <field name="code">HRI</field>
             <field name="name">House Rent Income</field>
@@ -303,15 +319,6 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="sequence" eval="46"/>
         </record>
 
-        <record id="hr_salary_trans_allownce" model="hr.salary.rule">
-            <field name="code">TCA</field>
-            <field name="name">Transport/Conveyance Allownace</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="800.0" name="amount_fix"/>
-            <field name="sequence" eval="14"/>
-        </record>
-
         <record id="hr_salary_rule_Other" model="hr.salary.rule">
             <field name="code">OTI</field>
             <field name="name">Other Income</field>
@@ -324,15 +331,6 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="sequence" eval="47"/>
         </record>
 
-        <record id="hr_salary_rule_agricultural" model="hr.salary.rule">
-            <field name="code">AI</field>
-            <field name="name">Agricultural Income</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="44"/>
-        </record>
-
         <record id="hr_salary_rule_st_gains" model="hr.salary.rule">
             <field name="code">STG</field>
             <field name="name">Short Term Gains from Share Trading/Equity MFs</field>
@@ -358,18 +356,6 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
         </record>
 
         <!--hr salary rules for Deductions -->
-        <record id="hr_payslip_line_professional_tax" model="hr.salary.rule">
-            <field name="code">PTD</field>
-            <field name="name">Professional Tax</field>
-            <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="condition_select">python</field>
-            <field name="condition_python">result = bool(contract.professional_tax)</field>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = -(contract.professional_tax)</field>
-            <field eval="145" name="sequence"/>
-            <field eval="False" name="appears_on_payslip"/>
-            <field name="note">Professional tax for company should be paid on or before 30th sept,The amount is Rs.2000 per year.There is no payment form to be filled.</field>
-        </record>
 
         <record id="hr_payslip_rule_tds" model="hr.salary.rule">
             <field name="code">TDS</field>
@@ -383,6 +369,39 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="note">As per income tax rules, all payment which are taxable in nature should be done after deduction of taxes at the source itself. Hence employer compute income tax on salary payment and deduct it every month. This TDS is based on employee’s saving/investment declaration at the start of year. If investments for tax saving is not done, large amount may be deducted in last few months.</field>
         </record>
 
+        <record id="hr_payslip_line_professional_tax" model="hr.salary.rule">
+            <field name="code">PTD</field>
+            <field name="name">Professional Tax</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.professional_tax)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = -(contract.professional_tax)</field>
+            <field eval="145" name="sequence"/>
+            <field eval="False" name="appears_on_payslip"/>
+            <field name="note">Professional tax for company should be paid on or before 30th sept,The amount is Rs.2000 per year.There is no payment form to be filled.</field>
+        </record>
+
+        <record id="hr_payslip_rule_empPF" model="hr.salary.rule">
+            <field name="code">EPMF</field>
+            <field name="name">Employee's PF Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = - (contract.wage + DA) * 8.33 / 100</field>
+            <field name= "note">Employer contribution does not become part of employee’s income and hence income tax is not payable on this part.</field>
+            <field name="sequence" eval="150"/>
+        </record>
+
+        <record id="hr_payslip_rule_empNPF" model="hr.salary.rule">
+            <field name="code">ENPFC</field>
+            <field name="name">Employee's NPS Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = - (contract.wage + DA) * 0.10</field>
+            <field name="sequence" eval="155"/>
+            <field name="note">Employee can claim deduction even of employer's contribution to NPS.</field>
+        </record>
+
         <record id="hr_payslip_rule_vpf" model="hr.salary.rule">
             <field name="code">VPF</field>
             <field name="name">Voluntarily Provident Fund Contribution</field>
@@ -391,7 +410,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="condition_python">result = bool(contract.voluntary_provident_fund)</field>
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = -(contract.wage + DA) * contract.voluntary_provident_fund / 100 </field>
-            <field name="sequence" eval="153"/>
+            <field name="sequence" eval="160"/>
             <field name="note">VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government.This additional amount enjoys all the benefits of PF except that the employer is not liable to contribute any extra amount apart from 12%.An added advantage is that the interest rate is equal to the interest rate of PF and he withdrawal is tax free. Please note that the maximum contribution towards VPF is 100% of your Basic.The highest rate of interest (close to 9%) makes it a very attractive saving scheme. Because of these advantages many employees chose not to close their PF account even after getting employment else where other than India.Employees also get a major tax break on their entire contribution to the fund up to a ceiling of Rs. 70,000/-</field>
         </record>
 
@@ -403,7 +422,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="condition_python">result = bool(contract.company_transport)</field>
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = -(contract.company_transport)</field>
-            <field name="sequence" eval="155"/>
+            <field name="sequence" eval="165"/>
         </record>
 
         <record id="hr_payslip_rule_lwf" model="hr.salary.rule">
@@ -412,7 +431,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="160"/>
+            <field name="sequence" eval="170"/>
             <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>
         </record>
 
@@ -422,7 +441,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="167"/>
+            <field name="sequence" eval="175"/>
         </record>
 
         <record id="hr_payslip_rule_dla" model="hr.salary.rule">
@@ -433,7 +452,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="condition_python">result = bool(contract.leave_avail_dedution)</field>
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = -(contract.leave_avail_dedution)</field>
-            <field name="sequence" eval="170"/>
+            <field name="sequence" eval="180"/>
         </record>
 
         <record id="hr_payslip_rule_cmt" model="hr.salary.rule">
@@ -445,7 +464,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = - (contract.medical_insurance)</field>
             <field eval="-50.0" name="amount_fix"/>
-            <field name="sequence" eval="172"/>
+            <field name="sequence" eval="185"/>
         </record>
 
         <record id="hr_payslip_rule_ode" model="hr.salary.rule">
@@ -454,7 +473,17 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
             <field eval="-200.0" name="amount_fix"/>
-            <field name="sequence" eval="175"/>
+            <field name="sequence" eval="187"/>
+        </record>
+
+        <record id="hr_payslip_rule_enpf" model="hr.salary.rule">
+            <field name="code">ENPC</field>
+            <field name="name">Employer's NPS Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = - (contract.wage + DA) * 0.10</field>
+            <field name="sequence" eval="190"/>
+            <field name= "note">Any amount contributed by your employer to your NPS account is treated as part of your salary and is included in your income but you can claim deduction under Section 80C for this too.thus, effectively making it exempt from tax within the limit of 10% of your basic salary. This is very useful and tax efficient for you particularly if you fall in the maximum tax.</field>
         </record>
 
         <record id="hr_payslip_rule_epc" model="hr.salary.rule">
@@ -463,39 +492,9 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = - (contract.wage + DA) * 0.12</field>
-            <field name="sequence" eval="122"/>
+            <field name="sequence" eval="195"/>
             <field name="note">Both the employees and employer contribute to the fund at the rate of 12% of the basic wages, dearness allowance and retaining allowance, if any, payable to employees per month.</field>
         </record>
-        
-        <record id="hr_payslip_rule_empPF" model="hr.salary.rule">
-            <field name="code">EPMF</field>
-            <field name="name">Employee's PF Contribution</field>
-            <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = - (contract.wage + DA) * 8.33 / 100</field>
-            <field name= "note">Employer contribution does not become part of employee’s income and hence income tax is not payable on this part.</field>
-            <field name="sequence" eval="185"/>
-        </record>
-        
-        <record id="hr_payslip_rule_enpf" model="hr.salary.rule">
-            <field name="code">ENPC</field>
-            <field name="name">Employer's NPS Contribution</field>
-            <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = - (contract.wage + DA) * 0.10</field>
-            <field name="sequence" eval="180"/>
-            <field name= "note">Any amount contributed by your employer to your NPS account is treated as part of your salary and is included in your income but you can claim deduction under Section 80C for this too.thus, effectively making it exempt from tax within the limit of 10% of your basic salary. This is very useful and tax efficient for you particularly if you fall in the maximum tax.</field>
-        </record>
-        
-        <record id="hr_payslip_rule_empNPF" model="hr.salary.rule">
-            <field name="code">ENPFC</field>
-            <field name="name">Employee's NPS Contribution</field>
-            <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = - (contract.wage + DA) * 0.10</field>
-            <field name="sequence" eval="149"/>
-            <field name="note">Employee can claim deduction even of employer's contribution to NPS.</field>
-        </record>
 
     </data>
 </openerp>

From a15c85fd4a93152d074ad6f7dc602507bb11ee7f Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 28 May 2012 14:24:08 +0530
Subject: [PATCH 066/999] [IMP]ids changed.

bzr revid: kbh@tinyerp.com-20120528085408-p1409ajat1yu5vkk
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index a9e219c33a6..d5c83722784 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -382,7 +382,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="note">Professional tax for company should be paid on or before 30th sept,The amount is Rs.2000 per year.There is no payment form to be filled.</field>
         </record>
 
-        <record id="hr_payslip_rule_empPF" model="hr.salary.rule">
+        <record id="hr_payslip_rule_epf" model="hr.salary.rule">
             <field name="code">EPMF</field>
             <field name="name">Employee's PF Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
@@ -392,7 +392,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="sequence" eval="150"/>
         </record>
 
-        <record id="hr_payslip_rule_empNPF" model="hr.salary.rule">
+        <record id="hr_payslip_rule_enps" model="hr.salary.rule">
             <field name="code">ENPFC</field>
             <field name="name">Employee's NPS Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
@@ -476,7 +476,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="sequence" eval="187"/>
         </record>
 
-        <record id="hr_payslip_rule_enpf" model="hr.salary.rule">
+        <record id="hr_payslip_rule_ernps" model="hr.salary.rule">
             <field name="code">ENPC</field>
             <field name="name">Employer's NPS Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
@@ -486,7 +486,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name= "note">Any amount contributed by your employer to your NPS account is treated as part of your salary and is included in your income but you can claim deduction under Section 80C for this too.thus, effectively making it exempt from tax within the limit of 10% of your basic salary. This is very useful and tax efficient for you particularly if you fall in the maximum tax.</field>
         </record>
 
-        <record id="hr_payslip_rule_epc" model="hr.salary.rule">
+        <record id="hr_payslip_rule_erpf" model="hr.salary.rule">
             <field name="code">EPF</field>
             <field name="name">Employer's PF Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>

From 986fd1159f8e59d370728c7f8c82ccc449a0cf7d Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 4 Jun 2012 11:48:28 +0530
Subject: [PATCH 067/999] [IMP]object and view of payment_advice and
 advice_line are added.

bzr revid: kbh@tinyerp.com-20120604061828-4dhq5c9w8t2o42sk
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 115 +++++++++++++++++-
 .../l10n_in_hr_payroll_data.xml               |   2 +-
 .../l10n_in_hr_payroll_view.xml               |  65 ++++++++++
 3 files changed, 180 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 8d85ebbdf09..b2bd5c111da 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -20,13 +20,29 @@
 ##############################################################################
 
 import time
+from datetime import date
 from datetime import datetime
-from calendar import isleap
+from datetime import timedelta
 from dateutil.relativedelta import relativedelta
 
+from tools.translate import _
+from calendar import isleap
+
 from osv import fields, osv
 import decimal_precision as dp
 
+def prev_bounds(cdate=False):
+    when = date.fromtimestamp(time.mktime(time.strptime(cdate,"%Y-%m-%d")))
+    this_first = date(when.year, when.month, 1)
+    month = when.month + 1
+    year = when.year
+    if month > 12:
+        month = 1
+        year += 1
+    next_month = date(year, month, 1)
+    prev_end = next_month - timedelta(days=1)
+    return this_first, prev_end
+
 class hr_contract_in(osv.osv):
     _inherit = 'hr.contract'
     _description = 'contract'
@@ -90,4 +106,101 @@ class hr_employee(osv.osv):
                 }
 hr_employee()
 
+class payroll_advice(osv.osv):
+    '''
+    Bank Advice Note
+    '''
+
+    _name = 'hr.payroll.advice'
+    _description = 'Bank Advice Note'
+    _columns = {
+        'name':fields.char('Name', size=2048, required=True, readonly=False),
+        'note': fields.text('Description'),
+        'date': fields.date('Date'),
+        'state':fields.selection([
+            ('draft','Draft Sheet'),
+            ('confirm','Confirm Sheet'),
+            ('cancel','Reject'),
+        ],'State', select=True, readonly=True),
+        'number':fields.char('Number', size=64, required=False, readonly=True),
+        'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', required=False),
+        'chaque_nos':fields.char('Chaque Nos', size=256, required=False, readonly=False),
+        'company_id':fields.many2one('res.company', 'Company', required=False),
+        'bank_id':fields.many2one('res.bank', 'Bank', required=False, help="Select the Bank Address from whcih the salary is going to be paid"),
+    }
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'state': lambda *a: 'draft',
+        'company_id': lambda self, cr, uid, context: \
+                self.pool.get('res.users').browse(cr, uid, uid,
+                    context=context).company_id.id,
+    }
+
+    def compute_advice(self, cr, uid, ids, context=None):
+        payslip_pool = self.pool.get('hr.payslip')
+        advice_line_pool = self.pool.get('hr.payroll.advice.line')
+        sequence_pool = self.pool.get('ir.sequence')
+        payslip_line_pool = self.pool.get('hr.payslip.line')
+
+        for advice in self.browse(cr, uid, ids, context=context):
+            dates = prev_bounds(advice.date)
+            slip_ids = payslip_pool.search(cr, uid, [ ('date_from','<=',advice.date),('date_to','>=',advice.date),('date_from','=',dates[0]),('date_to','=',dates[1])], context=context)
+            if not slip_ids:
+                    raise osv.except_osv(_('Error !'), _('You can get only current month payslips') % (slip_ids))
+        for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
+            line_ids = payslip_line_pool.search(cr, uid, [ ('slip_id','in',slip_ids),('code','=',"NET")], context=context)
+            for line in slip.line_ids:
+                if not slip.employee_id.bank_account_id:
+                    raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
+                advice_line= {
+                        'advice_id':advice.id,
+                        'name':slip.employee_id.bank_account_id.acc_number,
+                        'employee_id':slip.employee_id.id,
+                        'bysal':line.total
+                        }
+            id = advice_line_pool.create(cr, uid, advice_line, context=context)
+        number = self.pool.get('ir.sequence').get(cr, uid, 'advice.line')
+        self.write(cr, uid, ids, {'state':'confirm','number':number}, context=context)
+
+    def confirm_sheet(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state':'confirm'}, context=context)
+        return True
+
+    def set_to_draft(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state':'draft'}, context=context)
+        return True
+
+    def cancel_sheet(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state':'cancel'}, context=context)
+        return True
+
+    def onchange_company_id(self, cr, uid, ids, company_id=False, context=None):
+        res = {}
+        if company_id:
+            company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
+            if company.partner_id.bank_ids:
+                res.update({'bank': company.partner_id.bank_ids[0].bank.name})
+        return {
+            'value':res
+        }
+
+payroll_advice()
+
+class payroll_advice_line(osv.osv):
+    '''
+    Bank Advice Lines
+    '''
+
+    _name = 'hr.payroll.advice.line'
+    _description = 'Bank Advice Lines'
+    _columns = {
+        'advice_id':fields.many2one('hr.payroll.advice', 'Bank Advice', required=False),
+        'name':fields.char('Bank Account A/C', size=64, required=True, readonly=False),
+        'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
+        'amount': fields.float('Amount', digits_compute=dp.get_precision('Payroll')),
+        'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
+    }
+
+payroll_advice_line()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
index d5c83722784..8e62df86de6 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
@@ -134,7 +134,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="condition_select">none</field>
             <field name="amount_select">code</field>
              <field name="amount_python_compute">result = (contract.wage + DA) * 15 * employee.number_of_year / worked_days.WORK100.number_of_days</field>
-            <field name="sequence" eval="500"/>
+            <field name="sequence" eval="57"/>
             <field name="note">Covered under the Payment of Gratuity Act, 1971: 
 (Last drawn monthly basic salary + dearness allowance)/26 x 15 days x 
 number of years of service (date of joining – date of retirement/leaving job)</field>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 29323b458d5..de131f43e55 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -48,5 +48,70 @@
             </data>
             </field>
         </record>
+
+        <record id="view_hr_bank_advice_form" model="ir.ui.view">
+            <field name="name">hr.payroll.advice.form</field>
+            <field name="model">hr.payroll.advice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bank Advice">
+                    <group col="6" colspan="4">
+                        <field name="name" colspan="4" select="1"/>
+                        <field name="number" invisible="1" select="1"/>
+                        <field name="bank_id"/>
+                        <field name="date" select="1"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Paymeny Lines">
+                            <field name="line_ids" colspan="4" nolabel="1">
+                                <tree string="Payment Lines" editable="bottom">
+                                    <field name="employee_id" on_change="onchange_employee_id(parent.date, employee_id)"/>
+                                    <field name="name"/>
+                                    <field name="amount"/>
+                                    <field name="bysal"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Letter Content">
+                            <group colspan="4" col="6">
+                              <field name="company_id" on_change="onchange_company_id(company_id)" groups="base.group_multi_company" widget="selection"/>
+                              <field name="chaque_nos"/>
+                            </group>
+                            <separator colspan="4" string="Letter Details"/>
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                    <group col="6" colspan="6">
+                        <field name="state"/>
+                        <button name="compute_advice" string="Compute Advice"  states="draft" type="object"/>
+                        <button name="cancel_sheet" string="Cancel Sheet" states="draft" icon="gtk-cancel"  type="object"/>
+                        <button name="confirm_sheet"  icon="gtk-apply" string="Confirm Sheet" states="draft" type="object"/>
+                        <button name="set_to_draft" string="Set to Draft"  icon="gtk-convert"  states="cancel,confirm" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_view_hr_bank_advice_tree" model="ir.actions.act_window">
+            <field name="name">Payment Advice</field>
+            <field name="res_model">hr.payroll.advice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_hr_bank_advice_tree"/>
+        </record>
+        <menuitem
+            action="action_view_hr_bank_advice_tree"
+            id="hr_menu_payment_advice"
+            parent="hr_payroll.menu_hr_root_payroll"
+        />
+
+        <record id="action_view_hr_bank_advice_tree" model="ir.actions.act_window">
+            <field name="name">Payment Advice</field>
+            <field name="res_model">hr.payroll.advice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_hr_bank_advice_tree"/>
+        </record>
+
     </data>
 </openerp>

From f2d7415ec847ad32657607c79498309015ecb7fa Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 4 Jun 2012 14:46:29 +0530
Subject: [PATCH 068/999] [IMP]payment advice tree view added,unnecessary
 action removed.

bzr revid: kbh@tinyerp.com-20120604091629-x0rapzx94yx5lj6u
---
 .../l10n_in_hr_payroll_view.xml               | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index de131f43e55..d728e5411e4 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -49,6 +49,19 @@
             </field>
         </record>
 
+        <record id="view_hr_bank_advice_tree" model="ir.ui.view">
+            <field name="name">hr.payroll.advice.tree</field>
+            <field name="model">hr.payroll.advice</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Bank Advice">
+                    <field name="number" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </tree>
+            </field>
+        </record>
         <record id="view_hr_bank_advice_form" model="ir.ui.view">
             <field name="name">hr.payroll.advice.form</field>
             <field name="model">hr.payroll.advice</field>
@@ -105,13 +118,5 @@
             parent="hr_payroll.menu_hr_root_payroll"
         />
 
-        <record id="action_view_hr_bank_advice_tree" model="ir.actions.act_window">
-            <field name="name">Payment Advice</field>
-            <field name="res_model">hr.payroll.advice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_hr_bank_advice_tree"/>
-        </record>
-
     </data>
 </openerp>

From 71a4731a0ff242462c52ffb7db74e16e986e12fc Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 4 Jun 2012 18:54:48 +0530
Subject: [PATCH 069/999] [IMP]field invisible parameter removed.

bzr revid: kbh@tinyerp.com-20120604132448-cfb5mkem318vhxpr
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index d728e5411e4..56290fa84ab 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -70,7 +70,7 @@
                 <form string="Bank Advice">
                     <group col="6" colspan="4">
                         <field name="name" colspan="4" select="1"/>
-                        <field name="number" invisible="1" select="1"/>
+                        <field name="number" select="1"/>
                         <field name="bank_id"/>
                         <field name="date" select="1"/>
                     </group>

From 8827fee54231d9e8a6f7d24b981e769e8621a650 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 6 Jun 2012 15:25:08 +0530
Subject: [PATCH 070/999] [IMP]compute advice method improved,state workflow
 changed and place of states are changed.

bzr revid: kbh@tinyerp.com-20120606095508-3rubur9xhrbsxw6u
---
 addons/l10n_in_hr_payroll/__openerp__.py      |  1 +
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 55 ++++++++-----------
 .../l10n_in_hr_payroll_demo.xml               |  2 +-
 .../l10n_in_hr_payroll_sequence.xml           | 15 +++++
 .../l10n_in_hr_payroll_view.xml               | 20 ++++---
 5 files changed, 52 insertions(+), 41 deletions(-)
 create mode 100644 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index c605756417e..0073c1f3b27 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -46,6 +46,7 @@ Indian Payroll Rules.
     'update_xml': [
          'l10n_in_hr_payroll_view.xml',
          'l10n_in_hr_payroll_data.xml',
+         'l10n_in_hr_payroll_sequence.xml',
          'data/hr.salary.rule.csv',
          'l10n_in_hr_payroll_report.xml',
      ],
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index b2bd5c111da..989bda9b3b0 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -31,18 +31,6 @@ from calendar import isleap
 from osv import fields, osv
 import decimal_precision as dp
 
-def prev_bounds(cdate=False):
-    when = date.fromtimestamp(time.mktime(time.strptime(cdate,"%Y-%m-%d")))
-    this_first = date(when.year, when.month, 1)
-    month = when.month + 1
-    year = when.year
-    if month > 12:
-        month = 1
-        year += 1
-    next_month = date(year, month, 1)
-    prev_end = next_month - timedelta(days=1)
-    return this_first, prev_end
-
 class hr_contract_in(osv.osv):
     _inherit = 'hr.contract'
     _description = 'contract'
@@ -142,25 +130,31 @@ class payroll_advice(osv.osv):
         sequence_pool = self.pool.get('ir.sequence')
         payslip_line_pool = self.pool.get('hr.payslip.line')
 
+        DATETIME_FORMAT = "%Y-%m-%d"
+
         for advice in self.browse(cr, uid, ids, context=context):
-            dates = prev_bounds(advice.date)
-            slip_ids = payslip_pool.search(cr, uid, [ ('date_from','<=',advice.date),('date_to','>=',advice.date),('date_from','=',dates[0]),('date_to','=',dates[1])], context=context)
+            old_line_ids = advice_line_pool.search(cr, uid, [('advice_id','=',advice.id)], context=context)
+            if old_line_ids:
+                advice_line_pool.unlink(cr, uid, old_line_ids, context=context)
+            slip_ids = payslip_pool.search(cr, uid, [('date_from','<=',advice.date),('date_to','>=',advice.date)], context=context)
             if not slip_ids:
-                    raise osv.except_osv(_('Error !'), _('You can get only current month payslips') % (slip_ids))
-        for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
-            line_ids = payslip_line_pool.search(cr, uid, [ ('slip_id','in',slip_ids),('code','=',"NET")], context=context)
-            for line in slip.line_ids:
-                if not slip.employee_id.bank_account_id:
-                    raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
-                advice_line= {
-                        'advice_id':advice.id,
-                        'name':slip.employee_id.bank_account_id.acc_number,
-                        'employee_id':slip.employee_id.id,
-                        'bysal':line.total
-                        }
-            id = advice_line_pool.create(cr, uid, advice_line, context=context)
-        number = self.pool.get('ir.sequence').get(cr, uid, 'advice.line')
-        self.write(cr, uid, ids, {'state':'confirm','number':number}, context=context)
+                advice_date = datetime.strptime(advice.date,DATETIME_FORMAT)
+                a_date = advice_date.strftime('%B')+'-'+advice_date.strftime('%Y')
+                raise osv.except_osv(_('Error !'), _('No payslips for %s') % (a_date))
+            for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
+                line_ids = payslip_line_pool.search(cr, uid, [ ('slip_id','in',slip_ids),('code','=',"NET")], context=context)
+                for line in slip.line_ids:
+                    if not slip.employee_id.bank_account_id:
+                        raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
+                    advice_line= {
+                            'advice_id':advice.id,
+                            'name':slip.employee_id.bank_account_id.acc_number,
+                            'employee_id':slip.employee_id.id,
+                            'bysal':line.total
+                            }
+                id = advice_line_pool.create(cr, uid, advice_line, context=context)
+        number = self.pool.get('ir.sequence').get(cr, uid, 'payment.advice')
+        self.write(cr, uid, ids, {'number':number}, context=context)
 
     def confirm_sheet(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'confirm'}, context=context)
@@ -195,9 +189,8 @@ class payroll_advice_line(osv.osv):
     _description = 'Bank Advice Lines'
     _columns = {
         'advice_id':fields.many2one('hr.payroll.advice', 'Bank Advice', required=False),
-        'name':fields.char('Bank Account A/C', size=64, required=True, readonly=False),
+        'name':fields.char('Bank Account No.', size=64, required=True, readonly=False),
         'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
-        'amount': fields.float('Amount', digits_compute=dp.get_precision('Payroll')),
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
     }
 
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
index 3160e238a6f..49f0967add0 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
@@ -7,7 +7,7 @@
         <record id="hr_payroll_salary_structure_emp_ind" model="hr.payroll.structure">
             <field name="code">IND</field>
             <field name="name">Indian Employee</field>
-            <field eval="[(6, 0, [ref('hr_salary_rule_medical'),ref('hr_salary_rule_lta'),ref('hr_salary_rule_telephone'), ref('hr_salary_rule_internet'),ref('hr_payroll_rule_child_edu'),ref('hr_salary_rule_gratuity')])]" name="rule_ids"/>
+            <field eval="[(6, 0, [ref('hr_salary_rule_medical'),ref('hr_salary_rule_lta'),ref('hr_salary_rule_telephone'), ref('hr_salary_rule_internet'),ref('hr_payroll_rule_child1'),ref('hr_salary_rule_gratuity')])]" name="rule_ids"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="parent_id" ref="hr_payroll.structure_base"/>
         </record>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
new file mode 100644
index 00000000000..9b9a0230395
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="seq_type_payment_advice" model="ir.sequence.type">
+            <field name="name">Payment Advice</field>
+            <field name="code">payment.advice</field>
+        </record>
+        <record id="seq_payment_advice" model="ir.sequence">
+            <field name="name">Payment Advice</field>
+            <field name="code">payment.advice</field>
+            <field name="prefix">PAY/</field>
+            <field name="padding">3</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 56290fa84ab..d568418a9ba 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -67,7 +67,17 @@
             <field name="model">hr.payroll.advice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bank Advice">
+                <form string="Bank Advice" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button name="compute_advice" string="Compute Advice"  states="draft" type="object"/>
+                        <button name="cancel_sheet" string="Cancel Sheet" states="draft" icon="gtk-cancel"  type="object"/>
+                        <button name="confirm_sheet"  icon="gtk-apply" string="Confirm Sheet" states="draft" type="object"/>
+                        <button name="set_to_draft" string="Set to Draft"  icon="gtk-convert"  states="cancel,confirm" type="object"/>
+                        <div class="oe_right">
+                            <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft"/>
+                        </div>
+                        <div class="oe_clear"/>
+                    </div>
                     <group col="6" colspan="4">
                         <field name="name" colspan="4" select="1"/>
                         <field name="number" select="1"/>
@@ -80,7 +90,6 @@
                                 <tree string="Payment Lines" editable="bottom">
                                     <field name="employee_id" on_change="onchange_employee_id(parent.date, employee_id)"/>
                                     <field name="name"/>
-                                    <field name="amount"/>
                                     <field name="bysal"/>
                                 </tree>
                             </field>
@@ -94,13 +103,6 @@
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="6" colspan="6">
-                        <field name="state"/>
-                        <button name="compute_advice" string="Compute Advice"  states="draft" type="object"/>
-                        <button name="cancel_sheet" string="Cancel Sheet" states="draft" icon="gtk-cancel"  type="object"/>
-                        <button name="confirm_sheet"  icon="gtk-apply" string="Confirm Sheet" states="draft" type="object"/>
-                        <button name="set_to_draft" string="Set to Draft"  icon="gtk-convert"  states="cancel,confirm" type="object"/>
-                    </group>
                 </form>
             </field>
         </record>

From da13d90912fb12bd8f82a12300325f6f57dfee17 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 11 Jun 2012 14:38:49 +0530
Subject: [PATCH 071/999] [FIX] stock:'product level forecast' report does not
 support accented char.

bzr revid: tpa@tinyerp.com-20120611090849-cmir9qms3blrjjw4
---
 addons/stock/report/stock_graph.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py
index 5ee58bb9d2c..b5d08f93d3f 100644
--- a/addons/stock/report/stock_graph.py
+++ b/addons/stock/report/stock_graph.py
@@ -22,6 +22,7 @@ from pychart import *
 import pychart.legend
 import time
 from report.misc import choice_colors
+import base64
 
 #
 # Draw a graph for stocks
@@ -41,7 +42,7 @@ class stock_graph(object):
             product_name=product_name.replace('/', '//')
         if product_id not in self._datas:
             self._datas[product_id] = {}
-        self._names[product_id] = product_name
+        self._names[product_id] = product_name.decode('utf-8')
         for (dt,stock) in datas:
             if not dt in self._datas[product_id]:
                 self._datas[product_id][dt]=0

From 61a3238d978ab40e661974dc2b75fbda700f7c70 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 11 Jun 2012 16:20:38 +0530
Subject: [PATCH 072/999] [FIX]stock: fix the issue of counting of Deliveries
 in kanban view and improve a action string

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

bzr revid: mma@tinyerp.com-20120611105038-wrospxpjr2wbna6h
---
 addons/stock/product.py       | 2 +-
 addons/stock/product_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 62fdbb24ca2..9f9faa1cc24 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -44,7 +44,7 @@ class product_product(osv.osv):
         ], ['product_id'], ['product_id'])
         for move in moves:
             product_id = move['product_id'][0]
-            res[product_id]['reception_count'] = move['product_id_count']
+            res[product_id]['delivery_count'] = move['product_id_count']
         return res
 
     def get_product_accounts(self, cr, uid, product_id, context=None):
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 49e0e9c1880..e1840ac7497 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -140,7 +140,7 @@
         </record>
        
         <record id="action_deliver_move" model="ir.actions.act_window">
-            <field name="name">Receive Products</field>
+            <field name="name">Deliver Products</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>

From fb53de6357ccc8d481709fa4cd96d5d81eccfcb3 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 11 Jun 2012 16:40:55 +0530
Subject: [PATCH 073/999] [IMP]added icon,add search view,update list view,made
 fields readonly.

bzr revid: kbh@tinyerp.com-20120611111055-kc3k2x8kwx6srdgw
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 34 ++++++++-------
 .../l10n_in_hr_payroll_view.xml               | 43 +++++++++++++++++--
 2 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 989bda9b3b0..290aaa5017a 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -102,26 +102,32 @@ class payroll_advice(osv.osv):
     _name = 'hr.payroll.advice'
     _description = 'Bank Advice Note'
     _columns = {
-        'name':fields.char('Name', size=2048, required=True, readonly=False),
+        'name':fields.char('Name', size=16, readonly=True, required=True, states={'draft': [('readonly', False)]},),
         'note': fields.text('Description'),
-        'date': fields.date('Date'),
+        'date': fields.date('Date', readonly=True, states={'draft': [('readonly', False)]},),
         'state':fields.selection([
             ('draft','Draft Sheet'),
             ('confirm','Confirm Sheet'),
             ('cancel','Reject'),
         ],'State', select=True, readonly=True),
-        'number':fields.char('Number', size=64, required=False, readonly=True),
-        'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', required=False),
-        'chaque_nos':fields.char('Chaque Nos', size=256, required=False, readonly=False),
-        'company_id':fields.many2one('res.company', 'Company', required=False),
-        'bank_id':fields.many2one('res.bank', 'Bank', required=False, help="Select the Bank Address from whcih the salary is going to be paid"),
+        'number':fields.char('Number', size=16, readonly=True),
+        'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary'),
+        'chaque_nos':fields.char('Chaque Nos', size=256),
+        'company_id':fields.many2one('res.company', 'Company',required=True),
+        'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank Address from whcih the salary is going to be paid"),
     }
+    
+    def _get_bank(self, cr, uid, context=None):
+        bank_ids = self.pool.get('res.bank').search(cr, uid, [('name', '=', 'Reserve')])
+        return bank_ids and bank_ids[0] or False
+    
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'state': lambda *a: 'draft',
         'company_id': lambda self, cr, uid, context: \
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
+        'bank_id': _get_bank
     }
 
     def compute_advice(self, cr, uid, ids, context=None):
@@ -157,16 +163,13 @@ class payroll_advice(osv.osv):
         self.write(cr, uid, ids, {'number':number}, context=context)
 
     def confirm_sheet(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state':'confirm'}, context=context)
-        return True
+        return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
     def set_to_draft(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state':'draft'}, context=context)
-        return True
+        return self.write(cr, uid, ids, {'state':'draft'}, context=context)
 
     def cancel_sheet(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state':'cancel'}, context=context)
-        return True
+        return self.write(cr, uid, ids, {'state':'cancel'}, context=context)
 
     def onchange_company_id(self, cr, uid, ids, company_id=False, context=None):
         res = {}
@@ -188,10 +191,11 @@ class payroll_advice_line(osv.osv):
     _name = 'hr.payroll.advice.line'
     _description = 'Bank Advice Lines'
     _columns = {
-        'advice_id':fields.many2one('hr.payroll.advice', 'Bank Advice', required=False),
-        'name':fields.char('Bank Account No.', size=64, required=True, readonly=False),
+        'advice_id':fields.many2one('hr.payroll.advice', 'Bank Advice',),
+        'name':fields.char('Bank Account No.', size=16, required=True),
         'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
+        'company_id': fields.related('advice_id','company_id', type='many2one', required=True,relation='res.company', string='Company'),
     }
 
 payroll_advice_line()
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index d568418a9ba..3cf869ff6f2 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -55,10 +55,16 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Bank Advice">
+                    <field name="date" select="1"/>
                     <field name="number" select="1"/>
                     <field name="name" select="1"/>
-                    <field name="date" select="1"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="bank_id" select="1"/>
+                    <field name="state"/>
+                    <button name="compute_advice" string="Compute Advice" icon="terp-document-new" states="draft" type="object"/>
+                        <button name="cancel_sheet" string="Cancel Sheet" states="draft" icon="gtk-cancel"  type="object"/>
+                        <button name="confirm_sheet"  icon="gtk-apply" string="Confirm Sheet" states="draft" type="object"/>
+                        <button name="set_to_draft" string="Set to Draft"  icon="gtk-convert"  states="cancel,confirm" type="object"/>
                 </tree>
             </field>
         </record>
@@ -69,7 +75,7 @@
             <field name="arch" type="xml">
                 <form string="Bank Advice" layout="manual">
                     <div class="oe_form_topbar">
-                        <button name="compute_advice" string="Compute Advice"  states="draft" type="object"/>
+                        <button name="compute_advice" string="Compute Advice" icon="terp-document-new" states="draft" type="object"/>
                         <button name="cancel_sheet" string="Cancel Sheet" states="draft" icon="gtk-cancel"  type="object"/>
                         <button name="confirm_sheet"  icon="gtk-apply" string="Confirm Sheet" states="draft" type="object"/>
                         <button name="set_to_draft" string="Set to Draft"  icon="gtk-convert"  states="cancel,confirm" type="object"/>
@@ -81,7 +87,7 @@
                     <group col="6" colspan="4">
                         <field name="name" colspan="4" select="1"/>
                         <field name="number" select="1"/>
-                        <field name="bank_id"/>
+                        <field name="bank_id" select="1"/>
                         <field name="date" select="1"/>
                     </group>
                     <notebook colspan="4">
@@ -91,10 +97,11 @@
                                     <field name="employee_id" on_change="onchange_employee_id(parent.date, employee_id)"/>
                                     <field name="name"/>
                                     <field name="bysal"/>
+                                    <field name="company_id" />
                                 </tree>
                             </field>
                         </page>
-                        <page string="Letter Content">
+                        <page string="Other Information">
                             <group colspan="4" col="6">
                               <field name="company_id" on_change="onchange_company_id(company_id)" groups="base.group_multi_company" widget="selection"/>
                               <field name="chaque_nos"/>
@@ -107,12 +114,40 @@
             </field>
         </record>
 
+        <record id="view_hr_payroll_advice_filter" model="ir.ui.view">
+            <field name="name">hr.payroll.advice.select</field>
+            <field name="model">hr.payroll.advice</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Payment advice">
+                    <group>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Advice"/>
+                        <filter icon="terp-camera_test" string="Done" domain="[('state','=','confirm')]" help="Done Advice"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <field name="number"/>
+                        <field name="name"/>
+                        <field name="bank_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Bank" name="bank_id" icon="terp-folder-orange" context="{'group_by':'bank_id'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Companies" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="States" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record id="action_view_hr_bank_advice_tree" model="ir.actions.act_window">
             <field name="name">Payment Advice</field>
             <field name="res_model">hr.payroll.advice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_hr_bank_advice_tree"/>
+            <field name="search_view_id" ref="view_hr_payroll_advice_filter"/>
         </record>
         <menuitem
             action="action_view_hr_bank_advice_tree"

From 16f49c83c8e60f6f57d98083cec278943333e2c7 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 11 Jun 2012 16:52:25 +0530
Subject: [PATCH 074/999] [IMP]sequence file removed.

bzr revid: kbh@tinyerp.com-20120611112225-v7wcbozqyvyxhmfg
---
 addons/l10n_in_hr_payroll/__openerp__.py          |  1 -
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py   |  2 --
 .../l10n_in_hr_payroll_sequence.xml               | 15 ---------------
 .../l10n_in_hr_payroll_view.xml                   |  2 +-
 4 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 0073c1f3b27..c605756417e 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -46,7 +46,6 @@ Indian Payroll Rules.
     'update_xml': [
          'l10n_in_hr_payroll_view.xml',
          'l10n_in_hr_payroll_data.xml',
-         'l10n_in_hr_payroll_sequence.xml',
          'data/hr.salary.rule.csv',
          'l10n_in_hr_payroll_report.xml',
      ],
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 290aaa5017a..f552faa1176 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -159,8 +159,6 @@ class payroll_advice(osv.osv):
                             'bysal':line.total
                             }
                 id = advice_line_pool.create(cr, uid, advice_line, context=context)
-        number = self.pool.get('ir.sequence').get(cr, uid, 'payment.advice')
-        self.write(cr, uid, ids, {'number':number}, context=context)
 
     def confirm_sheet(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
deleted file mode 100644
index 9b9a0230395..00000000000
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        <record id="seq_type_payment_advice" model="ir.sequence.type">
-            <field name="name">Payment Advice</field>
-            <field name="code">payment.advice</field>
-        </record>
-        <record id="seq_payment_advice" model="ir.sequence">
-            <field name="name">Payment Advice</field>
-            <field name="code">payment.advice</field>
-            <field name="prefix">PAY/</field>
-            <field name="padding">3</field>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 3cf869ff6f2..d9549f99124 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -106,7 +106,7 @@
                               <field name="company_id" on_change="onchange_company_id(company_id)" groups="base.group_multi_company" widget="selection"/>
                               <field name="chaque_nos"/>
                             </group>
-                            <separator colspan="4" string="Letter Details"/>
+                            <separator colspan="4" string="Information"/>
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>

From 71003a5aa06cf7d4ac2c2d8936330b22070876e3 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 13 Jun 2012 12:08:45 +0530
Subject: [PATCH 075/999] [ADD]sequence file added for payroll advice.

bzr revid: kbh@tinyerp.com-20120613063845-1qiuuasfim19f94r
---
 addons/l10n_in_hr_payroll/__openerp__.py          |  1 +
 .../l10n_in_hr_payroll_sequence.xml               | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 07f83d2605a..b1825850256 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -49,6 +49,7 @@ Indian Payroll Rules.
          'l10n_in_hr_payroll_data.xml',
          'data/hr.salary.rule.csv',
          'l10n_in_hr_payroll_report.xml',
+         'l10n_in_hr_payroll_sequence.xml'
      ],
     'demo_xml': ['l10n_in_hr_payroll_demo.xml'],
     'installable': True
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
new file mode 100644
index 00000000000..140d0676c4f
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="seq_type_payment_advice" model="ir.sequence.type">
+            <field name="name">Payment Advice</field>
+            <field name="code">payment.advice</field>
+        </record>
+        <record id="seq_payment_advice" model="ir.sequence">
+            <field name="name">Payment Advice</field>
+            <field name="code">payment.advice</field>
+            <field name="prefix">PAY/%(month)s/%(year)s/</field>
+            <field name="padding">3</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

From 8ca629034c5b28dc27b09b4e62d2b860d55fe6af Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 13 Jun 2012 12:21:37 +0530
Subject: [PATCH 076/999] [ADD]sequence number created in mentho,access rights
 added for payroll advice.

bzr revid: kbh@tinyerp.com-20120613065137-78ye6taovw0yffdw
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py       | 4 +++-
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 2 +-
 addons/l10n_in_hr_payroll/security/hr.salary.rule.csv | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index b16cfb871d7..59d45c0b119 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -129,6 +129,7 @@ class payroll_advice(osv.osv):
         payslip_pool = self.pool.get('hr.payslip')
         advice_line_pool = self.pool.get('hr.payroll.advice.line')
         payslip_line_pool = self.pool.get('hr.payslip.line')
+        sequence_pool = self.pool.get('ir.sequence')
 
         for advice in self.browse(cr, uid, ids, context=context):
             old_line_ids = advice_line_pool.search(cr, uid, [('advice_id','=',advice.id)], context=context)
@@ -152,7 +153,8 @@ class payroll_advice(osv.osv):
                             'bysal': line.total
                             }
                     advice_line_pool.create(cr, uid, advice_line, context=context)
-        return True
+        number = self.pool.get('ir.sequence').get(cr, uid, 'payment.advice')
+        self.write(cr, uid, ids, {'number':number}, context=context)
 
     def confirm_sheet(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 351908455c0..35e56d9225e 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -10,7 +10,7 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                 <xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
+                 <xpath expr="//field[@name='struct_id']" position="after">
                  <group col="2" colspan="2" name="right_column">
                     <separator colspan="2" string="Allowance"/>
                         <field name="food_coupon_amount"/>
diff --git a/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
index 0015ef665b0..e1e23bf3985 100644
--- a/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
+++ b/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
@@ -1,2 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_user",1,1,1,1
+"access_hr_payroll_advice","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_manager",1,1,1,1
+"access_hr_payroll_advice_line","hr.payroll.advice.line","model_hr_payroll_advice_line","base.group_hr_manager",1,1,1,1

From 1514f85e3395a3ecf3432caae52f3c8599f94bff Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 13 Jun 2012 12:23:22 +0530
Subject: [PATCH 077/999] [IMP]button removed from tree view and state name
 changed.

bzr revid: kbh@tinyerp.com-20120613065322-k538s2sb7nekx5q4
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py       | 4 ++--
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 59d45c0b119..6e85c65bb2f 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -106,8 +106,8 @@ class payroll_advice(osv.osv):
         'note': fields.text('Description'),
         'date': fields.date('Date', states={'draft': [('readonly', False)]},),
         'state':fields.selection([
-            ('draft','Draft Sheet'),
-            ('confirm','Confirm Sheet'),
+            ('draft','Draft'),
+            ('confirm','Confirm'),
             ('cancel','Cancelled'),
         ],'State', select=True, readonly=True),
         'number':fields.char('Number', size=16, readonly=True),
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 35e56d9225e..65af024a83b 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -61,10 +61,6 @@
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field name="bank_id" select="1"/>
                     <field name="state"/>
-                    <button name="compute_advice" string="Compute Advice" icon="terp-document-new" states="draft" type="object"/>
-                        <button name="cancel_sheet" string="Cancel Sheet" states="draft" icon="gtk-cancel"  type="object"/>
-                        <button name="confirm_sheet"  icon="gtk-apply" string="Confirm Sheet" states="draft" type="object"/>
-                        <button name="set_to_draft" string="Set to Draft"  icon="gtk-convert"  states="cancel,confirm" type="object"/>
                 </tree>
             </field>
         </record>

From bd053e72bbbb048ae9f86e42dc55b0bd386f1dcb Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 13 Jun 2012 12:28:07 +0530
Subject: [PATCH 078/999] [IMP]date and line_ids are readonly true when advice
 is confirm,tooltip on date field and default test on note filed.

bzr revid: kbh@tinyerp.com-20120613065807-e5ldjk8pfy4u46tr
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 6e85c65bb2f..b79868f5060 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -104,14 +104,14 @@ class payroll_advice(osv.osv):
     _columns = {
         'name':fields.char('Name', size=32, readonly=True, required=True, states={'draft': [('readonly', False)]},),
         'note': fields.text('Description'),
-        'date': fields.date('Date', states={'draft': [('readonly', False)]},),
+        'date': fields.date('Date', readonly=True, states={'draft': [('readonly', False)]}, help="Date is used to search Payslips."),
         'state':fields.selection([
             ('draft','Draft'),
             ('confirm','Confirm'),
             ('cancel','Cancelled'),
         ],'State', select=True, readonly=True),
         'number':fields.char('Number', size=16, readonly=True),
-        'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}),
+        'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}, readonly=True),
         'chaque_nos':fields.char('Chaque Nos', size=256),
         'company_id':fields.many2one('res.company', 'Company',required=True, states={'draft': [('readonly', False)]}),
         'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank Address from whcih the salary is going to be paid"),
@@ -123,6 +123,8 @@ class payroll_advice(osv.osv):
         'company_id': lambda self, cr, uid, context: \
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
+        'note': "Bank Payment advice contain the payment amount, payment date, company name, bank and other information of the payment."
+
     }
 
     def compute_advice(self, cr, uid, ids, context=None):

From 13ce1a7d1a96ac2e164bd2aab5ee772ce816f329 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 13 Jun 2012 12:29:30 +0530
Subject: [PATCH 079/999] [IMP]added error message if no lines.

bzr revid: kbh@tinyerp.com-20120613065930-6wyjkh4yb1tt7y7p
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index b79868f5060..95ebf909044 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -159,7 +159,11 @@ class payroll_advice(osv.osv):
         self.write(cr, uid, ids, {'number':number}, context=context)
 
     def confirm_sheet(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
+        for advice in self.browse(cr, uid, ids, context=context):
+            if not advice.line_ids:
+                raise osv.except_osv(_('No Payment Advice Lines !'), _('Please create some advice lines.'))
+            else:
+                return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
     def set_to_draft(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'draft'}, context=context)

From ec4bf5e33cd785212d1ca678cd2d0b5dc33be658 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 13 Jun 2012 12:56:39 +0530
Subject: [PATCH 080/999] [ADD/IMP]payment advice report files added.

bzr revid: kbh@tinyerp.com-20120613072639-is9pr1vl3y7my3dg
---
 .../l10n_in_hr_payroll_report.xml             |   8 +
 .../l10n_in_hr_payroll_view.xml               |   2 +-
 addons/l10n_in_hr_payroll/report/__init__.py  |   1 +
 .../report/payment_advice.rml                 | 338 ++++++++++++++++++
 .../report/report_payroll_advice.py           |  70 ++++
 5 files changed, 418 insertions(+), 1 deletion(-)
 create mode 100644 addons/l10n_in_hr_payroll/report/payment_advice.rml
 create mode 100644 addons/l10n_in_hr_payroll/report/report_payroll_advice.py

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
index e3fff82fc38..90a6fd1560c 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
@@ -10,5 +10,13 @@
             rml="l10n_in_hr_payroll/report/report_payslip_details.rml"
             string="PaySlip Details" />
 
+        <report
+            auto="False" 
+            id="payroll_advice" 
+            model="hr.payroll.advice" 
+            name="payroll.advice" 
+            rml="l10n_in_hr_payroll/report/payment_advice.rml"
+            string="Bank Payment Advice" />
+
     </data>
 </openerp>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 351908455c0..35e56d9225e 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -10,7 +10,7 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                 <xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
+                 <xpath expr="//field[@name='struct_id']" position="after">
                  <group col="2" colspan="2" name="right_column">
                     <separator colspan="2" string="Allowance"/>
                         <field name="food_coupon_amount"/>
diff --git a/addons/l10n_in_hr_payroll/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py
index c90599352c2..5768ce50d05 100644
--- a/addons/l10n_in_hr_payroll/report/__init__.py
+++ b/addons/l10n_in_hr_payroll/report/__init__.py
@@ -23,5 +23,6 @@
 ##############################################################################
 
 import report_payslip_details
+import report_payroll_advice
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice.rml b/addons/l10n_in_hr_payroll/report/payment_advice.rml
new file mode 100644
index 00000000000..65ce07b56c6
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/payment_advice.rml
@@ -0,0 +1,338 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" alignment="JUSTIFY"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_0.30cmspace" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_space" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="1.0"/>
+    <paraStyle name="Drawing" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Helvetica"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Helvetica"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
+    <blockTable colWidths="269.0,269.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">The Manager</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">[[ o.bank_id.name ]] Bank</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_1">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_9">Dear Sir/Madam,</para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="539.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Payment Advice: [[ o.name ]] for period [[ get_month(o.date)['mname'] ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="539.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ o.note ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8_space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="61.0,151.0,151.0,175.0" style="Table4">
+      <tr>
+        <td>
+          <para style="P2">SI. No.</para>
+        </td>
+        <td>
+          <para style="P2">Name of the Employe</para>
+        </td>
+        <td>
+          <para style="P4">By Salary</para>
+        </td>
+        <td>
+          <para style="P3">Bank Account No.</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
+      <blockTable colWidths="62.0,152.0,151.0,172.0,2.0" style="Table5">
+        <tr>
+          <td>
+            <para style="P6" leftIndent="15" bulletIndent="0">
+              <bullet><seq id="L1"/>.</bullet>
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="P1">[[ line['name'] ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+          </td>
+          <td>
+            <para style="P1">[[ line['acc_no'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="62.0,152.0,99.0,92.0,135.0" style="Table6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P2">Total: </para>
+        </td>
+        <td>
+          <para style="P4">[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_0.30cmspace">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="269.0,269.0" style="Table7">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Yours Sincerely</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">For [[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Authorized Signature</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para>
+      <seqReset id="L1"/>
+    </para>
+  </story>
+</document>
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
new file mode 100644
index 00000000000..4c634edb3ba
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -0,0 +1,70 @@
+#-*- coding:utf-8 -*-
+
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    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 time
+from datetime import datetime
+from report import report_sxw
+from tools import amount_to_text_en
+
+class payroll_advice_report(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(payroll_advice_report, self).__init__(cr, uid, name, context)
+
+        self.total_bysal = 0.00
+        self.localcontext.update({
+            'time': time,
+            'get_month': self.get_month,
+            'convert': self.convert,
+            'get_detail': self.get_detail,
+            'get_bysal_total': self.get_bysal_total,
+        })
+    def get_month(self,input_date):
+        res = {
+               'mname': ''
+               }
+        date = datetime.strptime(input_date, '%Y-%m-%d')
+        res['mname']= date.strftime('%B')+'-'+date.strftime('%Y')
+        return res
+
+    def convert(self,amount, cur):
+        amt_en = amount_to_text_en.amount_to_text(amount,'en',cur);
+        return amt_en
+
+    def get_bysal_total(self):
+        return self.total_bysal
+
+    def get_detail(self,line_ids):
+        result =[]
+        if line_ids:
+            for l in line_ids:
+                res = {}
+                res['name'] = l.employee_id.name
+                res['acc_no'] = l.name
+                res['bysal'] = l.bysal
+                self.total_bysal += l.bysal
+                result.append(res)
+        return result
+
+report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'l10n_in_hr_payroll/report/payment_advice.rml', parser=payroll_advice_report)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From f7ccfee64d7b62b7921db64620267935dafc5eab Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 13 Jun 2012 17:56:05 +0530
Subject: [PATCH 081/999] [FIX]error message imporved and remove unnecessary
 access right.

bzr revid: kbh@tinyerp.com-20120613122605-ge147o1mps20wpdv
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py       | 7 +++----
 addons/l10n_in_hr_payroll/security/hr.salary.rule.csv | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 95ebf909044..20a26aff72e 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -123,7 +123,7 @@ class payroll_advice(osv.osv):
         'company_id': lambda self, cr, uid, context: \
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
-        'note': "Bank Payment advice contain the payment amount, payment date, company name, bank and other information of the payment."
+        'note': "Please make the payroll transfer from above account number to the below mentioned account numbers towards employee salaries:"
 
     }
 
@@ -161,9 +161,8 @@ class payroll_advice(osv.osv):
     def confirm_sheet(self, cr, uid, ids, context=None):
         for advice in self.browse(cr, uid, ids, context=context):
             if not advice.line_ids:
-                raise osv.except_osv(_('No Payment Advice Lines !'), _('Please create some advice lines.'))
-            else:
-                return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
+                raise osv.except_osv(_('No Payment Advice Lines !'), _('You can not confirm Payment advice without advice lines.'))
+        return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
     def set_to_draft(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'draft'}, context=context)
diff --git a/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
index e1e23bf3985..11860aa17e2 100644
--- a/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
+++ b/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
@@ -1,4 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_user",1,1,1,1
 "access_hr_payroll_advice","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_manager",1,1,1,1
 "access_hr_payroll_advice_line","hr.payroll.advice.line","model_hr_payroll_advice_line","base.group_hr_manager",1,1,1,1

From 1d4fbdeebcfae31dae03984b6e50395bf064ed01 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 13 Jun 2012 18:45:47 +0530
Subject: [PATCH 082/999] [ADD]added i18n for language translations.

bzr revid: kbh@tinyerp.com-20120613131547-vvzj19r5pjcgqok1
---
 addons/l10n_in_hr_payroll/i18n/gu.po          | 492 ++++++++++++++++++
 addons/l10n_in_hr_payroll/i18n/hi.po          | 492 ++++++++++++++++++
 .../i18n/l10n_in_hr_payroll.pot               | 492 ++++++++++++++++++
 addons/l10n_in_hr_payroll/i18n/ta.po          | 492 ++++++++++++++++++
 addons/l10n_in_hr_payroll/i18n/te.po          | 492 ++++++++++++++++++
 5 files changed, 2460 insertions(+)
 create mode 100644 addons/l10n_in_hr_payroll/i18n/gu.po
 create mode 100644 addons/l10n_in_hr_payroll/i18n/hi.po
 create mode 100644 addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
 create mode 100644 addons/l10n_in_hr_payroll/i18n/ta.po
 create mode 100644 addons/l10n_in_hr_payroll/i18n/te.po

diff --git a/addons/l10n_in_hr_payroll/i18n/gu.po b/addons/l10n_in_hr_payroll/i18n/gu.po
new file mode 100644
index 00000000000..3d6c8e77e83
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/gu.po
@@ -0,0 +1,492 @@
+# Gujarati Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-13 12:04+0000\n"
+"PO-Revision-Date: 2012-06-13 12:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Gujarati <gu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid " Allowance for company provided driver."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,professional_tax:0
+msgid "Professional tax deducted from salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Group By..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,driver_salay:0
+msgid "Driver Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+msgstr "("
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,company_id:0
+#: field:hr.payroll.advice.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ","
+msgstr ","
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,short_term_gain:0
+msgid "Short Term Gain from Share Trading/Equity MFs "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,short_term_gain:0
+msgid "Stocks/equity mutual funds are sold before one year."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank Address from whcih the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Other Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Reference"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
+#, python-format
+msgid "No Payslips for found for %s Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,medical_insurance:0
+msgid "Medical Insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Identification No"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,professional_tax:0
+msgid "Professional Tax "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,food_coupon_amount:0
+msgid "Food Coupons "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+msgid "By Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Email"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,food_coupon_amount:0
+msgid "Amount of food coupon per day."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,other_income:0
+msgid "Other Income "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage.(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,company_transport:0
+msgid "Deduction for company provided transport."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,saving_bank_account:0
+msgid "Saving Bank Account Income "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,long_term_gain:0
+msgid "Stocks/equity mutual funds are kept for more than a year."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Done Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Designation"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,long_term_gain:0
+msgid "Long Term Gain from Share Trading/Equity MFs"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Done"
+msgstr "Done"
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "joining date of employee "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,house_rent_income:0
+msgid "Income from house property."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Compute Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+msgstr ")"
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,saving_bank_account:0
+msgid "Saving income for bank account."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,bank_id:0
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,name:0
+#: report:paylip.details.in:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,company_transport:0
+msgid "Company Provided Transport"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,other_income:0
+msgid "Other income of employee."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Credit"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "States"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,leave_avail_dedution:0
+msgid "Deduction for emergency leave of employee."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,leave_avail_dedution:0
+msgid "Leave Availed Deduction "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,house_rent_income:0
+msgid "House Rent Income "
+msgstr ""
diff --git a/addons/l10n_in_hr_payroll/i18n/hi.po b/addons/l10n_in_hr_payroll/i18n/hi.po
new file mode 100644
index 00000000000..7d6d427b5b0
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/hi.po
@@ -0,0 +1,492 @@
+# Hindi Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-13 12:04+0000\n"
+"PO-Revision-Date: 2012-06-13 12:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Hindi <hi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid " Allowance for company provided driver."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,professional_tax:0
+msgid "Professional tax deducted from salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Group By..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,driver_salay:0
+msgid "Driver Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+msgstr "("
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,company_id:0
+#: field:hr.payroll.advice.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ","
+msgstr ","
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,short_term_gain:0
+msgid "Short Term Gain from Share Trading/Equity MFs "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,short_term_gain:0
+msgid "Stocks/equity mutual funds are sold before one year."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank Address from whcih the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Other Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Reference"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
+#, python-format
+msgid "No Payslips for found for %s Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,medical_insurance:0
+msgid "Medical Insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Identification No"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,professional_tax:0
+msgid "Professional Tax "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,food_coupon_amount:0
+msgid "Food Coupons "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+msgid "By Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Email"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,food_coupon_amount:0
+msgid "Amount of food coupon per day."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,other_income:0
+msgid "Other Income "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage.(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,company_transport:0
+msgid "Deduction for company provided transport."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,saving_bank_account:0
+msgid "Saving Bank Account Income "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,long_term_gain:0
+msgid "Stocks/equity mutual funds are kept for more than a year."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Done Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Designation"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,long_term_gain:0
+msgid "Long Term Gain from Share Trading/Equity MFs"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Done"
+msgstr "Done"
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "joining date of employee "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,house_rent_income:0
+msgid "Income from house property."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Compute Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+msgstr ")"
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,saving_bank_account:0
+msgid "Saving income for bank account."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,bank_id:0
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,name:0
+#: report:paylip.details.in:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,company_transport:0
+msgid "Company Provided Transport"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,other_income:0
+msgid "Other income of employee."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Credit"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "States"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,leave_avail_dedution:0
+msgid "Deduction for emergency leave of employee."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,leave_avail_dedution:0
+msgid "Leave Availed Deduction "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,house_rent_income:0
+msgid "House Rent Income "
+msgstr ""
diff --git a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
new file mode 100644
index 00000000000..2a0be577676
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
@@ -0,0 +1,492 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-13 12:04+0000\n"
+"PO-Revision-Date: 2012-06-13 12:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid " Allowance for company provided driver."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,professional_tax:0
+msgid "Professional tax deducted from salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Group By..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,driver_salay:0
+msgid "Driver Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+msgstr "("
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,company_id:0
+#: field:hr.payroll.advice.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ","
+msgstr ","
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,short_term_gain:0
+msgid "Short Term Gain from Share Trading/Equity MFs "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,short_term_gain:0
+msgid "Stocks/equity mutual funds are sold before one year."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank Address from whcih the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Other Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Reference"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
+#, python-format
+msgid "No Payslips for found for %s Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,medical_insurance:0
+msgid "Medical Insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Identification No"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,professional_tax:0
+msgid "Professional Tax "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,food_coupon_amount:0
+msgid "Food Coupons "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+msgid "By Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Email"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,food_coupon_amount:0
+msgid "Amount of food coupon per day."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,other_income:0
+msgid "Other Income "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage.(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,company_transport:0
+msgid "Deduction for company provided transport."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,saving_bank_account:0
+msgid "Saving Bank Account Income "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,long_term_gain:0
+msgid "Stocks/equity mutual funds are kept for more than a year."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Done Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Designation"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,long_term_gain:0
+msgid "Long Term Gain from Share Trading/Equity MFs"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Done"
+msgstr "Done"
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "joining date of employee "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,house_rent_income:0
+msgid "Income from house property."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Compute Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+msgstr ")"
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,saving_bank_account:0
+msgid "Saving income for bank account."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,bank_id:0
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,name:0
+#: report:paylip.details.in:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,company_transport:0
+msgid "Company Provided Transport"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,other_income:0
+msgid "Other income of employee."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Credit"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "States"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,leave_avail_dedution:0
+msgid "Deduction for emergency leave of employee."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,leave_avail_dedution:0
+msgid "Leave Availed Deduction "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,house_rent_income:0
+msgid "House Rent Income "
+msgstr ""
diff --git a/addons/l10n_in_hr_payroll/i18n/ta.po b/addons/l10n_in_hr_payroll/i18n/ta.po
new file mode 100644
index 00000000000..0b325d75865
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/ta.po
@@ -0,0 +1,492 @@
+# Tamil Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-13 12:04+0000\n"
+"PO-Revision-Date: 2012-06-13 12:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Tamil <ta@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid " Allowance for company provided driver."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,professional_tax:0
+msgid "Professional tax deducted from salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Group By..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,driver_salay:0
+msgid "Driver Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+msgstr "("
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,company_id:0
+#: field:hr.payroll.advice.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ","
+msgstr ","
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,short_term_gain:0
+msgid "Short Term Gain from Share Trading/Equity MFs "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,short_term_gain:0
+msgid "Stocks/equity mutual funds are sold before one year."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank Address from whcih the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Other Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Reference"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
+#, python-format
+msgid "No Payslips for found for %s Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,medical_insurance:0
+msgid "Medical Insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Identification No"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,professional_tax:0
+msgid "Professional Tax "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,food_coupon_amount:0
+msgid "Food Coupons "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+msgid "By Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Email"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,food_coupon_amount:0
+msgid "Amount of food coupon per day."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,other_income:0
+msgid "Other Income "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage.(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,company_transport:0
+msgid "Deduction for company provided transport."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,saving_bank_account:0
+msgid "Saving Bank Account Income "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,long_term_gain:0
+msgid "Stocks/equity mutual funds are kept for more than a year."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Done Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Designation"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,long_term_gain:0
+msgid "Long Term Gain from Share Trading/Equity MFs"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Done"
+msgstr "Done"
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "joining date of employee "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,house_rent_income:0
+msgid "Income from house property."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Compute Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+msgstr ")"
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,saving_bank_account:0
+msgid "Saving income for bank account."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,bank_id:0
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,name:0
+#: report:paylip.details.in:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,company_transport:0
+msgid "Company Provided Transport"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,other_income:0
+msgid "Other income of employee."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Credit"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "States"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,leave_avail_dedution:0
+msgid "Deduction for emergency leave of employee."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,leave_avail_dedution:0
+msgid "Leave Availed Deduction "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,house_rent_income:0
+msgid "House Rent Income "
+msgstr ""
diff --git a/addons/l10n_in_hr_payroll/i18n/te.po b/addons/l10n_in_hr_payroll/i18n/te.po
new file mode 100644
index 00000000000..e8a3c54d757
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/te.po
@@ -0,0 +1,492 @@
+# Telugu Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-13 12:04+0000\n"
+"PO-Revision-Date: 2012-06-13 12:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Telugu <te@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid " Allowance for company provided driver."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,professional_tax:0
+msgid "Professional tax deducted from salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Group By..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,driver_salay:0
+msgid "Driver Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+msgstr "("
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,company_id:0
+#: field:hr.payroll.advice.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ","
+msgstr ","
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,short_term_gain:0
+msgid "Short Term Gain from Share Trading/Equity MFs "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,short_term_gain:0
+msgid "Stocks/equity mutual funds are sold before one year."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank Address from whcih the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Other Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Reference"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
+#, python-format
+msgid "No Payslips for found for %s Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,medical_insurance:0
+msgid "Medical Insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Identification No"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,professional_tax:0
+msgid "Professional Tax "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,food_coupon_amount:0
+msgid "Food Coupons "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+msgid "By Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Email"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,food_coupon_amount:0
+msgid "Amount of food coupon per day."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,other_income:0
+msgid "Other Income "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage.(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,company_transport:0
+msgid "Deduction for company provided transport."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,saving_bank_account:0
+msgid "Saving Bank Account Income "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,long_term_gain:0
+msgid "Stocks/equity mutual funds are kept for more than a year."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Done Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Designation"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,long_term_gain:0
+msgid "Long Term Gain from Share Trading/Equity MFs"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Done"
+msgstr "Done"
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "joining date of employee "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,house_rent_income:0
+msgid "Income from house property."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Compute Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+msgstr ")"
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,saving_bank_account:0
+msgid "Saving income for bank account."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,bank_id:0
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,name:0
+#: report:paylip.details.in:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,company_transport:0
+msgid "Company Provided Transport"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,other_income:0
+msgid "Other income of employee."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Credit"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "States"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,leave_avail_dedution:0
+msgid "Deduction for emergency leave of employee."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,leave_avail_dedution:0
+msgid "Leave Availed Deduction "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,house_rent_income:0
+msgid "House Rent Income "
+msgstr ""

From 374c0888253a7ccdea63dff26cc2a8c1e64f53cf Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 14 Jun 2012 11:22:09 +0530
Subject: [PATCH 083/999] [IMP/ADD]changed msgid and added file for bengali
 language

bzr revid: kbh@tinyerp.com-20120614055209-4hc7kw2rwukc7jv5
---
 addons/l10n_in_hr_payroll/i18n/bn.po          | 492 ++++++++++++++++++
 addons/l10n_in_hr_payroll/i18n/gu.po          |   6 +-
 addons/l10n_in_hr_payroll/i18n/hi.po          |   6 +-
 .../i18n/l10n_in_hr_payroll.pot               |   6 +-
 addons/l10n_in_hr_payroll/i18n/ta.po          |   6 +-
 addons/l10n_in_hr_payroll/i18n/te.po          |   6 +-
 6 files changed, 507 insertions(+), 15 deletions(-)
 create mode 100644 addons/l10n_in_hr_payroll/i18n/bn.po

diff --git a/addons/l10n_in_hr_payroll/i18n/bn.po b/addons/l10n_in_hr_payroll/i18n/bn.po
new file mode 100644
index 00000000000..fcf32457acf
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/bn.po
@@ -0,0 +1,492 @@
+# Bengali Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-13 12:04+0000\n"
+"PO-Revision-Date: 2012-06-13 12:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Bengali <bn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid " Allowance for company provided driver."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,professional_tax:0
+msgid "Professional tax deducted from salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Group By..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,driver_salay:0
+msgid "Driver Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+msgstr "("
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,company_id:0
+#: field:hr.payroll.advice.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ","
+msgstr ","
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,short_term_gain:0
+msgid "Short Term Gain from Share Trading/Equity MFs "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,short_term_gain:0
+msgid "Stocks/equity mutual funds are sold before one year."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank Address from whcih the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Other Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Reference"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
+#, python-format
+msgid "No Payslips for found for %s Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,medical_insurance:0
+msgid "Medical Insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Identification No"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,professional_tax:0
+msgid "Professional Tax "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,food_coupon_amount:0
+msgid "Food Coupons "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+msgid "By Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Email"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,food_coupon_amount:0
+msgid "Amount of food coupon per day."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,other_income:0
+msgid "Other Income "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage.(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,company_transport:0
+msgid "Deduction for company provided transport."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+msgid "Confirm"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,saving_bank_account:0
+msgid "Saving Bank Account Income "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,long_term_gain:0
+msgid "Stocks/equity mutual funds are kept for more than a year."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Done Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Designation"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,long_term_gain:0
+msgid "Long Term Gain from Share Trading/Equity MFs"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Done"
+msgstr "Done"
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "joining date of employee "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,house_rent_income:0
+msgid "Income from house property."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Compute Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+msgstr ")"
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,saving_bank_account:0
+msgid "Saving income for bank account."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,bank_id:0
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,name:0
+#: report:paylip.details.in:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,company_transport:0
+msgid "Company Provided Transport"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,other_income:0
+msgid "Other income of employee."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Credit"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "States"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,leave_avail_dedution:0
+msgid "Deduction for emergency leave of employee."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,leave_avail_dedution:0
+msgid "Leave Availed Deduction "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,house_rent_income:0
+msgid "House Rent Income "
+msgstr ""
diff --git a/addons/l10n_in_hr_payroll/i18n/gu.po b/addons/l10n_in_hr_payroll/i18n/gu.po
index 3d6c8e77e83..4df241afb6c 100644
--- a/addons/l10n_in_hr_payroll/i18n/gu.po
+++ b/addons/l10n_in_hr_payroll/i18n/gu.po
@@ -228,7 +228,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: selection:hr.payroll.advice,state:0
-msgid "Confirm Sheet"
+msgid "Confirm"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -323,7 +323,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+msgid "Draft"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -421,7 +421,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
diff --git a/addons/l10n_in_hr_payroll/i18n/hi.po b/addons/l10n_in_hr_payroll/i18n/hi.po
index 7d6d427b5b0..614b0fee2cf 100644
--- a/addons/l10n_in_hr_payroll/i18n/hi.po
+++ b/addons/l10n_in_hr_payroll/i18n/hi.po
@@ -228,7 +228,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: selection:hr.payroll.advice,state:0
-msgid "Confirm Sheet"
+msgid "Confirm"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -323,7 +323,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+msgid "Draft"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -421,7 +421,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
diff --git a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
index 2a0be577676..8ea08ebb10b 100644
--- a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
+++ b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
@@ -228,7 +228,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: selection:hr.payroll.advice,state:0
-msgid "Confirm Sheet"
+msgid "Confirm"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -323,7 +323,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+msgid "Draft"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -421,7 +421,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
diff --git a/addons/l10n_in_hr_payroll/i18n/ta.po b/addons/l10n_in_hr_payroll/i18n/ta.po
index 0b325d75865..e1f35c84ff8 100644
--- a/addons/l10n_in_hr_payroll/i18n/ta.po
+++ b/addons/l10n_in_hr_payroll/i18n/ta.po
@@ -228,7 +228,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: selection:hr.payroll.advice,state:0
-msgid "Confirm Sheet"
+msgid "Confirm"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -323,7 +323,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+msgid "Draft"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -421,7 +421,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
diff --git a/addons/l10n_in_hr_payroll/i18n/te.po b/addons/l10n_in_hr_payroll/i18n/te.po
index e8a3c54d757..a201e0afc5a 100644
--- a/addons/l10n_in_hr_payroll/i18n/te.po
+++ b/addons/l10n_in_hr_payroll/i18n/te.po
@@ -228,7 +228,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: selection:hr.payroll.advice,state:0
-msgid "Confirm Sheet"
+msgid "Confirm"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -323,7 +323,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
+msgid "Draft"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -421,7 +421,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_in_hr_payroll

From 18112a5ee0939e544694f56433f8012f69f66e77 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 14 Jun 2012 17:59:19 +0530
Subject: [PATCH 084/999] [IMP]report improved.

bzr revid: kbh@tinyerp.com-20120614122919-sfucseuqr9z94mpg
---
 .../l10n_in_hr_payroll_report.xml             |  2 +-
 .../report/payment_advice.rml                 | 79 +++++++++----------
 .../report/report_payroll_advice.py           | 14 +++-
 3 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
index 90a6fd1560c..636095dae12 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
@@ -16,7 +16,7 @@
             model="hr.payroll.advice" 
             name="payroll.advice" 
             rml="l10n_in_hr_payroll/report/payment_advice.rml"
-            string="Bank Payment Advice" />
+            string="Print Advice" />
 
     </data>
 </openerp>
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice.rml b/addons/l10n_in_hr_payroll/report/payment_advice.rml
index 65ce07b56c6..4657de677ef 100644
--- a/addons/l10n_in_hr_payroll/report/payment_advice.rml
+++ b/addons/l10n_in_hr_payroll/report/payment_advice.rml
@@ -45,8 +45,6 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -59,8 +57,6 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
@@ -69,12 +65,18 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica" alignment="JUSTIFY"/>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" alignment="JUSTIFY"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -137,16 +139,16 @@
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">
-            <font color="white"> </font>
+          <para style="P7">
+            <font face="Helvetica" size="10.0">Payment advice</font>
           </para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">
-            <font color="white"> </font>
+          <para style="P12">
+            <font face="Helvetica" size="6.0">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</font>
           </para>
         </td>
       </tr>
@@ -187,64 +189,59 @@
     <blockTable colWidths="539.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Payment Advice: [[ o.name ]] for period [[ get_month(o.date)['mname'] ]]</para>
+          <para style="P8">Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]]</para>
         </td>
       </tr>
     </blockTable>
     <blockTable colWidths="539.0" style="Table3">
       <tr>
         <td>
-          <para style="terp_default_9">[[ o.note ]]</para>
+          <para style="terp_default_9">[[ o.note ]] </para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_8_space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="61.0,151.0,151.0,175.0" style="Table4">
+    <blockTable colWidths="61.0,154.0,149.0,175.0" style="Table4">
       <tr>
         <td>
-          <para style="P2">SI. No.</para>
+          <para style="P1">SI. No.</para>
         </td>
         <td>
-          <para style="P2">Name of the Employe</para>
+          <para style="P1">Name of the Employe</para>
         </td>
         <td>
-          <para style="P4">By Salary</para>
+          <para style="P2">Bank Account No.</para>
         </td>
         <td>
-          <para style="P3">Bank Account No.</para>
+          <para style="P2">By Salary</para>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
-      <blockTable colWidths="62.0,152.0,151.0,172.0,2.0" style="Table5">
+      <blockTable colWidths="61.0,154.0,149.0,175.0" style="Table5">
         <tr>
           <td>
-            <para style="P6" leftIndent="15" bulletIndent="0">
+            <para style="P5" leftIndent="15" bulletIndent="0">
               <bullet><seq id="L1"/>.</bullet>
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="P1">[[ line['name'] ]]</para>
+            <para style="P6">[[ line['name'] ]]</para>
           </td>
           <td>
-            <para style="P5">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+            <para style="P4">[[ line['acc_no'] ]]</para>
           </td>
           <td>
-            <para style="P1">[[ line['acc_no'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">
-              <font color="white"> </font>
-            </para>
+            <para style="P6">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="62.0,152.0,99.0,92.0,135.0" style="Table6">
+    <blockTable colWidths="62.0,154.0,149.0,174.0" style="Table6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">
@@ -252,20 +249,16 @@
           </para>
         </td>
         <td>
-          <para style="P2">Total: </para>
-        </td>
-        <td>
-          <para style="P4">[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
-        </td>
-        <td>
-          <para style="P4">
-            <font color="white"> </font>
+          <para style="P1">
+            <font face="Helvetica" size="6.0"/>
           </para>
         </td>
         <td>
-          <para style="P4">
-            <font color="white"> </font>
-          </para>
+          <para style="P1">Total : <font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font></para>
+          <para style="P3"/>
+        </td>
+        <td>
+          <para style="P3"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
index 4c634edb3ba..e10b5af5b28 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -3,7 +3,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
 #    d$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -40,10 +40,16 @@ class payroll_advice_report(report_sxw.rml_parse):
         })
     def get_month(self,input_date):
         res = {
-               'mname': ''
+               'from_name': '','to_name': ''
                }
-        date = datetime.strptime(input_date, '%Y-%m-%d')
-        res['mname']= date.strftime('%B')+'-'+date.strftime('%Y')
+        payslip_pool = self.pool.get('hr.payslip')
+        for advice in self.pool.get('hr.payroll.advice').browse(self.cr, self.uid, self.ids):
+            slip_ids = payslip_pool.search(self.cr, self.uid, [('date_from','<=',advice.date), ('date_to','>=',advice.date)])
+            for slip in payslip_pool.browse(self.cr, self.uid, slip_ids):
+                from_date = datetime.strptime(slip.date_from, '%Y-%m-%d')
+                to_date =  datetime.strptime(slip.date_to, '%Y-%m-%d')
+                res['from_name']= from_date.strftime('%d')+'-'+from_date.strftime('%B')+'-'+from_date.strftime('%Y')
+                res['to_name']= to_date.strftime('%d')+'-'+to_date.strftime('%B')+'-'+to_date.strftime('%Y')
         return res
 
     def convert(self,amount, cur):

From bfc3f9774a8802057c9edc84edbe0dcca7a62d88 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 14 Jun 2012 18:15:33 +0530
Subject: [PATCH 085/999] [IMP]sequence set on confirm button,company field
 readonly on confirm,field name set as letter detail.

bzr revid: kbh@tinyerp.com-20120614124533-h1jdw9692uj8ptk5
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py       | 11 ++++++-----
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 20a26aff72e..d2893c25bd8 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -113,7 +113,7 @@ class payroll_advice(osv.osv):
         'number':fields.char('Number', size=16, readonly=True),
         'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}, readonly=True),
         'chaque_nos':fields.char('Chaque Nos', size=256),
-        'company_id':fields.many2one('res.company', 'Company',required=True, states={'draft': [('readonly', False)]}),
+        'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank Address from whcih the salary is going to be paid"),
     }
     
@@ -131,7 +131,6 @@ class payroll_advice(osv.osv):
         payslip_pool = self.pool.get('hr.payslip')
         advice_line_pool = self.pool.get('hr.payroll.advice.line')
         payslip_line_pool = self.pool.get('hr.payslip.line')
-        sequence_pool = self.pool.get('ir.sequence')
 
         for advice in self.browse(cr, uid, ids, context=context):
             old_line_ids = advice_line_pool.search(cr, uid, [('advice_id','=',advice.id)], context=context)
@@ -155,14 +154,16 @@ class payroll_advice(osv.osv):
                             'bysal': line.total
                             }
                     advice_line_pool.create(cr, uid, advice_line, context=context)
-        number = self.pool.get('ir.sequence').get(cr, uid, 'payment.advice')
-        self.write(cr, uid, ids, {'number':number}, context=context)
+        return True
 
     def confirm_sheet(self, cr, uid, ids, context=None):
+        sequence_pool = self.pool.get('ir.sequence')
+
         for advice in self.browse(cr, uid, ids, context=context):
             if not advice.line_ids:
                 raise osv.except_osv(_('No Payment Advice Lines !'), _('You can not confirm Payment advice without advice lines.'))
-        return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
+        number = self.pool.get('ir.sequence').get(cr, uid, 'payment.advice')
+        return self.write(cr, uid, ids, {'number':number,'state':'confirm'}, context=context)
 
     def set_to_draft(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'draft'}, context=context)
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 65af024a83b..5c239eeb295 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -101,7 +101,7 @@
                               <field name="company_id" on_change="onchange_company_id(company_id)" groups="base.group_multi_company" widget="selection"/>
                               <field name="chaque_nos"/>
                             </group>
-                            <separator colspan="4" string="Information"/>
+                            <separator colspan="4" string="Letter Details"/>
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>

From 2f43fd498ecda5ac70f49eb0638e6382abcc87e4 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 15 Jun 2012 15:27:32 +0530
Subject: [PATCH 086/999] [FIX]sequence number changed,rename security file.

bzr revid: kbh@tinyerp.com-20120615095732-869m6lnbrwgax3ec
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py             | 6 ++++--
 .../security/{hr.salary.rule.csv => ir.model.access.csv}    | 0
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename addons/l10n_in_hr_payroll/security/{hr.salary.rule.csv => ir.model.access.csv} (100%)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 5b297931531..7d5b5b11885 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -160,8 +160,10 @@ class payroll_advice(osv.osv):
         for advice in self.browse(cr, uid, ids, context=context):
             if not advice.line_ids:
                 raise osv.except_osv(_('Error !'), _('You can not confirm Payment advice without advice lines.'))
-        number = self.pool.get('ir.sequence').get(cr, uid, 'payment.advice')
-        return self.write(cr, uid, ids, {'number':number, 'state':'confirm'}, context=context)
+            date = advice_date.strftime('%Y')+'/'+advice_date.strftime('%m')
+            number = self.pool.get('ir.sequence').get(cr, uid, 'payment.advice')
+            sequence_num = 'PAY' + '/' + date + '/' + number
+            return self.write(cr, uid, ids, {'number':sequence_num,'state':'confirm'}, context=context)
 
     def set_to_draft(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'draft'}, context=context)
diff --git a/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/security/ir.model.access.csv
similarity index 100%
rename from addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
rename to addons/l10n_in_hr_payroll/security/ir.model.access.csv

From 8c8de36e182907bd42b82bb7b8f4f9cbd839577f Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 15 Jun 2012 16:16:51 +0530
Subject: [PATCH 087/999] [FIX]prefix of sequence changed.

bzr revid: kbh@tinyerp.com-20120615104651-yyrys4pqgfuechly
---
 addons/l10n_in_hr_payroll/__openerp__.py                  | 1 +
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py           | 1 +
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index b1825850256..aa65eee647b 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -48,6 +48,7 @@ Indian Payroll Rules.
          'l10n_in_hr_payroll_view.xml',
          'l10n_in_hr_payroll_data.xml',
          'data/hr.salary.rule.csv',
+         'security/ir.model.access.csv',
          'l10n_in_hr_payroll_report.xml',
          'l10n_in_hr_payroll_sequence.xml'
      ],
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 7d5b5b11885..52d901f4ad9 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -160,6 +160,7 @@ class payroll_advice(osv.osv):
         for advice in self.browse(cr, uid, ids, context=context):
             if not advice.line_ids:
                 raise osv.except_osv(_('Error !'), _('You can not confirm Payment advice without advice lines.'))
+            advice_date = datetime.strptime(advice.date,DATETIME_FORMAT)
             date = advice_date.strftime('%Y')+'/'+advice_date.strftime('%m')
             number = self.pool.get('ir.sequence').get(cr, uid, 'payment.advice')
             sequence_num = 'PAY' + '/' + date + '/' + number
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
index 140d0676c4f..ea809ed9321 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
@@ -8,7 +8,7 @@
         <record id="seq_payment_advice" model="ir.sequence">
             <field name="name">Payment Advice</field>
             <field name="code">payment.advice</field>
-            <field name="prefix">PAY/%(month)s/%(year)s/</field>
+            <field name="prefix"></field>
             <field name="padding">3</field>
         </record>
     </data>

From 94059b2cdac7fcc5288757a57dcfae30442473c2 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 15 Jun 2012 16:36:56 +0530
Subject: [PATCH 088/999] [FIX]return added.

bzr revid: kbh@tinyerp.com-20120615110656-kuyp9z4swxqcovoq
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 52d901f4ad9..1fc0d13e7a9 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -164,7 +164,8 @@ class payroll_advice(osv.osv):
             date = advice_date.strftime('%Y')+'/'+advice_date.strftime('%m')
             number = self.pool.get('ir.sequence').get(cr, uid, 'payment.advice')
             sequence_num = 'PAY' + '/' + date + '/' + number
-            return self.write(cr, uid, ids, {'number':sequence_num,'state':'confirm'}, context=context)
+            self.write(cr, uid, advice.id, {'number':sequence_num,'state':'confirm'}, context=context)
+        return True
 
     def set_to_draft(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'draft'}, context=context)

From 16fc15248560deda399cb2beab49e3cc9a17dea9 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 15 Jun 2012 17:29:34 +0530
Subject: [PATCH 089/999] [FIX]dict update.

bzr revid: kbh@tinyerp.com-20120615115934-6i5nmzq2jmijvxn9
---
 .../report/payment_advice.rml                 | 32 ++++++++-----------
 .../report/report_payroll_advice.py           | 27 ++++++++--------
 2 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/payment_advice.rml b/addons/l10n_in_hr_payroll/report/payment_advice.rml
index 4657de677ef..176543fdcdd 100644
--- a/addons/l10n_in_hr_payroll/report/payment_advice.rml
+++ b/addons/l10n_in_hr_payroll/report/payment_advice.rml
@@ -69,14 +69,12 @@
     <paraStyle name="P2" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Helvetica" alignment="JUSTIFY"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica" alignment="JUSTIFY"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -139,7 +137,7 @@
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="P7">
+          <para style="P6">
             <font face="Helvetica" size="10.0">Payment advice</font>
           </para>
           <para style="terp_default_9">
@@ -147,9 +145,7 @@
           </para>
         </td>
         <td>
-          <para style="P12">
-            <font face="Helvetica" size="6.0">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</font>
-          </para>
+          <para style="P10">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
         </td>
       </tr>
       <tr>
@@ -189,7 +185,7 @@
     <blockTable colWidths="539.0" style="Table2">
       <tr>
         <td>
-          <para style="P8">Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]]</para>
+          <para style="P7">Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids and o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -224,19 +220,19 @@
       <blockTable colWidths="61.0,154.0,149.0,175.0" style="Table5">
         <tr>
           <td>
-            <para style="P5" leftIndent="15" bulletIndent="0">
+            <para style="P8" leftIndent="15" bulletIndent="0">
               <bullet><seq id="L1"/>.</bullet>
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="P6">[[ line['name'] ]]</para>
+            <para style="P5">[[ line['name'] ]]</para>
           </td>
           <td>
             <para style="P4">[[ line['acc_no'] ]]</para>
           </td>
           <td>
-            <para style="P6">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+            <para style="P5">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -249,8 +245,8 @@
           </para>
         </td>
         <td>
-          <para style="P1">
-            <font face="Helvetica" size="6.0"/>
+          <para style="P9">
+            <font color="white"> </font>
           </para>
         </td>
         <td>
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
index e10b5af5b28..0dc1c61b6f7 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -24,6 +24,7 @@
 import time
 from datetime import datetime
 from report import report_sxw
+
 from tools import amount_to_text_en
 
 class payroll_advice_report(report_sxw.rml_parse):
@@ -38,7 +39,7 @@ class payroll_advice_report(report_sxw.rml_parse):
             'get_detail': self.get_detail,
             'get_bysal_total': self.get_bysal_total,
         })
-    def get_month(self,input_date):
+    def get_month(self, input_date):
         res = {
                'from_name': '','to_name': ''
                }
@@ -52,23 +53,23 @@ class payroll_advice_report(report_sxw.rml_parse):
                 res['to_name']= to_date.strftime('%d')+'-'+to_date.strftime('%B')+'-'+to_date.strftime('%Y')
         return res
 
-    def convert(self,amount, cur):
-        amt_en = amount_to_text_en.amount_to_text(amount,'en',cur);
-        return amt_en
+    def convert(self, amount, cur):
+        return amount_to_text_en.amount_to_text(amount,'en',cur);
 
     def get_bysal_total(self):
         return self.total_bysal
 
-    def get_detail(self,line_ids):
+    def get_detail(self, line_ids):
         result =[]
-        if line_ids:
-            for l in line_ids:
-                res = {}
-                res['name'] = l.employee_id.name
-                res['acc_no'] = l.name
-                res['bysal'] = l.bysal
-                self.total_bysal += l.bysal
-                result.append(res)
+        res = {}
+        for l in line_ids:
+            res.update({
+                    'name': l.employee_id.name,
+                    'acc_no': l.name,
+                    'bysal': l.bysal,
+                    })
+            self.total_bysal += l.bysal
+            result.append(res)
         return result
 
 report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'l10n_in_hr_payroll/report/payment_advice.rml', parser=payroll_advice_report)

From c740e3fdf8e5f2a946d7127b8e451f3f372c2b78 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 15 Jun 2012 17:33:41 +0530
Subject: [PATCH 090/999] [FIX].

bzr revid: kbh@tinyerp.com-20120615120341-0paz93bx2luwrqi6
---
 addons/l10n_in_hr_payroll/report/report_payroll_advice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
index 0dc1c61b6f7..61ad9a8efc5 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -23,8 +23,8 @@
 
 import time
 from datetime import datetime
-from report import report_sxw
 
+from report import report_sxw
 from tools import amount_to_text_en
 
 class payroll_advice_report(report_sxw.rml_parse):

From 07081e4b732986fed6f40995262d9fc59adbccc2 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 18 Jun 2012 11:26:42 +0530
Subject: [PATCH 091/999] [FIX]report modified.

bzr revid: kbh@tinyerp.com-20120618055642-1p2uztplg15ceu03
---
 .../l10n_in_hr_payroll_report.xml             |  2 +-
 .../report/report_payroll_advice.py           |  8 ++--
 ...t_advice.rml => report_payroll_advice.rml} | 48 +++++++++----------
 3 files changed, 28 insertions(+), 30 deletions(-)
 rename addons/l10n_in_hr_payroll/report/{payment_advice.rml => report_payroll_advice.rml} (90%)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
index 636095dae12..b6392871434 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
@@ -15,7 +15,7 @@
             id="payroll_advice" 
             model="hr.payroll.advice" 
             name="payroll.advice" 
-            rml="l10n_in_hr_payroll/report/payment_advice.rml"
+            rml="l10n_in_hr_payroll/report/report_payroll_advice.rml"
             string="Print Advice" />
 
     </data>
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
index 61ad9a8efc5..7438965f465 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -31,7 +31,6 @@ class payroll_advice_report(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(payroll_advice_report, self).__init__(cr, uid, name, context)
 
-        self.total_bysal = 0.00
         self.localcontext.update({
             'time': time,
             'get_month': self.get_month,
@@ -61,17 +60,18 @@ class payroll_advice_report(report_sxw.rml_parse):
 
     def get_detail(self, line_ids):
         result =[]
-        res = {}
+        self.total_bysal = 0.00
         for l in line_ids:
+            res = {}
             res.update({
                     'name': l.employee_id.name,
                     'acc_no': l.name,
                     'bysal': l.bysal,
                     })
             self.total_bysal += l.bysal
-            result.append(res)
+            result.append(res) 
         return result
 
-report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'l10n_in_hr_payroll/report/payment_advice.rml', parser=payroll_advice_report)
+report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'l10n_in_hr_payroll/report/report_payroll_advice.rml', parser=payroll_advice_report)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
similarity index 90%
rename from addons/l10n_in_hr_payroll/report/payment_advice.rml
rename to addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
index 176543fdcdd..55014e3b1ee 100644
--- a/addons/l10n_in_hr_payroll/report/payment_advice.rml
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
@@ -66,15 +66,15 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P8" fontName="Helvetica" alignment="JUSTIFY"/>
-    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica" alignment="JUSTIFY"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -137,15 +137,13 @@
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="P6">
-            <font face="Helvetica" size="10.0">Payment advice</font>
-          </para>
+          <para style="P10">Payment Advice </para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P10">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
+          <para style="P6">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
         </td>
       </tr>
       <tr>
@@ -185,7 +183,7 @@
     <blockTable colWidths="539.0" style="Table2">
       <tr>
         <td>
-          <para style="P7">Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids and o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]]</para>
+          <para style="P8"><u>Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids and o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -199,7 +197,7 @@
     <para style="terp_default_8_space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="61.0,154.0,149.0,175.0" style="Table4">
+    <blockTable colWidths="61.0,189.0,165.0,124.0" style="Table4">
       <tr>
         <td>
           <para style="P1">SI. No.</para>
@@ -208,36 +206,36 @@
           <para style="P1">Name of the Employe</para>
         </td>
         <td>
-          <para style="P2">Bank Account No.</para>
+          <para style="P3">Bank Account No.</para>
         </td>
         <td>
-          <para style="P2">By Salary</para>
+          <para style="P3">By Salary</para>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
-      <blockTable colWidths="61.0,154.0,149.0,175.0" style="Table5">
+      <blockTable colWidths="61.0,189.0,165.0,124.0" style="Table5">
         <tr>
           <td>
-            <para style="P8" leftIndent="15" bulletIndent="0">
-              <bullet><seq id="L1"/>.</bullet>
+            <para style="P9" leftIndent="15" bulletIndent="0">
+              <bullet><seq id="L1"/></bullet>
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="P5">[[ line['name'] ]]</para>
+            <para style="P7">[[ line['name'] ]]</para>
           </td>
           <td>
-            <para style="P4">[[ line['acc_no'] ]]</para>
+            <para style="P5">[[ line['acc_no'] ]]</para>
           </td>
           <td>
-            <para style="P5">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+            <para style="P7">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="62.0,154.0,149.0,174.0" style="Table6">
+    <blockTable colWidths="62.0,189.0,165.0,124.0" style="Table6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">
@@ -245,16 +243,16 @@
           </para>
         </td>
         <td>
-          <para style="P9">
+          <para style="P2">
             <font color="white"> </font>
           </para>
         </td>
         <td>
           <para style="P1">Total : <font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font></para>
-          <para style="P3"/>
+          <para style="P4"/>
         </td>
         <td>
-          <para style="P3"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+          <para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
         </td>
       </tr>
     </blockTable>

From 56dbf247d3ee21702d1ea9f0653abce2f38a3fee Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 18 Jun 2012 16:40:22 +0530
Subject: [PATCH 092/999] [ADD]added doc strings in methods.

bzr revid: kbh@tinyerp.com-20120618111022-0mqf7ydd3n08hsgx
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 1cef9417439..cc23bd34cdd 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -31,6 +31,11 @@ import decimal_precision as dp
 DATETIME_FORMAT = "%Y-%m-%d"
 
 class hr_contract(osv.osv):
+    """
+    Employee contract allows to add different values in fields.
+    Fields are used in salary rule computation.
+    """
+
     _inherit = 'hr.contract'
     _description = 'contract'
     
@@ -54,7 +59,11 @@ hr_contract()
 
 
 class hr_employee(osv.osv):
-    
+    '''
+    Employee's Join date allows to compute total working 
+    experience of Employee and it is used to calculate Gratuity rule.
+    '''
+
     _inherit = 'hr.employee'
     _description = 'Employee'
 
@@ -128,6 +137,15 @@ class payroll_advice(osv.osv):
     }
 
     def compute_advice(self, cr, uid, ids, context=None):
+        """
+        Advice - Create Advice lines in Payment Advice and 
+        compute Advice lines.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Advice’s IDs
+        @return: Advice lines
+        @param context: A standard dictionary for contextual values
+        """
         payslip_pool = self.pool.get('hr.payslip')
         advice_line_pool = self.pool.get('hr.payroll.advice.line')
         payslip_line_pool = self.pool.get('hr.payslip.line')
@@ -157,6 +175,14 @@ class payroll_advice(osv.osv):
         return True
 
     def confirm_sheet(self, cr, uid, ids, context=None):
+        """
+        confirm Advice - confirmed Advice after computing Advice Lines..
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of confirm Advice’s IDs
+        @return: confirmed Advice lines and set sequence of Advice.
+        @param context: A standard dictionary for contextual values
+        """
         seq_obj = self.pool.get('ir.sequence')
         for advice in self.browse(cr, uid, ids, context=context):
             if not advice.line_ids:
@@ -169,9 +195,13 @@ class payroll_advice(osv.osv):
         return True
 
     def set_to_draft(self, cr, uid, ids, context=None):
+        """Resets Advice as draft.
+        """
         return self.write(cr, uid, ids, {'state':'draft'}, context=context)
 
     def cancel_sheet(self, cr, uid, ids, context=None):
+        """Marks Advice as cancelled.
+        """
         return self.write(cr, uid, ids, {'state':'cancel'}, context=context)
 
     def onchange_company_id(self, cr, uid, ids, company_id=False, context=None):

From 344ddfbdd5fcf2ff6f22a76f5aa405e8ebeee185 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 19 Jun 2012 11:54:26 +0530
Subject: [PATCH 093/999] [FIX]base:fix the issue of KeyError when changes in
 line of Journal Entry

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

bzr revid: mma@tinyerp.com-20120619062426-x5ykv2thycvpvs4l
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index f0c16d8586c..a441a262003 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1363,7 +1363,7 @@ class account_move(osv.osv):
         balance = 0.0
         for line in line_ids:
             if line[2]:
-                balance += (line[2]['debit'] or 0.00)- (line[2]['credit'] or 0.00)
+                balance += (line[2].get('debit',0.00)- (line[2].get('credit',0.00)))
         return {'value': {'balance': balance}}
 
     def write(self, cr, uid, ids, vals, context=None):

From 02f0cec18c9c247f6d1d936f7c7b1482d417fedb Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 25 Jun 2012 14:09:23 +0530
Subject: [PATCH 094/999] [FIX]removed wrong translation from msgstr in po and
 pot file.

bzr revid: kbh@tinyerp.com-20120625083923-nlkmdeiw8bl2jfd7
---
 addons/l10n_in_hr_payroll/i18n/bn.po                  | 8 ++++----
 addons/l10n_in_hr_payroll/i18n/gu.po                  | 8 ++++----
 addons/l10n_in_hr_payroll/i18n/hi.po                  | 8 ++++----
 addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot | 8 ++++----
 addons/l10n_in_hr_payroll/i18n/ta.po                  | 8 ++++----
 addons/l10n_in_hr_payroll/i18n/te.po                  | 8 ++++----
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/i18n/bn.po b/addons/l10n_in_hr_payroll/i18n/bn.po
index fcf32457acf..8947bd94af3 100644
--- a/addons/l10n_in_hr_payroll/i18n/bn.po
+++ b/addons/l10n_in_hr_payroll/i18n/bn.po
@@ -43,7 +43,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "("
-msgstr "("
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,company_id:0
@@ -54,7 +54,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ","
-msgstr ","
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -356,7 +356,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Done"
-msgstr "Done"
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -401,7 +401,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ")"
-msgstr ")"
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
diff --git a/addons/l10n_in_hr_payroll/i18n/gu.po b/addons/l10n_in_hr_payroll/i18n/gu.po
index 4df241afb6c..0f31be93e33 100644
--- a/addons/l10n_in_hr_payroll/i18n/gu.po
+++ b/addons/l10n_in_hr_payroll/i18n/gu.po
@@ -43,7 +43,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "("
-msgstr "("
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,company_id:0
@@ -54,7 +54,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ","
-msgstr ","
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -356,7 +356,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Done"
-msgstr "Done"
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -401,7 +401,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ")"
-msgstr ")"
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
diff --git a/addons/l10n_in_hr_payroll/i18n/hi.po b/addons/l10n_in_hr_payroll/i18n/hi.po
index 614b0fee2cf..854ae90f0a4 100644
--- a/addons/l10n_in_hr_payroll/i18n/hi.po
+++ b/addons/l10n_in_hr_payroll/i18n/hi.po
@@ -43,7 +43,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "("
-msgstr "("
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,company_id:0
@@ -54,7 +54,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ","
-msgstr ","
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -356,7 +356,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Done"
-msgstr "Done"
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -401,7 +401,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ")"
-msgstr ")"
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
diff --git a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
index 8ea08ebb10b..3b6bd171e93 100644
--- a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
+++ b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
@@ -43,7 +43,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "("
-msgstr "("
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,company_id:0
@@ -54,7 +54,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ","
-msgstr ","
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -356,7 +356,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Done"
-msgstr "Done"
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -401,7 +401,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ")"
-msgstr ")"
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
diff --git a/addons/l10n_in_hr_payroll/i18n/ta.po b/addons/l10n_in_hr_payroll/i18n/ta.po
index e1f35c84ff8..d9feea03c30 100644
--- a/addons/l10n_in_hr_payroll/i18n/ta.po
+++ b/addons/l10n_in_hr_payroll/i18n/ta.po
@@ -43,7 +43,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "("
-msgstr "("
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,company_id:0
@@ -54,7 +54,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ","
-msgstr ","
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -356,7 +356,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Done"
-msgstr "Done"
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -401,7 +401,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ")"
-msgstr ")"
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
diff --git a/addons/l10n_in_hr_payroll/i18n/te.po b/addons/l10n_in_hr_payroll/i18n/te.po
index a201e0afc5a..f490f754093 100644
--- a/addons/l10n_in_hr_payroll/i18n/te.po
+++ b/addons/l10n_in_hr_payroll/i18n/te.po
@@ -43,7 +43,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "("
-msgstr "("
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,company_id:0
@@ -54,7 +54,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ","
-msgstr ","
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -356,7 +356,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Done"
-msgstr "Done"
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -401,7 +401,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ")"
-msgstr ")"
+msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0

From 136da17cb357c0ef53cfc9abac0d580640363a7b Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 25 Jun 2012 15:07:52 +0530
Subject: [PATCH 095/999] [FIX]removed duplicate msgid from po and pot file.

bzr revid: kbh@tinyerp.com-20120625093752-ekym79961h5f2fbu
---
 addons/l10n_in_hr_payroll/i18n/bn.po                  | 10 ----------
 addons/l10n_in_hr_payroll/i18n/gu.po                  | 10 ----------
 addons/l10n_in_hr_payroll/i18n/hi.po                  | 10 ----------
 addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot | 10 ----------
 addons/l10n_in_hr_payroll/i18n/ta.po                  | 10 ----------
 addons/l10n_in_hr_payroll/i18n/te.po                  | 10 ----------
 6 files changed, 60 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/i18n/bn.po b/addons/l10n_in_hr_payroll/i18n/bn.po
index 8947bd94af3..c40a809c9fb 100644
--- a/addons/l10n_in_hr_payroll/i18n/bn.po
+++ b/addons/l10n_in_hr_payroll/i18n/bn.po
@@ -251,11 +251,6 @@ msgstr ""
 msgid "Draft Advice"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Draft"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Date From"
@@ -358,11 +353,6 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Search Payment advice"
diff --git a/addons/l10n_in_hr_payroll/i18n/gu.po b/addons/l10n_in_hr_payroll/i18n/gu.po
index 0f31be93e33..217fdb92ed8 100644
--- a/addons/l10n_in_hr_payroll/i18n/gu.po
+++ b/addons/l10n_in_hr_payroll/i18n/gu.po
@@ -251,11 +251,6 @@ msgstr ""
 msgid "Draft Advice"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Draft"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Date From"
@@ -419,11 +414,6 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,name:0
 #: report:paylip.details.in:0
diff --git a/addons/l10n_in_hr_payroll/i18n/hi.po b/addons/l10n_in_hr_payroll/i18n/hi.po
index 854ae90f0a4..09a12c4e6ec 100644
--- a/addons/l10n_in_hr_payroll/i18n/hi.po
+++ b/addons/l10n_in_hr_payroll/i18n/hi.po
@@ -251,11 +251,6 @@ msgstr ""
 msgid "Draft Advice"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Draft"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Date From"
@@ -419,11 +414,6 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,name:0
 #: report:paylip.details.in:0
diff --git a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
index 3b6bd171e93..f0743236825 100644
--- a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
+++ b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
@@ -251,11 +251,6 @@ msgstr ""
 msgid "Draft Advice"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Draft"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Date From"
@@ -419,11 +414,6 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,name:0
 #: report:paylip.details.in:0
diff --git a/addons/l10n_in_hr_payroll/i18n/ta.po b/addons/l10n_in_hr_payroll/i18n/ta.po
index d9feea03c30..44455c501bb 100644
--- a/addons/l10n_in_hr_payroll/i18n/ta.po
+++ b/addons/l10n_in_hr_payroll/i18n/ta.po
@@ -251,11 +251,6 @@ msgstr ""
 msgid "Draft Advice"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Draft"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Date From"
@@ -419,11 +414,6 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,name:0
 #: report:paylip.details.in:0
diff --git a/addons/l10n_in_hr_payroll/i18n/te.po b/addons/l10n_in_hr_payroll/i18n/te.po
index f490f754093..0a4d00f0044 100644
--- a/addons/l10n_in_hr_payroll/i18n/te.po
+++ b/addons/l10n_in_hr_payroll/i18n/te.po
@@ -251,11 +251,6 @@ msgstr ""
 msgid "Draft Advice"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Draft"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Date From"
@@ -419,11 +414,6 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,name:0
 #: report:paylip.details.in:0

From b74ed773f2801e6e6fcf70f373208da87bd1156a Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Mon, 25 Jun 2012 18:17:40 +0530
Subject: [PATCH 096/999] merged with latest

bzr revid: vba@tinyerp.com-20120625124740-bj00i90a526kdsci
---
 addons/crm/security/ir.model.access.csv      | 86 ++++++++++----------
 addons/project/security/project_security.xml | 15 ++++
 2 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 7707118324f..7fcf0679eea 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -1,43 +1,43 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_crm_segmentation_user,crm.segmentation user,model_crm_segmentation,base.group_sale_salesman,1,0,0,0
-access_crm_segmentation_line_user,crm.segmentation.line user,model_crm_segmentation_line,base.group_sale_salesman,1,0,0,0
-access_crm_segmentation,crm.segmentation,model_crm_segmentation,base.group_sale_manager,1,1,1,1
-access_crm_segmentation_line,crm.segmentation.line,model_crm_segmentation_line,base.group_sale_manager,1,1,1,1
-access_crm_case_channel_user,crm.case.channel user,model_crm_case_channel,base.group_sale_salesman,1,0,0,0
-access_crm_case_channel_manager,crm.case.channel manager,model_crm_case_channel,base.group_sale_manager,1,1,1,1
-access_crm_case_section,crm.case.section,model_crm_case_section,base.group_user,1,0,0,0
-access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_sale_salesman,1,1,1,0
-access_crm_meeting_manager,crm.meeting.manager,model_crm_meeting,base.group_sale_manager,1,1,1,1
-access_crm_lead_manager,crm.lead.manager,model_crm_lead,base.group_sale_manager,1,1,1,1
-access_crm_phonecall_manager,crm.phonecall.manager,model_crm_phonecall,base.group_sale_manager,1,1,1,1
-access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_user,1,0,0,0
-access_crm_meeting,crm.meeting,model_crm_meeting,base.group_sale_salesman,1,1,1,0
-access_crm_meeting_all,crm.meeting_allll,model_crm_meeting,base.group_user,1,0,0,0
-access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0
-access_crm_lead_all,crm.lead.all,model_crm_lead,base.group_user,1,0,0,0
-access_crm_phonecall,crm.phonecall,model_crm_phonecall,base.group_sale_salesman,1,1,1,0
-access_crm_phonecall_all,crm.phonecall.all,model_crm_phonecall,base.group_user,1,0,0,0
-access_crm_case_section_user,crm.case.section.user,model_crm_case_section,base.group_sale_salesman,1,1,1,0
-access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1
-access_crm_case_stage,crm.case.stage,model_crm_case_stage,base.group_user,1,0,0,0
-access_crm_case_stage_manager,crm.case.stage,model_crm_case_stage,base.group_sale_manager,1,1,1,1
-access_crm_case_resource_type_user,crm_case_resource_type user,model_crm_case_resource_type,base.group_sale_salesman,1,1,1,0
-access_crm_case_resource_type_manager,crm_case_resource_type manager,model_crm_case_resource_type,base.group_sale_manager,1,1,1,1
-access_crm_phonecall_report_user,crm.phonecall.report.user,model_crm_phonecall_report,base.group_sale_salesman,1,0,0,0
-access_crm_phonecall_report_manager,crm.phonecall.report,model_crm_phonecall_report,base.group_sale_manager,1,1,1,1
-access_res_partner_manager,res.partner.crm.manager,base.model_res_partner,base.group_sale_manager,1,0,0,0
-access_res_partner_category_manager,res.partner.category.crm.manager,base.model_res_partner_category,base.group_sale_manager,1,0,0,0
-mail_mail_message_manager,mail.message.manager,mail.model_mail_message,base.group_sale_manager,1,0,0,0
-access_calendar_attendee_crm_user,calendar.attendee.crm.user,model_calendar_attendee,base.group_sale_salesman,1,1,1,0
-access_calendar_attendee_crm_manager,calendar.attendee.crm.manager,model_calendar_attendee,base.group_sale_manager,1,1,1,1
-access_res_partner,res.partner.crm.user,base.model_res_partner,base.group_sale_salesman,1,1,1,0
-access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,base.group_sale_salesman,1,1,1,0
-mail_mailgate_thread,mail.thread,mail.model_mail_thread,base.group_sale_salesman,1,1,1,1
-mail_gateway_mail_message_user,mail.message.user,mail.model_mail_message,base.group_sale_salesman,1,1,1,1
-access_crm_case_categ_manager,crm.case.categ manager,model_crm_case_categ,base.group_sale_manager,1,1,1,1
-access_base_action_rule_manager,base.action.rule manager,model_base_action_rule,base.group_sale_manager,1,1,1,1
-access_crm_lead_report_user,crm.lead.report user,model_crm_lead_report,base.group_sale_salesman,1,1,1,1
-access_res_partner_bank_type_crm_user,res.partner.bank.type.crm.user,base.model_res_partner_bank_type,base.group_sale_salesman,1,0,0,0
-access_crm_lead_partner_manager,crm.lead.partner.manager,model_crm_lead,base.group_partner_manager,1,0,0,0
-access_crm_phonecall_partner_manager,crm.phonecall.partner.manager,model_crm_phonecall,base.group_partner_manager,1,1,1,1
-access_crm_meeting_partner_manager,crm.meeting.partner.manager,model_crm_meeting,base.group_partner_manager,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_crm_segmentation_user","crm.segmentation user","model_crm_segmentation","base.group_sale_salesman",1,0,0,0
+"access_crm_segmentation_line_user","crm.segmentation.line user","model_crm_segmentation_line","base.group_sale_salesman",1,0,0,0
+"access_crm_segmentation","crm.segmentation","model_crm_segmentation","base.group_sale_manager",1,1,1,1
+"access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","base.group_sale_manager",1,1,1,1
+"access_crm_case_channel_user","crm.case.channel user","model_crm_case_channel","base.group_sale_salesman",1,0,0,0
+"access_crm_case_channel_manager","crm.case.channel manager","model_crm_case_channel","base.group_sale_manager",1,1,1,1
+"access_crm_case_section","crm.case.section","model_crm_case_section","base.group_user",1,0,0,0
+"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_sale_salesman",1,1,1,0
+"access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","base.group_sale_manager",1,1,1,1
+"access_crm_lead_manager","crm.lead.manager","model_crm_lead","base.group_sale_manager",1,1,1,1
+"access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","base.group_sale_manager",1,1,1,1
+"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_user",1,0,0,0
+"access_crm_meeting","crm.meeting","model_crm_meeting","base.group_sale_salesman",1,1,1,0
+"access_crm_meeting_all","crm.meeting_allll","model_crm_meeting","base.group_user",1,0,0,0
+"access_crm_lead","crm.lead","model_crm_lead","base.group_sale_salesman",1,1,1,0
+"access_crm_lead_all","crm.lead.all","model_crm_lead","base.group_user",1,0,0,0
+"access_crm_phonecall","crm.phonecall","model_crm_phonecall","base.group_sale_salesman",1,1,1,0
+"access_crm_phonecall_all","crm.phonecall.all","model_crm_phonecall","base.group_user",1,0,0,0
+"access_crm_case_section_user","crm.case.section.user","model_crm_case_section","base.group_sale_salesman",1,1,1,0
+"access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","base.group_sale_manager",1,1,1,1
+"access_crm_case_stage","crm.case.stage","model_crm_case_stage","base.group_user",1,0,0,0
+"access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","base.group_sale_manager",1,1,1,1
+"access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","base.group_sale_salesman",1,1,1,0
+"access_crm_case_resource_type_manager","crm_case_resource_type manager","model_crm_case_resource_type","base.group_sale_manager",1,1,1,1
+"access_crm_phonecall_report_user","crm.phonecall.report.user","model_crm_phonecall_report","base.group_sale_salesman",1,0,0,0
+"access_crm_phonecall_report_manager","crm.phonecall.report","model_crm_phonecall_report","base.group_sale_manager",1,1,1,1
+"access_res_partner_manager","res.partner.crm.manager","base.model_res_partner","base.group_sale_manager",1,0,0,0
+"access_res_partner_category_manager","res.partner.category.crm.manager","base.model_res_partner_category","base.group_sale_manager",1,0,0,0
+"mail_mail_message_manager","mail.message.manager","mail.model_mail_message","base.group_sale_manager",1,0,0,0
+"access_calendar_attendee_crm_user","calendar.attendee.crm.user","model_calendar_attendee","base.group_sale_salesman",1,1,1,0
+"access_calendar_attendee_crm_manager","calendar.attendee.crm.manager","model_calendar_attendee","base.group_sale_manager",1,1,1,1
+"access_res_partner","res.partner.crm.user","base.model_res_partner","base.group_sale_salesman",1,1,1,0
+"access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","base.group_sale_salesman",1,1,1,0
+"mail_mailgate_thread","mail.thread","mail.model_mail_thread","base.group_sale_salesman",1,1,1,1
+"mail_gateway_mail_message_user","mail.message.user","mail.model_mail_message","base.group_sale_salesman",1,1,1,1
+"access_crm_case_categ_manager","crm.case.categ manager","model_crm_case_categ","base.group_sale_manager",1,1,1,1
+"access_base_action_rule_manager","base.action.rule manager","model_base_action_rule","base.group_sale_manager",1,1,1,1
+"access_crm_lead_report_user","crm.lead.report user","model_crm_lead_report","base.group_sale_salesman",1,1,1,1
+"access_res_partner_bank_type_crm_user","res.partner.bank.type.crm.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0
+"access_crm_lead_partner_manager","crm.lead.partner.manager","model_crm_lead","base.group_partner_manager",1,0,0,0
+"access_crm_phonecall_partner_manager","crm.phonecall.partner.manager","model_crm_phonecall","base.group_partner_manager",1,1,1,1
+"access_crm_meeting_partner_manager","crm.meeting.partner.manager","model_crm_meeting","base.group_partner_manager",1,1,1,1
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 199d3c0c422..5998b861b0a 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -62,5 +62,20 @@
         <field name="domain_force">[(1,'=',1)]</field>
         <field name="groups" eval="[(4,ref('project.group_project_manager'))]"/>
     </record>
+
+    <record model="ir.rule" id="project_visibility_rule">
+        <field name="name" >Project According to User</field>
+        <field name="model_id" ref="model_project_project"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('user_id','=',False),('user_id','=',user.id)]</field>
+    </record>
+
+    <record model="ir.rule" id="project_manager_all_project_rule">
+        <field name="name">Project Managers all projects</field>
+        <field name="model_id" ref="model_project_project"/>
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field name="groups" eval="[(4,ref('project.group_project_manager'))]"/>
+    </record>
+
 </data>
 </openerp>

From b4ee40fb17e6b9ba7cb02088b93239a1edf8fec5 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 26 Jun 2012 10:52:22 +0530
Subject: [PATCH 097/999] [IMP]header added in report

bzr revid: kbh@tinyerp.com-20120626052222-3aqu7j8fuquygbny
---
 addons/l10n_in_hr_payroll/report/report_payroll_advice.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
index 328d0a37b43..86bdfe01998 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -62,7 +62,6 @@ class payroll_advice_report(report_sxw.rml_parse):
         return self.total_bysal
 
     def get_detail(self, line_ids):
-        print line_ids
         result = []
         self.total_bysal = 0.00
         for l in line_ids:
@@ -76,6 +75,6 @@ class payroll_advice_report(report_sxw.rml_parse):
             result.append(res) 
         return result
 
-report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'l10n_in_hr_payroll/report/report_payroll_advice.rml', parser=payroll_advice_report)
+report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'l10n_in_hr_payroll/report/report_payroll_advice.rml', parser=payroll_advice_report, header="external")
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 19289148250b0ad1473d6d2149728f777733dd20 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Tue, 26 Jun 2012 11:33:54 +0530
Subject: [PATCH 098/999] [IMP] typo

bzr revid: mra@tinyerp.com-20120626060354-jyqzuxdi9y30jzr3
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index b082da5f9f8..017f7a46015 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -37,10 +37,10 @@ class hr_contract(osv.osv):
     """
 
     _inherit = 'hr.contract'
-    _description = 'contract'
+    _description = 'HR Contract'
     
     _columns = {
-        'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll')),
+        'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll'), help="Amount for Tax Deduction at Source"),
         'house_rent_income': fields.float('House Rent Income ', digits_compute=dp.get_precision('Payroll'), help="Income from house property."),
         'saving_bank_account': fields.float('Saving Bank Account Income ', digits_compute=dp.get_precision('Payroll'), help="Saving income for bank account."),
         'other_income': fields.float('Other Income ', digits_compute=dp.get_precision('Payroll'), help="Other income of employee."),
@@ -57,7 +57,6 @@ class hr_contract(osv.osv):
 
 hr_contract()
 
-
 class hr_employee(osv.osv):
     '''
     Employee's Join date allows to compute total working 
@@ -113,7 +112,7 @@ class payroll_advice(osv.osv):
     _columns = {
         'name':fields.char('Name', size=32, readonly=True, required=True, states={'draft': [('readonly', False)]},),
         'note': fields.text('Description'),
-        'date': fields.date('Date', readonly=True, states={'draft': [('readonly', False)]}, help="Date is used to search Payslips."),
+        'date': fields.date('Date', readonly=True, states={'draft': [('readonly', False)]}, help="Advice Date is used to search Payslips."),
         'state':fields.selection([
             ('draft','Draft'),
             ('confirm','Confirm'),

From bddac9565b9176b403d087ed93e9027017c72a66 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 26 Jun 2012 11:58:52 +0530
Subject: [PATCH 099/999] [IMP]improved demo data for salary structure,data xml
 file is moved in data folder

bzr revid: kbh@tinyerp.com-20120626062852-iwkeubxywadnbqvf
---
 addons/l10n_in_hr_payroll/__openerp__.py                    | 4 ++--
 .../{ => data}/l10n_in_hr_payroll_data.xml                  | 0
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename addons/l10n_in_hr_payroll/{ => data}/l10n_in_hr_payroll_data.xml (100%)

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index aa65eee647b..69591a6c110 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -46,7 +46,7 @@ Indian Payroll Rules.
     'active': False,
     'update_xml': [
          'l10n_in_hr_payroll_view.xml',
-         'l10n_in_hr_payroll_data.xml',
+         'data/l10n_in_hr_payroll_data.xml',
          'data/hr.salary.rule.csv',
          'security/ir.model.access.csv',
          'l10n_in_hr_payroll_report.xml',
@@ -56,4 +56,4 @@ Indian Payroll Rules.
     'installable': True
 }
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
similarity index 100%
rename from addons/l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml
rename to addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
index 49f0967add0..a7e0e783b45 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
@@ -4,10 +4,10 @@
 
         <!-- Hr Salary structure-->
 
-        <record id="hr_payroll_salary_structure_emp_ind" model="hr.payroll.structure">
+        <record id="hr_payroll_salary_structure_ind_emp" model="hr.payroll.structure">
             <field name="code">IND</field>
-            <field name="name">Indian Employee</field>
-            <field eval="[(6, 0, [ref('hr_salary_rule_medical'),ref('hr_salary_rule_lta'),ref('hr_salary_rule_telephone'), ref('hr_salary_rule_internet'),ref('hr_payroll_rule_child1'),ref('hr_salary_rule_gratuity')])]" name="rule_ids"/>
+            <field name="name">Non-executive employees</field>
+            <field eval="[(6, 0, [ref('hr_salary_rule_medical'), ref('hr_salary_rule_da'), ref('hr_salary_rule_lta'), ref('hr_salary_rule_telephone'), ref('hr_salary_rule_internet'), ref('hr_payroll_rule_child1'), ref('hr_salary_rule_gratuity')])]" name="rule_ids"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="parent_id" ref="hr_payroll.structure_base"/>
         </record>

From 95a64af19e460e6d7a679befc48a745ecc3fdde9 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Tue, 26 Jun 2012 12:00:03 +0530
Subject: [PATCH 100/999] [FIX]

bzr revid: mra@tinyerp.com-20120626063003-5sh236r4otzgxly6
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml   | 3 +++
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml    | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
index ea809ed9321..7e4b0fce7ad 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+    
         <record id="seq_type_payment_advice" model="ir.sequence.type">
             <field name="name">Payment Advice</field>
             <field name="code">payment.advice</field>
         </record>
+        
         <record id="seq_payment_advice" model="ir.sequence">
             <field name="name">Payment Advice</field>
             <field name="code">payment.advice</field>
             <field name="prefix"></field>
             <field name="padding">3</field>
         </record>
+        
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 5c239eeb295..0fbf81c7f25 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -34,7 +34,8 @@
             </data>
             </field>
         </record>
-        <record id="hr_employee_form_inherit" model="ir.ui.view">
+        
+        <record id="hr_employee_form_in_inherit" model="ir.ui.view">
             <field name="name">hr.employee.form.inherit</field>
             <field name="model">hr.employee</field>
             <field name="type">form</field>
@@ -64,6 +65,7 @@
                 </tree>
             </field>
         </record>
+        
         <record id="view_hr_bank_advice_form" model="ir.ui.view">
             <field name="name">hr.payroll.advice.form</field>
             <field name="model">hr.payroll.advice</field>
@@ -90,7 +92,7 @@
                         <page string="Paymeny Lines">
                             <field name="line_ids" colspan="4" nolabel="1">
                                 <tree string="Payment Lines" editable="bottom">
-                                    <field name="employee_id" on_change="onchange_employee_id(parent.date, employee_id)"/>
+                                    <field name="employee_id"/>
                                     <field name="name"/>
                                     <field name="bysal"/>
                                 </tree>
@@ -144,6 +146,7 @@
             <field name="view_id" ref="view_hr_bank_advice_tree"/>
             <field name="search_view_id" ref="view_hr_payroll_advice_filter"/>
         </record>
+        
         <menuitem
             action="action_view_hr_bank_advice_tree"
             id="hr_menu_payment_advice"
@@ -151,4 +154,4 @@
         />
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file

From c71ceea1a41abf13e101d5e5e4713b8137af6f58 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Tue, 26 Jun 2012 12:02:19 +0530
Subject: [PATCH 101/999] [IMP] typo

bzr revid: mra@tinyerp.com-20120626063219-fgaaklh8koi4azii
---
 addons/l10n_in_hr_payroll/__init__.py                  | 10 +++++-----
 addons/l10n_in_hr_payroll/__openerp__.py               |  4 ++--
 .../report/report_payslip_details.py                   |  5 +----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/__init__.py b/addons/l10n_in_hr_payroll/__init__.py
index dd0fa2330b7..8075cff2bc0 100644
--- a/addons/l10n_in_hr_payroll/__init__.py
+++ b/addons/l10n_in_hr_payroll/__init__.py
@@ -1,13 +1,13 @@
-# -*- encoding: utf-8 -*-
+#-*- coding:utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
 #
 #    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.
+#    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
diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index aa65eee647b..06f99354a5d 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 {
-    'name': 'India payroll',
+    'name': 'Indian payroll',
     'category': 'Localization',
     'init_xml': [],
     'author': 'OpenERP SA',
@@ -27,7 +27,7 @@
     'depends': ['hr_payroll'],
     'version': '1.0',
     'description': """
-Indian Payroll Rules.
+Indian Payroll Salary Rules.
 =======================
 
     -Configuration of hr_payroll for India localization
diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.py b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
index cfd29f8afba..fc56f0f6f42 100644
--- a/addons/l10n_in_hr_payroll/report/report_payslip_details.py
+++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
@@ -1,11 +1,8 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    d$
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
 #
 #    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

From 738827e88507281722f6dd02e7d3341f18d33c96 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Tue, 26 Jun 2012 12:03:09 +0530
Subject: [PATCH 102/999] [IMP] typo

bzr revid: mra@tinyerp.com-20120626063309-qv0thobubn75kjg1
---
 addons/l10n_in_hr_payroll/report/report_payslip_details.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.py b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
index fc56f0f6f42..2732d5d09ae 100644
--- a/addons/l10n_in_hr_payroll/report/report_payslip_details.py
+++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
@@ -32,4 +32,4 @@ class payslip_details_report_in(report.report_payslip_details.payslip_details_re
 
 report_sxw.report_sxw('report.paylip.details.in', 'hr.payslip', 'l10n_in_hr_payroll/report/report_payslip_details.rml', parser=payslip_details_report_in)
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From f1523e3ab7036b04dbc43eeb41cc10117cdb37ea Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Tue, 26 Jun 2012 12:32:46 +0530
Subject: [PATCH 103/999] [IMP] typo

bzr revid: mra@tinyerp.com-20120626070246-v336zy1roe0ekqmr
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
index a7e0e783b45..6308e42e6ae 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
@@ -5,7 +5,7 @@
         <!-- Hr Salary structure-->
 
         <record id="hr_payroll_salary_structure_ind_emp" model="hr.payroll.structure">
-            <field name="code">IND</field>
+            <field name="code">NE</field>
             <field name="name">Non-executive employees</field>
             <field eval="[(6, 0, [ref('hr_salary_rule_medical'), ref('hr_salary_rule_da'), ref('hr_salary_rule_lta'), ref('hr_salary_rule_telephone'), ref('hr_salary_rule_internet'), ref('hr_payroll_rule_child1'), ref('hr_salary_rule_gratuity')])]" name="rule_ids"/>
             <field name="company_id" ref="base.main_company"/>

From f1b51af5d4fbd65f38871b65c66d51a650bd5429 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Tue, 26 Jun 2012 12:33:26 +0530
Subject: [PATCH 104/999] [IMP] typo

bzr revid: mra@tinyerp.com-20120626070326-ovs3a42usmrf1rms
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
index 6308e42e6ae..90413c79ea9 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
@@ -6,7 +6,7 @@
 
         <record id="hr_payroll_salary_structure_ind_emp" model="hr.payroll.structure">
             <field name="code">NE</field>
-            <field name="name">Non-executive employees</field>
+            <field name="name">Non-Executive Employee</field>
             <field eval="[(6, 0, [ref('hr_salary_rule_medical'), ref('hr_salary_rule_da'), ref('hr_salary_rule_lta'), ref('hr_salary_rule_telephone'), ref('hr_salary_rule_internet'), ref('hr_payroll_rule_child1'), ref('hr_salary_rule_gratuity')])]" name="rule_ids"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="parent_id" ref="hr_payroll.structure_base"/>

From f7d64e909c7e89f74626b8b14b7d31a541f931e1 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Tue, 26 Jun 2012 12:39:18 +0530
Subject: [PATCH 105/999] [FIX]

bzr revid: mra@tinyerp.com-20120626070918-a0ll1d8277udq9d0
---
 addons/l10n_in_hr_payroll/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/__init__.py b/addons/l10n_in_hr_payroll/__init__.py
index 8075cff2bc0..9f1b6af533c 100644
--- a/addons/l10n_in_hr_payroll/__init__.py
+++ b/addons/l10n_in_hr_payroll/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import hr_payroll
 import l10n_in_hr_payroll
 import report
 

From 58f579fff109bbfb57f895e3b3743f088884c5b2 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Tue, 26 Jun 2012 12:42:07 +0530
Subject: [PATCH 106/999] [IMP] typo

bzr revid: mra@tinyerp.com-20120626071207-6u95sv62ybz4bc33
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 017f7a46015..8affa170abe 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -76,7 +76,7 @@ class hr_employee(osv.osv):
         """
         res = {}
         c_date = time.strftime(DATETIME_FORMAT)
-        current_date = datetime.strptime(c_date,DATETIME_FORMAT)
+        current_date = datetime.strptime(c_date, DATETIME_FORMAT)
         for employee in self.browse(cr, uid, ids, context=context):
             if employee.join_date:
                 date_start = datetime.strptime(employee.join_date, DATETIME_FORMAT)
@@ -96,8 +96,8 @@ class hr_employee(osv.osv):
         return res
     
     _columns = {
-        'join_date': fields.date('Join Date', help="joining date of employee "),
-        'number_of_year':fields.function(_compute_year, string='No. of Years of Service', type="float", store=True, help="Total years of work experience."),
+        'join_date': fields.date('Join Date', help="Joining date of employee "),
+        'number_of_year': fields.function(_compute_year, string='No. of Years of Service', type="float", store=True, help="Total years of work experience."),
         }
     
 hr_employee()

From f227e6548b47f9770227fee7b76106f8b4f3181e Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Tue, 26 Jun 2012 12:43:46 +0530
Subject: [PATCH 107/999] [IMP] typo

bzr revid: mra@tinyerp.com-20120626071346-exs4zrnekx5icssq
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 8affa170abe..ff3ddf331ba 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -222,9 +222,9 @@ class payroll_advice_line(osv.osv):
     _name = 'hr.payroll.advice.line'
     _description = 'Bank Advice Lines'
     _columns = {
-        'advice_id':fields.many2one('hr.payroll.advice', 'Bank Advice',),
-        'name':fields.char('Bank Account No.', size=32, required=True),
-        'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
+        'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice',),
+        'name': fields.char('Bank Account No.', size=32, required=True),
+        'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
         'company_id': fields.related('advice_id', 'company_id', type='many2one', required=True, relation='res.company', string='Company'),
     }

From f57b58bbd2f13606d3cbed106a8879d549850445 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Tue, 26 Jun 2012 12:44:59 +0530
Subject: [PATCH 108/999] [IMP] typo

bzr revid: mra@tinyerp.com-20120626071459-ltbasivd1hnpwpr8
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index ff3ddf331ba..8e650912c1b 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -50,9 +50,9 @@ class hr_contract(osv.osv):
         'driver_salay': fields.boolean('Driver Salary', help=" Allowance for company provided driver."),
         'professional_tax': fields.float('Professional Tax ', digits_compute=dp.get_precision('Payroll'), help="Professional tax deducted from salary"),
         'leave_avail_dedution': fields.float('Leave Availed Deduction ', digits_compute=dp.get_precision('Payroll'), help="Deduction for emergency leave of employee."),
-        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance."), 
-        'voluntary_provident_fund': fields.float('Voluntary Provident Fund', digits_compute=dp.get_precision('Payroll'), help="VPF computed as percentage.(%)"), 
-        'company_transport': fields.float('Company Provided Transport', digits_compute=dp.get_precision('Payroll'), help="Deduction for company provided transport."), 
+        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance."),
+        'voluntary_provident_fund': fields.float('Voluntary Provident Fund', digits_compute=dp.get_precision('Payroll'), help="VPF computed as percentage.(%)"),
+        'company_transport': fields.float('Company Provided Transport', digits_compute=dp.get_precision('Payroll'), help="Deduction for company provided transport."),
     }
 
 hr_contract()
@@ -81,15 +81,15 @@ class hr_employee(osv.osv):
             if employee.join_date:
                 date_start = datetime.strptime(employee.join_date, DATETIME_FORMAT)
                 diffyears = current_date.year - date_start.year
-                difference  = current_date - date_start.replace(current_date.year)
+                difference = current_date - date_start.replace(current_date.year)
                 days_in_year = isleap(current_date.year) and 366 or 365
-                difference_in_years = diffyears + (difference.days + difference.seconds/86400.0)/days_in_year
+                difference_in_years = diffyears + (difference.days + difference.seconds / 86400.0) / days_in_year
                 total_years = relativedelta(current_date, date_start).years
                 total_months = relativedelta(current_date, date_start).months
                 if total_months < 10:
-                    year_month= float(total_months)/10 + total_years
+                    year_month = float(total_months) / 10 + total_years
                 else:
-                    year_month = float(total_months)/100 + total_years
+                    year_month = float(total_months) / 100 + total_years
                 res[employee.id] = year_month
             else:
                 res[employee.id] = 0.0
@@ -114,10 +114,10 @@ class payroll_advice(osv.osv):
         'note': fields.text('Description'),
         'date': fields.date('Date', readonly=True, states={'draft': [('readonly', False)]}, help="Advice Date is used to search Payslips."),
         'state':fields.selection([
-            ('draft','Draft'),
-            ('confirm','Confirm'),
-            ('cancel','Cancelled'),
-        ],'State', select=True, readonly=True),
+            ('draft', 'Draft'),
+            ('confirm', 'Confirm'),
+            ('cancel', 'Cancelled'),
+        ], 'State', select=True, readonly=True),
         'number':fields.char('Number', size=16, readonly=True),
         'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}, readonly=True),
         'chaque_nos':fields.char('Chaque Nos', size=256),
@@ -126,8 +126,8 @@ class payroll_advice(osv.osv):
     }
     
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d'),
-        'state': lambda *a: 'draft',
+        'date': lambda * a: time.strftime('%Y-%m-%d'),
+        'state': lambda * a: 'draft',
         'company_id': lambda self, cr, uid, context: \
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
@@ -150,10 +150,10 @@ class payroll_advice(osv.osv):
         payslip_line_pool = self.pool.get('hr.payslip.line')
 
         for advice in self.browse(cr, uid, ids, context=context):
-            old_line_ids = advice_line_pool.search(cr, uid, [('advice_id','=',advice.id)], context=context)
+            old_line_ids = advice_line_pool.search(cr, uid, [('advice_id', '=', advice.id)], context=context)
             if old_line_ids:
                 advice_line_pool.unlink(cr, uid, old_line_ids, context=context)
-            slip_ids = payslip_pool.search(cr, uid, [('date_from','<=',advice.date), ('date_to','>=',advice.date), ('state', '=', 'done')], context=context)
+            slip_ids = payslip_pool.search(cr, uid, [('date_from', '<=', advice.date), ('date_to', '>=', advice.date), ('state', '=', 'done')], context=context)
 #            if not slip_ids:
 #                advice_date = datetime.strptime(advice.date,DATETIME_FORMAT)
 #                a_date = advice_date.strftime('%B')+'-'+advice_date.strftime('%Y')
@@ -161,10 +161,10 @@ class payroll_advice(osv.osv):
             for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
                 if not slip.employee_id.bank_account_id:
                     raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
-                line_ids = payslip_line_pool.search(cr, uid, [ ('slip_id','=',slip.id), ('code', '=', 'NET')], context=context)
+                line_ids = payslip_line_pool.search(cr, uid, [ ('slip_id', '=', slip.id), ('code', '=', 'NET')], context=context)
                 if line_ids:
                     line = payslip_line_pool.browse(cr, uid, line_ids, context=context)[0]
-                    advice_line= {
+                    advice_line = {
                             'advice_id': advice.id,
                             'name': slip.employee_id.bank_account_id.acc_number,
                             'employee_id': slip.employee_id.id,
@@ -186,7 +186,7 @@ class payroll_advice(osv.osv):
         for advice in self.browse(cr, uid, ids, context=context):
             if not advice.line_ids:
                 raise osv.except_osv(_('Error !'), _('You can not confirm Payment advice without advice lines.'))
-            advice_date = datetime.strptime(advice.date,DATETIME_FORMAT)
+            advice_date = datetime.strptime(advice.date, DATETIME_FORMAT)
             advice_year = advice_date.strftime('%m') + '-' + advice_date.strftime('%Y')
             number = seq_obj.get(cr, uid, 'payment.advice')
             sequence_num = 'PAY' + '/' + advice_year + '/' + number
@@ -231,4 +231,4 @@ class payroll_advice_line(osv.osv):
 
 payroll_advice_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From f7278c6baf28e3a678040ed77752d947588b01e9 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Tue, 26 Jun 2012 12:58:58 +0530
Subject: [PATCH 109/999] [IMP] typo

bzr revid: mra@tinyerp.com-20120626072858-pcw2dfvblv3pe6ng
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 0fbf81c7f25..f5cae645cc7 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -85,8 +85,8 @@
                     <group col="6" colspan="4">
                         <field name="name" colspan="4" select="1"/>
                         <field name="number" select="1"/>
-                        <field name="bank_id" select="1"/>
                         <field name="date" select="1"/>
+                        <field name="bank_id" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Paymeny Lines">

From 1461900731dbaba2300dcf4eae28116c108558a5 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 26 Jun 2012 16:18:58 +0530
Subject: [PATCH 110/999] [IMP]removed . from help,removed select attribute
 from view and added act window for payslips of advices.

bzr revid: kbh@tinyerp.com-20120626104858-z7htwjuid3p6e7mx
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 41 ++++++++++++-------
 .../l10n_in_hr_payroll_view.xml               | 26 ++++++++----
 2 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 8e650912c1b..4dc5e05f111 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -41,18 +41,18 @@ class hr_contract(osv.osv):
     
     _columns = {
         'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll'), help="Amount for Tax Deduction at Source"),
-        'house_rent_income': fields.float('House Rent Income ', digits_compute=dp.get_precision('Payroll'), help="Income from house property."),
-        'saving_bank_account': fields.float('Saving Bank Account Income ', digits_compute=dp.get_precision('Payroll'), help="Saving income for bank account."),
-        'other_income': fields.float('Other Income ', digits_compute=dp.get_precision('Payroll'), help="Other income of employee."),
-        'short_term_gain':fields.float('Short Term Gain from Share Trading/Equity MFs ', digits_compute=dp.get_precision('Payroll'), help="Stocks/equity mutual funds are sold before one year."),
-        'long_term_gain':fields.float('Long Term Gain from Share Trading/Equity MFs', digits_compute=dp.get_precision('Payroll'), help="Stocks/equity mutual funds are kept for more than a year."),
-        'food_coupon_amount': fields.float('Food Coupons ', digits_compute=dp.get_precision('Payroll'), help="Amount of food coupon per day."),
-        'driver_salay': fields.boolean('Driver Salary', help=" Allowance for company provided driver."),
+        'house_rent_income': fields.float('House Rent Income ', digits_compute=dp.get_precision('Payroll'), help="Income from house property"),
+        'saving_bank_account': fields.float('Saving Bank Account Income ', digits_compute=dp.get_precision('Payroll'), help="Saving income for bank account"),
+        'other_income': fields.float('Other Income ', digits_compute=dp.get_precision('Payroll'), help="Other income of employee"),
+        'short_term_gain':fields.float('Short Term Gain from Share Trading/Equity MFs ', digits_compute=dp.get_precision('Payroll'), help="Stocks/equity mutual funds are sold before one year"),
+        'long_term_gain':fields.float('Long Term Gain from Share Trading/Equity MFs', digits_compute=dp.get_precision('Payroll'), help="Stocks/equity mutual funds are kept for more than a year"),
+        'food_coupon_amount': fields.float('Food Coupons ', digits_compute=dp.get_precision('Payroll'), help="Amount of food coupon per day"),
+        'driver_salay': fields.boolean('Driver Salary', help=" Allowance for company provided driver"),
         'professional_tax': fields.float('Professional Tax ', digits_compute=dp.get_precision('Payroll'), help="Professional tax deducted from salary"),
-        'leave_avail_dedution': fields.float('Leave Availed Deduction ', digits_compute=dp.get_precision('Payroll'), help="Deduction for emergency leave of employee."),
-        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance."),
-        'voluntary_provident_fund': fields.float('Voluntary Provident Fund', digits_compute=dp.get_precision('Payroll'), help="VPF computed as percentage.(%)"),
-        'company_transport': fields.float('Company Provided Transport', digits_compute=dp.get_precision('Payroll'), help="Deduction for company provided transport."),
+        'leave_avail_dedution': fields.float('Leave Availed Deduction ', digits_compute=dp.get_precision('Payroll'), help="Deduction for emergency leave of employee"),
+        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance"),
+        'voluntary_provident_fund': fields.float('Voluntary Provident Fund', digits_compute=dp.get_precision('Payroll'), help="VPF computed as percentage(%)"),
+        'company_transport': fields.float('Company Provided Transport', digits_compute=dp.get_precision('Payroll'), help="Deduction for company provided transport"),
     }
 
 hr_contract()
@@ -96,8 +96,8 @@ class hr_employee(osv.osv):
         return res
     
     _columns = {
-        'join_date': fields.date('Join Date', help="Joining date of employee "),
-        'number_of_year': fields.function(_compute_year, string='No. of Years of Service', type="float", store=True, help="Total years of work experience."),
+        'join_date': fields.date('Join Date', help="Joining date of employee"),
+        'number_of_year': fields.function(_compute_year, string='No. of Years of Service', type="float", store=True, help="Total years of work experience"),
         }
     
 hr_employee()
@@ -112,7 +112,7 @@ class payroll_advice(osv.osv):
     _columns = {
         'name':fields.char('Name', size=32, readonly=True, required=True, states={'draft': [('readonly', False)]},),
         'note': fields.text('Description'),
-        'date': fields.date('Date', readonly=True, states={'draft': [('readonly', False)]}, help="Advice Date is used to search Payslips."),
+        'date': fields.date('Date', readonly=True, states={'draft': [('readonly', False)]}, help="Advice Date is used to search Payslips"),
         'state':fields.selection([
             ('draft', 'Draft'),
             ('confirm', 'Confirm'),
@@ -171,6 +171,7 @@ class payroll_advice(osv.osv):
                             'bysal': line.total
                             }
                     advice_line_pool.create(cr, uid, advice_line, context=context)
+                payslip_pool.write(cr, uid, slip_ids, {'advice_id': advice.id}, context=context)
         return True
 
     def confirm_sheet(self, cr, uid, ids, context=None):
@@ -222,7 +223,7 @@ class payroll_advice_line(osv.osv):
     _name = 'hr.payroll.advice.line'
     _description = 'Bank Advice Lines'
     _columns = {
-        'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice',),
+        'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice'),
         'name': fields.char('Bank Account No.', size=32, required=True),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
@@ -231,4 +232,14 @@ class payroll_advice_line(osv.osv):
 
 payroll_advice_line()
 
+class hr_payslip(osv.osv):
+    '''
+    Employee Pay Slip
+    '''
+
+    _inherit = 'hr.payslip'
+    _description = 'Pay Slip'
+    _columns = {
+        'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice')
+    }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index f5cae645cc7..f91068cb564 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -56,11 +56,11 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Bank Advice">
-                    <field name="date" select="1"/>
-                    <field name="number" select="1"/>
-                    <field name="name" select="1"/>
+                    <field name="date"/>
+                    <field name="number"/>
+                    <field name="name"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field name="bank_id" select="1"/>
+                    <field name="bank_id"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -83,10 +83,10 @@
                         <div class="oe_clear"/>
                    	</header>
                     <group col="6" colspan="4">
-                        <field name="name" colspan="4" select="1"/>
-                        <field name="number" select="1"/>
-                        <field name="date" select="1"/>
-                        <field name="bank_id" select="1"/>
+                        <field name="name" colspan="4"/>
+                        <field name="number"/>
+                        <field name="date"/>
+                        <field name="bank_id"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Paymeny Lines">
@@ -153,5 +153,15 @@
             parent="hr_payroll.menu_hr_root_payroll"
         />
 
+        <!--  Shortcuts -->
+
+        <act_window name="Payslips"
+            domain="[('advice_id', '=', active_id)]"
+            res_model="hr.payslip"
+            src_model="hr.payroll.advice"
+            view_id ="hr_payroll.view_hr_payslip_tree"
+            id="act_hr_emp_payslip_list"
+            groups="base.group_hr_manager"/>
+
     </data>
 </openerp>
\ No newline at end of file

From 9c9f189d4363516e1b06e6b44ed080d29f8b0262 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 26 Jun 2012 16:21:40 +0530
Subject: [PATCH 111/999] [FIX].

bzr revid: kbh@tinyerp.com-20120626105140-xj5oz4u5l8cuhms8
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 4dc5e05f111..31d2f6c3f77 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -242,4 +242,7 @@ class hr_payslip(osv.osv):
     _columns = {
         'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice')
     }
+
+hr_payslip()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From f30c6941501da639dffd89f614823bb9b4d2df2a Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 27 Jun 2012 11:14:41 +0530
Subject: [PATCH 112/999] [IMP] typo

bzr revid: mra@tinyerp.com-20120627054441-fw274wtwwua3m2ox
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 31d2f6c3f77..58fe4187506 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -115,7 +115,7 @@ class payroll_advice(osv.osv):
         'date': fields.date('Date', readonly=True, states={'draft': [('readonly', False)]}, help="Advice Date is used to search Payslips"),
         'state':fields.selection([
             ('draft', 'Draft'),
-            ('confirm', 'Confirm'),
+            ('confirm', 'Confirmed'),
             ('cancel', 'Cancelled'),
         ], 'State', select=True, readonly=True),
         'number':fields.char('Number', size=16, readonly=True),

From 9e43d3db910c93ab9a32510a61e7188e45b82616 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 27 Jun 2012 11:44:04 +0530
Subject: [PATCH 113/999] typo

bzr revid: mra@tinyerp.com-20120627061404-et3mugyf2l39xiz9
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index f91068cb564..ac14e228b39 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -139,7 +139,7 @@
         </record>
 
         <record id="action_view_hr_bank_advice_tree" model="ir.actions.act_window">
-            <field name="name">Payment Advice</field>
+            <field name="name">Payment Advices</field>
             <field name="res_model">hr.payroll.advice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>

From ac3241ed13d31254491213e78af336cd79942591 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 27 Jun 2012 12:56:22 +0530
Subject: [PATCH 114/999] [IMP] typo

bzr revid: mra@tinyerp.com-20120627072622-h8vlzlai418y2o7e
---
 addons/l10n_in_hr_payroll/__openerp__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index ab63f17b732..0b2ecd9756f 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -37,7 +37,6 @@ Indian Payroll Salary Rules.
     * Allow to configure Basic / Grows / Net Salary
     * Employee PaySlip
     * Allowance / Deduction
-    * Monthly Payroll Register
     * Integrated with Holiday Management
     * Medical Allowance, Travel Allowance, Child Allowance, ...
     - Payroll Advice and Report

From f9eebe87ab6806c8fd3dc37b0556b19d81e27205 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 27 Jun 2012 14:24:47 +0530
Subject: [PATCH 115/999] [IMP] l10n_in_hr_payroll: Add store=True for company
 on advice line

bzr revid: mra@tinyerp.com-20120627085447-o3qt1h9a8ka4462m
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 58fe4187506..f9ec82ca264 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -227,7 +227,7 @@ class payroll_advice_line(osv.osv):
         'name': fields.char('Bank Account No.', size=32, required=True),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
-        'company_id': fields.related('advice_id', 'company_id', type='many2one', required=True, relation='res.company', string='Company'),
+        'company_id': fields.related('advice_id', 'company_id', type='many2one', required=True, relation='res.company', string='Company', store=True),
     }
 
 payroll_advice_line()

From 82246cfb09f69a07d06b33f6bce63e07c061578a Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 27 Jun 2012 14:30:04 +0530
Subject: [PATCH 116/999] [IMP] typo

bzr revid: mra@tinyerp.com-20120627090004-onw7v1m2lfshfovh
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index f9ec82ca264..8344b9a94c1 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -122,7 +122,7 @@ class payroll_advice(osv.osv):
         'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}, readonly=True),
         'chaque_nos':fields.char('Chaque Nos', size=256),
         'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank Address from which the salary is going to be paid"),
+        'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank from which the salary is going to be paid"),
     }
     
     _defaults = {

From cb586e2e4be84c824aed1fda31957c881df7d946 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 27 Jun 2012 14:40:05 +0530
Subject: [PATCH 117/999] [IMP] typo

bzr revid: mra@tinyerp.com-20120627091005-b9ojnfiiqs6uavh1
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 8344b9a94c1..685cdd55897 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -120,7 +120,7 @@ class payroll_advice(osv.osv):
         ], 'State', select=True, readonly=True),
         'number':fields.char('Number', size=16, readonly=True),
         'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}, readonly=True),
-        'chaque_nos':fields.char('Chaque Nos', size=256),
+        'chaque_nos':fields.char('Cheque Nos', size=256),
         'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank from which the salary is going to be paid"),
     }

From 4365592320a7c3d34278d89dbad2f90a893c733f Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 27 Jun 2012 14:41:01 +0530
Subject: [PATCH 118/999] [IMP] typo

bzr revid: mra@tinyerp.com-20120627091101-ljbsd9v8568swar8
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 685cdd55897..92520ebf3aa 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -120,7 +120,7 @@ class payroll_advice(osv.osv):
         ], 'State', select=True, readonly=True),
         'number':fields.char('Number', size=16, readonly=True),
         'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}, readonly=True),
-        'chaque_nos':fields.char('Cheque Nos', size=256),
+        'chaque_nos':fields.char('Cheque Numbers', size=256),
         'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank from which the salary is going to be paid"),
     }

From 35a9faf9edf54ba62ddb3353630bc5d8e6aa5a2a Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 27 Jun 2012 16:20:52 +0530
Subject: [PATCH 119/999] [IMP]improved payroll advice form view

bzr revid: kbh@tinyerp.com-20120627105052-i14kz4wz47v5lrnk
---
 .../l10n_in_hr_payroll_view.xml               | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index ac14e228b39..fdc9b537a57 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -73,7 +73,7 @@
             <field name="arch" type="xml">
                 <form string="Bank Advice" version="7.0">
                     <header>
-                    	<button name="confirm_sheet"  string="Confirm Sheet" states="draft" type="object"/>
+                        <button name="confirm_sheet"  string="Confirm Sheet" states="draft" type="object"/>
                         <button name="compute_advice" string="Compute Advice" states="draft" type="object"/>
                         <button name="cancel_sheet" string="Cancel" states="draft"  type="object"/>
                         <button name="set_to_draft" string="Set to Draft" states="cancel,confirm" type="object"/>
@@ -81,32 +81,35 @@
                             <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft"/>
                         </div>
                         <div class="oe_clear"/>
-                   	</header>
-                    <group col="6" colspan="4">
-                        <field name="name" colspan="4"/>
-                        <field name="number"/>
-                        <field name="date"/>
-                        <field name="bank_id"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Paymeny Lines">
-                            <field name="line_ids" colspan="4" nolabel="1">
-                                <tree string="Payment Lines" editable="bottom">
-                                    <field name="employee_id"/>
-                                    <field name="name"/>
-                                    <field name="bysal"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Other Information">
-                            <group colspan="4" col="6">
-                              <field name="company_id" on_change="onchange_company_id(company_id)" groups="base.group_multi_company" widget="selection"/>
-                              <field name="chaque_nos"/>
-                            </group>
-                            <separator colspan="4" string="Letter Details"/>
-                            <field name="note" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
+                    </header>
+                    <sheet>
+                        <label for="date" class="oe_edit_only" string="Date"/>
+                            <h1><field name="date"/></h1>
+                        <group col="4" colspan="8">
+                            <field name="name" colspan="4"/>
+                            <field name="number"/>
+                            <field name="bank_id"/>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Paymeny Lines">
+                                <field name="line_ids" colspan="4" nolabel="1">
+                                    <tree string="Payment Lines" editable="bottom">
+                                        <field name="employee_id"/>
+                                        <field name="name"/>
+                                        <field name="bysal"/>
+                                    </tree>
+                                </field>
+                            </page>
+                            <page string="Other Information">
+                                <group colspan="4" col="6">
+                                <field name="company_id" on_change="onchange_company_id(company_id)" groups="base.group_multi_company" widget="selection"/>
+                                <field name="chaque_nos"/>
+                                </group>
+                                <separator colspan="4" string="Letter Details"/>
+                                <field name="note" colspan="4" nolabel="1"/>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -164,4 +167,4 @@
             groups="base.group_hr_manager"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

From f89a0d946c8a4950dd862b0606a358cfea86a2b1 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 28 Jun 2012 11:07:59 +0530
Subject: [PATCH 120/999] [IMP]improved advice form view and date field
 required.

bzr revid: kbh@tinyerp.com-20120628053759-k9tdeiubt882fufa
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py       | 2 +-
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 92520ebf3aa..eee0273a021 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -112,7 +112,7 @@ class payroll_advice(osv.osv):
     _columns = {
         'name':fields.char('Name', size=32, readonly=True, required=True, states={'draft': [('readonly', False)]},),
         'note': fields.text('Description'),
-        'date': fields.date('Date', readonly=True, states={'draft': [('readonly', False)]}, help="Advice Date is used to search Payslips"),
+        'date': fields.date('Date', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Advice Date is used to search Payslips"),
         'state':fields.selection([
             ('draft', 'Draft'),
             ('confirm', 'Confirmed'),
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index fdc9b537a57..83d9aae8968 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -83,11 +83,12 @@
                         <div class="oe_clear"/>
                     </header>
                     <sheet>
-                        <label for="date" class="oe_edit_only" string="Date"/>
-                            <h1><field name="date"/></h1>
-                        <group col="4" colspan="8">
-                            <field name="name" colspan="4"/>
+                        <group col="4" colspan="4">
+                            <label for="Name" class="oe_edit_only" string="Name"/>
+                            <h2><field name="name"/></h2>
                             <field name="number"/>
+                            <label for="date" class="oe_edit_only"/>
+                            <h2><field name="date"/></h2>
                             <field name="bank_id"/>
                         </group>
                         <notebook colspan="4">

From 634646956bcda80ae84af3daddf818148f999357 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 28 Jun 2012 11:57:41 +0530
Subject: [PATCH 121/999] [FIX] l10n_in_hr_payroll: Small fix

bzr revid: mra@tinyerp.com-20120628062741-1ob3zfgddl10gexo
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index eee0273a021..bc87cf6110f 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -227,7 +227,7 @@ class payroll_advice_line(osv.osv):
         'name': fields.char('Bank Account No.', size=32, required=True),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
-        'company_id': fields.related('advice_id', 'company_id', type='many2one', required=True, relation='res.company', string='Company', store=True),
+        'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
     }
 
 payroll_advice_line()

From bef07b18af8165c2c82ac66995eec4d8eed5dbd3 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 28 Jun 2012 12:15:25 +0530
Subject: [PATCH 122/999] [ADD] l10n_in_hr_payroll: Add dedution rule for food
 coupans

bzr revid: mra@tinyerp.com-20120628064525-exuxtyv2ix8xf99e
---
 .../data/l10n_in_hr_payroll_data.xml                   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 8e62df86de6..a8e29c8602e 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -424,6 +424,16 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="amount_python_compute">result = -(contract.company_transport)</field>
             <field name="sequence" eval="165"/>
         </record>
+        
+        <record id="hr_salary_rule_food_coupon_ded" model="hr.salary.rule">
+            <field name="code">FD</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="condition_select">none</field>
+            <field name="name">Deduction Towards Food Coupons</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = -(worked_days.WORK100.number_of_days * contract.food_coupon_amount)</field>
+            <field name="sequence" eval="166"/>
+         </record>
 
         <record id="hr_payslip_rule_lwf" model="hr.salary.rule">
             <field name="code">LWF</field>

From 4bfaeb5e1729beef8f6c55815613c5dd2cbd2d70 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Fri, 29 Jun 2012 10:47:11 +0530
Subject: [PATCH 123/999] [IMP] l10n_in_hr_payroll: Clean

bzr revid: mra@tinyerp.com-20120629051711-ql2954rycp5raite
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index bc87cf6110f..9f9365d7b7f 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -154,10 +154,6 @@ class payroll_advice(osv.osv):
             if old_line_ids:
                 advice_line_pool.unlink(cr, uid, old_line_ids, context=context)
             slip_ids = payslip_pool.search(cr, uid, [('date_from', '<=', advice.date), ('date_to', '>=', advice.date), ('state', '=', 'done')], context=context)
-#            if not slip_ids:
-#                advice_date = datetime.strptime(advice.date,DATETIME_FORMAT)
-#                a_date = advice_date.strftime('%B')+'-'+advice_date.strftime('%Y')
-#                raise osv.except_osv(_('Error !'), _('No Payslips for found for %s Month') % (a_date))
             for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
                 if not slip.employee_id.bank_account_id:
                     raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
@@ -245,4 +241,4 @@ class hr_payslip(osv.osv):
 
 hr_payslip()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 555d9ce0a39cce905ed7265d7f00b51fce740ef6 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Fri, 29 Jun 2012 11:04:56 +0530
Subject: [PATCH 124/999] [REM] l10n_in_hr_payroll: Remove group from act
 window of Payslip on Advice

bzr revid: mra@tinyerp.com-20120629053456-eyeiy6gtahddj44z
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 83d9aae8968..4ab8ef7886f 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -165,7 +165,7 @@
             src_model="hr.payroll.advice"
             view_id ="hr_payroll.view_hr_payslip_tree"
             id="act_hr_emp_payslip_list"
-            groups="base.group_hr_manager"/>
+         />
 
     </data>
 </openerp>

From deb3b1161eb9aa2d7e25957001da82b696a65005 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 29 Jun 2012 11:11:18 +0530
Subject: [PATCH 125/999] [IMP]field added for calulating salary rule for
 DA,view for the same

bzr revid: kbh@tinyerp.com-20120629054118-4mqwotwzexl4daky
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py |  9 +++++++++
 .../l10n_in_hr_payroll_view.xml                 | 17 +++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index bc87cf6110f..bf1c075cc62 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -245,4 +245,13 @@ class hr_payslip(osv.osv):
 
 hr_payslip()
 
+class res_company(osv.osv):
+
+    _inherit = 'res.company'
+    _columns = {
+        'dearness_allowance': fields.boolean('Dearness Allowance')
+    }
+
+res_company()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 83d9aae8968..28c3538d858 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -157,6 +157,23 @@
             parent="hr_payroll.menu_hr_root_payroll"
         />
 
+        <record id="company_inherit" model="ir.ui.view">
+            <field name="name">res.company.inherit</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="priority">20</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+            <data>
+                 <page string="Configuration" position="inside">
+                    <group name="rule" string="Salary rules Configuration">
+                        <field name="dearness_allowance"/>
+                    </group>
+                 </page>
+            </data>
+            </field>
+        </record>
+
         <!--  Shortcuts -->
 
         <act_window name="Payslips"

From 48000ffc050b89eae01fa0b938c97114f0450b98 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 29 Jun 2012 14:16:36 +0530
Subject: [PATCH 126/999] [IMP]salary rules changed which are based on DA.,help
 added.

bzr revid: kbh@tinyerp.com-20120629084636-b7kc4ys46c4gouu2
---
 .../data/l10n_in_hr_payroll_data.xml           | 18 +++++++++---------
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py   |  2 +-
 .../l10n_in_hr_payroll_view.xml                |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index a8e29c8602e..13045060679 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -17,7 +17,7 @@
         <record id="hr_salary_rule_houserentallowancemetro" model="hr.salary.rule">
             <field name="code">HRAM</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = (contract.wage + DA) * 0.50</field>
+            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.50) or (contract.wage * 0.50)</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance for metro city</field>
             <field name="sequence" eval="51"/>
@@ -31,7 +31,7 @@ Income tax exemption for HRA will be least of following:
 
         <record id="hr_salary_rule_houserentallowancenonmetro" model="hr.salary.rule">
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = (contract.wage + DA) * 0.40</field>
+            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.40) or (contract.wage * 0.40)</field>
             <field name="code">HRANM</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance for non metro city</field>
@@ -92,7 +92,7 @@ Income tax exemption for HRA will be least of following:
             <field name="condition_select">none</field>
             <field name="sequence" eval="21"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = (contract.wage + DA) * 0.10</field>
+            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.10) or (contract.wage * 0.10)</field>
         </record>
 
         <record id="hr_payroll_rule_metrocity" model="hr.salary.rule">
@@ -133,7 +133,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="condition_select">none</field>
             <field name="amount_select">code</field>
-             <field name="amount_python_compute">result = (contract.wage + DA) * 15 * employee.number_of_year / worked_days.WORK100.number_of_days</field>
+             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * 15 * employee.number_of_year / worked_days.WORK100.number_of_days) or (contract.wage * 15 * employee.number_of_year / worked_days.WORK100.number_of_days)</field>
             <field name="sequence" eval="57"/>
             <field name="note">Covered under the Payment of Gratuity Act, 1971: 
 (Last drawn monthly basic salary + dearness allowance)/26 x 15 days x 
@@ -387,7 +387,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="name">Employee's PF Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = - (contract.wage + DA) * 8.33 / 100</field>
+            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 8.33 / 100) or - (contract.wage * 8.33 / 100)</field>
             <field name= "note">Employer contribution does not become part of employee’s income and hence income tax is not payable on this part.</field>
             <field name="sequence" eval="150"/>
         </record>
@@ -397,7 +397,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="name">Employee's NPS Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = - (contract.wage + DA) * 0.10</field>
+            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) or - (contract.wage * 0.10)</field>
             <field name="sequence" eval="155"/>
             <field name="note">Employee can claim deduction even of employer's contribution to NPS.</field>
         </record>
@@ -409,7 +409,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(contract.voluntary_provident_fund)</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = -(contract.wage + DA) * contract.voluntary_provident_fund / 100 </field>
+            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * contract.voluntary_provident_fund / 100) or - (contract.wage * contract.voluntary_provident_fund / 100)</field>
             <field name="sequence" eval="160"/>
             <field name="note">VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government.This additional amount enjoys all the benefits of PF except that the employer is not liable to contribute any extra amount apart from 12%.An added advantage is that the interest rate is equal to the interest rate of PF and he withdrawal is tax free. Please note that the maximum contribution towards VPF is 100% of your Basic.The highest rate of interest (close to 9%) makes it a very attractive saving scheme. Because of these advantages many employees chose not to close their PF account even after getting employment else where other than India.Employees also get a major tax break on their entire contribution to the fund up to a ceiling of Rs. 70,000/-</field>
         </record>
@@ -491,7 +491,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="name">Employer's NPS Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = - (contract.wage + DA) * 0.10</field>
+            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) or - (contract.wage * 0.10)</field>
             <field name="sequence" eval="190"/>
             <field name= "note">Any amount contributed by your employer to your NPS account is treated as part of your salary and is included in your income but you can claim deduction under Section 80C for this too.thus, effectively making it exempt from tax within the limit of 10% of your basic salary. This is very useful and tax efficient for you particularly if you fall in the maximum tax.</field>
         </record>
@@ -501,7 +501,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="name">Employer's PF Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = - (contract.wage + DA) * 0.12</field>
+            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) or - (contract.wage * 0.12)</field>
             <field name="sequence" eval="195"/>
             <field name="note">Both the employees and employer contribute to the fund at the rate of 12% of the basic wages, dearness allowance and retaining allowance, if any, payable to employees per month.</field>
         </record>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index bf1c075cc62..de4487749b6 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -249,7 +249,7 @@ class res_company(osv.osv):
 
     _inherit = 'res.company'
     _columns = {
-        'dearness_allowance': fields.boolean('Dearness Allowance')
+        'dearness_allowance': fields.boolean('Dearness Allowance', help="Company provide dearness allowance")
     }
 
 res_company()
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 28c3538d858..346d9a7e0b8 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -166,7 +166,7 @@
             <field name="arch" type="xml">
             <data>
                  <page string="Configuration" position="inside">
-                    <group name="rule" string="Salary rules Configuration">
+                    <group name="rule" string="Salary Rules Configuration">
                         <field name="dearness_allowance"/>
                     </group>
                  </page>

From 78ac17cae488e8bf3bb4578494c93ef7150328c3 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 29 Jun 2012 18:58:11 +0530
Subject: [PATCH 127/999] survey move navigation at top

bzr revid: tta@openerp.com-20120629132811-41yg7lo06oqjs1ii
---
 addons/survey/wizard/survey_answer.py | 70 +++++++++++++++------------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 15e2b56a1be..b4d8b23f331 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -147,6 +147,45 @@ class survey_question_wiz(osv.osv_memory):
                 if flag:
                     pag_rec = page_obj.browse(cr, uid, p_id, context=context)
                     xml_form = etree.Element('form', {'string': tools.ustr(pag_rec.title)})
+                    xml_header = etree.SubElement(xml_form, 'header', {'col': '6', 'colspan': '4'})
+                    xml_header_group = etree.SubElement(xml_header, 'group', {'col': '6', 'colspan': '4'})
+                    xml_group = etree.SubElement(xml_form, 'group', {'col': '8', 'colspan': '4'})
+
+                    #############  PAGE HEADER : START ###################
+
+                    #etree.SubElement(xml_group, 'field', {'name': 'progress_bar_' + tools.ustr(page_number) , 'widget':'progressbar'})
+                    #fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
+                  #  etree.SubElement(xml_group, 'label', {'string': tools.ustr(tools.ustr(pag_rec.note)), 'align':"0.0"})
+                    
+                    etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(pag_rec.title) ,'colspan': '2' })
+                    etree.SubElement(xml_header_group, 'button', {'icon': "gtk-cancel", 'special': "cancel",'string':"Cancel"})
+                    if pre_button:
+                        etree.SubElement(xml_header_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_previous",'string':"Previous",'type':"object"})
+                    but_string = "Next"
+                    if int(page_number) + 1 == total_pages:
+                        but_string = "Done"
+
+                    if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
+                        etree.SubElement(xml_header_group, 'button', {'icon': "gtk-go-forward", 'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context)})
+                    elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
+                        etree.SubElement(xml_header_group, 'button', {'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context)})
+                    elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
+                        etree.SubElement(xml_header_group, 'button', {'icon': "gtk-go-forward", 'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context)})
+                    else:
+                        etree.SubElement(xml_header_group, 'button', {'icon': "gtk-go-forward", 'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context)})
+                    etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_right"})
+
+                    #############  PAGE HEADER : END ###################
+
+                    if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
+                        etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
+                        context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer})
+                        xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Add Page','icon': "gtk-new", 'type' :'object','name':"action_new_page", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Edit Page','icon': "gtk-edit", 'type' :'object','name':"action_edit_page", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Delete Page','icon': "gtk-delete", 'type' :'object','name':"action_delete_page", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Add Question','icon': "gtk-new", 'type' :'object','name':"action_new_question", 'context' : tools.ustr(context)})
+
                     xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
                     if context.has_key('response_id') and context.get('response_id', False) \
                          and int(context.get('response_id',0)[0]) > 0:
@@ -353,36 +392,7 @@ class survey_question_wiz(osv.osv_memory):
                                     fields[tools.ustr(que.id) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
 
                     etree.SubElement(xml_form, 'separator', {'colspan': '4'})
-                    xml_group = etree.SubElement(xml_form, 'group', {'col': '6', 'colspan': '4'})
-                    etree.SubElement(xml_group, 'field', {'name': 'progress_bar_' + tools.ustr(page_number) , 'widget':'progressbar'})
-                    fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
-                    etree.SubElement(xml_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages)})
-                    etree.SubElement(xml_group, 'button', {'icon': "gtk-cancel", 'special': "cancel",'string':"Cancel"})
-                    
-                    if pre_button:
-                        etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_previous",'string':"Previous",'type':"object"})
-                    but_string = "Next"
-                    if int(page_number) + 1 == total_pages:
-                        but_string = "Done"
-
-                    if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context)})
-                    elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context)})
-                    elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context)})
-                    else:
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context)})
-
-                    if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
-                        etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
-                        context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer})
-                        xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Add Page','icon': "gtk-new", 'type' :'object','name':"action_new_page", 'context' : tools.ustr(context)})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Edit Page','icon': "gtk-edit", 'type' :'object','name':"action_edit_page", 'context' : tools.ustr(context)})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Delete Page','icon': "gtk-delete", 'type' :'object','name':"action_delete_page", 'context' : tools.ustr(context)})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Add Question','icon': "gtk-new", 'type' :'object','name':"action_new_question", 'context' : tools.ustr(context)})
-
+ 
                     root = xml_form.getroottree()
                     result['arch'] = etree.tostring(root)
                     result['fields'] = fields

From 4e6580c7af7dab5e80a35c65f588fb0a97671923 Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Mon, 2 Jul 2012 11:06:17 +0530
Subject: [PATCH 128/999] improve surveys layout

bzr revid: vba@tinyerp.com-20120702053617-3l2dos561jof4p39
---
 addons/survey/wizard/survey_answer.py | 70 +++++++++++++++------------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 8c7fabca427..78638dd0589 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -147,6 +147,45 @@ class survey_question_wiz(osv.osv_memory):
                 if flag:
                     pag_rec = page_obj.browse(cr, uid, p_id, context=context)
                     xml_form = etree.Element('form', {'string': tools.ustr(pag_rec.title)})
+                    xml_header = etree.SubElement(xml_form, 'header', {'col': '5', 'colspan': '4'})
+                    xml_header_group = etree.SubElement(xml_header, 'group', {'col': '6', 'colspan': '6'})
+                    xml_group = etree.SubElement(xml_form, 'group', {'col': '8', 'colspan': '4'})
+
+                    #############  PAGE HEADER : START ###################
+
+                    #etree.SubElement(xml_group, 'field', {'name': 'progress_bar_' + tools.ustr(page_number) , 'widget':'progressbar'})
+                    #fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
+                  #  etree.SubElement(xml_group, 'label', {'string': tools.ustr(tools.ustr(pag_rec.note)), 'align':"0.0"})
+                    
+                    etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(pag_rec.title) ,'colspan': '2' })
+                    etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_right"})
+                    etree.SubElement(xml_header_group, 'button', {'icon': "gtk-cancel", 'special': "cancel",'string':"Cancel", 'class':"oe_right"})
+                    if pre_button:
+                        etree.SubElement(xml_header_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_previous",'string':"Previous",'type':"object", 'class':"oe_right"})
+                    but_string = "Next"
+                    if int(page_number) + 1 == total_pages:
+                        but_string = "Done"
+
+                    if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
+                        etree.SubElement(xml_header_group, 'button', {'icon': "gtk-go-forward", 'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context), 'class':"oe_right"})
+                    elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
+                        etree.SubElement(xml_header_group, 'button', {'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right"})
+                    elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
+                        etree.SubElement(xml_header_group, 'button', {'icon': "gtk-go-forward", 'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_right"})
+                    else:
+                        etree.SubElement(xml_header_group, 'button', {'icon': "gtk-go-forward", 'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right"})
+                    
+                    #############  PAGE HEADER : END ###################
+
+                    if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
+                        etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
+                        context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer})
+                        xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Add Page','icon': "gtk-new", 'type' :'object','name':"action_new_page", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Edit Page','icon': "gtk-edit", 'type' :'object','name':"action_edit_page", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Delete Page','icon': "gtk-delete", 'type' :'object','name':"action_delete_page", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Add Question','icon': "gtk-new", 'type' :'object','name':"action_new_question", 'context' : tools.ustr(context)})
+
                     xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
                     if context.has_key('response_id') and context.get('response_id', False) \
                          and int(context.get('response_id',0)[0]) > 0:
@@ -353,36 +392,7 @@ class survey_question_wiz(osv.osv_memory):
                                     fields[tools.ustr(que.id) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
 
                     etree.SubElement(xml_form, 'separator', {'colspan': '4'})
-                    xml_group = etree.SubElement(xml_form, 'group', {'col': '6', 'colspan': '4'})
-                    etree.SubElement(xml_group, 'field', {'name': 'progress_bar_' + tools.ustr(page_number) , 'widget':'progressbar'})
-                    fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
-                    etree.SubElement(xml_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages)})
-                    etree.SubElement(xml_group, 'button', {'icon': "gtk-cancel", 'special': "cancel",'string':"Cancel"})
-                    
-                    if pre_button:
-                        etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_previous",'string':"Previous",'type':"object"})
-                    but_string = "Next"
-                    if int(page_number) + 1 == total_pages:
-                        but_string = "Done"
-
-                    if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context)})
-                    elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context)})
-                    elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context)})
-                    else:
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context)})
-
-                    if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
-                        etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
-                        context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer})
-                        xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Add Page','icon': "gtk-new", 'type' :'object','name':"action_new_page", 'context' : tools.ustr(context)})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Edit Page','icon': "gtk-edit", 'type' :'object','name':"action_edit_page", 'context' : tools.ustr(context)})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Delete Page','icon': "gtk-delete", 'type' :'object','name':"action_delete_page", 'context' : tools.ustr(context)})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Add Question','icon': "gtk-new", 'type' :'object','name':"action_new_question", 'context' : tools.ustr(context)})
-
+ 
                     root = xml_form.getroottree()
                     result['arch'] = etree.tostring(root)
                     result['fields'] = fields

From 3fbf31c10e80676e2e84fbfe0c1d6164b8d3fdde Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Mon, 2 Jul 2012 12:12:19 +0530
Subject: [PATCH 129/999] improve header part in surveys layout

bzr revid: vba@tinyerp.com-20120702064219-5lx3nbbvoctjp8hu
---
 addons/survey/wizard/survey_answer.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 78638dd0589..a0c35be81cb 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -147,33 +147,34 @@ class survey_question_wiz(osv.osv_memory):
                 if flag:
                     pag_rec = page_obj.browse(cr, uid, p_id, context=context)
                     xml_form = etree.Element('form', {'string': tools.ustr(pag_rec.title)})
-                    xml_header = etree.SubElement(xml_form, 'header', {'col': '5', 'colspan': '4'})
-                    xml_header_group = etree.SubElement(xml_header, 'group', {'col': '6', 'colspan': '6'})
-                    xml_group = etree.SubElement(xml_form, 'group', {'col': '8', 'colspan': '4'})
+                    xml_header = etree.SubElement(xml_form, 'header', {'col': '6', 'colspan': '4'})
+                    xml_header_title = etree.SubElement(xml_header, 'group', {'col': '6', 'colspan': '6'})
 
                     #############  PAGE HEADER : START ###################
 
                     #etree.SubElement(xml_group, 'field', {'name': 'progress_bar_' + tools.ustr(page_number) , 'widget':'progressbar'})
                     #fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
                   #  etree.SubElement(xml_group, 'label', {'string': tools.ustr(tools.ustr(pag_rec.note)), 'align':"0.0"})
-                    
-                    etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(pag_rec.title) ,'colspan': '2' })
+
+                    etree.SubElement(xml_header_title, 'label', {'string': tools.ustr(pag_rec.title) ,'colspan': '2' })
+                    xml_header_group = etree.SubElement(xml_header_title, 'group', {'col': '4', 'colspan': '2'})
+                    xml_group = etree.SubElement(xml_form, 'group', {'col': '8', 'colspan': '4'})
+
                     etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_right"})
-                    etree.SubElement(xml_header_group, 'button', {'icon': "gtk-cancel", 'special': "cancel",'string':"Cancel", 'class':"oe_right"})
+                    etree.SubElement(xml_header_group, 'button', {'special': "cancel",'string':"Exit", 'class':"oe_right"})
                     if pre_button:
-                        etree.SubElement(xml_header_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_previous",'string':"Previous",'type':"object", 'class':"oe_right"})
+                        etree.SubElement(xml_header_group, 'button', {'colspan':"1",'name':"action_previous",'string':"Previous",'type':"object", 'class':"oe_right"})
                     but_string = "Next"
                     if int(page_number) + 1 == total_pages:
                         but_string = "Done"
-
                     if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
-                        etree.SubElement(xml_header_group, 'button', {'icon': "gtk-go-forward", 'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context), 'class':"oe_right"})
+                        etree.SubElement(xml_header_group, 'button', {'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context), 'class':"oe_right"})
                     elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
-                        etree.SubElement(xml_header_group, 'button', {'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right"})
+                        etree.SubElement(xml_header_group, 'button', {'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right"})
                     elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
-                        etree.SubElement(xml_header_group, 'button', {'icon': "gtk-go-forward", 'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_right"})
+                        etree.SubElement(xml_header_group, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_right"})
                     else:
-                        etree.SubElement(xml_header_group, 'button', {'icon': "gtk-go-forward", 'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right"})
+                        etree.SubElement(xml_header_group, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right"})
                     
                     #############  PAGE HEADER : END ###################
 

From c97219fbbd54e4812f2d7137a196af5e9846c4f2 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Mon, 2 Jul 2012 12:54:32 +0530
Subject: [PATCH 130/999] [FIX] l10n_in_hr_payroll: Fix view inhritance

bzr revid: mra@tinyerp.com-20120702072432-gdmypy92cx0ila7o
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index d58955ad2f1..afe991b311c 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -6,7 +6,7 @@
             <field name="name">hr.contract.form.in.inherit</field>
             <field name="model">hr.contract</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
+            <field name="inherit_id" ref="hr_payroll.hr_contract_form_inherit"/>
             <field name="arch" type="xml">
             <data>
                  <xpath expr="//field[@name='struct_id']" position="after">

From 45136ad569e11e39d25b982ed86eebde516f031c Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Mon, 2 Jul 2012 15:08:15 +0530
Subject: [PATCH 131/999] [FIX] l10n_in_hr_payroll: Add default of DA to
 company with true value

bzr revid: mra@tinyerp.com-20120702093815-oowniwkm5yk2n0eq
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index d5b6e3b6904..1c7f10cc87d 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -247,6 +247,9 @@ class res_company(osv.osv):
     _columns = {
         'dearness_allowance': fields.boolean('Dearness Allowance', help="Check this box if your company provide Dearness Allowance to employee")
     }
+    _defaults = {
+        'dearness_allowance': True,
+    }    
 
 res_company()
 

From 1b4d58d3d345e942d71f5ee9b2c9d0ccb6dbd631 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Tue, 3 Jul 2012 12:13:32 +0530
Subject: [PATCH 132/999] [IMP] Fix field visibility problem.

bzr revid: tta@openerp.com-20120703064332-w13ysbifmwwhef8p
---
 addons/survey/wizard/survey_answer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index a0c35be81cb..3723c8a68a2 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -202,7 +202,7 @@ class survey_question_wiz(osv.osv_memory):
 
                     if wiz_id:
                         fields["wizardid_" + str(wiz_id)] = {'type':'char', 'size' : 255, 'string':"", 'views':{}}
-                        etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0)})
+                        etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0),'modifiers':'{"invisible":true}'})
 
                     if pag_rec.note:
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})

From 9b84b3cdcd4ccb73815afa2a15fe523ccb43fad9 Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Tue, 3 Jul 2012 17:10:47 +0530
Subject: [PATCH 133/999] improve surveys layout

bzr revid: vba@tinyerp.com-20120703114047-bjd78b5x55wq9mai
---
 addons/survey/specification/survey.png        | Bin 83247 -> 67420 bytes
 addons/survey/specification/survey_page.png   | Bin 70614 -> 50072 bytes
 .../survey/specification/survey_question.png  | Bin 91547 -> 56641 bytes
 .../survey/specification/survey_response.png  | Bin 75180 -> 56037 bytes
 addons/survey/survey_view.xml                 |  23 +++++++++---------
 addons/survey/wizard/survey_answer.py         |   8 +++---
 addons/survey/wizard/survey_answer.xml        |   1 -
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/survey/specification/survey.png b/addons/survey/specification/survey.png
index 8cf0f7022c11d499f13356734036fdec6503cc64..52acff391d02585b0c69135ccb7505eca6b14f11 100644
GIT binary patch
literal 67420
zcmYg%1yoc~*Y>4RDJkhj8l(i2PU(<t3F+<_KvG(fknS!4=>`Fj7;)&98oFV~nQ!oY
z-+%pgvEbgtx#ym9_C7nF{hVkGH3i(q6psM_z*T%Bs|5h)$Xhf38x{FSa5mKN;mJc<
zQ5zc@d*QG8D)N!sQ%>LWt;>5)pLg!ofQ_?@lQoxzrMtDYvxlvV=Mh@BH~`QAin3DL
zzFGTAHi6m$^T4r<+QO3KuM#0?Y4z<tQj+M}=ucQ<;&)SGYfXqb>0+pR{Xg%KXcv9N
zMbT`@d*hNHK|}b4F8+MUO8GK59oDZn%`EmwgBy%MbAGR$p4|YyOjk>w5<$hL4=0eu
z&Uerqx;z2C`HeJ%_Vr~XJbHvj;|W2IA~AtB_`2S^P8(=m02O;^Qik=?8SjYF{d;K-
z(pO6g|L#7u9Uwm)^ff3>lC4v8u8p`DPeD;}IAvVU>F)j>ZFGwx`^iIldQY+W4r`<A
z2?-#s%VuMXYoR9ov81A+qLfrGvN83YN(o0c#(!H@SZ}CLF=G7E|FX4p^MN_~VUT-c
zVfYe@g$jwkzr8q;)%DPj#Xjj62ahZ?dF@r01=;o8<?k9(iUBj|oQe<KnCRW$leyj=
z|4ktzxAadoYow6Go*=qFlkV?3Bo}+d!{c(><dnwTT}Gt~P~fIAA%_@V!vR|ia49Ah
zyMZN~cCMTT&D=5=H9OkvR+;A7XOPB`gvf{ecQi`+zAdoaoU0t(LAR{2_Z+OO8ag@z
z;j63Wu>%EI$~U|@yHfhT!kC(>e@jy;^CDjX|KDe9mM4Opot^#t+gNxdBqX@GxfvMx
zAo!~w229O(wM4jBEyom!E1_#)Z;~u>Sidhui5A<J4&&l*a-d=##4R})85!y5daU^T
zZcs#7EC{ArItqi;V|=J3&Gk3!ne>w$1lu<L6gj7Xfq{yOn1XF`Vp(iWoyL}ySt~vr
zdpH(O0fkXECF&$E`bXZEpx!>;hK=kNsD#U1!0k>2eyy6yF)eH>a}EC}$m=*z23*Y?
zMSI_Mu*KS~w1Y7$fk%Dj9mcmq8L$VdT#f?K;vk0VW3N1MxfG3pb|Yz1ofZS+owl>>
zr}iUFe+{Fxa!>KB4W^m4JDp6<l^VwfL{X5387;$(?>k>No_=N;cqi71=pIRP`B{B^
zm{Vms=g5c@VcApO!7MeK;^8iT>Yh#ao#+&Klqq6a-a-HP;DZzT&k|ky9wzRBdy6v?
zO;ut&W%njWAB)v+UtKAc7otkCO<7qVbd-{^q#X6j0kWFJ=zlGwtyJHVuj|M`zQ+o8
zK3}=t>kp$33JT(q7k|k<nccXyKr&ZcByj60Q`>)D%QVH!O?kmKys{;Bq3Wj?Lw%Fz
zcNuN7pI+-Y%-PxUT6Z9PbwMFP__$U^1kW(5bu(oMQIPENqoC$u8tx+oS84c8n?o+t
zUlO8jn>ozWDPSFVl6lr#Ic44Rx>E1O!h?+Ljl&64A)>XNh$+UN8!*ah{Md~b-@$Co
z++OM>LaeLRURDz^TYm`@ruuXiCeMp|_v3ek?v??z$$UV<I+Nz)+w&Z1CA&9!ABdhW
zQ93*&QGl1EC<iToD1cBS+_EIrCd#{?8v(a5cn<b|Qu#0`rUb@)W?P1iwx4pu6hQnh
z(|F*W_nsgho=W?fT8RTImGgs1k40CR;q>BM9#uW!gmvMBCou=Nqj5HvUiMIY<|vpG
z{5%Z*GPe;;vT<j*A52CRuy`^0M16&vcI}9p?P_mEeFbh6Z&H2`tCO3=WXkNv=eDl7
zSAD<`D3sl(%cX+YLVG_()^wZL@W{jhjdN=sRM~A@UoOl1G#gW$DnPHu0DYh?cqz$x
z5C2vcFVK4HQ~zxi$R9oH*UR&m*nQFU1KrqVgkbwcWrGXiW@pBo^WHRF#A>gt!NmVZ
zWOyVgm6;GC*32n}Oyc-MG(OI`W>u6=&D*v((qIr`#KeZ@)&7=9_g4aM`vDY|j|JH7
zZu8ym)h-0v7KyRxQ@Y3;e2SNaE(W^XCj50b>A?Y}X0lC)FZzog%~<{!maK};oiHPv
z*XW|bx|B$DWO$AHWPIU#3TB`_+EMDXT2m-z4QMzy?obA;SMo<WoA@*-Cr;Cox*^n8
zN(^ss_nuM`+Anu*^l!F<ujS5bnS0FNp`H7vS8Oc|s-2*da3DJAPM5nGQyb@;M5ShC
zYCClZUR#~EEXV}PYE&)g243_}6ESx7Wo}}P&(Ji1?&poLo|wenV(*q8(f}c+rJG{$
z{TsQ*vmTb?fr0^-O#;fXaDKCZKRLXX&D92i(e_b~@I6g$4?Vi6M_eX?|Lpan5s^P}
z@qt#K6xWKK=%>DQnz+pg@NZTYZ5;EO$Y%kgh0q;u20sq%Ap<^2QLh+XY1(vGUAu^;
zW0>URUd%?FfoKC(iv`L}8h6r7XK<W__B-eB(;N}rr)j~F=d`dtEze5!UyJ&j&9(ii
z=wcrJ`Wrs@l$!H$v-AmW*Fi<9QGqhisN2~0BO7rT?-N^o(D(>rd-jdE;Bj5)q1esb
zK6${OzyklVEPiXNt^FxK>rm#G9UJ|@2`d<>2}fhWftwr<!ZQ+OPvysPTDyOKp({Ho
zI}Pmb<nkk?`6c|Xr&C`~>o2H~Er9OZ!S~*y^9SRlW^oPsp08MopP8U&9HcKKkgEF!
zVK)1Z9fDZK-$O_0m$=dBf3W0%it+XR52udA4Sw%5uyL5BHwme4C8TzDwKxhL&OCbX
zpwEUH5NUMS{z}CW2n?w*@7NFub^zWP)hK>`mI(EDEX2GL>;d~)biwk7zT_um#b7FT
zqsq4*gUOufB2GctwTd2QIln-c^U9DUOP4_Vt*~b9xs!;J2}9JlmDrIL+)85Y^JufH
zlTbATd!p9p1h4;ZLF+zew(tF;Z2bv=H@h<d^#$$m*<u%;WfW`z`Z9k64)7EhalKne
ze$*}!_F=unUimaXinb=BC2+3Z@bQWj-+j|zx0eJH@MTzgh+Q&{_qkHP4d?OvhN|iP
zjYlTvM)sEiyc1SM7sCv_tX2*(H_!db$kxfha_N+lwLDjP^~S<JpDrdHONi;&$|x%r
z+Zcv&;sWNSel!1$<61=`p%g)QZ0t-0uKq=>VJr>o0*80s<nFJY!%MXNWdF-xpUHS1
zZydvQp|-a3RSbh*vkzLIQNq!iZAnQ#wRp<sCOU@FZ41U{2z+OXh2YirLNCS)rngNk
zD@eBv$Fx&Dgzo*mMl&?pIKDOrw1Iw<gyGU(GE(AalgLeE2V8*}6X?Y<5FM$*mum;X
zG$@LMvL8@fQNfZEtZ0L*#T3@{VlKCbUsMRn+F1+9?(T3tz?VQViTlc2#B%VTxe_cZ
zD=ED4<n7yK>3n|cQT+V3xNUov^bmPOu7Nw%O5Jt)fJE_pR#$aJpwZ1s#Ga21n4O^S
z$=!fWyJolAKi?}GPGDxXvbbn`^xG`h>1Af6GdiXqx@HisSlg9VP?k0z`}({0Q1)9)
z%zL*2jflK06ZWChI6EAxfaS~kQa>rzt<q-;{4g4ob&Ou!Pu#cX+Je=WfDA`b&({(=
z=HgcKox?}$;)^3VQrYYbq&kJcSSHSU<$6OBgJeXqb#%<UX%~sd&l1}Fz`asqx6?FD
zbs2?2#mZ^ocRv}I*+x>is~a{H;>a`wCpIe<hriiDO8n0O*3;c|gt6xfGj;m#j|H<q
zvXbV$N3CXFdH^6vJRlG?!BeEP_A(3^!fmL?F~_}7)rmQH{O<eJ<a{%<g{BPw$47`P
zWq2PCxxgDPe5DE#ukm7VFhfE&q;sGs-}}C60Wz+iL|zoNotyKI+})BBKd%k4G#xTf
zPw+noLjg2g-67{t(}i5iTIMeoT*ERLJ%NXTUWWwrF3`WmeQt1_k+FA0$shJv-OA&5
z0Xa8zi?RuVeYAu#|97aYc$NJ_7I~8xtKV9+SywzVQ+yhB_$gS6djPA_x7KkVP#=dF
zKyakQ>+d_>BFA3QdKyF0w_SV=ycqOd23bIl6q@gq$e+aS3HzTmfV;Q&*9WeHdZ&VV
z2*oM^$sK0v+ta}8hd@@F<=#h>j!rU(NfmNV>I^z>VNxWGEzY?GUOfMSPd#5?5UZ|R
zRraO<W_Pikv5p~+06y`v52VIv0(0eHF%3x+*ImYD>vR+iB?tT$tkytJ8I87ZXIRVu
z`6N-XhPnUm0WwRKZQi@TpM`t`V}T^%-Mxk{_8GcCFN!D094nX|&r~97%9+vvZx0wP
zhjwezxDDKQ5(kaM*Z~~joM)X|NO8TZ5fidpA5jm|&U5ph7D;fJE;X9^k%|@&w#|5)
zY?noMr5`9q2>@19%U74Z7jZ%t<kyP`v6I>IQs_pRpn6(OesGcZwE+e|kU^jn!~$s9
zhDwCI=4cmKF;VsRp2pyJ6H!|_9di)k@)s1YS^A`z*m*a5{H(Mp*nB$j)vt<6pNk}7
zbifai78@0K^P{XraRlF5&*-ZZuZ$EQ))jWu4^=jo`mdX7fBLetUSRD;D6$<{^1hCV
zWfk<buo1&g=2K!TRzaZh-OCN2-~b_W$_Gj3Fpo!1h|kE|lOKl=5G*uSU(YUE;z<K}
ztm{A2SE}~z2YbvDDsNEya)i*mF0E3Gm6}lU^8e$t1yR(A=@qri&CN|sbHsg!0oLN)
z-d@ZwsYLi*6>tn6i}EIs$Ov4?O~>nm<Uv3UEcizqmp=!Sqysi*lX%tdR->8WL61}*
z-{;YA3_riAKqo1$t%;0b9k^ZmIF2v&vSN&dM_ugGCh^_tj<W#)`H|XET4UE`(|}oB
z<@4HG?~}E<^+B%d%Y{KdQPbTT;9JamG>j^wV?(udt5o6KzCqxmii|*LixyUb=y26L
z&28PXVP~ch2T9@uf3wN_w34vdyzS-CF1aF>+|;!>tnli6(ACZ_i@EI2>1++Q6?Tmq
zMI|U&jmj&q_2s*T_C>^gIHPfsSt6octcz(6HWlSj9~fNr{QeD|toLQs!r_))_uY04
zD0bQSyLk1B>K@!xZnnyM?+YG9fR#hV_$FX*QW1s_yl*(0BH4N;L{xk%6*hll(xm?Q
zBkk{T_tOT5+)je=$y~k(W7^Re-p5_>mh6@QHHvS(A*Zz>Kl#ua28N=vqL#~x@NLhi
z@@7KFi{(mTBV#nXPcQlhJ#7{;6&lYj#tPFW(RxnkVPYrR-DNyoaIbb%X7SYRg(FIK
z8>aUyOP3Y2uA2o*t%osHuZD}Q+y5ueSL&Y%yN_Wo@W@DI@|qpIme@%5X6k)h<Mu0t
z(VS%MZBpiF<lg=RyJJh};Gy?jNaw$;988VV6*x}Ay4TReGVclD(+vpGgmV{GJNvDD
z#(RcIVjZl&nd2d-${!gX<NhwFD;9cxyY#9)z1Ag!PGipFTjACDwDC#$d|#8l{@s{R
z+LdvIPOf6lX6rc~Zps=XZCA7BZn9pgxaIpis;l)qGyWKz;uiY?)w#>Lf=l(z^IG17
zj{f$b1^2d}bl9bEL%+7YFS$V=d_XvcKlsYiIdZ{7IXRg3uSAGp;CaL&^-h7k)*)!1
zqiY(~e3Qj4C2h72b{$RS%cYq;w4B+?>wuMv+-{exdIhBL<}OD%L~>nf@4a!khQlP_
z&>z2H&zI-_#^+w@u{R4sW9V>*Z+D9NYFtJsX{q0fw_aDez^qzZviy#?KsV(xq-vk7
zT775q&ZcQbo)yeX4+xoZjm^5ZTutC_`552b+?i;1pI{)AlYQKH9p<NbQaycl$AaVC
z^b_}QoNVN=yzRt*%d__P;P7aoAx<)Wog~SoXS8#TCu8bqq$7ZPipxkVgPfb5)kVBd
z&@0f%T*>$U$&&O)6TUiSUxiO|Vv4CvEO+#K1%h6KPf+1GCgtNfI(uBBa~(kZk^jin
zV#2cdG6v)`HvOxvm{sG_CvSj#@Jw5lU=tSs2x5|LqPerGUhkzrOmdF#*#E>Ri#;6~
zYA=H>LX1)mb|nr9k5Y}!>YF%C+B`kBi}c=S`@KtLDe{AsqBTZ2sot8~%VFY?X^bo+
zYZ;_oT-Pq==hJZ7XOu{Y=0GoYmZzR0?|HB)B^*H?)W#t4${%~qQfkbitzHll6Hmew
z$t>$R(L$IMb87QgByN_(7M^Kmj+4D59ym+U(V04P6i$G6=)Zj~BQ0&!+zw|hfA*Pk
zL==1`3MM<_7RrI56<~Gq!)k(6eGk8xOg~WtGZky==!h+df<358%@mTD?i&kOleIcG
zbaYaf9swQrzg;RMP(c&M3=!&?h^`9>9#FQnCz}V*k=tcztMg>>Humo@`;eQzota8g
z_t&m%jdx*P|KbyS;>>2p4>5qc`b2QBwZZuC@bK8!rm$LYnid5K2?;rQIZyf85?T)#
zr6)vnIc+K!)`|8A$V+CADTuQ2H~!n&2yd@tjiGsIo1uHrNW(ZqYz~BUdDV4U*7<1s
zr7reek;5N8AAFmz&T1K_rAd78RTkfc%(5}uDgKtTL^XHW_Dcv7l@TyLkYpBfkBF(r
zgojr=-_13U7&t4s&^l(CwxQF`K9AbXm%#6=`rG%)R&{4t@3=}^XXoofP}uo4PpNgs
zaza!Ndf%POGT<Qys&wk4ROZpY_Z6dlSeY=#<?gWsL`M3_z&^M+JLZs&LHxJ4#ClRH
z%EiW5`|pliyJGyZ(rts{WYfSV{%qBAuLlH3<A7ao11+TgFDvq5Xa5uC1^!GmWNl;f
zjFdDo{NW<Q!93m-E1O4KwKKS+39Vt-4f}|U=ySfIbVy@^_bPZg&~T2*s_Zp11(i<l
z+Rpp2EyJN4)HsciPVsQz-P(l5Aqoe7lUWL?Z7hn<<sZ%18{&VTZ>~_S-TCHkpPUpP
z^T+%=^iQSXSHa@RbLV1-&9yIQ(AwY&#Io^qhZWB+eG!{+xN&=_)+B4in2c&`#m$kN
z4P{|4G7;H6J$9aNFs#15zJ8gh>M{eNgm*A<=RlDX{`vFg*jS@JXMTP@67kUB{g`)Y
zG?|W7#vxE~_G^m9_^qp#Td&If+4SVD5sIXj{bCa5uh|zTH7l~3js<o5adrGgT^ZkY
zl#h2)+itpXW^9{~=u$pHC!=I@Ym1bGL?l}cIL0}@2=7>4hhNZ>CI7j*yX)(dZkVGY
zBqXGuh>_S#BS%7Ds_Usm%PdnxVzSHYv8(fT!rk%>@yM|1{wO~=N5rEfFHaJ=|CfUQ
z_PrxsJ`2mYxM2on54<a<cD>tqsX9l$q5ihbC}ZN0@ic<yXICx?W;i`eJb19qa%j=H
zSv-%nq6%AEu{ia$x;p%1edytx@QfxpdEAKqB6q(MCE&vD8*kJl&2opor0Axgha4<4
zTM~Gszr&aOAL8a^eK6lBE-t>*=Jn*!qt=g*Cr_UE?9bMDAI!^x$ttpYUN|}-akhAD
ztjh;DbS9i+1=PIOepKVht<i7(uOCNZvYQ7O3tNz_3J{>+99E8+koc!#Z~GN{;xUy^
z38#qfEvtct6tb)W)5%~DH{bz^++eN%M+QEm5z=Kzk<;kmV(s37nz{rP5@L&`$$W!N
z2eZ$pLA<e#{sFNjxu>V6yTRXndtOVHNp%Qa?oL-Pq>SS|eCfBK<^9dYg#;M~u+6?U
zM@=w<`1g+B(?cbjf8Ryove)MLK%1d&^SvcL@NalTy)=L)NpB17zY&zb!}w3j{5@<u
z6lp!i{l}6IW3y+NMGL9n{(p1aN0HQHtit?n|H!9*6WD$gN&-AA0uo$h6h_B3iFd{R
z_oVUgmH++Yp(pu97@*&faNlG<HC~h)SV;uP(kf@-iAAk|d}^ECrE!G)>u`p>3dnO%
zSuV$Q>8N{QcKuq;%`lP0Sv2RXaL}|7<12IO|E%ZBhmRRi?U5pqYeQ_EZ~KPKYD_!*
z$1((I!8ZzDv4QES5rnJp&fUW#u}wC=VF4!b_7tc^tkZXa<iIEwrndv>ws-p@dfsf8
z;7vJ?dYQPGI1(~T;7BEiX}ILaWx!pv4W=RhBy95M7-d^LvGsrjFZ*Kyq~bzumQDPZ
zC5V6))n9i5l=O#(l$-J0xn4K2OXu)g#IxrpKu8ws`h3TzJ{!d;5`n~B0CQD!<E}uj
zwG-mfHKK)*F)sXs?qV4MpvoUQe3WzwLT&4~sC`zzywm4#1P2@8f7qWr8A{xHd8h(z
zVgpb#oo;ZuZ@Y~AGk6pX82(KO2mpRJ$|jBe{XhulC&IsbLQvW>HI;O9oTi<6et!V1
z8_B&vN+1CM2>JrlHXfa*@xB3o>vE$m<Bo|EfIe`Ao*Jbm9VFV=Q%<|i`9>_~06oMz
z3=36qxo)LYJ-3~iP42P7!b`(fnMvPWFXJ|&cYxnMv$zZ)kkky%X`P+LgysvBPd-7n
zho!MI#a6HT4Zk}rFwCcC*E|1RY>g$_9MQ1)C(~zrNQD!u@FR5X8MC}`@pq|4tLhGh
zk00g6YSuZ;Hy`~eG)ug6Dk!GlmV2`)E6oIy^6%-l2bf;@-T_}q<~)3&K#fB9r#>_z
zyOeVjz@Nl}Q7nRiZKHO1UY}*~li=^D;a-%m2?y9$6ucS`EIuOOCAXQ-_p{_rm(8B_
zcV0caZx++t1NIJqPbo=X@#$i?oDV6WO*SryDp(;X;J_CbTf)H4S1s;`%?p9qB6vbX
zm16?`_R5!DnvmFDvchC7B?p75NZ!cUIiXjB`YNy!k7fThpX*QwrOUbX;Hulh&h)pX
zq6lY;)W+o*6o6oidT0^y*0Y^Nju(^V+}Qyo<lKaX3aL%~Mp{76qVt<d^Fl6`9gQX;
zV19X4C)wH{)d)sLjJY~0o}6sC9zTW!bH)UA6mL(hflqIJN&rdoq2B5{zc8k2B|=~y
zv6I=j0DDim(Eobr;%^kKTJSE-6M4kLa<}b&!&<c<kbX0zyU9LeoHJ_dBB1)jL1?uY
z=AxV3^tLpCM);cztZB(WcOX6c`)a40=2?#Y`xldET3g@VOG&a81Hh`s`j}I&SmR7a
z>eqED(&8+!uZKVgrSrjV|JSM1YIUAv_}tlo#93D)<3b6lWM6f&A^bK%a8F<91H@uj
zUDO%_*?4capX|-M{=?RH;O^$v4R~Bx0oXvGwB;=>br9@0D8FFVb~E(BSZGV=<)QYF
zRT5LZjglD|pFTaiUNz76a_Bn~%nnHB*L7MuA!32w?A2NhC6Evk$59CG_F~ZhfR0YJ
zZe?z6Za%}!-R@rPTdlV%pxc9yFV_g(MxUIriV8c5rz%dbFB6UyefA5j5%->hp{jP{
zck7Ba*%MB`7N%0VZ{JxNq*k`pZ}&ghToR6}`^g<v@XjTbpNp5dJGY+SL{qkIATJzS
zshri23BaJMa%ygRCw?;*PM}G=U?{6pZsrRU=NjFEoO)A(or!!nm&!kGHKDDCozKg)
z(}PD{L{?`mGV!Q{KUwQ!UE3h8oTV%*ZUXp+-m(0%#oP@erYL#Iu2g_6GxKh~OiiPM
ziNlP2M1(A|#4~#EKKzZ-!l_9c+3f}YvNt6yv8Uf@G1g5*#e3++26QuhY-@Yl7Fl4D
z{#ars3P$Up4Tg(Y4#q)j##xoF+0O%rh@$YwlTvfUuX7Qj!^4koaHxd5_aW+H#TC1^
z9$T}HFT<ER#T`;<EC{6?UoKEK*sxHG?;jl<S@NBP(j9luVaM^xX$mOm$Z6{6=n~&Y
zuqt-F=jXvDVo@P`WrYnqgxPRtZd7DMIw(+9k<ix^oLRtXZEamq!8gciDLRCKfgvX^
z|D1^lhg?)xK;ZkX!g8y_Ok6rYNagvLVJm@jQ4zP1`u3_(u91uqln|*T1_s9d{yzWn
z?Fqyn<^BCV516Q2H|W>+Q4svhv1|R3jR)7sGC!G6T3hE$OC7GG5*m<F2GA)IhOB)v
zBmtgEdT*2lxKL@JS-J)uHKnGMRw=ftVZBN~lhkkS<+}IFn-t=l$5{nzUpwxfg;|J|
zz8KWjDNfevMGP9fu0mM2{7N-psaF>P3>RNiwJHKiD3TBX<wabg-2H3TA!Meh$^q|O
zok44wG>P&!q#>jHtsN2ZPlvNdj8J|HtoqqEw7ztz4?h2Vy{#F=8e`IavluL~QbBTZ
zp`)cWX*rbK8BlCJ@+*~#BRcjhc$4I;O!N0S2sQjuM@NUyioe6~pJIQdG;R}`pzZuy
z`9wS%oJj$v75F{A`1vQ6b1Y<4s7iP5hvFAP*ufX;bY5@x-L(j9;5X}$)XRef*a5_*
z@9JcIFp(vE)c-)RleE{(*w?pZ&QVRoi=CgNQj4bLu_*Yh(vovCv|37Nsi+$p2Pf`h
z-1j+0qh{x7PiGB{Pf|(7*4A=za?38rU!5<!c8j8kIF`o2GeUfP_22T$hsLwjN+Gw^
zJw1|NhM7j(-@VKC`Qj%Xc(>rvDd>B=ikWgCS5}VI<M_N>ap(-CD;q{G3YUcGj)7#E
zp^MQeu}x?ptdWh68eR+*a4~FrxR{Luv30g%w9jyx1Wx8_2Us7KQzU2jFHO5`mLC`d
z=-roCp?ws>*=5l9MaF+EbVTN~oV+RAwgvl6V_7JBvfm~6Bv?rxYH;axdv+Ry!LrIP
z&B*X07DVf1?RXN(kD6wtZRo3d80h3E7m_WG@U^o~)8J=8_oST%pYEY>00f~#at|`}
zOgHIz3_t|>&fMMIhey-zXoFpWOYZ~JQq?nZ!HPeh4+|BPO#@Wt>cWajU$dxBtL0vT
z4n-26ncpc^-CLilr`P+Py;n>+PdzI7cdg7+2VCxyV&PJJx4*F0(YcsF_)nH$o!?#_
z3B5^jUpp!L9~Xe8iV_ENa5kqi0Jgu>?zr<uDh#t)zs}+={E;Xa?0cc33PHx(CF+@&
zz-#ZrK&yTI$|-j2(29z`fBzzP<HzXezkbVfiUmyNF<Op|C8edcrVY=<#5xTc-usIq
zfnZ*XAJ{-kT`*#uMQxh|Q%46O;&&>8FTM?h>gntIZfs9%j-(x_s!YDds&8n>&3!es
zvJ!mW3DZ&%sR`WjDOJl(<uX78!0OpI7eXt@9I2Cn-|BdE2U3E8g|%>SiJY!AvV-LY
zh1%3CVL$iNWHt%Jl_gS-GY$<V`>2+V(iQMK>TKIBUUzMG&XAg1IX7bsHJ&~Tsmp2h
zHu1CPms}1_S4Rm^UySdcC#{mO#%OJd5F)pHdV*FsAZ9RL6$nf$*0@N2qse<qZ#7w@
z8L(_@ueu_9G0~|>`g6P)MKY7LzkoAIymXde(%p5aM-J<(KFhr6oM!fyy2K1mRYWaE
zH{HVZ@?@zcQfV~m--2JEa5`am#@7S3s@l5$0+p#YV-jEx8{F=5zz(`JNKIN>^Q-aN
z%d725A|(7;K`0$U@Y~2naO`)T<#B-=hR@1a0`*&r51?ZdS|ZD!ZTe2Md^Yz|yLspn
z((Q@v0#^UU!Ltt5m`ouT@o&Khh`K~453eRIeW4zJL<*u(5Z^2!<ab~z!QCf`5{@q^
z0pz+StY03jNLXAQ2Z3&b5KBHji4@G(eaev1Jw|zePLy-hqE5eB_ugLW!-w_3g!s6)
zstloqxjT54$U72C-}4+4#iYKz{={5iP0h9{^`qtNS6-+gEiEmFOYJLO(CoJ~!GZmQ
z@u76sp^|LbLN3cDKFe(WW3Q~^T8+7pulD!n7jR|qPB%F%<cJ0A4tX9f`ptfO=d<iJ
zGrVC15XjZ#<*jB8#7f*8_m}t*cv-|XQeKV@9bn$woYi6_K~Agikg-oH=|S6)7r3)?
zAz~*i&k*-+XoPvOKycxdYAc~LAd&p_bC==Ki_$8<3kRJKvw3%EyyLWt1jx9cp|ae#
z;1!LlJ67`n39zg!xCD!T%}UMYiIi(T0L_FIMtKq<a!ghsn+c|Cy^W70J&$@nhvumR
z<`zGbVapC(o^v;13gD6w)DULQHg!b%A+6V!Zpk{de@R2y+-4c@Lg~>En?eGT15)M+
z?_h|@8YaG~4OV>gNJaCb-Ww$#1e#vp`r(84m*;b4LFpCjVEtj1+&7*6(ba}1#XW-X
zKgG!Gn>P3~y7XWLGHRx)iwQ6n7rS)cHw{~z(jd?PSUe5&vuA0UX|Po^e4MW9t<LC&
zYY&;WH3kR)cjplGMD=u}7~8z|E~g6QENOguEb3IQp%NECVMv=A#^g7cYnyE7)b#te
zMrVX+u6GsdWAGVitenmil74buLN%nA^y4hh_RU8YD=eUNM2>9=i-IkNkeK*<(F05^
z?#{%+lejKCsBdRyr(|y*b$K8L$#_Jc#Ple1_2>vp29bCT{H(7!swtkKl9rJ{hWg?=
z6AB^;5P|shmar&1!5hZ1qLL51H&)S~W@{2v_x`f6f^>9|NL7lE&Su-vwQsGa`p#Qn
zVmU?M%P;gi*cl}|AVDH1*9{hUFW7%2RtwVa!b!n{jRfvvmYEB>iz_OE&uGBl!&0C8
zZ7-35Jz!AZAX?mhgwNJi8O&Z6$E$|jxmWj0LG`Z~`Lu^l9q_<x3IDwbIe*xWL*;XG
za&Jo?L&5FLil3|@U(_kue6W-hy+-H=HPMyE@I^KFTyj38Fe@jS*;m|Wx}dK3KcT2^
zdf!-iqwRqBfL2^woHC9Pa{1^H==SnpuEFLu9KCR&#RUO33%(cR<Kq(+Zt+uzt73)4
zQKV#M-i}o0_{5P-G^^)!fo?>vdeF$p$-8Sz+HJrzr4Vuoii(O|E}5vHy9tHbjvM<G
zanN}$|MM@31l+8FIqT;k3;ePQ_^!9GBMFbexNqOSb&o_50LLdMD7BIXv`>n1xfKa5
zIqAi_yef5};M^H3)Yf0W+`+l98o*agh$22`?GIwJ<Hex!_WTsl2;U&m9`7NDDY9w&
z0xIlt)c;Zs?OmWBJ<jAz<3TT?-STc1lWAo)Sv>F#NT~8uRfYWe^-EN!+Ox(&*`&+2
z0o8m*xJBI~xTGSdnYH*v(BapMe`{;~u(r}bPn~a_+lqL5FHm3QYW(v@bdSE1({(sO
zp=Mn4ySX{^5Y#e-#EOUrX*n5T0I(FC!a8SdGM$hp?s1EVh(PM3I`-qoyGxZbJs;3+
z&kw1os2pEr`XxYIz9UT<DVMSB3$pW1H`{fVlrJ60_}|CTVLy4s<sbNqxU*9f84n_3
z4rXR%Bwz*P;Zsovc~?!@d+EuhUJPdjsYnL~B7ch2p?=Ntd)v{-MqOQ9{sQ>G^TIm0
zSklJDvQ!-nKPl{E7!MoQ)E*g^LyH<?1;23D4>Wr}7=xOp{ugmyub>Lm+&9!OxBfoG
z)TuUXEEDYhXX(?1H_1?oN{U-axhJvTWjue{x8(kWmP9AONF0q0kal#OJ6uwMEXGNx
z;c>8rteS%)KZ_TW0pAym1(_opCZyvMFj?`pAJH2sK58&*{4T&PYV0^uvwLv9x1I8d
zHw<fKx+3LM8jGyLt@n1%?bRKKs`#cgy8GVSK{CW3)j$psFcgk1{juTu_Y@{6Ny)>{
zjDNFV?S#D&PB=5=ev4m~8??)IY;RlJut+S&#>RF6gFUO<V<|5tF#z`?6_}r&U#vfT
z&G5VJL_vfPzD%+5R1(Lae)&=j?9Ge8^I^=NVe2>*1waUM+W}glxL8?)!G%3s;a_@K
zA>fA*qPcsw!y@BWCqqDH$xu8PMf=<<eto9Ui<@03H>8}f&&I|fB7y<X_{GW`nny~~
z+J#t#@013$wp#lvlh^y!nR1vXr&b$5ukOz3m)g<D8w@#nIdsVaF51lDA*R83+Txx+
zyIkMR-CTUobs!IUtl<w^f}d@<NlC?Nfe!1FzN{P97tMuYyw9xOKK|PSTPe*bQP+F(
zsVFI(KQ@iap~kKWe&5Kfd=&z;lr@>gYk}naz;ALuw=jvb{f6A2Q^nln&Pv=xhk}X<
zCPfyt9MLbS&lQt6N069aZP)4J$u@~PmKzw&TEPlzvDG8_0i%8@l_RM5dEC(s@%PWs
zg$Q9xf$#gb|L`o6h>R}OJl63Pj*DJqDoblkO?YR(49vJWbK8SeZerC{BNG=me;;tY
z+WV(@IkX%82T<}`CLqYe+OyY9y&n@&mAIorO@1WJJ49Zs>jzb{tTolv5m7|#JjjKn
zjE??Mmq>ZWy@82y9Pk%oW(RVZ8&pv5XwW%7QJJ=q%qEHbx23+?h}xxd;9#K?Wfr4X
zh!Y3Ewv;8v3cl04+4!PmO7kWOSCWHsay%D`hH6jy_w5eXy?V|%>fJrZ*ke|1ZgH<&
z;%fbflFNFA@NKlQ3lTs>L<9j}dt#8Pqa&C(=F$Q8M;fY%<<1+6T7C54v!l}7po$~^
zJ<nIP{>QyW&aK7cvBm`s4n1)tc50;!^NJY%_K9BR^IE{xX1t7zEsi&VAX=-&Ok#Yd
zdA#AAUeaD36HD?@e#Uc;tVAXh0138*ViY&nP%a(vDWa;bv!)Odh7err&xKAD_Bun~
zgSm|wA{Uwy6_cU~L>SS4Hv@zP;p-bRQA(!1y+=JLWJ28A>xmcVeFY3{{*5vO;YCd5
zIAjf-h@hRt*5^Q4ucTG_QwFaiJV2IU{|V`=DJTWa^&<nyCsrK`iytk*K$)c{Bw`9p
z%oLf-Ak8%;CFKYi#0Q0go7=R}KBY?uf0EI4W(GQ8gXuC?zZvFt*5tB+2ZUkb-at2o
zoAD`i5#s3g-;$CDV+Y*18P{WZx@OO3%)$vuA#+GqFk>^8bdL3*!+bjtnJeTw$bHcR
z7K86G;@rZ4kT=-4PZ;Gbmr8jt!)?jQZ)Ej;3ygvB13@S~;=x_(3odBgSAC$}<eh9E
zs)C=I?4E~JITB{VZUq9ac?f<m_E_dwP*77CR(cm{A>@(&42q@X$BZ0P0lOr6u}&t2
zzSE5_Ko2nnaxbtZ5XeDVR?Syi{=imzYE39l?_uNdl<`lVy?R71%5$+l%-Yy>8dL9K
zv+A=_zOz$Y+liU{7~o`&A;VG8iT)j;HB~rRwZFf^)A=Ldz&#J2@dS2uCSFAf4?>2U
z-`-6W$f>36O_sm)^YaU(8_nXi+-FQg$H3Sb37h6uMjBy-1S&trQ>)kkEe-vz85xg(
zBqlM$q6g7nBFr@LpUz;Lcw}^8(J`X2XLO1H;;-7omHkrjWx!x4l1+6S{_PWiI2{1|
zpqB|f>N0YiRxzrRru#8`R$qY4Wn@^YMzXdRx;2IdlvFTr#<^2z{30s2z6tFjsiV_q
zUby+A{3%DxH>dkTm;Pm{rjo2C2e&RBja8f*5J@is^!P%v#n*?PJbii!zh|IVlm6j-
zAl%Sub!hCj(zSZjMO08oU8#!#*k;7@b~ibptgbx=^f^<FBJtv*qo1Nn<)XRriTI6d
zjVX0PlaP#HYU<8+>+<*Ng%kR^y58bKLN8uu=uF)xAOK{(x3;#{2HSQsN5J!XdWK3>
zc7At(W+<JvXY<hj0o#{-a{beu4@hnP^FJFTfS{0`i;qqCah#Mkv7{4+Zz`iK2WL^e
z3K?3CkX^=n9pg%e2tc;BjuK**k(xF7P-<*)Il4PhaBUAu<wUY)bQrJ&#Ha;ug%fz?
zN8ba#n>}^jzHP*%6wvgvHT?bU9g?7C-G6-s{&TowEecl8aikC?0E#XTP(s*a{BHza
z$OA<vXuq1AxfZ_BZ$!~v<<XVcoo<a~RS*u^YHMF_=V2b|RIP}KiU!Wd@-*2&2EWwU
z%_C8w(QKhaUuxYa?fnyt4l~1vVwanJ5jWfep>&-3-|`e-hp=T2^{_QNgVg)GJMr5M
zBGAnT*eLqoto29uzc@|<Vs}FWRFVK81bLIHA9<P3^Aa8dg~<eK%gu=**%`|LJzr-V
zIiTzP+9}7PXnD@f8K3iclody}>S=><OdBf#-RKk00A`W&!erFs(+-!0_c@->dTR=L
zdASMaw&54H1oYvC)x~B(<z2TmubF-X58|x2t+Su@k^x+tll2Yc^l`lOFPp5!vqH%E
zk@Md2CJK`h@lUo<p_7e|A$;Y1zE}+Zm3G$c${Pgwp_VqD%~s5v_GEX0p{Dty`)0Q?
z6Mn-XD5#T5gag!e!~K!2r|?2hi!zD1jPPd0$01@cL=5<+`l?04Mjiw2$AA#Va9hJi
zV2>O0koomDgCU>lbAw5#@t$KB6eLGRDhVy?2QeVA+V>3;aX1mYgJ++<Zol^9Gpkeh
zO7q&DjSZEa!E$x#rTT$4l&4z*h$f(aE-&U$;@KOzW|QLvLWm)0?8h-AUF(B>gU8$S
zJYyqo`S?i&KTd2LwoePY=Dk~${4HSdqD(|YKqB{P0q^r4Lub#4&gT7_a**?^)$dpd
z_)?3^@!;zd3jN5Ok46l*K|z7TJ(dI1X%&jVEaN{%1JA0P^ZwE|=Hx2P{EHl<XWEd?
z0Q+D8jXoL4ihr)kf&bZIDJtc-BP07jO=SZ({~#kS6Gh>FiLUerya%mMBD~%=NLl|_
zA{B*Ka(j4oqeA8NYU&J1ZpmP2-0)snI<zY{Eno=GP@{*;gRdm})#laV>+37G^@HXp
z=UIZg&9q48CH;XWvm6!s>uYJ}n!z(FdV8gql?JfCwB7Zp)R?_>TnahP;BsgF-}PYo
z0{jLf(QRxIU)*-4#suVzH_b1{MlI@ljO_AU939jFk2&f_SWi{lC>+n;Bs@Sq=Mq)J
zQ9$$~WbvEl&rxN?sC`6?j(BCM9UXR!PUTe=RWse23PVx?f>(Zg^x>LH>=av5ebSae
zT?@A7Y#c<ifdn{_rw}$~D(HN@92YAAwx;X^G}TDB@bfU=XC^@ra<cVDnoPqkzv)(@
ziLQ@b??p>k!=ar%tPnGY;bHN5M}7+CH03P8*liATK1@JKi}1+RH5^+?DiVH=l6NTF
zNl#{3QSq3hf!KcSzNW-3{L?ct-*>kO)aB*nIj?%E3>y3|_sOYAFa(=7&2*gZ^dCt*
zD55=sssuW#cvpvNHn050)GufxbzVCDXA)koOoHKTKluu^(Y|$D733>F>wNrIL{BVe
z5$FMk2aCEuV!a%N#K5nh>j8a3B{E1sA?Ud(s?rB2ilmw{V=}5`M{VujlFX}PS6$sf
zZ4xrZ0)4+Lar*DyzdO!wrxTR0D%qC#O_s&@U<0f}iIl9?ac;f6fsUMz?}PFAkLam}
zo=R_xXTpvd6Mahq5PM?wZxBKZ3>G)v?J`RI`nEmD$s26ImsG|V@~e$Wov`8u8HN8w
ze0_d|vfAH&|6E-caqses-g~emg+sMa;f!Qt!7PN=97lNkWJ>QYf!bP>$38>YISUDR
zR|(jCZC!G=C>SJ5PMHWtU*_*m(OUJ}Jhy}8%g6%;1b1e>A7C(8obaFVtf%KEZ;&>9
z=SdhU*zCoie0N&cQz`GJ4u@y!!kUnl<xY{<;yWN`=Jd?&{c{Cuj8BHmk;*iP{tjO)
z)?!g`t#NC;ey*~~XFQ<3AY`V=!hYZ!?H>HuXXSn<H<;V3%Q%TiM@J;V=z4@F3=2QV
ze3YzHulII3rXWPmL^{>F<&V=bvPk+c+ez7s4&>>gt<oI!s{<ikMj65MxYyo4jhen5
zwx9u$ki3EeasV4lB%QT4lNNZD&pIOc@oF{fg9lU>w<^6qe}ARcJu6*{&y|jr_=h$L
z@U_GZQ)Vs_H*#{4FM(eI(Qy=pkD6R7g$@Ytr~?|z!=+_!#NGOYeZRrhUMjtRKO9FM
zndx##En(XI83}-yX=_`&q|8>UQKw~y0Z69eh**;M9e;h5|0q5>4DZL6B^K*M7o1pk
z1cNS&Ji@;QA`9EgPcHYw04N_{Oib(ps?4ILbm4VhJuq;?D+=a_S!3rw1May%b>pQu
zf$rcOF(d*pU0YtU%aR-T2N`M2&gz3A0ZSE#fF^Oa8VhhNT6-j}tFK)|YsMz=&&*zY
zMpk{&)9o7OYCPpDo)HibJbU(xj7%T;S#KDtJUDW1$6Xr;|M@eddBq#Cf_U0)LW;h5
zF%vytvA;sg9;)1VkUf7;vl84ab{02xpo@w&_O=AQ<I1A(nfBS)HNTC(7e!7ENNA`e
z!LMf{&(KBKh6RJW)Mdl3eh>wzi=MzlkRjjiDsolTDYJGVM~x_aC?lg_RM^(0$aIw(
zm(g?29R^%7ji8Q_)+WbyR6_t6y#?$L*c>|zho*dCxxNcbSr1uH?vIM43GQ%&lpwv*
zE+;NXqigKFhj2F4kQ)^Xc4$FGIUAcc1PEF8lYWyvvgs<k?|nPJ62!sI9#i(Uvd1l}
z7s<&94Moj?`sF}{6QI|~d*B5{JkpXeWf0IJHi*<agq<>S7_j?>H#X86-h=M`MoCFY
z`4<EQYHB_OpXCf=4#>&nD4Rs^T^<f|v$;K5OBsJ-{ahy+7dL+U&xMi=`a?M}Ni9qG
zU85mVkkquaE_~?}n;A$zlSaT+qtN)*ru*E%<rfxpd3pK4fq^M^D@)L)u}mSB=g%L9
zYS>}R%kUIb?8XZI7{v7wVFv*7wspLUiqlYxK#PKt(e%F0jG$6=A<w-*Ia$}|Uv#yL
zvP9O6+XT#Sy<enHzCL`BNPEO@^+r|iEgseCBNQDj=5S7vUs-B0N6WHFlV4a4Vo4Rp
zGNO+<EVri*LOrli0LWL~8VLkb#@37U7N>>BhwbY7iw4SS-npV|UPm-nf1?KTWyEZ3
zi;EAdjRXf}qxxycwkgRC;E`S6o@gS{u>4Q!Olh%qmz3161gtLX*~GiVIWDur0xtU#
z#b0@B;Q-t5he*?lFM9rI*p^sUGl?l@{c&u}IW^!JL=sklJakuYbF_>!hcb$a86`-g
zmN;wB<e1Jm!pqCsj6+R9O<gT?oJcF=ygnG;U26nw9nTPS;N$1d1>NktK5SuRVX;}K
z4Yqp!9)5QQM&fGs0N}d1+M8w?)T&ddi|j-QpTg=`<y%)AlFP6$I{H)0r$+8i(C|*n
zs6oY-eM|9~;&wBQPwEX{IkKN2gU{_>$mFoeuzIQ8=b7A73NIBGOOs!=0u=FsAt536
zx3JsW+nLF#<rZ4mBqmK_W)N3;EW-%jkQ=h{6aNR_HJu%Z(>nY4c`(ztp2wIKaq%qp
zFzfiR9W%sHkpUBpjVlGvzrCy(qQ&1`nDHH=26_al=QS_lc>TaM5xf<4;eSHn;zHEL
z-vM?&pzAlkef_h^^3b_a?G#^~hV#5dQUCAm`(IBt)9BSoALr$Wtp6NOedU7(-{;Sb
zqCrKb06k}$g}dsxcq)o)*f<-~(t*gm78-`qb9O8e*1O@226!H@t7dJ#_IBj*yOhVi
z-ht)@n>E*fq)~aWZ^$T>$}3o7Dv+c;_LvGgBxF8V#;Qn+A!Q!tbzrz$(*f^BfP%-f
zkQiM{i?AZGNRCaMrm9Cu3J96fbEk3e@%?EycsAr#JC>E6l5JvWXn%P^Po;o8JThi-
zau4f|#C`2{y77Gnf-F>`p`yO>-p+%GYN&o8v7XwULV}J$o(J;{3W*$AC}qRL$&+7Y
zqC@+o_QWsUiS~<mqX^Y8F?{+TBkREVdsD3*P{T(1VyrPeeobPdMtiTr#nz0qoxyv$
z0#*u~NM&-<e1+0Rs}?Elw-_O=RBv^}U%Xfycs8X#li%7p`QBq=<0@MMe0}}kZS~1k
z>Wc}UqTDEnlQ_V&!+2qbOUdg@gL$BUg9(LLa<ngO0(@GwQ%WDBQN##po4!Qwj#L>S
zH^vmCG#z61F`8FF!K1D&(A<2g;cDCVy0SKuk>RRGQv6j0f2I^|uR1nxC4LevCNBPh
zQ)PEn({|Z7x7Qf#*Mmg9#R9Kf6^SoCiy#5Lp;9Dkf&*UoG=a$1bY+TzlT$?kHlg_C
zuw@;uus6>xL;Ol1m&3TriM;sf)2Ex(YS_S!p`qYT+s{U+xJgBcr+PY5jxS>iW|2O@
z$*AdLL0N94p4@q37_xXGFlH`bc<u+*i`Pn6S5~g=+cq0YOHF<0%3=GU^}*3o_D%~;
z2gsABomV$EhMlAa<wb51ADI;83r`5KkcYbLhh4*rOOOY938a2w{eJTK^D4R8+egK5
ze|9ZlkLRz?c6T7*P!N)jI6daF_T$NN%~y3}ndjIq-glhH|AvuVW)%q`<A+p&r}S}D
z24jN4ctH49vUh#x;2l|l-Pz@<BhF7-W0^D1pZ3Ta_zvUMUbNPHz4eIw3SZ_Jl6uy@
zoh49i_-dZrNi&e7k2wzM`Axua@|JJ!h+p0aUR+)oaxciz%9irgfmSkaJrgR+-}a<>
zxI-eV{j5`lQiYUKxy>+uyuh)H(@k+C(-I66Z*sU0N(<MNaG{DO|Bx-Pi-Y<N+B$M-
zJkA&tRx@kwIyHn(ZGNyb^n1^Ks^OFp##>VRwy60=k7f@1wF?>|-rKY+rx9c?LrbG~
z(z+{}*8UA$IH8h)H$a!Rg8%DQP1ogqWjE@-7)ASuQaSNtelS#ci~SdePNj(SiwL<v
z*rBV%)N+<``YYov55@4O1wyH5JWFqnBA#D-W<NA($EH`&siv~An<GRHD76#?1~av9
zXmTVhV?D9QgK+Rai_orC6WDBRL_g7c7g*c>k3hCfF(um_mWHTTg@uiiL7){hruP?X
zKlYU>YxoCSLhvBSEDp1*4FnOKMRT<~?`d{~Ipc*C5@!gmTUr2lhq}S%5=A*AfH(ua
z{hF^b^koN=X4F)di_^4T<)XLGTbm=T<P>7Wjk5f}y!sDf^Ef-|dFEb=H7T|__|1sO
z$B$jmrqz<s(59oA4J%3sPtOHcMrRBprE#Y42Q%$HZtGt30)mFAs*P_;CEzx01fp>u
zVK=>ZZ*f=q=F(m->GRcu!V3H6P8M|<i0JBW_Qxta3R_}8So1LsPSy8U1eT**6euB@
zsydZ>v@KRMS{MK@*&%wcZ_xMkGeM&Pf4;SHSs7X0o-BwR_(4o~vdAGGk;x}+T5i{a
zA&ZqrMJ+Vo?SAO*P2xl6N~Hk!(jq9^B0~C8KIiz@BU;Y|ZnGIJ?(XkgT3<`8$LC~M
zWunr{u3`fU*wDrek_X#^q4^}Sw6$%SBH&#?Y|=No-0lVbNi2ZO5-&=|Z0N3__3@YP
zn{6{JaJzHM{T$2Tfv;lvrB+tXSIxE1q_Ly%@vrAUHgdQqTc=d&vQ6tets_;-Pp~I!
zes@~lPOW#{)Qa#Z!Qt=}U95uSRE^HdKib^`Gb%_3T1j}k(~E<H!%~!ocMvJAu+R{#
zeUz&ek7$_?UztxLp*{z1>avB0iBtHC%9#B|v(?Eh<F3!CiG+5zhZRtZTU>{s2APRJ
zM(=eO@1%A!nDUa(Tp(KzA*wU8(Pke<@lAT#*f-SI*AjQoyVP}!?w{>iTTTYU?L>+5
zR=B?9ez&G#L<Px7ki8ie1);P*<E=LdWTckdE(O0G>M?_r)3~1!T7s~CP~UOc-R=}D
z4TU+|*Ekx3NEs{-JGnmca=|>E*FF?jJlkZZFVT@ba{fSwpI~9McDT47DD*~JW#QxU
z5-M}ZTHM`Iv>%4|FXhOlr2-dQ2VJF@V6zm(0-1inJ(2e7-hfPKY1JTq@Bg>}oBMA#
zIo;|$rqTydOhtA4m3)qj!thc^b3{rbaq-VARW6w-DwI*8^+?*6@PM27urxmRt-Err
z+~7M<LIEHtpQ?&NuzOPY7Ha*7{;=RQ$aBE^Ce~+JM9l6~474!4{PcGozLsuAru(@{
zla>bt@S}_~V1*P{zqUBPrj}lElO)7x!ME86<2T?7j>*+WX~~&{27rILQ<0Ca-VRm%
zNsM@nC+zWfvPkxK^E*6e+S|!Du-aJuFHe5V_KwkHYq{@|%$)3pNXdjZDiAB-9=Py+
zK7(#va+&7Px#%Ya@#Q`_AQRkS=5nxKE?<n?(si>sn$4JWJf<!*iW(WP(Y?RY)9U%g
z4M+7NNx50%`%CNeYyXm6hhodURa*&p)@hDQ^u*IpGcxQ4IW|B*11wG_IlX=yH&%Ff
zNWS(4Jnzp6buDT&`dEL~O@3{DC{&el<~Rs1Os|)sB2#E~5<5D@Zw*kfI?WwY-yg?*
z>_EhUO(kik`=QQnJ0$2`OraGt0Tt^g;EcLX;B~+)IWD)m^OFb2*L0#>maRsep!S2_
zZPzaQXOcbq+|hCIOk5Otp=EfFn2=Y?>|eoObrNZCn*lYOft4mA2Pjyg$ZV`zZsv8=
zrNit`>SFVqMW5y@w(>)<1zI!ECpZ6nOH0g`)3$WV`yuM7E8{bwPm;BEJzp&yR{H<s
zHI^X(5|GKaq7sr2HkQGb{puP?1QW2r<86zaB;1@S1%GZm@QW4q#&4PHhEhApOE7;-
z_&>7V0;sAd?jJrhNGd2ugLESuQW65v-AXq~TtGUcLt46|J1^ZKAl+QLyF33!f6w#G
zyz|~+hC2hC!`a=t``u4%^nsVLd;PC!@z33TT4Wxp{k%mp#nFTL5j%#cr}PU@X6xhT
z%`Z<`Om1xl?_$@PEoU$#;}dJnG<R;`*~y`f$IBU_CwzTdnWPWci-}PD96pS})ogeY
zEEKzEdn12bn8qdfaoRuG#*BOfvkZC@o)Xw43tCtak5k|>KIYy|*h!)qh2f9`Sb0Sw
zyCH`&hW5hQ<2y_r<b+wPeq6F2XkW`#92mm*Q`=s<FGrv>o<+Bl(-oII_4%&Cql97t
z@Sl#cNrbXWe#LL(7|(IO@_4VCY>pdhnU<&>eMo0uQ#hm$@^_I(qbOZ}$2S-VU8m2{
zZ-viN_%Kc6MuXARtkGLu>_;S=c1MQla`VWt!ljqjV}R3rxy6Itq9EuXniTDI{>k%(
z3?(vT5Vo+?a=UqE$*Q9s?b>v^-Ku*UPkod&?7EW3-Y#}gZ>fmwU0BGSToTWvD%i*|
z8J#2R=y3sTcfRT1u`5l97<`&eyv2aavUT1`d}D7>YU7M^Wc2Ed4&tJ_MzZsLgwRFH
zN4~LQouWXp4GBpM<UVuC=yk!0-l!{)50Sjd`&iZ{bhoEJ36jY*`D<O>NKF7lUTKCZ
z$+u#J{NF_!7(SIN=9(uVw}sM3Lkj&-0p#bZazzK0VeHPq1DNDLS!Z~<XnD;)cx?>p
zZ9$*3Fo4_)?_^{ilmvLdGt*aFJ(ukjf#tIdReA@~*(k`{aS9F9B)Z`}gm4!xgUJIx
zE?XWM$ijALT=36-L<Xe%ged<G^^c$dNLVu|A70$C&g_z-Q*g&pdNT_CEQnV&2WOmM
z;&X@50;gQefxU5ux6(VF(go*u$8d8+Dw&Dsxbzk%OMUrNHeR@$rsKewQ?JkWJ^^f#
zd7)q54g5-VnPK%L4oiC9T55yq#ahu=<+rC-$Brg{m8OEVFre5P!dg*X-E|jFMe4A%
z@j?`DOkRa>MYy(V)R@wSrYrp8@5kNHG2K9%If~2RJGdZqb@PSf7anJTFfA*eJbvm&
zT=!I&l@$kcjrs!?%47ev1tcWQg*G1?!%H4-SU~}RNT4!6Z0k3RBEqtSnH>Rw(<|^i
zB75AAKu(&YoKX}>(o?pZj#<Up`H6$h)y9z=Lo=T`qW9b6j|Dyjhbpu(Trqu$E|14r
zQUg9DfeSdXRcFVn!RpEtznF&!r09+QeA<L-)7v-w^Q*6L@T+u8!{6HOVbv~)*Q*VL
zF91r4!mYd#y0ah5#qX<Gds#5P420N^TaPrkf}a|8nb$ae1%?7Sx5|?pvD(SIPX23z
z-!}Mf{2ztgoJnycW`%)!0S<wx^2YK;;(;1(a^H}jz9@-OAqBBgiF&4GT1h7H7x675
zx$(0mb|!&wNv46RrWVcG!WDut6I}=@iio0!NXE`S&70pmy~18lEN3nIx(j=Sb@KK)
zn>w4N9SII|jK5(YYn9-ixJ43oJa~R&<iyF1FhIE4>C58vz628&n0TdUO8ZIPD&qdC
zm1L>K;~w_3MuN3Uv_E}CsO$>n*WeoEq8VIhq%9z~(>s3^5@HB=zR+Z&Avu$O*J+!Z
z>Nc&OUSf!S-=W|>kx-RD(w7-tvFX;UvgE1B9FjHxOkghZlvkx!b6v&OX!s9V2*kNb
zhRAdD+tYKN%kyj~IM*->=up|VWc}Lxn3Io&b%a|KU*eU{IsEF?(`hm_6a8rtuR)D)
zHoW4^mj*VK{5fsN_4@N>X(kq!^ZfHU4i+U!V7ZcCVIA*qxB%IE_eEp2L+ar3EKDpm
zF%zxBf;Vt9h4<E(egFbuIojXet8ocYD=-hqGS*V&KZge-l)BwcJKf~ZV@!6^6TAyK
z+~S+=dS?R7Fn3=lMpvx`B3ue_2=IJWDQ@2>rm_4J)Wzd9=QVmvsN>LytHuyvl6j(E
zpG*2C-Tl-6E~~0S`^uCH&hXwa_i3x1<`%#aBgR4*J_{fGa>K8QOYRS}RUwMd%_^OL
z{rDTx`KocxA_-yEwt}pWLG!|krI83yRz!HJxjMGtJ}a%$vl;Sc^M}-v(L44|dqV}M
z8^3lXvB$gF=y3}Chp+Z>)5kjL`*+@~-ipm;9(_9u1qJ#~nB@L!LYX{ayXjFUUQ36u
z1U=9*r%qg7j}I}<B2-crnaz_xn}z!t2-R<sF$p}KM2o1XUN2j13rD2P|B&<koYmNS
zd6b<eLcqmxIBkGlRhtGxgde=*A*c3sD&SApBoqE=Cu~FTwn1trw>5&4fe96(h=`(O
za)FJ~aC~a)oq)WP4CfVw6B!dqF_H*sX3<Zk0et<B^dWQ3^P@(wI~}Jv1+d?V&W-BK
z2G@y$nP?$|Uys&!oOphi#(zaqx=7@`>mD*_dAvlndUIADaJ@dV*{t6-Exh8h1ASV0
z6bs1$u2=Vq;rEvC_ZE#vJ<ij7?44>R#IWJEN_vGo_8Q%FaJfJRWbKG_BIji~`~)Q%
zoQTb+$rOO&Q+9trBsGK;R~E3zD;A`ww?W77B2`{$CC!&-v*7;TBq0>4T6yQtU(LT~
z0sV7EeI%&yoWT5s(O}&*<TC@ehjx`0N71+v(^e^+v*rP5i(j$raTc9@z|WJI2F9qy
z1zS-ZRnJr!IfX*-<;>I3yTt3HPMeh5S1+Tkg@c$^r5#Nbm;SUag@Wd*sG{-)!BIZ^
zfV-|pSsK)TcCO$UgIji~rP0981Y$w30|<ZW+agjYXM?0%2_?sR-A>v|BGGaAJcki3
z_APaZAi5AwrOcSTUQo(;#-MgBk_2Ky(f(W@do|&MBWBus5&&M3r4B|N;@FWPu-Ndq
z@@+DB)y4%mU0kB3AlYbRC@lMS{&JU5@A0l*Kx!C&9P{1d#bW3hmw($0OKo`bZDG{p
zSn6$r%QZh1Ko`P)dq#AoexR-{xH+14Bokf@vzEK+x0&+dv(D+YPxi#v-YM@-^68qn
z#z;W70u-gzmFVXW;=5&98bVC9GU&*~Um;S4h({YsS8i;MFv(KA_7<_ArvS;7A0~TI
zt#l#L5>Y{vL0L>8z6<gNs(^^N(kny-QaIH}Wf6P{CHi7UD(OmXqPho)kgRUQ0*?wk
z8$tl&thJcp=N6oKi9xLcB(+~WZ3{_M@s$Qmf2DQRtR<1kRN8o4Zw$R`U**1i{jRz?
zH?#-=To;P~ieI4SmT-5D@w>ff{d(R!-QJ2=beh-0#zt9l?S}blpuA-_sb40Ksq-du
znz~q}zI2rHfQ;1WlQXR5BvSA~{0LP}4q<q%g{ep0Z}IkCGT<|z8+r-T02db*OF|J6
z&m18*_71}GT8*`kMS;BW@g3ko2ZzByzqV)YmWS8O2%E128jXxC=0|k8U4s@5vLXJ8
zD5K{WSvjS6l}u-XtVLniLvA&_8f5O3&C7G56|r<72}&Q!nrFa=S#n)J<-!FqvC>j-
zs4(l?2A(<Lg~vT+^6`vPL3Mzj#+BMnjqWSYOp?$6x<ZQ*arpn{dtCCP4%ilmzVlax
zZocp(*Q9QEN{z&73ao)0*g|2QFg5(tz^$9PXAan`y@QtUj%ZGJn1%#BklW#KuYjDZ
z9pZJ^v0&WySsiEmBGtK2Nhh?w&lxO(M;(zpXE{hXO62aZzJL8!Tv6lUOI~iRQnskJ
zi)(3VnUMoa<u1xy&BAnIX?T+mmPKbEzxdQT?Df>MICFS+eZB3-pW2|-zxxx&sLih+
zdtWVTz;<hTxRp+qeDEyLQAxaP%Z}is5vL*MU$6~pU}>qfu#ka#c{Q@#!ZtbURcq7S
z0mKWuoci8Pgf4tiu7|rjU5IkgBqk|JNEUB|O3~y6Dc_uU+n_HRV5#8y!fixE=1sO`
zKKB)}IZ2cN65{q6ZW9SA$lk1TQBY8T;3+7SC~-V$%0cy2R8_^p9p7ej({YnhWr&l>
z8MEAj9$RR;xVQ{hH%m<Uj=aSE@pEE|tTYsSbSG6fI5;&mwLmPAkcfyWb52mtv>1^u
zl<=1Tc!rMd=jV6v&BLgwW<P>%Sg|36iw@h+l5*L!9TBLJm<d7t%l+kLWoKg|cNVDR
z#i~Ctn}Ad(a}7hPJU%XN_Vivdi(U0{gyYfTgZ-=N9Y+v&!^fO)_zC>eL1o7On%>jd
z)vs~Z;}THDrUCM83Opj?pa}m+#RmSG`n1@81Pp5ClpoqZ2MdlE$p;lVZ(=iM0q6J>
zCWq4(Y{W!U^u{8EeHlF|a5eFBSf?|H|NbaHjxz}eYVsI}yrF)P;Ao@!GoEFLUdX-r
z8ef{rQxoTsNTkFki%#sfi4YY!_#mLOvg8CYqsL++xRuXR(VmWZV4;y<Ekez&2L-U~
zA9BCzlx`hjUkgAg6q&zS$m~>CyG>od^xe2CL#K22@Y9%2sbsIXmZavb1(X&t#-6o3
ze=0X5y=ZoBgO+5ucexZAI((W^mh0BK?Rhe{AiTe1fc)O}C@Mqa;oVlM-g?KFFhnE8
zNd}`A62gPMPc*|{_FmEkYwEwYs)?3_o#kJ6(qQVTx$hS_@o5Fh<0qU&eGLdwlt&U_
z=R^`21?|*yA%=9%yg?=)hk!7np{_WZ1M9W<VVe05s>f>!H~>*cPAhz!?DdM2Wvw*>
zor9%a%1DtNRgKr)=>FRl9ecoAQ*$2~Xy2qOin<p_tbyqCOmS4wpU0y$kA2%!Af@l;
z-)OK$L3Z^!4L^l|`Bq@FX;eub<#QAt1;M@<AM!>yG~GwWYyfT7mMFSp<AeL};gA54
zRH8J-@>DXVyX2mTo!vKQSqtl}2iCJ+1(qai=*xM%4;MR^Sr~acW41k`*eM7Lyo@hL
zQ?kLmcPS>Cnno-Ml+SIua7dFx#93j?!I2LDCsNrs#w@e>FdxgsgI5w2lh|md(G7Cm
z3=9lSB>$OJCksXqK`i6sqS@22j5DC1u$n|zvB|+;mh82JkF(S0gM%bcf4CIZiY1;v
zCmkl4jMHP1TAE*dm&*HD!wTc1-SOfz4}f>bd%YOpaAsvqxv@50RYmh=TG^H-E<In#
z3Vs!V-hjsCT4ZZ8HP7oV=LO)75Z)=(<8M)cemYs8kK(<)ZhX|^_xE##qot*FuwCf}
zdVWEfHRz$TLm4||IrE#Twusr{;7I~BL;I^D)sUzqXae#lTXcs-Q;R}Mv^LzsMKBmb
z;J&ExQIDwD7L3X7mPFAY0>+6Ea$`p~8`g)xA<Ch~`>zknC@a$t00(<RZ3SjP5olxc
z|F9BFGr4j<zc!ULo>gI%FDzjkEPk;o*lec}m_u_^mbG*l`%uAiJk=f`D?pd8*OvEB
zwXUHr(6A430AMuY<>A6zp*4qlw@{EIE)X9RK~^UCtwVq89l3a~=0K7CfNKpqr+8<j
zZ&`fifI`A!t%|Bn(ZGUzv&nF`e2|y;7d8iO9<Z2<i_WL6+&6oMrJ@nP6&D*2=vQNS
zm09>(=qrMu2dAWmS@!O6n%Iw-OuZWa-!Ez9t*>(^o1Cp>@D0eCWsur#EBifG)dfj^
zyX~sOFX#OOui3%IBmyZ|P$qS{-uL_W2fN;})24LbT1tH0DfGxrAXLFPffVJ_gteyc
zO+))Ae@LFY<NL7=uUT#Tx6sPFny>WhGh{jBsdlKUM7$K@IhS&%YyF{mmPU&HWO6}W
z<`3h&y=K-zCj*gQaGgDn$dAF3&nbU%!kY7*R!ZV5jYRw-DE<A#rSzAGAop>t5Hh%c
zo!FV122V*K^CA-MG-(d8tbz<&zst*yyMl4SIaY(a+7t{JIU386b#dVZsvpdWR2$JX
zHXdGrAEJxuY%uE6(9jSx?}7Ys#;AD{i7fh=Cp@`qG&j@nrhu455^@N<7}a0bTQn;0
zbCojB@#v#cEFJ2{vI!y114rIAp5@2hvIMHW1AF?Ffw!rGEq223anyY~UvL1*0U_kh
zLEO7hPC0-|X??*K9xQt`LAKs4VAotLUNr0H_1<cuLHY+cI)`V1tOEx-=pihkV3F#N
zlRT)dt2<w2AY7sj;~rMWlK>gm;$kKP0|UT(ZInA7f)CPr`enVu;OHs+cCbx}1Q7R1
zNJ)_idp1c$k}gK%e0LRwBli#TB@Z@SFrBS&Hj8^w&PB(|xhGSM?X(T#AH@}$XTd*$
zJQ-;z#Znd2rbwYaCyD4#QA2s8)3`&q2*08hSACRSc2&aJwIOjr#PpnsrUEk*XlZH3
zIc=b@GIv$dEQ<z>GJUtp{Y(pfYU-SDDHyp4er084Y4fFaz~_HcLgv)uVTdM}(gPX>
zK?wjB8rlhjiMj6%O~i&+j<YA9r18_3#FV04R&&!mbg5r7o9Hd&kceyz^rm8D=`+`L
zeQ1_>jrQw+=l<LaFFt}*vW%LRR$rwxEV5R#p9OTuDB)QUk~M?&JdOHG&H0evU_STj
za{V%mqDin3x~t<5m-|t-=Wn8Vaf6xA1zBYdju?ZqQ<$cYw6K7F9dasZ%e$?DIdYgp
zH701D0K}D43+B4C;K6!p&*Hce)>AOK`{TzCTv~a@ow06MMfFd{OVR3J*+wSmA+K5z
zv3&M}Ed6|2#=2TE8^1Y=nZLzT#9u$a<84u8<y$b|6Z{(v8%nsgEabwxc8ofR;oWUV
zb(#5Ilu7-&#aDmDAWR2Ws$?W2sR;>r<2$7hx4RK)2;M)o1Y7ewcaNtOrtXh4KWD!G
z<d@y}OW}Gt+(ST1!Ny~y{z=Zm?6WiTbfIYNhiYchpIePfrDw0eVO{cT^NQ?Q%Y7yT
zs{&#w4Fk*i(9ULNu>L+{?xZCG0)j#+|4R~*g<>RGEW3yG0Xf(2-?4l!Ln35bFVfD1
zQj4i|@P}ZIPtjXC#Xs6~gumTdtdwq%?&B`LWwfUFSAPW)0@$Gwt}r1N*X~Cjm0aNo
zVd;UBSy-#i#iax7q1WM|OGd`z64%r`Vn&5I8R1yR0U>?=_yX<L;#T<IjfmsL*|DnK
zjpa~gBxGDyb7XmxNy7tjH{>gUtwx$Qy_We|{|_AKTfrt10&8{96(^`mWp@`?RwC%K
z5WB;1OKYL&e0g~!<Z1R8e3#Z-ggzqjTugg+PU^Xs3Z8@#X(^5sfMfZSR>E@e+kPmQ
z+c!`lUcK@)nhLJmBS3*W8TXll&B8@2@yz{b-k$6}eEFQv&eeR3CuXk>kLPXstuQ*0
z=m<fUUFzfV50>_g-dfLUdz(zPPc`kGy-OUBwr=!|K^Y(^C?3atb@+nJv$A5I0<a=*
z-|}$A+Bu|~y<P1HYu_0~d1PW@WyL;Bd;EP~fs7@CWqrS#UGtq=6qnd}tDEu)td79}
zgEy8)a+7|T=kzXGqtyuG5(#kGK3;SqE7rZTy$RBngg8%4Xl$q9c8X!A-#ZC!uTq-5
zd&x(R1?WoEt~WRTvA^du3PW#wT1u64+zPGTPrrrtc=&_5_Siw@9Mq7%t#uZg$O<Pn
zuB4;{`Z++Az}0%6lP~kp9_tm&5|5p>b}^MSP}ssVZ^ccE7s9_mns}Oj8;$U~NC>95
zisL<b{@Q7HA^V$slhgRt05{!tM33|99c+vUbe3UQt>uREcW$3a#JmN5i;tGXfEU$T
z6?W?Y9_KAfb3i`5Vofv8?k9NfxvYU=xctK3jL$zpbHqX2h#M^oZ;ACMj*fI%Wpq;I
z16flQ_t%~(bQPn6JP51%tzXT`Fs9F7a>Ta2%iRMib3*H0qf??(15zBb+uFcSdWS9S
zkdi-3kE@|amL2H|p;J60B2_QEX|kNuHcRh68AT?te%!(TYPn=~ws>D{1~psr!L|P0
zy93*5xhFSyce%Ph&Aq87K(jp|aAZw*eLYY{lU&K&bh1grDCZzm0;YF*S}J6B5Q3BO
zF0UZp<XNw?fXm`hPow)q*uVxnppA?FPO#;4?|r<xtfEE)+!qpE)`hzArJogn>7F^}
zCq$l%ixa1J4r#941@ebCL+)EwcEoNT5&cbqf3WF*Ei$Y9E1_6k0q(6Fg^>6rs}JAQ
zicDCUJ^$KncLet_t(k|xw!)2m0|uhlSKvyp*U2uCi-G%TP+_a=Vfs{g)gqg6@(2CF
zh=khhmC(bA^XFj<UuI#l(WzH2S_b~?5NfvE50)9`fzn>K9_8}2Zv3SS%+&OLQmvcG
z_ECpdOR?q*GZmKYl2!(hMR=t%T=?n7;d8HN5t?fJx2i31sHBy1KSWcZ`qG8GjY9Kg
z8rYzPsGH-CM^i4?@(|5?Xl7mhPXA6Q$EF!+Gk<IL)x^p8^rzGlm-z1irj>6PvJoIM
z!S8Ssb+SK{`aP{{gmSd<wr(qdHFW~E4r#<>@1yw=tLX~wKmHT>{6K8p_7moF<nmeK
zm#zXf0bP$LGzqfugcn_>IS%JJUfei0Hw#zp_+U{-0pJV_0e~6z4}J~CI6eUIH)NDh
z!ULvFj3-7sTi!`R2<N41$%K;aRvf%aYR>{-N6$Wf45_;^Xi-$TY$Y}^RolKurJcw7
z(%E&~B{FN@W7AqZy*a{puu`;_Q>dIaeyeD>(CE}}WofllAXr}{1~YOQHqZI-W9ofE
zjM{!4hYwd-?T_P`=J(xei8)RzHQ6sF8X+&!nfoDxZdAR9bqj~(RspmGoC#G1CF}N9
zz^ivIPtOBSeJVshD|rNj*PEEzuaVGR{}~3AeGc;T<rdhHc(2|)oq0T^P9G>YYRwFs
zwLISMrOx(}__kS|FDOgOC-G7?ak)XV7<1dl^7g-C0%oXN`%+AT?034?FB%-4co~Q@
zFf(6EM;nJ2x}OsUPFie73*E7&m$e!QxNQ*K=BGhFHt<w;m@+?|6`)+v^H3v-29YkG
zH$D6@kwkBMs^8hegkkX`0;2g}c$MjsaLC&V`F@xrvb~V~fayJMiZE2XA7P(iy@4tD
z=&YHx4{r(&u3OJ_&s7za@bJOt^h2YUSxhSabhxSCUjl6sNG}W#0Bw8;Z|6odn-Mtg
zPc@<O<ACBxd$EBqFO;FQF6_rAAOj)WWOdUuWby@&cAVh(1lzFJDp8N=Tkj*}ea~w)
zTv502rPQ+{qbW50cV%`5+?-+tqEf7R(&eZX@vA%`+X=77gS!o9848M>&ES~#!*j(O
zZhLx`scPJx-uS!_S29K2u1WbA6zBn8Hp2xSMO<!l+Ur@emmNn3mk5XbZQ8~9G7Yxl
z%lmAtbkDl|+2YUWX>|)DihL<A3M(r^0)|{YEbT!st*k{jHk0*&OS;KvVT@X$0^0o0
zNBIWjvND^j>9pUi2=mMgqYGoX(0TMI%)or>%fTFTVz1jgj)6eM`topVd_eetL@XEL
z&+0DQ4Um9A1?-^woXE{o($9mZhg(c}nfaX`t`AR5$Q07I$%s84e7mtx3XK2mDql!M
zZQU^99+V&Ns}Y@={V|we6l0vh5`LPAp5yp^6XoD#ju9}oK+&bAZ)oJlg)ixOxn8#X
zb=nv#0zQbMuJB(?+Y^zrdZ}|&K!r3BfG+!A*VBUD<r%gV<QoXyE|>W*xrt(!Qv*CO
z;qz#jE&`y|c_=}@>H*$abgS94@g#sqdLv;?8&W}a^#qtyeodv=Ix_Tpu0{v4L5ua&
zXr*g$$@=dJoemYUrO_eiM>HAmV)KwtJtMXc(Rfofzf+JpU-!k;ucVqV3MG0%y}opf
z;OnPrxfQ%bT<Icn^M;}edOw?QTCm)DV0A;$(N&S!&Ef+MER><Xuno$#pKEu*Cru}l
zvt^z&j3&1kLmRFz4UeYM5t{O(jA|X4aOs2ljcDj29kk+TNZ{Rd3rgTDKFf^bQZjl+
zu>gK^waM}CZ9g~k0Y(Pj#&CC+U2_B!d=`D@abHcRQ>K?*Qg$W#_5x@{k!d#_dt5AJ
zSV1M`1NRBF!}mwyU$wEWPqEY8d>YphbvjO8HCJyW;T;S$Ptldc5%Hg$MCrkKL-AQW
zcQ5KtHnGp%Dcd;|Z3-EZoFCuJ$}GAaZY;ZzqVXSh1~g0flAE6^t>wuP5#!IplfgH%
zsm#H?|F0GRgrM1kDsX8pJv?`k2Nq)N2!G;rJ>%1AE!MBf9`<;m_$8wi=%rd1{KU4l
zTmbtPs4a_S`>rSNPnclCO{blGhv`Qmqvh?9@-Gn#lf4+IwPka4TiXYHQB5^p7Pf>X
zBU>5`)+Ia#1`FZLDYd6(tKiKz33;K7_8L8rdBl*SHpUH4lgXNzR3AMRxl3#w5<&I~
zXY)%|#>J;T_O01-^fyO6QD>r`{~>D*;95BDQ=oSwJA2nY^hPD`b-?*XMy}=7k$fW#
z=g!itVvVCRGEiZ@7wi-)+SA`bB2ir`B@&i~E4kwYE2=Fi+kY2@XM*=wx5T?spFgy<
zn{A?n%=;8gR@Y^A1g4dwZG}r_2ZnO&{%kxt<aui5(Ws-%!~TF__<i2v>8cOEHJz0T
zT#X);3fem=nNbuL<`{q7e!R5n^^Z;5G<rSI(ud||zH6SH^b8YyEnnFq502)pFdaft
zU*i1h6QlOkO{5Z!+(%B@ijBR?%{a_RY`Xczjr_?`6p{FiOC^Mi<6orSIEvbG&$Uds
zln~a!mkwCIoa4na-|$2F=Wh^<n2-cswOpssxIgMW-9R@gkOEK)>S;$6T~9R#%>l)6
z%Te{%;d$<>4HOHV#SU772R>n^kDA@zL-Qma7S5DQ(8+$9Yu-#zTKw6bSVS9rPQ$fU
zH15lUo0LnJ;ln>2nVd-%Vj5eLa+!S5E>$4q<$ke1a%Y|0u!F{z+?pL5+A8qNdbY#M
zmc>wX?)Np1*Q^cEl-zK1VT_i9>K~lSyK&+Lbh}nNb$+jXp`;i1#WwqO8B;6LD{Ao@
z@(8)jrrVXfdq?=5Pc831b*?rnT&~~4>G?9}J&TRY4-dv3Y_PdGoi_7eDlcw1>U!O|
z7Vfy7FCQr6xjUK;h-728y6$2)h%CRaqG5Wt9z;pt17@s{m-r}E6@E*2rvIyn)xU%t
zHSRT=<q2nCKWn_4LW5%S-rXdZeHU~zI!GFxL<aJmg0bJZ!cI5J6m$&7{hgBU*Ta6|
zJRwsG?^&p7N`UgSd@!fr-qy`V<h)^CVS29ik?tA4jjr<a-IL8O{$QhSzo70a>Qc5a
z>D>bx3C_|+qAR~wfQbF@^pnH&#Y?HQG$d=0FSqZarkyBqzB3c3fi8Jf)!0B1FjY5x
zV;gQ<pQp#`d;>dl$N+M5J&ZmL!BTw&+C#W$hTQKjv4yUW){2ngC$AdsR#r|VX&ByZ
zmZ>QW^J{z{cxrnS<<k>rx^THz2qjf!sd;}$_}uh(?N;c^)hPCo=dGKZ;#Es03gm5F
z()gF<{yG=EU|K$JUmQwYb+TVRMzw|aDml85DA8{gSQ66fuk!uvY7ZDlUpz+yD(QlJ
z0XzU?9`TS;dK~py5kt0oxPFGKs?{|1N4c)7I^hChGb>e_QpUEha*F}0C1wZIB-;YN
z!=Ek=DWbA)ImHA+(@JgiB?P5JbAELTO7!om4a)k8>iDRC^gVFFChVf^`qFNb2L$=9
zb2&S=$Vdcji12pOTNwvt+}uBk&}&}V%-wF~PyG75&K{YgC<eO|FT+aELJ&cHj!03y
zx15KcOTPqX5<(YpTkd05{Lz6wwUP;?8#C=nGN}^GM4^&~cj|ig<oT!{pu|mq>Psc<
zS@E#dBB;2dM-^gtQ1vYdD+97_pOsU0jFP5zkJCx_{4GN1Yl(5e;id9Z<b(n0fl8*k
zrL)t!XsY0>{CzA5rT$e+N%{08kK(^OCDnmWmFDrCb>*JR1_*p7+uux};WOJjm3Wg7
z02r}W-NH}bE>-@==fu9MQq9Y3R{zC_y}j<bxM8of@*dfih&d!{!8XA=*u})7S_bsi
zy$LaNc*Dxbcm}>sPAsM-`wt*QYbZjEbaKHm@g~r}yx4<SshibB(C)6K5*}u1sm}3K
zy%_xPSr#2U(PbI!tHnHJdVFUn47@Z;?vg_phB1Mp#nYO7y?B&70c5E$oAei*Of*%%
z>%p@oFhzx`yjB@u#JbCd&%^{Xceg69c*AR`V4N{)9Kc5sA!K<`A!G^OS(~~F;KEZ=
z)0%8s#Z!aob~mb_JxD@YFC~+52cBV-=-nJ9vkJUoO4)>&f6*4kGL}9?3pyfsV=b&X
z_YMiNiT2($vWUNWqhs*q`igYM4_5oIUIRsZbnRkauc-UvP?ncA;$9Cqh+$kBk-BJd
z8f*4zK(0B46USfseCH$<#59maH}$H(O13(hYBGY6V?r+vc2Eipdb{-<H+k_}sJIT1
zf{hsb7MZ#t3|GYUmCgbe=X2MEg{v?Bs`T&5ikq%2hjAO})99=A{0sgQ4`mL}>R8BH
z<ww*^I*<l^He_H0a^SjSPQ3>Zosy}cQ~?9`DRjs$Th*FTnP^p_pV8?lu%a{Y^pIwW
zSahrA0choEE4B=*@t3|J-0|^cYlnW+8I0X+HH-zBmynp<am9-aO+A&-D=2HboJW7{
zZ1}wqrv<BSN?DBH$yA45FUi84<McCl38jFb>ysGCeb<w#XG%f-tz?t~e#<z!=go>C
z9^xFIKCC9U?hBNb&~uz0T8ss^V_M5E-{^PVJzk$&rldtt>#pk2q=MDkLcsmj%}Vw5
zpZk+k>;#Ybn@O#eeQKeqS6nM^tpH0dUbBT@{Gl(S5=k`+@!_@Y!GjAV*lX?o?I>BE
zR2As4N8oTIo+s7U$}WBbPtp1GiCk`6V_$i4j>wXc3mBw-IHT^Z64JS>c;k7mM;{et
z@}uu@<q5JipGe#d3z_n45c>A#m(b_5QpSw4PcaXE-$L`Ic3kOY%%+(Q;<dgV{d!)2
z95JCOZ*zO7F_l8xUZCYCiXPulH8f<}8uG?1GG5^J-eJT4$4HuAjg`9f9C;T;>g)XI
z??ag4$%H$0VI%}^nr^!_dc^{UFjV`bcv$ZkX!oN~dI%>zx@huB#nsm1H|jAb(OqyC
zeK=rFhzF|a54O$0yv&A=30{R}lmQs?{E~RxNlAn^A-cR^_zgvuIj6qdbOB>6s~j~z
z8u#e>d5tmB8U$fI6dj+U#?$M*ddoQa7<ByUwevFDAW{+j0+ctGwhFwPN9|g%(8OfH
z@@mZxC5k<rm`4$MuwGc(i+=`RPUvCSn(2_cRBA>YB3tL+elJxvG(58RX7%pk&^Z6e
z5KWAr6$~x!$P28~qL1?b(Zij0ibgWGblo$22~(y-qo_cz3%jw}h~e-;1WG8}@6V+=
zCM|uhq;y1$(13x;ni7M#w@_HgsCjJsm5uNmGJT`>UuMh+5qwO1iBZFfwz!5sW@%;6
zPc1Iqr3Q&=Fl>CU#mLC&@j2vl(%h1Wj?pF$QB<+Ni?cIdl_3Wqi%MF?ORJ`=>^C@#
zjA5*SFGqfQfXu)kVa(4zYeGmUdQ9iUw|kESFW|E(lPo=}=Ns{O6Q8ZPxO`1@r<TwF
zWz-nz0tlnbx+NJ|z~>aK!1)i={gu7kt<CqJI?fbw?>@Yc7$@#!uX!i#y4blnk+0>s
zkTjd8F!p`iH4Um=0^+ezQBl@Jwyt3GP+tsfxa1qTakJqx8xUUpFpC5Rx3LlMVi}Zx
ziUEzPv9Ymown!q2YD_R#IGXCazrTyXk9fyKvMwJ46x)WKT=YDF)S+)GwbrxtTB+V>
z6!L-Dm-VtW%*e6ACekmAwOonK4jiv;$c?oi{KPV7daso>?bE%YRsFzF$)?luqmuOW
zKpe_v{eA&-yiY&Gf&2xT1<c9P>h?h`*-OvIhv2=ZcikHCXh4)ni!HWN{*n`1O)T;_
z$h}o-+kkoSAhc!En!^2|Xc7$g&7ZW~80IFm@r%_Pv8-`&Tl_mBwQI^$ng=#2XRSv^
zM-LdS6{>@2MAFO~z615k54K*zx=^;oWeiN_!<DIFxnk%J@|K0*TyuKs`C<H+CscuK
zwp(P#d86mma}7z*!k=pqC$q7&wY9egix)-;$pT5=Qz5Z{&vP!-n1u^SNx3k+V-VR(
zD)LC(9T*shYia#=%Vfl5hIoFH_6!tFB^*T2y15nu8+{{TV57aWrlfq1CL{~YViwDx
zD+HnRjE2UMLtoI8JE429t!kjBhY5g$^8uad@MrjCkFB}qHAM#9YT3a?Lu_HnY&Q6F
z8rAq6tYA2;6XL<P^%0~IM0#OLf9Y)RE4`AX5(pf&5D1?*c2{Q)*oue%)kWUPNFeW@
zsivyxB7g{P8S}H-25gDGg2dB+3?QGzKdJncTvY?qe#P~o5rs<vZD0S|*8b<~gr>*q
zc8B(O#-tf#`3Aow)8aN7Uus*dk_nsi1)s~8C-m0UxVX3xQ%_UgzvmDA&zJsdjXBZD
z<Q9jmA;xo3AbYfn?O-2MDnC5tmjg*zoavW-tGU?E2X3Tag5DFa;so+`QD6z|msgBM
zZLt&~FE{6Sl{2+a<JC}!E;rJSfjNlz#l=+q1mTimLEVN*J?$_)p8vfSc+a}&Uiy%?
zgyCSm${NVICv)30h=K5P&5OUa3MF_x#s{#nfdfH*@Gf8f_lB8o|E<?1sDnOSAUUpN
z3EW;ZN|sFzR2EMlfazUgL6eq9fFCI3{=cUJ-;h93vgnE?3+L~^Y%tR*FpU@+RJz=O
zT}qA`O?4uufcmvw7g&ZgTJ`?loxn$1{*grog<%3<ULTk+F4)N?lj^<Iq=nFSdxI$*
zdi1L3N{KydK+o~KE1sE_+5L>4J)<a08G#LK;E<4KV3B-(Z>$CCd;D>{yu5(&S!*C;
zdhh=_349~4?4qXjQbGyY&nI^WEMWpZ`}+DOUEq<IQ3G#t2>DOu%2j65ZGV?MZ|}u%
z9B2*r$s{EV`y!c}FN=j%<17Qed_eaXcJrUZjgNzg;*uwQ_PYm@#`A);%g!=Q(w-pQ
zlBr3*#q%&D>dXwgZm+IVUWw$^5gp0C^nyLyX?5!1zB!A0wy-*BmSVZn=5utVO&^k_
zd2leUEaTZfzlBA>S6L-J@WFPgg+vNMQb5SQ@y!NuVBKPLv}bikUBtjr>V@wW7XpD5
zIp4>6Tyq|kyzx$goDJ?QV!{1o!t+V4AMe5kla{Q|ytfPazRdG&Uhd8Qxlb{g;)s)%
zR1c<P!=RRl{)i}M3?$)zQmP=^gsyRZVZV20llW)Z$ogJ7Wx!y1oP5X$Iy%QQ6X67Q
z9{C;R`?dI&C`=9I+jobukoczx#;W_FN6{pYIQb59x%T$cS*BUe{(bGop3P@GXh&(h
z)kPF#=NOSMvB0JR|EbPnZ5{LwUk@v2scu5{o^i`T3x$GE9OP<nVbIeO__5ct=8cnx
zLoOa|Ldlzoa+P*D`nul%J=Lc@)3ch%uU_NFMwy@xFQo`?^U+V0JdU9FDgpHGwt8Ig
z^S%tt1u;rssZ38%$Ik<;E=<}ELr^yC4DYFOMOwN)s)Om={Z-gd`2XN>DMQ1Nv*HxW
zky7w{)JUTW4p1B)`HEmyA9~}sVQ`_t@DT1ikRsC^JhVIif`+~ax=k?t&UdkOHaB?V
zKI}R6P=sQG2nU7-KM@u5LZoGaL)y&+g^a9Z?g<P!)Pm7k>AneYO7)D%-26Cul#ETr
zzmr>z{EyK_bt2H01qezEbO}@(i^p;<sl_*oQd(^U=WJxEg%RYh@AQx{6kC|qc%Nt`
zK!%hf%-!5T%kXKLEg>@VR@LXFd6A-4Jk-7KNKHIPmE=oGq;?74<5qzWkEA#$6y;f-
zS5cN`d<nnP?b%DD7ZTK1O^2Jw4GBz3cHO;Lf4cw_0d<DTdDp@5T#$|mPehuiGRT{u
z60kAJ(+PN}$954yaoyizFj0t;y(F|Ke#!u~W5u-c{Ft9TN-<dm8LCyR2X|D|mqvW1
z#Vu-(-<zL<wCzR2TV*^OR%Uu7B+%z+GRRO&6UKLw)Q8)U2p*K^?i6Qcg}6$I82a?z
zAV4_L#sm!1E_Zqx$D}TQ3gsurAY~22d0k&`?NyRwB&1Faw#G#^pUoKy7<g9lLc6qB
zWkRwnphjM3F{F&8?>0XXaDCM%d3bwQ%l`2AE*{}WgbB&K%8Ggcuae`@!+@)X*CEsh
zD```nl=mA0|BjDV1+ZLLdh4_hArovw;J*FuKt!Bfx~6zQ5pPgKvqk?Vlqys_9!?}@
z)!qG`ARyO5xtwvY#zsC#iJkL}%&et+CtKc<`(se6m$wWO9@sH8TjOL;IP;H>q6{xF
zMf@wPisBy?Vi73^h_}|(vW-CX->ahe__godkR;{N*!B538l&bm6+Ahm<+Y+U&3%xq
z_&XB$aqJ-Q;J+R487&G9l`iKSh<1eFtgdCN6>)8Cy_=Ss{)CF0VTnI&i3x}(iKKRp
zR)^rc9&&yO05;w`0irz~1_v)+M`T)rWN{KUS4xCrfs=?u54ynr4D<vSW;g)I3Byus
zMU_{=lhFI63x4Zl!<6IWiNbjyz-gjuH)!w#b+DsnWAa!L{MSFIPMnJ$0c}`jy62rk
ziC)Rn^|kphEz$q{%v{3(K11DV!qNbQVxP(W*QKa%y4`4P-~Yzd|NFIsI3SD!f8p;!
z$;f*23;O;qpNG?6sizK)^ZNOy^4AP3*?1E%5Jd*B;S1);G?DxldpC(e)cY@39@J!l
z^w_`4DWZVVv;VG3f=UCjq<`<?ME*azE$|mz&cM?-PMgYvpT3!0ehnlC3twn#R18f7
z>a@KEleYx+qE{D1%H8|yBiC*Ok!{Q9^mH;JqP@QpI0;gk15ShSqAcLD*N`I{Vrb`f
z7b78wwQnLN?6MJerB1XtOyFYjY#HoxVu9OW=fl017(hITaW{h)w-rWcE@l%Y?7xVR
z-{|0YLN%Q1t5UruX|AapIG`#P`nHK)HeKh=OJ1ABd}c5wbk?fSYr(fXAnbmKbQob~
zi#DKhJ{E7KTrF^=on5VNyZxtE3W5YI>epQtOs|pt6#jGdyD)P4<s70qZY*Tr7kfdf
z#-K+R|MtpRRb126{6M=(T4F3-E}{rX_WaIThSZ~a4-q(Qkvwdb%t<MM!Sdg=ggvik
zhhJjBX+C7Yj+%`Wd9beEz*@C#E+8mHM~VE=0(B8&@7%sws=6*-euE(`HdqXvV!DMQ
zijHh&_b4QD^Rmq7^uEsI&MN++uJ1XwQFsC&M|JJ$l>!frc#e~C1|i>mF>75ro~JN9
zvCM~}mj$}<S#3S;uTMA^LNG6y<3VI=1pyb6aY>sh{B`P_00n=?FH?6X?H?v$<9JA%
zig@71uv-yNg2Pgqc`ii$Zt!+Fdm>x7<@PYbqgH9*+&^V-NvXekiA1^9dS$voWpjv(
zz=(dP;<)>Y^EvvMWKZkO0EqqAev4O4{lk!DXd8-MfR9W8!XN;SR=n|R5VjA2ZkA|Y
zI*k3nKitDtO1YSAf==m<AMEh1EEf)6McfYW@lX?jL}z2&Z|=6<-p>PCwd?6H%=D#&
z%kg2p2K+_OrQ(fKXOF9e!)*Gm?b@uwM*efp8W;3*-RCx*QBjHaH9xl;K&7ySZbQ<Q
ziv%ocEbRjQk_HbT=|Ud-Y;0^)h{JsOv#4Mc<=+@@BAy5w`|nVBr3q{>K23UTG7(Iw
z$4ciCrgVS>$m!_c*(Sapag-%-?CnZk!_a<4mqU)Vbu`ZC^_8&G>Af2cRDi)G=yH$C
z^(9Xp;@kRG)8t#ZQ|4Kf{tFj!zOe)Qn?$!rnQK#>&AxV?oYz86+shWPj1N!udRje;
zYwtbO$OkZcjF^Y-Hk04wE?&U_W<fgFqbQu-u#IQiDKFq#6V!uyLYM;C>FZ;noTY=O
zmx!MRJu~tP*Ag$FjYV|^WVo7D+%^vms+P(iz1gcw=d)F|oGFn%$oF*>aTtX?EGhT3
zU9ayCDPyhfGf`Ukln)<29z&S&XTd;)=XiL()Qest|JNQMT;x5z6H7$TQ%jmN&no?5
zpt1z|l9dMVcP@Hy8@}&(5Y8!=@RC@&@pOU50K%lnI|v>9UhPTzJ9-@#XGuVE#<RTI
z?b-ex+<<vf4JY%^n)_is>_Zi-IC9if<U03zH|+g(8<^+moDTex;3~nXCb13}5&Av6
zOtA7f0BDA{T(zB4JvuQ{*aDuz3h8A_kTw>88g&Cpia|o4D5aQYA~4EWE7ynPHQ(!u
z!pdDxv(flV_`-j4pvEd)_a;E7aH}NdkYs`@zb4|1*n!W0+IywvOar5we$H!(;M5Rh
zB8>wOmDH$!DrZn~3hq5I(i{}4CSToBOE;XNwZ#=U9Bae3>7ZkiIy)YX>oKC@NxY_9
z?NuPG*y>(l6sLIcIOO7jLkxdpaK}RdkmC+|Qv};RRvy*W=KdLJ%#)@?w(@%uz;b`|
zrkz3SrXVzn?%2I-#l!2~#Z7+r_Y0O2mY4{f6Ee{+`#))ylE)Z7XqAA7<nVxhtf|+-
zXuukWflH2aon$ph+SPWlh!TH^I?g^kb_>I@t6SoCY<M>A%7q}?_m5}yU$h-fAFqc3
z2ZRpqcZ-jwKCb=fh)%C}zey^dhi?Rmr+&op+s;i?n5N>B?wzkbI3F@pO(&ZNy}o!%
z`K5);96+if{LPgZNa^eQ!(=)hn0MR_+m&x+80CCFj<Fd2{@}y-OZE8G!APO%E^V`r
zDI9k5`K~@(WN4Hp0+*9KQ_b2@t6+qcF=-jn9RJTVP<3pX5GzJPvEI)E*U*m(DDgMi
z-c<e>bE6Ia!1d)<kG<u%b8F@1I;#92A%=E2UYZkx`%aB`)~$MebSr(}g_xKd)>Nrh
zg@qpuhofnR%qxEEx3j|cONS`}G1)FUqjL(=Qjv+V|3Aow>qob=FYLgPp||1E2%?tu
zvd$ZLH_*t)!DGj}QLcm3j^lypwhI%M?Zpf|?}N3h<aa(t#2FcZ_(gbJsL9W~!4Bif
zPdxt1OLZq>YXAl@XLB57B&*@sH1cw6Ujl2NeneH=O6cERrkpdT!~I&~sxO+<S5Zl+
z;O^{Ck_?x_9`%`u&EQBR(>Z1`Hv)hR)3x2JxBCTtD0z-Q_Hm9nGa+4_WsFuI2n1Nv
zP!x^$VrrO;#&^3RB^L7Erl+umarsr0Q*q^`{I`f569uIKW39#VCY=R(y)pxEWt1I1
z&)G=VaD~snlyS8@L`e6nJv?!eMS{}|7phnq;TyM`u6of;J<lifn60s8wteyZ<l&q1
zThxnJpu#ouHQpQdZ$Zg%FQieGZm9o&#DTMV3;P8E3IN-?Z5;0m2cr9F9nHPgh=gHw
zvccBJ-cu0x(xUMi=;g5cRe^=dh3IDlyVkV`pO@*6S8?*Jf0~~nQm*g^wTebTN5`lz
zB?>?|U&^xH^Rrc5i0@1a7$NNFRq&$HEuqn9dRCBKk?;}^hNKc%F-{Y<1_WTs%P+(a
z1a!f-C8m&>4(fj<<lMX9>*UMVdfa|b6k0RvbzVE$a?lqTFLF9VCB#w1^!W!jW45Ni
z)&q3`1%Dc==RqcI)&6F}qF0{_jl<5^q!yBi_WM8ieH@1*ix+FOM_S3~Rf}G3b+gx3
zDUABNpu3O4#O2#FuwNa_AGk%WNO`^%C$0e*xh^mr^q~c7w}Zz5*uXxJ{ODvgg^PZa
z-^glaUpom~jT25orBE<`|Lx;XHqrVGVZlT<$M)O%=5F_I8nOtjhC*&<yBkFu&x#@H
zRv+Y&1&vO>WLlqPV>7ROn@=K*zB{OWpAnvTd~AfPYy{V)+~j=WR>a|ezMmoYK_*qu
z#xh#VjDGQQ{e9@Hs7mkas%h(alWED1?k+?A6EnyfSSGVIw8Yff`gE|m`))g)!xz=h
zafg_%v0Y9@^V33K_3|(sahqHkIOP><r?_nXIgO14k5CqIJrtCK);LZidjJ@t9%Ke=
z-pW|dC@TM|3J1XBhu+;rVcV+H2jfeGgPxRlvBew5{5^L&49X%~chen$fUo?-{dgYp
z-biJb>R1(HKLc^d{jZUC<=)*oVJgOWy*fvuU@g8DUv|w&m(r`A6Eu2E=CIJ-K_0@`
z_rR4qW5KscYuSxY^v9WXx-CI?8ZRfNSnoK1C*m`?%qqahcDF!GYh~*dVV1X&3F0c(
z3RD;5YbCc)v{#<~HL>ECtnZHm3LY!DH)*lc`1zQ-I_$J7taKn+mO(@MDXBW9JQoV+
zD^>W+E=51(k{-s4Oo$T7^efxU_20T!_s?~|PIL<mOb)+XO__h&XfcvMV_M6V#Oo&c
z$YG}y-dAO&z_}M<l{cL-+j#BE9I>bU1gDOg$?XG8NaZs^!9g6@40l5U9F$R)M#@~+
z5+3HFFXq-O&}n{YUp|%_K7_DFH!PZL@_JXkPiC^HGLVtgX)xbOg2vM{Jt@Plw_cuS
z={8!dhMCFzsQR`uCvj$_ul=?cgpKpwwhpH9-mJXd+>o6rb+vP~kK773fe~uEK71;v
ze_j8MMj`pLewE`x()6Ot_4Y+W4Z`0}CdEz$(6~@`AHl{mD0)R}D|C7ld)>a|rce7N
zZW?I2DScT(uXLb9^H)Io3|=vIjNgFo#a~b}0|%7NY8-gMc{54-GBILfe?Kd#jNgB_
zzr&q=atkSAnifd$$4MBU{q)HnXYl~cO4ACaLj~G&&h(S-)UV$~E~OJ{L_eG<g<d|g
zr3XOWJWm`1*VsA#R||l<tUHY~QOK*eZ^SCxxVgq!d(^KP6$b|tQ+%E?ip<H={epQ<
zTS9*^Yet5?lCc@KP;IDjc)6dnvUzU<D{jlpq1CZ({au6J7t@O+FH^`aKU3%NwI_G}
zyf6DjHOwArrrksR(#%ZTM^0A3()RtEnAu+l<yPSp6&2RAOK2imhnMKkpy^Nkb2L`%
zxmqebsZXH?QQS`2-;}jBb?_fUP$EHrk0m`z)l5tem=f8{59HGip#bmyWT5$}gb|0y
z>9z8{;o(@ys<GoYe)%n|*}3Cb)!X<{aVk2jI81jyj{*R+Rd&}aI>UA4hH}Gd>P<`_
zi>TqHO)NIzyX(O_6vV@1{o2t=KN1aIsccR7(vtb_Mw!gU$hTFRBLU=Z6*+NcZEh|)
z_<c@KH^8j#i(jP6{Sz-;IN-c{REivMpKc8B<Clpv3x~S?zwj+f-QdzPVG?Q>N7sU|
z$u?1ue)4^0#%N$<8XpJ!h=#?Cie01JKE9=zq(gtFg9<4!uS!Zx{nrQlJt(Wez5bt&
zt?;LxvY^;K`Rx>5(FOoGQoKW^CYai?W#x^DPSncaqQX>QOPh5>1}fEA394@A?*mrf
z4*le3m~3){EzWZoIlOhK30Pl2dz$}kQXb1y-W{*aCzfwwA@`6cPde0|XqQmR5-@}2
zob&xlIW*Itf*rEo8RM{|6I0>%^%X#1csuNR$-aRsn8(FvMo}V)4!jCoFsuQ**?ThX
zTStqLaF|{R_ya(>q>1NHJ`#|I-$sx;HPip}yo9|cpUK7cz2F4>;#wa{<~Kp6p+5KT
z+kc)e_ac*j_SzfI*;W?YEw$i#)NM@~AdJi@=P?nS1B}mn$x)f@nFb$@T+EiKfFCAW
zcoNn#<GFZ83-|9O)%R!mcJ$th{n6`{<47<uD`TZ&tU3b&0O2+JLtKIU3VfZ%6K!Oy
znKPavr-JP0DVDxJzvojt`fW+$Y^T09^`QdqdWJlCA9Rhh)UAN!Xvv(fuNk@RhM5Lx
zlE(uX<?dO1zO*w^hGE)0r<izEA?dKYtV-fNn)dK#Os`18P9Z5~@psuz+0<jrUH@LD
z?wiEqR=pO;-6?COei9f&2F25KL0xf?O+*61Buk<=;JtH1Tz})(^+6HJbALFL#aeGW
zj&JwxtsZnkNO>cmng>Af=yjyC>S`Z~6AsV(mrgL=$Lfig+gcOMKJ#<<23niqmOLN6
zHa9-vYuE6y!?t1;o85Tc5rNUgd%6NyulQsAaisC6l~j|ES1=!I12&3bP`lyZe+K2r
zVn2<&+&UbjE4O?z_9Bd**^Il=TJ$g%8t+$nt=Q7+S$3+u8Cy-j&0%z*4IKENBLZyH
zzo^YQ(BE>L#)K<2*$npV#|As(VorVU%FUH@kE$@`LY;eUk#Lzt9<kxgIxrVs54GjU
z>8W**P8LDcqd>E`!n$1<xjZQ1iI9`G+SW+vDe*K_l8n?b`$%BTofJ+C<ZS>hKzVw<
zZnNjvC%=o(KPtuC6kJp00ZQ*MVD>zo_cri9_h${PSx1tPF%?jKD(8`*Y3VomMvP?x
z+T|WMw=>4S4Vp_tW^pE5_1V+h6;aro59h<e!sdMEn_SNblgGyqMZoh<S{QJ_{AB+i
z5k$%}aR|b5z_@pZ)k6*nw1N4g-!671&*w@%qE)>#c)Rbk-W0Ew$uyvOYv(5xP1Dr!
zNm7|9x!&_2<Yf^@We6^ExZd&U1P&Ij(OC8C9UA8JxQbM{G&U9xj=x7rkOW3v<08`%
zhypg^mX))pK*NvNS#(n>^H6+N7t@p7j}FSW^;@Q2C@gl+$WiBl@Jxm_R~<LctEq7M
z)mimC>&7meF~V)Y(H8JE#dWpWf@!8z^Y;6~Oj{W*x9jReML~UX{7@Q~+vr%Be|2Bv
zLR>KuSbZA*nLVG2o`l%^S)Yykf0X@ISR7rrE{YaT6bOXi5L|);4est9+}(n^ySqCC
zcXtR7+}+*X-FA_G&b`-po^^Bjj;6b-YK*EeK6!-*oq2fHc6eYUm-v?nDz$PmTW12B
zal0tpV5lNJV}+G3zy>5Z{YJN@jVoOyOj(gyay;GiW(oMp>-Re+hin6s9K)p571FW(
zgaCMaOMwBD%0E?zpqlYj_j`$>7V{Oxbs2+i^-;ZJ1i<dc<*(F|&`Jdbb<ZKZNi?F&
zPauATpBqt?Y9?|K8Tj?DP=17O#n{H+EG+O+Ks|&Vzj^d?-UsX)%+C4+zjM9;yY$Cc
zc?!$F!lV{R253i`jP8Glh=?4R<y72Qf0d+n9o}1RX;Kc|!I~^DQK|cg%@TunzF^U&
zmH=8z9NIO3eV{xDC|K3o;$A1WyWcZI*|Kdf-!F#yE+BOA2LOD;z}{o)SOBk)oUstf
zuk7i%C>5q|FrBk)?{lGCA?Ne04rm1hav;-A#%@+Dbd~OMlg%4X+fu%;UFZ+QQ7T%4
z{CMRz7JVa&$yY}~X3DZJf$_7?aIfXD<xDxq-pa+lNA9POWL!K%U}fk-z<aKMK`0?U
zJ0v9l|C16Ptt25UK>9(Ls<M{ie4A7ZBnH%0E{0lA&O!Sn7=??Q9B;h57Uec=!KPHp
zE*p+LWUbdY^6FyM%E%Q25E1YV5{XDy>JxC95y)u=DUcsZo5%6E<mcal4a1YaG?57B
zUcH82_Kgp|#xM8eiGocG2$1`*a{vJZ$n3)50a@qG4#KebO%NU%Kfr_kEASa-gUQIC
z>-6L00v~W|zVwomau#mOT88~S3tUV7tNhhSrx5~Rvl3j-Qd#ZiO>2quL6R!d@~qh(
z4~W;IAj{j>pbf`2>FL4q;Q8|ha&X+DJlX|r{1EQ2{%8#G<q5Swt`Ics@$rG?HoT++
zm9uHy4^)!J7KXY|eh2Y1HI2Q!2_UnjuM+)_e-<fN#u)`Il62?zCy2DPke0(>)PfQc
zz~+NQ;*dTrF56Cqev#`&^p4~fs6@Fz^(=)L?u4QVf&zE<LGBcCSH$_bc6?FyLIvI?
z5-zS9=s3g$Oas-TEU8q4gug+1nq06FvO9jX)HJj3wHozxC=|WGHgn?p<uJ&vlhR;o
z%^L#z#HTl2qo4?NuF6$4PMjXPpV5@~|5ivxSJ3>{ew5aTu8EssBLhBcJn(%ZuP=*6
zOpbFO^|F)snxZ*VbA^Su+1XjxybZw(wfJkJtl$o6yWski69b(cEFUUd@d<kIs&5BJ
zT*~i=fn8%R_==z3KxPCOOiUTqEPu>fs#-V#se{TTAU9WCzW|97qs*jT5_t;z718z+
z5*~HWH$WpsZ)LOl%QNUl`ThOIuOH3W5=}icVrA+ruiieoy%7V&zJJ5J50p<Q_-amr
zmt;;K0wWZ`3n_&KWnvW+3gyTxu4Wqgg`$4T6p&L;fHjgqQCc^8^%<{p;zD1I!#J-M
zNuTB{y-yy4;py)7qI=jQ%|CKYq=Ji2KmFe!;;PPP29;SwAUG26D04O9jv{QogK}m*
z%{F?cy#L=>c!6gz8arbMc?z1MZdf#QMa#p7WgX28d(I@%xpUB09$YPxSzb)ripHaK
zEni=g1czYF4urX#_EVgcFb<}FN2K!z<Bi)2R_6ho$l?<d=T_Z~YIrm=Iy3A)h=s~j
zSmN*T|7rW&aTvgMXP8ubzOmKc>v|($5*UDJ43XwuVSlphx_j!`{cOMaVGjvuJ1!Vx
z0aIlafP^AzkMYBF3bD@PCicgrFEd+mmj~#-Apn!TYkq1obT-=i)#Z-!prBQA0^Br~
zd0<-HB+g=11tcg4;4;|t&q56-bhAGWCJb|5pL@Scb6|fwHo(E1`}_~WtHimLNIw-R
zk6T7j{ic|h^e9ePM~0Q6sD+rn$-2z8|Iy$c+9(DMx?+D*iTpWiS$S^D?vny8`-Sg}
zi7E#cqRLp@9kp5d-Adj@HP-1CF2@a|eGgro&(>5aiHOOT->{2|t|G8{<Qtss#D45~
z*XeR#;WV`<SnQ3%!Ku>cJko;YGD5%&=a#>edNz^!A?%&G=Loc#U+{A1z~EpClZCqX
zi@cdq`?%73wQs^O&A)uIC7b?^aoyGOBw&wiEs_%XpnOSp(rSNqfjStihwl6~tG2U~
z`Z}`{Zkz4SW{Ird%z_*7XWY|Ca#?8eS9Uh66_yahMjonh=-qW@KyTsd;!J&m#3$i>
z=X%?4FUy=YA0&`(RAWfdZ(yGMaPD1AX|Wbv_MDQ=^7Hm?2W#o2%KpSsTJ8wyPx{<a
zqFMrs9XIM`E?y8msTY2tVNlNRD59&}MCAfKrKG^5+{8LsN)X~d&o5fSG&KJ9Q2gFE
z&R*s_G<QTWd{YNiKUI_U(^Eww)fXgasJWeoy$S!+ROXApuDOd8W^4UDILs$Q@{`@0
zmAv?yH_|u*RG8R@jwPh27gsGwYNi-tQ2oI{KZdyMk8<^1J~(ZMGQq*_Um#GbJXchW
zBtvall~$Hd>TQ#xcfn6h)l!tH?$MR!?O)hZ+>T{y-}~5{Pxa<Vh+sf-#|Xhg5^^B|
zT!=m~c<_Of7-=;r7n~*cyQ3?y1WxsV+K$Va19EkF&HKgk_QH#&<|gj!3e461m}Kgd
zBGiPSZdFff<w}aqPPP}jB~5@ckE3Hl&C;+!EFqEL)_9xnoDt8sD0y`6Z*)`z@@Sj2
zzd{Q#oXreo2Kq;5&o1{8O39a+1T)TOx9PfuoGUEs6Cv{{*edpqwk$pKo|M%qozcYX
zs`iXMghA`KdEHN^o#7(N4OU&OI^ArQIuFAtTY$T{`fa-f(FST6#)Rwzb&rv^Ao7w3
zKff<&5S|x&7QD9lvG2gV=-AV-^U+j8T|dOKlRi&wLAMU<Fb9-ENm4-tXC_+bwxjjj
znMK%5pW{KOMy^YBGl}@x6ztbYj|EPs(O(~>loH(LHy=bKWB-UccOlHy-Hpb6U1E*E
z=LWWl8#q~fG|}+n-Hg}w8G<XlVc+kOxu>8ZAs^#1-%qth1-oxOpSN}FOMms<i*I75
z@4t1v|2zT3Hzuqw;ZMcvmiRUqb<g5^vfAT)2>cz@k>S~sx2KiD5+|V;P4dx#8eb$9
z<AwMNfzgAE%*vBnbfE1q67oa(nU0q{Jp@QlSp@xUOWiBu2$a7;NPF+S9QU@+68G~a
zJvsXkJ9)`2$>Wk?(9=rPJXO)<#8y0)Itorqx#GODX?yS2W|mAx5u}Np3lsLHQ8tT|
zv65l9_1fa8&4)BrB<PLskFS^?@L~geeAuap-u}!CH!Jw7m(KY$5)nH2d^+SQDNj*6
zoCu_3IEHOte8$awIBUXv7!EnLEM+dG(YZB$+V{$Mak;Fifl|5du3J%R<F7f4Z7;b^
zUaVwK#&kC{zOz~|=<15Uc6sTvczIY^BXD2(LZ>-$!}(41vN1jVWHWGNDk<^1x)`e(
z`>%|ZwN1LSOv{of?208^aoveYWR>O$4{)A?Jh?p+=M0Pt8pTu?*9wF+ELM~ciizR9
zGJ40XIoxW)^IX5a@0=}*10q0-k&s*~Lh-!~jj)&D7|Y@7ETav%z$f%ch`0Qdp>ZDn
zjVYTFz8Q-Cc^zz^{^pT@_ri;OL&)`+JHN4e#C_;4d8ui~<+)XbtE>W<_y*xv^yJ5{
z2HNvQz0#HJrFUUD>h&(MEK0j{n$Rj~W}~SI4;?GhMPCLgQ{fWc0KmL2WQBg6s5A<C
z@Havyhh0|$QNmAV&vQ%Z?$y_36H$7y7E7Mqc9~qOj=s)y9G-{mbn(2|tG}pNZv$70
z3}g>VmDlDCG|^)1%6D4@*(FlwKBRp<-1{PJVy&%mf^G;c{`kE#5*ZTF$CjH6fbn?`
zPlkvWFnkT8?EioVKi!BQ+=U;IW!uu2!pZSqdczOJJC<gtL&8CuK|$lEQERs7oaLdX
zq&($#_>MZ}&~2y8D@xX4Xu#2Y`LA26T^GjNGQ_2{LtZGIih$qbzq-d6<WUV|P(X!b
zmFmNAMUJ17vAG^&W-hKscbi#!>5F;;ZU;-@&j<CH(K3=BQt#$FGl4&7)U6lutZI4G
znA<5z6bWE=G#~4-KXi`D^@n@nP7FV?Gt=ZsMkpbexZCu}fUa_#f-g?C(<UY}ZA|)u
z*`o2^ma4ZV8e!s6B&Lo0*dBaN{0CY`Cc7?c?F5@Idn)zXKDgCi>}`Ajh5!9WZxz)Y
z_+S{qh6zU4os2i~+RMJV{VvLrws$(CIJsqO*{$*C^?W_$g8hcB&ffW^N#)`zQnor%
z={8KJ7pyfy{A6Mh!0YyIdZ;!WnS?F-w_4lF8tbc(E5;hCpvWq-pO$g0V;~^5ZLz>H
zXPb~IujY&ZLKA@d^%s@K-FPxwD%Pv^g^$iP-0%$DN5~$qNiTE#Su4Zk)b6)eh#Cfn
zARA`bt<7}cxeCGeeJh9Hko%Mu-t9FS+ewMmr_%dgNnE$ay@65-&M#TCSRB^5&@RY}
zOM9i4&&A*F^s+Rv{P$^(_E>f2oT;7rOYQHrejFQ*wKsM_0y?BWtlLrMnPT*nyzt~&
zmvE9#N6)t0)z^Ny*Uvq-118#u$s@Kw_yBy?g-1L4%=7&XOruEA{)A}uCfk7$!vGCZ
z=l#>=R(rAfGm+egB?i&RMGa%#Kw%=s(M^t}nZ|~D$id|E8}3PXZNY*FvU4kdXY)mi
z*&^;lW=HS~JP#rS7Ya0YIWZu>yG?R(^xnm8Oxq;ALJxPGL)2OBSe!Xe^?r?H#yJ3+
z<K{4AXJl~ka<<a`-dTG3xJ}`=b&n^ze0p1(n2=Dw-a>YCcwWlySV9n_hREgdx6v4q
z3ljQkq!e_Q0;;OQ@cpK>30!UT{VfhTpk_X=N3QFoxJM#t42R6ryfFVHcxlNlha!iX
zLW&28d$K)s+G@=D=Fd7&u;Mr8ht_AP=~CyD)&vMpH%6sdw<0~=A{Fw3f3!6|j_csS
zfU9Ahg*&VIs0p7vP<~vhx*o{1?C43e`7ODMoZ0>l9%DoI7<1+kau%E2u@%oRxX!MP
z;xY?81uc0O1Rnc}h^rvmGK2V!8Rj@J<wYsX9b<fq;_MYL(g~NB)&RZ-X+Rd<Ti1I&
zR8&+cP>{fe21t--WZ@4hsX}dk4${*5#{4`tOh>R&f<7f1?Y<k#6#e0;_zS2KCG9fq
zS;h#T*&RXuXxoVZpy(gYjA^l}<>*KEsj8WkmR^Tr{N2XsZIpRYk+%Biaz72nX;`K-
z=rx&_jlfUJwT&?!$`KjWaeHkO+sAUfFBcK#g5=WVT;B-SWgKGQ&K#%rJ-IAS-@U@g
zR=M<8A@Y~YUE0tA=ZgJL3nUosdZ!$kt%nuiHX02Pi9$L0-FN*(5Uc$S(L1&^I>`KE
zO*44+{bw<*29UV*E4;+@_5}u0S)_&Du&|ZPtZm{`Y&4_1#G6>NawgWNeSfEk7<ra*
zij6#g7UoQ*0ehr+cW5f_EtjG~ogb~TP&u<4^4mC6nH_%oFf{Ks)^VBfeeMr_c}87B
z^GfvNl2GjxJrW3xBs~IMmLM{-*mjqTb+cSa6t#usu|E;2NIjj|@i8U`*L0|~UV-8U
z#F?9?XvI_+|AAuX4<^DhMs(eiD;*{ciYs1`a2DXqAmvbCN(ghsmD`g@rTQL_mEe5q
zQ#iuAEK$iit7v~UI(e{{M?8|=v^v(){oeVsUH+sP=X%vUoP$ySc@ajElc8Zc#V?pd
z0@HP)V+n?P`d|%$$o(<1Ms?+Fzmm1P4U;CCm&`*!M&-EN!EW>YptstC?Q|*?4Wz8Y
zxmBINz<8rrYUJ4G6io)C;rRWzoNGaDL}-7Oq~2UGsWE#l(QvK3DjKPCyXsQZaKF2{
zE?GIbJO10J(=Q3<Kj^Qn11IlxVRe*)b{!u}*S+9K!VHo;m%8YPZAbF)5d5@Qu5qTt
zw@h)-4*n=&`bg=}+rVY4&2w@i!ri1_VAC$h_b+sFM;A5n7rrmp<6pwxS0dbf_J<mA
z<1px!1h|S^aGam@aD%M&7Zz?W!qUR+@cGATbf}eY-o3{<AV=1v`bwwny52dml71fe
z#v{aGwZH+FA!Y{m{nA(CXUvJ#d#8~iXU6hx5yR%}+5UsB&u^HbNb(~{a1XBM3Yie<
z8}96ak0+GmA4({*NNwMQe9&!U5giIS|H5DKEDuF3>wvIV<_3Dmo{_psqj<w|VBJa%
z4Mh&{WA)Wv(Hj*DKO_SnrFXSIAe(P2e&-#4qGGR(#_se!KznIH9QrG$o@QqcklV(>
zE(JDBm|vqG(Er(-*ZaGu_<7}c?rPrPqygsA>2S~B_yP&w<6b>r+<xO#Y|`c*rM*t{
zDUk6con6DF+OFYjXlnw+%V9&^n+qN?0LTI<OEplKBNs7^DtvekJ$q3RLT6=IcBdO^
z<S)V{nD6;-8rnz_;}k|;q{ERDbKB{fgdEikPX+7r1m}&$Gv`{Zldr<_y2YVAW}?)u
zc2`?9*IW)rxp1%-4Mq~LmiKEIzG%}TVAX@6%EMlsg_tEr3ah@{%||a%Aj0acL)sU@
zl=rI`Tua%=*eJpWA63V1`kMdpv5&W$&Ym#GzYju&;kaSf9n+s#0&l3y;qKat>_F2b
zmevx|An=yG>z4g9gOGS^`x0@7H-fIq90zOb-<j7dUFQ0u!5&WK%`4d1ppYKeBZ>UQ
zMlIwa#SDgx@L71vA^qI{7NUAR$X^Q(T>KtircKuz)2f^ivhb`^o1N%JF4%fpZ>JEg
zZENu0vv#is_lMYeEZJVf#)HUY3a&bOXy1=q;C#)lbx-g8`3-b?RpVKHxmHQrKnvza
z;jdeT5M9P5j1+?RT6Ij*L+fDeRxl0K<ddE%SSb>PMf~)J8*zFbeSpRb4>H14pyjbI
z;eZkm`V6hd67ob(BaE~cN4;FDT29%FRw-{%t%ejN@k`*CCzbCWA6rH4<h*@pOr8kQ
z@k}Z@qZF<&eqnk(=?L_O_xfdRJ+T+J+?byn>NxGV$d=0PisN816!MYjKIDvT1Z)wE
zz(qNA3D@subGkR*O;EE?Vri)iw*Kgrim+^-%(fsMvV`W&cWL6FeQwvGcxmpSZJqvT
z3Zjzm31|i4EI}MH^npb)sR(qt(Vx{(+qSgkRny4=f)09-(&A@Lrw<1=7t__n>JZ@W
zOF}QgT|d+?Uuk9)%1N(1gv7ZsnA)QG%!7b%gS}$9QoSY1$+^;Cy&V^?IN1*|+ut!s
zcPM&L_wg);Uz!kpJ)M1kQ?k#2W)tFJ31$XP1IaP1%+|(Bk!?a=-f?p<@l%I=byE}V
ztfTuhv*R1S(5qjR1qSizlq|Z6hvH$s=p)5tRm%9eZ;g8t9>@?<l?;oX48C|yl+PG5
zbVC6nmHJh4ZXgq`ItUd#yX#xPZ$qsR*omu&J%OK08&w+EY3cA^ixzAki~~rO2ld1B
zOw>w>kzu5(<#Wp<H-AVYq6K$>Th{mFp{XgXk>IS}i{?JV%^wn=cnM-*sDQ~4E&!co
zfZnZLkuanmr^P2-O<jwcwu2t*`#qU*Y6`U~vErwx$<EJd@JA|s7VBAJDHdUw_z-80
zO^Zm|PXU^w%neWe!3ZJft2XRr`3Ba<F78=zql1`3*B_+oD7&uv*h!}+ZbztlDk)J1
zrp6CTPFmvQvWJ*Y_r|X{4U5pK@Q!9H2>5$F2_eK_vnv#|zB%iSY+q>{vZ`vKI;52~
z%hbD%oWxlC6pV^$XdKt9&!+>uHi-^&!-k>lIOAU7ju~%)b8Jauu2YZM96Xw0%9zl&
z5hp#NSgRUV+?+EyS05I0YMfx`9R-&{d3Baj4AN4Y!DN>__M!jt3ERb?F7V6Ve#WqQ
zXE2TRVr$M?e`LzAd1-0M<nvDl{kE`U^nLQ8(o)9P5u9?1^qyUWQew$|I&N&$%KCY;
z8$dfVs=0$q)>kYk`6Y3%NinaZIwsi1BA`jMrK#Gk;-ein!#WbC3ttiW&I&A%&0eMo
zpLU$Om=PRvj-#dxfMTD6IvoBP5A_(Ti%pnR(jXX;k10&xGr=c~qDL#(I*;dLUZj)_
zOg)@jZ(n6C2iiW@tUPBw#lTX3u4{}@P5)W6sp8{WB%i+6dY(NwFeb^y*<2*j{QZzX
zy?H){82h6ap79byzAfhcG=CtIB5@FaXS>Jfs=w|>J;Tw~2hDYj!*-k*MxH~=aeDaW
zLjCy-kh0{`E#^x0XUK?4a%x6&Tc6{3o`RrhA;|g|G4b*~2AkC_#X1{G#jvftOkCV1
z_KlB8?}kpJTg82e91~M|sVf0XQ39qsq{>1X-`w3Zm)!&B<Uphw$n?VuA$=?3JG1Im
zc=bXT7J6wh7-l?&-1Ob#al38d0Q<~(r*1*R+4lGvTjS+%V1xh{huLk>=kgMn-RZLY
zvk>Cn%%>d}zd@VGb2fMOqC7b@0y)3Q%dAy(Cj0m!c>C6}>#;qdC<#~R#HhBtJ0TA-
z#2EFp;YM9Fnr?pL$u`je6D$}^!5>Mz+aKK^P1zTL)vxtR4+su!3uXSn_fsw--~{|B
zCo9s=og~ffysV2~-dV8NzbzI&*gmp69?d=}e_$>8HnUI&&W`Z>g4Vy)8Snk)&n4KM
zEuOzgqX@y^&Sd$LYe?5@sPfuaPifkeF@2yF9?<Fj%hZYpiVT6)?OlKWF4_q_gRUZ!
z>dp08S&;j3Pi8OnmX=D5HhZ9;*a4*{9(+(1pS13w`U761kS=Ya9JwzhQ#%BRyeug3
zM;ibereLZ>iw+W5RW_ti3gpP6`-;_uiz&^f@7{QU07zvJ3;ZeYFN<2H6!>H>EWF<Y
z1@FmATE}uq%xSVnr6#JP{}&7J2|ChwwR41y2XzQ1(~wVtAyLe3vo}&YTYwBDXkmEK
zqZ>ELqHW>3S^ow2&@|6P=W@P`cS~}rUtJq}XKGKxNgA}WIj?WNDOy%%Ke_sCrs0;F
z=2odAi2L9a#gkdy8qv-{5izheEg-vaTq(Z!qjY*~%~72^7Ib{_(<;tnVP-yKv%q$%
zIHm$QV$Y<rCOv}4bM()DYwxd{u&sBR-S)<b7EqQBo+C9nMPCBl!q{??z&mC4)_$h>
ziEsVK19CDRJSZ4;5U86BBA{yoBd){<z$^(mkgvls<;t|Iv=kPUX~jM=_KqNUSo7D7
zLJ<hVQo5lyU}#qdMM3FSpjNql#MN*ddDOfx9(+{ZFs`|uF?Vk2QvQZ2T7q6&w{1dc
z0xo|r^N`5U?MaN2<cs$MW-3i)&&o!AX58RRP_!#xmWvlKCG-#MtsGLKUG@|5Z`>C?
zJ=g<(%>Ryrrn{JOuIGsnV=`DxKEhZFhGG##_f^l2KfQ=1vYja{c-343lZ%wKOM09Y
z$72=5S(<gxX6`dhqDSFgEq3nU8e)A648CBDlXw_+C;zsfRxy&=p=V4Kv$c?zFD1F&
z6D*ks)I#fN2A2yAC}fZB4hlJE?IS+7o_%)oeTiZfX2aEQjq>7I-;od0YMy%9>`U)A
zUql{=B(U{oJWEO(@hwwGgTN?z+aK2ri*9?2TxTlbd$@zmFG(jes*wxH(Dc*48<J7K
zLpE-Eds|ss=ZxA+JDm#@Li?`;JDVyBSR1AlKf2M6mHh0ft$gXsU2gw{G5j6lhsx<A
zA3Os962RQ(a~Y_}$&L5MbLuDy!Is7m+1A0$We3Da)U<>`=whit0~7!xb1a!+o>@=i
zC2MH>D9g(7!ozzyv7x3usjM9D<%pcdQ9arN7=(-dm8w{Q*47U#h%@uJm2=!Rv}~M6
zjU=xkP~qJneb}E~U*o;w%J}(=YYM3l7^9WRE5FyqpB`OG2;73Q>aFfr-+gJJ3epb8
zVJ8Vmk4TBCbnUV8!c+L>+{BKZL2Psd25}hf+V;DvcgIO}m}!F9XU1@XZ$~73j^BX#
zWOgtrQTtP<cA^_P4yJ<}*TLU38pp4ve9n-MGyd3hYcVyO8E>wk(Vu#vek-9gflKy?
zAov4nt0G%9V8Iz0bAvm3S62>yPzUeCzVfLdJ|<g*%3E+he|mUTv-RY|fAir3yZdu<
zTN|fvR0;Mld$`^l=o1T?$BPgSIVj=*tC>bn|K}HL-iiTI&ft2{+|t4vMnOti?{sBs
z;%_}-ZEFkq1QpfQ*#{E>4u;B#?{LI*y-C0>(*<&-!q_6TX4kusRJtXXz5o?}DuT2G
z8n)bbQ-f9}<UbsJ4srH)W&H-=6q{>a=5A1LGF0q7>@E|>ijW1JgKYNe>u%QbAwfhR
zG2*IL@}flkwM-*hN(cJL4{5WMFyL4zcTpmHoZK8b9*zlOswd#Vzu^yaI_fkaV1ocW
z`hMIVJ>ZsEUn}8!S)G>o`spw>-R+inze}Bie(RXkVXFJ9jBxfcr5Bd}70KUwVo@xq
ztUJO_fqeLpA~{zd#g+-d%TfFPy_`{OkA-bu+PxIA2Mmd%Q9SXS__}<H+=j?oP`|9^
z4zS;L#XG+xR~m2NUCc%n=&|{Zf}>h#_2SCQn#wAxnNNSm7n;QAmLKF5MOUC<`cm-s
zFC=KRaqE-k=buc4t6D)@V~^r``#V!baNB`<Z!gwjlOsB2)mm#VD#l=jYR~XTv$o!T
z##-ud%C}LqhV?m}TTxko0@Cfp_7jem6K>?aX$t)xw)zNk<a>7s9;nL(`Qnw&ICXX?
z`8W=SQcXT2j6A!`w#iiXD<^Z-3;29z_XB@mT3I$mM+`pLq;uKJ>P_cfy<EAQF7Kqf
zUJrxgTI=qTQ7%Is|0}nH$LJ;Jq~&HUX^yWujeXBoU@1`?^V-Ile6Na9g+ukyraevE
znU-pR=wCZyD^rrg`DJR38k*&ywfyo)c<dRh<#Is+)9B~F$1IwkuKi86k#??6Mw+x6
zQ=Yr7qY3oO?hd1GwAqLAJ}Zcz1jWrs{!btIU7bZs{g5l*C+@bhwTYR&$a3Xo^_=z7
zB3`s7Ts5~Nm;YX6Q2$FC2LVs3D629SJDSkAb#DYs`A?7Qz@yw{``Y3Z7F*wsnA1hb
zIu%lBnU-4pP<vhBf1$RD8{LHxG#RbGy#ufY;Mu?eJpiWd5HVHT&%20TS{`zD1%X8~
z-?kJd#P?5ohmE@jZ(KCR>P{pemSvjb=UAN9O0@oQX`F`&h#4NPiTK0Zj<OB#SpYP5
z<trz0J^_EHw^;Ty>xJC*+Q;wQRRjfflxi;kItb{9Y6=)HJj5)yZL!LEV{1o-QFWO&
zpr;}{EeVrBbY>C&103;qlEUMAz~k{OF_lKYWd<cF_=qC_d1z@hC2<yKir>w6@Sig1
zjo-5BFE<tYV-`LC8!=m@1EH*+b$%|+b&`Pj11ZhOcm1kFU=J!fT_m+?&;JtV<;{(P
z^LSb-Z(PewWu91hcaNp2qcnNBKuaV<4y4C-jF1@Rg6phyLrru5-NO+4yIKTB6BejH
zx}Hqo7M}QKqKp133ZfIO#woYcj0vGe>*vEiZjCWGeD)E*;x@X+!t^s(P2>jiza8Pa
zWyy~>?B%YKfq}LspNhVxJ#GDr>oRRsPI~IvpE7D-0W_6B>pD~@&Emlaik{IL3ljOf
z2l_+Kwp20*pmQtag>~e*rA#*T2u~Q$$r-a*5RyxEj*gc|tv3ZUtq_h`EgGNj|GQn7
zWBiT*`rK;^NkpI1G32JF=joX?gCWc*lkOr(m)pAsS&r`z5l9GZpHH&=tngA<{T+3S
zU33ikKFij5B6ssU4mggWmvNl+<rQh%dwms_ADp1`vzN8bVG7PkVg2}C*38*@m{XEa
zJkXpJ`10~R@<d{?5!BF>y5uClIl01ABz%_52$TE|lHp^1@Uc+LCo?OH`9SsubH)2k
z%M{xnaE+lr!Ro1aPY@}hN1Mop56<h3W1LoL9JX?+!%IwfoNp5;e4x+Hk2o!W3qMu{
zg$Odh3pCUGb1@wSW((k51I;ZHBSx%)CV&X-%OkC(CJxMw;3<+ifZSmT0gxLE(zOyq
zXNH^yuJ*bleQRei-;6Hdy-MM|Rs?z~i|0%^;$4w|?vOx>qtSnmj$;VU#|W{gj^0Ru
z12=g!H8m3vFoLOCZU$vR8XA*!92Zcy5eKKHrY)WS&&1C3DH=MhE@5bU-}nFwT^+;d
z6cxdTv0HnM8O#N_QHsQg4;JLXfD=7;UU!{Y0@24fS{TJgneHc;RBoX09!Kq@zuexu
z51vzvsCa2kJ6=Nahv5G=le@XwVUTh+6;KakV1Vx$adSV>&yY8hCR4SDp||V=EAshq
zk&buyWqnCFy>i%`BU^tE{^r-GGwjg+ZiJ=NvevHAl8p?6HmCf?#`|OW{-^twolZ|=
zuz?C4wsCkOf%os(^?9CxUUh;?%MF*G6q;V<W9v~8<ZE=M_>aoAi*r>*3|!fuHL{xg
zDFpfHuehBn<7wVM{~adNd7#Z14#;d0M(OJB7Xf27#$*-NxNaFzl;PoFb93|CWvJJ~
zJh8s+zJk)yk;%!)0-*QuaUyc^M!m^QDX2*R0}Wkm_wDrut>9;2;A@a!z1#ahmh#XM
zPT>=jhZr%4oRN@_fc4I-(RtN5kKp~c;S)y-mneYiyS-3}Lb6!yG>Ah15A_iOjEW?{
zIdLvJT1gWlZt_o4dFAzuvV*=T|6MWG|I5!~M*Lq)j}_jHak|muG4tv{3ihw)S4h$2
zNhj<7pn3k!&w=0_e_8pstF!Z&beF@5v1~!k>&*#^(gk_du4+3e`}|wo^B`uro=|a+
z*kFF2LgXC2IoI0H8l}HfTDV@lx1palSr=%wNaMO5w0YP)Qbx@|<GMH)LJoUayL*lH
z<hO@BgH2Y-;J95M*i<=is86B7<hs6J&1Oi4Duz{ew>bolp6k%}*Ai0#b>YOnF{#|(
z^&S=jB09A$SryBA6%podhi)D~h)1p4*VLPhCd~2Uu6bF3^Zi5$dz1C<l7&j0o;X|C
zb*ShW63RKJPk;y6LW{M1+M4=eF~+2uWf4=^M@5+<{ov!lp(m+$ofC9$-0T5dNP#e4
ztxHEeL|Q5taR`94rEx_0&NDKH3~*IHPl17psx3Y&{p~@fa?_7xb-u9iRH^RHPDJh}
z!J36&Q;^{|;=B?03(zb)Uru?}?=5CHv*`v6IxjBY^E-Eir$_zBf9NS=D+y0_)~Q{$
zH)uV+T3?XOepGhgy+l{3%jp?X{cbCT2mqwn>%@*@gI-rEVIlB+%k`U@&pDScRh1g5
zw8IEM!XuPQZ4MUMbk*1I8&Uei`DCO69OY+Dn@LC;xx^pej(x%XS&qj{E8ut<@Z2>;
zq1_xqiCM*d(767|Ydn0@s76`bfoFX1Z>lizm8I}I<kFKhB5JC=%gF>;jpwuV?WsKz
zbMvuDw6?}}C>r!WmFW|<-qFH{-XCv0OkL<h+)m=In!+|KzKIq=_6#MVe_5Yue8@v}
zJ@bSScGg&IW=Wx)ep};U5Xvs=LhINWx6~y7OUgp5)gR+SnyohLN%eX1w1MgR*V(?(
zJNgO5+S|TBkdPh<-if^xQX*~KYx|p17Us)WDhih9P+VkF#<s2>ia=p3$S#cYpuO9X
z*8A17wWSLLoG~cCgYkju`)Are2jh*ORh~Y5al4vQG}$KpZKj@@k{2F~(8n2}e`J|G
z!Wo6YZTU3`bp_GYvJur~1K&h$iC*iB`}bG&6&myHV9)B4%h-e5?pqMg(;QQZpj4r^
zF#W+g;Zn`HYM}5E{Xo(53Y3Cgs5L8!{`ApY3H)^uPu&l9@w-SWwIyu}H7W;<m6<P5
z3?_`l8t~}OH~R5i-M*W7Q?s2=P(}xj*D7)rr}ABbjHaTJLdtb!8{L*)?=MCDy5T@F
zk%<Lti&bYF2%@7(KuJuqt1Yg%k=)?LHfuBJmnc=KqSGDs0#kmopR{BaJNKz1!AG4q
zoQ2NMp5FEkn|z=EN4FNF2iAwroc3EP)ZOu^VoK-zF%{YAE>BBCO814ZsCY)UhvhVH
z@o4nX)Ldwrir;$l332RwrW<Uy{q_Ab4lXh@u%D4|i%3gJIYLdWULww^R1D{FSWU3s
z>(J)pY)&68U8ZNmAU;K!m?iXC987Xqk~7eeRy5vZ$icxFag{M)R3gj^a^U;0InbQk
zcX#{NxYS>LH4--!g9jZ5FgO`@ue$#{TVCc|9ytFXQk&o$?rBJCin)R<8xmzI?6~)L
zfbh`JbqNSEcOk4EfA@Z_4{l<hFd-x1@9zRjQ?S?=H+M5VS-}*7d86IfKKm>GIxv9o
zB_r-5E)qI4Akx-bPs6fd7+UVCBamOcw>KSqv5F+W8PH^Dg%5gBY?Qx4wBqVN<qr2j
zaDoQ<&uQ(<)a%x5H<A$aml|>Sij3X@G3r{8o`)8DU0UBG;)c3I5ylK2^+$1B^|Tvp
zl|W637=auXV#W}*Uw9S~-3LMf@{5ZRP12oNQyAk3TDoZE0}yC_3}{NB0w1I(;6Phh
zNFc)lng(*W#>xA7cTkv#0O5DZXK`iz7ZV1aLIt^Lb{D)SnV;{m2K6_(eSzOIYQ@W|
zp~g^Bt<$Mm;y(Kt21BLi-v*+9{Rkfz>)zBR`__8P92Od@#hAS$g$2&Z0A`9FUk!^`
zgM{@fVTz-+QcUCGC2_p$Y53~xZglQ3<N16h$kE#J*!@#(txZoT#|n(HZ1nE>-%VEk
zjS09}h53%{<QQOfYIl?z<*IY91xBxje-oad4M|tavxJ=`kCUHKS7s)qdR&Sjn5&j9
z3JbZEty0eEW-{M`t7<k@$j(~Vxi;sBKth)j^OZa=k`)t`df+$4Bf2wm6H*N@%K{%x
zoFa7W{K9BpQc0E9#Kph#rv||}xJ5J}8OxIDY;-7)tSokBlo;eXd5?&K_KA^N0I4Qg
zc6)E({<mGhs=N8*5Bu`n>)Hh9J9)4k8Tq%q(r16<u;-fGI`2cv#O%ycpLijKizfFE
zcHVcQ9Vm>N_+nJABP}QzfA}EaZA${sfFZ9!kqI%o+-5*Ri;4^#K2&hQX`ubi|2#Nf
z@HT&<2{h?|{OG3Ao3XO-FC-`Tq37>zvPor1a=9%^@QmrgbWK8SzuW`|$;N?4reLQr
zkN5(U6!9bUI{`C00)Xba9DmZ99G3?Ni1(IrF*+Yi>xwVpl{HQL6)ET>5f5Rj*Sgx?
zB+!$8FPk$Wv{0ihF49|1Cao@lM+RiK{~RIyX~eTm-(5w<gul}0RKswtu=537&?NkD
zAr%Mhi;B+7oSAe>dyzLj+0k6~oE{M2PEWKTHByU!jTF^t+vypi4a=pG(qeWckZob=
z&S`6R-Uw4<zlRQp?CtCbLhOy%3N0*h+Va8#RUe_tYZm+U2?<lf0<M<#o~De%jO7Y%
zk|OHC^IoV$5iel}ofLYtR<VK2pE2s+-^DlA+a8qe*cIz5;Tg$0h%I)+cNdWX<Ss7S
zz1vJXghf+sU%yLxlGhHe$FLAG1}r6U4~M=1pGj;EljC~ZWJR`yVR$ZqZgHo-k{^JW
zaf_cJ_e-0FXWv0}AWBj;4x<)g$ARIJs@h`u%4!Qu&BwvdZ@zN_Tx6~~os%k2>VpaO
zy82@512X%kiNYJx7D~+KEl3_ASS(~~s6$6Dv?AEFq^}1hzACFYIIJ_&(q?ZjDwy4i
zre!R3u_P&ZbAXGBnXjENPoN_}G@K}Gw$R98)Y2|AUU)j|LxhanOe)nw44rG?U^#9M
zWXQMb<c++&JU2;xASpM`H;!FO3rvcoH}CW#LS~{t$vNgU(&wrFBCER5^)6<dy0p#M
zHpo)-rODynGc^Fu%g=Ap<AId~w$w<iUPJK#unlvkdd&|wY(^r9laqiRAEczar9KXV
zv~H@;mQFVe7DS9z<q6Hr&40LxBQo82yO%#>j`J!|8y)_)Ek2y}p!`qSv1osPUs+a0
zR<`0DA`hjchKue&>7!O)#m{ygv(T%}5X@i_5*~PFszXR0sducEcUSh&!8+Y-F^I=g
z^A&h<osmQD6!K7dLY$E#CBQ&b7Yy?zJG66KpPnYCKSE~S{}oef!2I_w2QWr`jWprE
z{(q7WAEE#6!KD;tSEa2+C+Khhe#Ln8M`=OuYblL1x^Hs+>%RcJ##SJ^;(y*XFxVL%
zm&qRMy>Kz<@p}EvWbG-N1wDqSsAy_xYI5VZRyd$Wno!uu!67F8^~FRC_si1q?n_pq
zGd+elC^2Os2x@-8XF7X>LS>}=ot@r<eYsS@pea(5P}Jr1wfW;?7U^<}<}qVZE+{dj
z!ut00LTcRq|G1=omx5^Z|0-K-a)GPmzX9p>Ty_2rA}<xK)@Vb<#B|diOHqO?^u%Jb
zJDM$s5Gr83z`W4wN6)dk-T7Lx%Oc(0+0m%~wYEQ1RDvxEf<Q`N749!C2;j5+i}jWN
z1R|4wGGQmnEnq||I$;wW(*TklDs*~kg`@?t$24hDepqIK*#FGT%nyUi?$0iXV#Lu)
zj<E@^npO8#2Qw+Fn7F@!Uo!@{EYkg}dr(1Xch?XU`I@BgeB(uf5xTdxM=xG9WjqK0
zUfR+@wQ`9<5jLYK8oxAnN>AV?jpipNF6vg?4n{LOOOmE)lqta;r7)ubFPdMZP|`v{
zYa~P+%D*BZd<W?1bbq-=5Ge#&g`4=xCiCG31_azboV39q;Czb}QDMab2RvU1^x1F%
zP2crRUKmmMua1{kDJTvUuJ%BekSM|}s|KFT`i+`u&530*D04EfD0=O&<Jh839V?;~
zXLj^+zx|?FjCkVUifu&aRefYv9aNpq%F0q^4HA$pkYh<bR#*Z3X@jy*-ugyI%UVy5
zd#NE{e5}uTz4f5D5dn{#JI1NI9-NVjUj*RI4*tN5%+vEpEo(qDa^L8K-`~r9m!f3I
z*!U_Lckzj&uBNe)o0YkW*AwAI>0(R<s^|W^-Uhk^@Q_=})|zF*+P1#e7>XlUv?Ss^
z$4|~_4{Nhq+iWb0jmJ~<NQGaft6mc-n;t&tP58w3tApVhrtIo6MH{7HJEbn|VmU#q
z*Yh90!q_#m8A@|<>u|C0qHKbhIF2ZFiRXcx%~HFW+SNW?*H~X)`y2J#y<_g)JxO3y
zll4sbFjQ8v5qiRaXq~GY>SGgFhRc9~Y$0O28tBZU&<z~9xyd{G4h!nK)a8`AUfGuk
z4|EI8N*4FBSKCeX^iai+wKRq}8>z4VS)G1crgh(3O(e=l>sBEwEbBE%`FJsO!FCD>
z2nmUlD9kvGf(*KM1ppwu%3Rv|0CfWo&icbxKD5X8L*=$yyj@OQw;EM(PwC{RKGq_R
z*(~Mz{*0z1i0a;wH)KbspSRu!SWCO@?NwJP?evpK?Cx#nhDjcNu+qC2us{pb04;Nm
zpk<xdstQ+jF@^-*%hubCDU(}1O9qbR<k_`U*u>hO&U-Eo-CGur5BzM?-5L|^e%4u0
z{ZY_`gE6g-JII9A9uY-PXR+P!oBOLerF>=V6^V+74ER*l2*7=UUMu8M-Z2)F4&iVf
z0B!1>w&Sd&`fr6NHk6%^&ENfNCJ;ktD)Fv;&RTHCH`GLfCAA$5$uTKSOcjzwfuKs8
zeb}qjO$~&RVc6|6NXNpupE{WM;H~aP$$<i(ZFI?7E5Njs+ay?T8>F95(UcP&F&|ds
zA;a33iJ97x#O<WsGh7Mz`oa~k)t`*kw{mZvhgh^Se?}|r?PuViU+XJ1XDDU0QnY<Z
z-~tV>PRCBdbGFo<SA^50+v7IXYFPo7vAM-bPO1a36gdePe;Cdmy@Fr8Ma=e2+P1ee
z7(G+o9%DbQYU09pFz&3s$WW`d_6u(fx4>PYp=8#^#GAgbA+tO@Tr@6<)WxSGP&3Cz
zM>!RA5Z>C~<S@H<p@S-E-a+Gos@=}29?qeGdDmM!yM<#d!qS%~>@IwNN?i*Qp?U;Y
z&Xj}bq7=W)Sq17r;BjgU0M&B5DzVr14lBiLk4e9OA0`S%uXikL2mBUrwG?o=&hhgj
zC44%64{j(nI~dVG#4tA8wVZ3K9dkMj3vr<!39e+rpi%)e2(#rK-bp9)ANqMOR(+Dw
z)~4QkU8K&A+Wm3w`Ybd09*JEJP_&w$l3hwWCx5yuv4Bi>+!&h82x|5oh<D#Syiiaj
zsaxn)FbQg)J&AX9hh<Co(VAS>@c8K7Ch|P-)c0&oJDgu4Mc7P}om|~&)==SFdHmf?
z(0atgx|FLt_(&zY)>OkP5}yXIqAl-x8_m_<ySB$A*gG1s72P<GfsC=1(7P|;*aOw1
z`O-_i>DOBrOU<81Zc`o@2%g;0G18ygW!?a)Ee^t%y9_qv;SDm$QL3P;vE%6&9x0i`
z&^p&VBXv2rQzT_vPM*k}a-Ae8UIvZJ{6hHEw!FcQj<}lUl({Z3^CxAoNoy!hZo%2{
z61_>WRH&{trHEI%o9Hh?$<9aFS}kswen(!{74+*8jf8Y|b|VoN(HmG}i2aOu$yVIy
zQ?`=xTYO?5{|OO#t#-rolaJ{xMX>9~yrYM!KTS=X3>Cxd+S=(3`(v7)#T#MTY8<`!
z@Ieky;UA$7k4oB_etaLYUYh6xS&0k14;MY@(#DWcx_U(N%XjdfhV-k(%SKMkU)UY$
zH3QsdkET_cpu}?+4+<AK@kd2b_#2!x9X!|w1Q*(<dpB*uPd%JWUam<Ee6jv$ubCV{
zmA6VXi)`V3zVFu*LE%4Y2<As^r~8&+Z!cL{q@sBvB60jXqu_fqT<_*vMP<mPrRT9Y
zjnYl8B?w@%G%cJ1W1IYQ%?>TOLwlQr)QKhn$0*rL3P;;ei_Qno@<>)b^}dD1!8BaC
zW~;E0Tx8EYS%|!#u%nQbEN$#WtxbEN{o;D!r$VxuobyxXm<=tBsj(dLd~?y|-QLyA
za~W%L<@bVmhpwmsbu(%>!{pBB|GIvQpw4ZiR<HS!KgrS;>PVsLyO+be^9@@H@!)vz
zsoq3nvX`ZJyY9b`<%gf6$^0Tn7kTj^=e!N5?88wIcFMg!d4q5=hFyt4_caR>QCJXN
z4lBo`-%^wNlYA&cO1SI=Ifl&8H>V#G4^HZbY@K`mw2V<DAhd_!>SHM0;}0wUe801`
z;zkY!7)Xwch5K144gss%*%1%{GX0#R$iR=PvqRjMl;Jkx0X)-iTHz&C(gJuOt_Tb0
zUD5^cVnvov0Px`hD}eacCzXmbPs5P6H_4T@Qw|F@x%f8@1y-v0_9b_*>LS~6z9rcb
z@}IM9>^*a}FID0Rk2s3Vei6s{#<`p1U7PNYJ^uAUv<;45#JX>WdKbk=zX)TvI~ZHF
z&hy-o0KE2NhZk${htb~BQneGz3j8k?Ai?SKLk<MIm(-mdHr;dk#y@P8>9l*>Z2Zl7
zG6lYiQ7!F7iP8bT^rmB%t2a;h6ZMmqb*uz7Qm*v5vVmkeTwJkRfwve~#KwaM3&-2j
zBR7kXN4bFY=Mkls&sN*yRVleg`)eO`s=`oJfW{jsD7gjkc-WhhIR@gvpKg>prl16T
z<s|381{4`kj`kB|VXz#SG7C2KiduzlseizkH?Udx$nTyqYb$3#!2|p0z?NHL0Qe(g
z4gm}g%43|NgQe3(1D`O5tK?a9fGdhY{hNH!gMqI-U%B&9uGNhPkWX5yiAKZ^As36P
zP=8}$)nnr~mNqoK;?~;aG411fSKDA8J!af?y!JKbIqt{+CFkQ<{_{{o@xQw81`cHF
zd1oA@AhjgMi<CRlr&4*8la&kBt%W=SVfmQ&su<;xtZ#8a*>G-+y0jQS!OFk*EY}XU
z#^Fog-sPWQ99qv0Si44xDK3wX$dS(>nVKWl=`5j6<nt?6wG~rIJSL4zU{B+G0M7m@
zpL}Gbe$W=X1cKBk193q9sUrJJyQ(X*hT?CX6b82n_N9z-eaMU<=9?pg_^0e9!J7;t
z`-b;ixe<-9x3)0{A`&}klklp~UEVLMSK(p1W?G<#NngyS8jI602B1pWs9$)8=WQZL
zZBI(UoNQl7@MlZ(P5|Q9qa-+lic<Yf4}W)_)6fywhgybhZbsKKCyP{W(vsrQ)ErDt
zT6wmLE|S>Zljgh^3qa6lVS18)G|yKBn;P}Dtc}E`e>;3-p^PehXBJFjSahdVEST63
zIG{YFs_2O!e*Fg{I%0K8xabs!gBhO#SxKuixx|hA(0YS9PhoD&r*}r?*euITjAwxm
zTMIL-2W^JZA(A@}tW~VE1?aAiAm^*mCYgiIvNPU9V^$Xu&l$n#{Hq0%bhG$@!_prV
zb8ZBZ#WwdBd)$|P(Hxt)c7g}kddsa3L_l-J`A=n#!E3a0EX~ae_rNO3U$yi;=}$(c
z^dc_k;ERRKMSg&V%BJhl#Pb#V$st_By(Qv$0zE>uU3v+(xy^eLzMVg@fn?;V?6381
zw(G8|yFuz8OWvD8q)dNe4h~HX<Fk`KrFJB4B<!-(amMS9FkqTfyEige=%({@Ad#2v
zfj(f+)@F0G`$12n3@3VrI;=JNJ6FLhndqda%CcJ9je_g7u)L6aTW*ab#nc*g%MXs%
z0tM&`7;@>-Ii!n6tEE3asb!OVXgso8Rad-{<a)pg5Eg_b)3bA62}1DfN-&(G12Z1^
z@hiLFGFXhTeg2B7#Dj<4qBC3D-;*i8gJ&BNg}cQ08VRC<xDowFR9?#El-1PCTzhAU
z@?S755US%q9o~UT`_uOTQ2!tpl0M(_tdb}gUQoqz(4e-ub}_EH!U7WnWSpM5xtaGI
z$m*V_@pg8u2Pjk69?hPe^>Hu|H`+Sb^lL7}{2}8NfC|X^LDL-l<b~bY$c~Gnoyvpw
z%)7APDF$w{7)EEcW_68GMNcOht$G<(C)=t=o$I;9XYZ6+wAHRdjT^~L$Ghv0&F=Un
z-sN?ycl#kUJs-rKZJfiXgekw1NND)AUw&+MUDuaSJ=|;PfHtblS@IPJd|+QkLi`U_
z4+t>AjO(cd?Tb-^eevKA1mpD9y7~J}8NHWaf_EIb5sQiFt#ay;@{TXNM;wdF_EW3Y
zKF>XyYt}M4JA!?#Nrw*_gDU$nWp4u2?mSogK2v<uH389BMwN5?3vW-~zn6{_47KSk
z_7$%9npFFE;nV4XZ!^PCN%c{@OqZ!OX?c<XEMf8-eJXgHQe)*hJ8i2najxU<TfKUl
zqP`ZW;rjApv1UbKSz8Oj3)f|Ff^-tQOC>_;81R+fc8V`4GE)HlTYiu|+%=Lvya%)T
zMp3?~u;j{LvvOHo?$9U8WgykJ<QsdWOO}qy3Ke$BetKRO-bT1i7p+n<rcM6Y>-T+B
zsdj#p4oz24q6P<xPQb|tfTKT8=%+<mC_Qvv@-Sga&v^8i5t{plbVq?k?aN*2nF81Z
zeVZdw5VI1iY$FTRO81&uap6b$`1x&bZr(mTMC&GF!i4C}foa`8XiC&{7z}uN##EA$
zlBp7)bhYz?l1g&B=IP~S^Hg10T3SOx!?i4k;o!-{gXf`&zhKj_NAki0-M0s}WcJk1
zF`L#rRNjJ75qpFXp}M;Iw*ipA0n(pqYB~$Rt|~~`E(PCx-6j!@;Xu5c)%GB|q~wUe
zGPEJ(`%aMPNlZ?@uRsU-C~lpub=DB~gXlRifr*mQ&Yjx-&3^ws@QS&2iwC?{M4v7Q
z<IkCfd`&S|Ho<e=>IW4#9!fwSF-T;W-|zoGhY<?vy>_`b0oM0HzII*G(9BG{RzjoX
zJ!9aUsXkgRGZ9zz|Kz}blsiG59HH=m)RWn38(D}@rl2}89_=-u4&4Ro20dZebaZr}
zVz)~9Ecj=goHPy&4#*2{G1GGz%i>oqspV(<o!HJqyNU{Oz>P_YnYsQemoUE#6}UK=
zR5+=%tNI%1&mQ%ft%60M|7(py6KoSotX|aYrbWcZe?dW+oR@wbw29;E2tNn7|KxMQ
z%8)%+3CS-RHKwp_l&NYcta){4p4=uy5wWnqwYS&12=0IeKRXYdJtm{7YRu>ykoCpR
zh!@PMB~kc;eXD+oY@SQdQ(EX7z0QeL@~^XXe!o4u*nXl<E;{t!(l-yy-A#l2_U&69
z-X?~sS78L6d~urOBKVGYLb5<;4UACm4Oq~P#M3~@Fw#5={26~K=>%H6aq^ZUI^mlD
zG!~ufYN->{T_J;$P!ho>CH-Os=_S3(+AbtnVoL92YS$_%BtV1?0h|2yCjmY>--7Fj
zNbhK&-=6~I$h-b^M)${L>H<J9f{#9OH$q}q`96h<vOR8`ttX*Onw@@g%W|Tn_*&=H
zqd}l!L`O{O!`1JZ-M`QlM5HaevC9w_ij+`#GyouXv~=kvGW92uH(SMKE1&&OtvfiS
zSH|tQV0s+^CG8{_g3GD?1_%tCj0t?8#v1rma{f_j8)yFPS&(%&7F~FrQ)~Xv=nWDI
z*KsEHNpsr<&u3fr4&9SM>YHuyc=sxz`Bd^DG1r$T@gC}!v3;sH6Z(>vNXBhJyGU=w
z05SRP0=0q=T0BcDZGazwOI~ZA^`f-ylG^pWZ)G3^c<BDfS*tn3_t1q&h4otZ%fCBi
z2YSCs$23JjYNGiSkh53Y>}~UqJ5BWz`8g>bsyERy)MXW3j*jPOpwceO8jJ*Z@H&s|
zL3lvsle5>_9J3~Vh6tW6#m0qTRUBH1RhplSl~iY2NGCKZdjRdR*cN5Al9%y)|0&Ee
zyhjE$g%S!u5&!Y=4jnR$+?0t4^~_8NksRm0=aedS#mTtX80<ENq#hhq)rItQH353w
zf?_zF+J+s~=wPQqnafCjpP2wNDd7h_J~$f=)HJz=L#D<k%Mi;VU=bV#3(NEco+lV3
z?6smZNdwkLu>zhuS_?L=m0pOAUeGTLprue`<&!G+Qd@e4(dQ1Tz60_(^1v$2>c{`5
zz3%{us_7OSR1AP3NK}FjAUR1EVNeH<EFek3AV?CFoWr1e5+sZ$K{5i8bIw7M<eY{i
zAQ@%|Lk_cze(&G+{(s-r+p4Xt-KxDs(RXh5?c06&oYSYzIei*J@eSv6DIM%aXX7UH
zo{L$$I_6=#@SVysr7r7F`*qH&Z<p5{@j(_$VH9kW=im9952Jw87tmv|$J-MpygAQf
zX*^#IWV?#1ocHe6zXH)XJA{r;;~V9Og3X@OCGRO?>MrGc$!?%iKIwk<;tN{+dA<!8
zhRa`d8+fFCynTuxIPV9}0JbrNFYTaV5IzkJ$Wx8yp{`sevafg`Ve#$Z&h$%!AEUPB
za|Z`&VkGaU)=3toIWPG$2u8WHv6K}<_eOI?rd*6iGQ`bO(%6W;^c!dRg)EQ7sOzTx
z`I0YK3DN1}_AT~~vQ)5M_!C}KFya(*9eIeu?2#G}$HA<##VNdwyJgdEyO~F>_5kB}
zGIgD}_%oeytEsFGVR|C}Cp0j=@(jzAFoG*gP;c&W+^H<>{i4@y|A74Wr>eF`71t{*
zFFXVbt~2$ec7#w&*J2^>xq2p4khz)|H_Yw6x`wKBMU{Ge7*E{2`KQtwzSdJ$HD~Kj
z(sj1Bwt#MP<z(eo+vj)J<yGwhF2tAuI1Syse6CTO`BUeQA3vTWPWFw7<cOGLL$a%$
zIXXJ#uxDgs?2|wq?HF<>*X;kAc*J3dKDNMo^9!M*t-&%b1(%#r<K@XS_sMjIF!!d}
zd4Z{er4AHz*ZEHviI)>WV^`Y8dHsH4&oCJ6rzhu<ZU9rR`QM@EpVRCL{_$z~@sD81
zAI~@Z;eJs;=YC47TCGcg*Gr_6*vK!WJuR*m2smre<&rC>r*Elw4ahIRAkrPAmVsxQ
z%CngKUsyhoTU#eAMEahETrRnS!N`Yf_b-3wTFCr8O+JlDe#%x;BVJiGM-LV*uVe*p
zhRY<s`rV+C!m3GniiCfttii}$e}s=uOiUa;3rYVm87QXDsQka8-9Ib!pH35h$A$j8
ztN&CXd>9Q5cm{!T77@!VcOjY68>eyl^RH9b&c0m23YfL5tt9ul1FbRaeHf>np8kVs
z37`A!6&%1&svTIK$z7q{?&7>T)cf*}q2R0L?sgAs97%WIA^k)au+2Fm?ggT_ibrW3
z2dp9~2&@6Yn;d#Fhk#{l5Ap5rr~RqS%+)N|!Gl<N<zAODa&K`iqO)G_)rK<3KF6m6
zmEjThUC58VC&!Id&YG$Z8flfnS*U^PjqbAIZeJat#k0Ti6gXvB!>1m4PFf8jGJie)
zyYcR4jb~DI&8(4#g+S`7boUYi)4J(;`p(->tIQL+`c|l^K_F9hn+X%yNn4h8FG|fW
z%u|vLb=5j|X}q>D)%;qT)c&35c4&obdX*#T%G&El*oM^$<u}SND!%q}X`5ZXipl<(
zgNRoVcc|>-3N3Guq)`hyRf+HZMM=(|uH{!rzt@9Dpe^W`LPc92(7frca{2lU;Tml3
zWWU-kQSR=23le)M#GSU~Hj*0agIs_(1lPd6k7t~kL0me%5x=LFZ@)UPK}GPS;`_iz
zo|y_F{9QKfm#w#bsvd34o!gaL@;8=~)+QuU%*=!qZU7AEl_02s+!=)Q!>ZjamN%0u
z=`1<w%njWvK>SH`C_avh-xea(&YsT~ZW2kF`b?%-+EKHOpx%c42!G09L;#U`B!3|y
zYj8PawY?-%wNHNn;%yexipRd}3w9H`toKdX`It0L_#Q`P;7v%j()PRhUna-uDIjE?
zP2he?$_2=UhS<%KHcJ_suO^Up8EOf(xD?eT>Y*{|uOH<&qHYB$JW)$6ANpzFvD1bZ
zkJqx@et3D<h^MWCo10^OPbvWtP6tU*Tm3%qEjv4Q?Ve>pgr&w<E8eutOEt&K@4^{c
z1bgdyUw`HQO#aASoLaw%==QU)n-3pTn#6K~t`&Y9^{T11i05ZekuY%R!u4c4O1M<1
zR!?ObUI0l^X#M)Qs!C1mXI2m0gQy&V$X^sU#r+1<*t*&ahfixNeOvxI@~+t0Z>Uqq
zwUtimK5*OH{?>MjX(KvNJ|j1@=DxeA9K{FS3+8d^eA^79AtdVTDKf8T-om<drPvM^
zjhyit7@v#f39yq^3;MI6<o!Ortf`w>V>9*q$a#C2;s)g}d7?<W!jP9?SFDCIj9nRQ
zC6;b+AHOr~Zu`9BzHthn)NqsB{<(Y)GNYy`7iRq=aNYSg8Il8`>KuCV%1;gmpJ|9$
zCJ%)M0c3f0sO$4Z2)nd1=?>fd=cfJoJT+)BZ>r90fb4vC1s3Jy9<B^>?$*ZNE-78z
z?ktI|mWO=&F;w%YhK(JvPDMt`)y28^@Oz;U`cR_E0kxE5q4;r1LOhE?4U#BCU*&4h
z*~_0Thj8oammW&LBk9`mC0yegguGt}%JD<v4&lc`r}g1)`47@Q6+K&V7<p%2l~n!s
z@wsQpke_1}MP?DoW@HzVGx&e|?>)_G<dM2Od68EyFHGTEeRM9Z4gomw&&1*qN6rA@
zFj#}?y$>L^aopN*;wg6uF9~CuKz<Apud*Dhm5i^grO&>)l)a4B(1bufIXR~0iewJl
ztfL7=#0e=(c-|b#kXgVORY^<TuX>tj3@Nu<&~>EGEDFxvjFyH#`kU7mzND#DRQU-U
zBi)@D88uuN@p$_M;g@y-azDJ8-!ex-?h>iWRX5z~4bLo~9F8bOIB-sKdt{Y!mk#Z+
z*1UBZiTN;&&dEO^nv^do{-BxhVF*r<d7GT#`eo<06ObE^?!Jxc>=ZNW#-iTR$o1Y1
zm9wjfCuMBynCTQ6QMB7|OIWq<E-nFQoqd<71z{a!oiw)sdYZzcUs{GVDN6KrjGTi&
z0;I28-(Y{o-I`Xaj2agdUtJC^Ej4DG=BK)L3;M~vq1<-CFJ`Z}366WR^wbml&D}NI
zB8&{-WWew%F-`eQVor;*OzACh4ZLoZbq&p*o;sNw!;JdO%VO}c?-;JFw#o{ntcnnp
zD-WLh<)dG<vSsHK6PHJF31WEt4n)e)6lZ?Y;9?tS?BY~7IYpMRURl(0^j+v6mm$H}
znHr(zgdq%#Scvesq#F~X8$uV{g6mxX(G_cLY)#cZsl%!HyZqU=*l82X)K_mf%0i*3
zt{(TS?JL~eFORQ>>?=g|U90IxPik<{nsvC>aS0*?oDbNP^QQIOk9}boV`2tn12~u1
zQh$a(!tw8^bi6bCJLwko75CG+Ohsu*Sgvl)2W`v;T_;1XA7xEjhcrJrO$=S9pS49l
za#Mt%y#!yGR;)q$z49@PSfMXQ9kj>>v%^w?#%Xef8+Gm(7J`>%S>!?nQPZ2Pf+{*>
zzZ8{~?9tIXUl?9llE%o%wPKyn6Xe+T`R!dgCqO;78^vJhcd5+ZNVsflH29oOmWWS#
z?5sQQ6@T#eUp)>al5i@hQv0x_28WXhSx+sCNOziV)QC)-t|GD$JWu0%9!j7w$oa7q
zYQ*y+RM#byiKhdDsFB&KYPoAwoF!~9X}FQw>H-M+sw6-sTJ5Sn+4oeG;)5gmJWQgC
z5i`oTbe;div1$c98^B`elBo+{V@<_y@8tBUKbXYGOCS{^{F`vQN---ws_Ke0wq~!Z
zIh_~88VB4Q`S~Fbnk8)l?^i}UF|cg>{$pXYcEZRAilbSP-r~iuAO@$6n#W(Y2Np;*
ztxnDJs)=Pt_e7=dec0+3##mZURm|s!!yN9vPW7r@f=TcqU82?Dz6mg4>`(U{+2DmZ
z#@h1j#%`Ximhd1&`*yRLAM!%OC!Xt-Jg8p?zIz7s31QJQVW#>iIbKJI)iPAM`FG02
zRA=mWt!H`;8%x~_Ho7Odkt@!gxRwcv`N#!iiypxJi#N}KAPn{??&?K_e!;Z%A&bdd
z3<a#;5S#BiR)n$WvC*6OyFUjzv-znVyij@D6I+22I_{-d$-#cA;his|bU<=EXig^D
z_G{^B9@o!^JRLA;EW@BD2XBhrq>AAb;;dN}Awc>TET9-85s1BqlVAPcD0FqQaj;7|
z?{7{$&=I57?=7`h{rW`FsypRb4||B^(Z|gZJz<Z%cywh1(_3RV#aPU*87BK47>u>6
zIr11djuCO&{Cbkq3i;M-#NSa!(#S{hcw`4eaC<Eq=kKwsfDp~`5>z_UYl$?k8aXvK
zR)5kY^g>=*QsX{w9IY?R9zf&ske<!UL5@?0MOm0Kf}G6E*_#k>N!<baAO2mUcYy?F
zxoBW}P!YfYwouV1YJ(U%5D3Miv;Y5_li4RYh<8y+PR{zz1|OitP{2unZz$`^%eVWJ
zF{!DkbystqgM?iVfL~*H@FhH4$ZC{NX@FdU4g&EWFw}{7L8GLklq?f$S2bxidW!%e
zpPrR<3y6Z_>!suC0Sv@|xGd~N=^p!Cn=G?N*xGJJISsL%KX+JR+!`|f>sPrRPt{~M
z5%?sHHdn_zC3W~=%9khzL}OIt$?uj(2G&Nm*iheQ`^z2=LbH0WG+L1ShQ`y&|3CSE
z1qA*~z$e%()#7=Q9~kLgZ0rGD063!O-=TaM<ZD79*J|-@+RMujNcvBQ#V3;mfKvd{
z0g;J+C*-$r>R~u=>)^a#&wLJY$ew$K0ZW+9Jc8Sh!~~;9K&9SGKMg1b0{JPJf6m+M
z1Nm)$rkL`pY~YdiKs^z7se1_&aA?){<}+742k5Ss-kIQgV)I`N5J;jp=IjZ08TfjG
z>;3P<`}EE3+L-4M<!^jj8ZqsPE^*nMtz8NJT?mKR9K%OVAE({;lb?3DJAtJ8bC0U*
zKCQTTR*a_e&#mZdp2!ZtE=jI<(2D(IhlG<>BmPFd-*jeQdxb`xjg8IR%Br)gOG#dS
zR@@he=&-&0IaI4rL3gP|^o&h;Mg}`8>td%kE0|K*+1WwVS4(qqQKvQSq*eeg8#Jg&
zCWxki2x4=y+8}RaRS9?2dGa93->v=ArN4XjUr)RVe(sDQkn1HQ-PMd|&CKVr?1`6f
z-(9n?v{b-pD?fH~JN&|LY-evTqy&DSO{otd^*_x(d}hnlTF;}qieG+ix^Q*K<NV#E
z2Z{~(%5CRlP_3UsLmvY8NZF1UxW7)ofl#AAsRNtA2AKACpv%|gqfx}!DEoAo-hz2~
zC@FObjp!Mdjo&z9K72ISA$<E$sbgsLtFm!NeHG9MltuJ4zvPmVAwi`x)L8=l(<EL6
z+KO<+0Xnv3n0{0$JL?q4sgGiUNKr<ZTy28zU2g@l=%E0ZkG{VI%-9>S9-J3p;%4Iz
z(q-ja+|llP2eaMuq+4%lPFk)UBpf)dPM!E|A1l~B$nDw136O9%M5Io`3N*Ug>b6Uh
z1eVkG(9y@@x>j?%H0=l;2n46%K}PfJ#ZGtk5US^>C(TzWzSgGivx;QJQV2UCFWzm+
zdOCf5en5q4vu>jku}6sO*>~tDyf~WqzSd%=)DbHr8w4i>SQ&ecbvg0FlwxY~+c*{2
z&YQ7LSG?1tYpTTuQQis+!p>e6EASvE*!tL`VRep2?zGjn)VjM4`OL8KhC=)#b#Gk!
z+G^_LZgWQ<JmpOzaUg!f&i)B?+FoW}_wmZmVxIPXJ#1I#bu<#OE`qH&`9#(wuH}pz
zPP<lh<iqX$O0(v)JJg@u$+?eZ#6bKj-$dcTa+(MwRYlo4i2-ta<io({N*L#;oz2*d
z82ZIH5uS`4#_{J8wQFr6RBMQu*C)B9FA=+4>IyQc;&YrAL#mHAmtU`zmdLBgH}8C-
zl+J*XTZvU44#ibPhe$WscK=w*x{G3nnkOk0<aRg8q6q2~IIcqX6Q`KCSKaB~7=Q0)
z9pz}DT3Mt8y9Lmm3NQ-|+=8C_(Tu)QCAKnf+d*ICEM99PpGWh2WDxxfdE``S9{c=Z
zYl6$mZ2Rfi_sI4bH|!@Ch12b-aBJ8>%*e{Q&|x%7paD;u7@icl--w*jINklM;<W@5
zKIyie2SgW*{~^+Dk1Bbyewy8rfA0F5@$G(MOIbaM_1r4V;Ygm|I^w85T7vtUEltB?
zZp>y8wlcYOtj@p5n#t{@bz>+Q6A!PFgx$|x`wn4gnFZyWkz`vUbqC6U{-ezc*Ddm_
zFE7j^cRE<2WX#tU#&;P7f{ou&<8i0EsoKpua~yd+S23`SV?^m;W2(Ltw7<5j0sG^N
zha+YlK^J3DRxwa$9mg+;8iPR~C*%Z>O#hun2Ump*{>>Lau$RKobs{Myl@{3~sH8t~
zwK2cRj>SE%Je8U1+9jvj$zL3C9;ybSbjoeqF=}fbN9&&5xNWc9s_AaFZD}Z(b%V6z
z6(PbTRefr*$EcgWeWj~$n4XocbY(ZD*M6lX72EAZegRL^G+!(~aXwM5^B0|nFQ5)O
z9+a;6mHkyK>>8tc+Ydo9Kh|WUWB+~y+0=ky`sICd#_5d@1&=+MWcBpItYpwm2g$N4
zw^n=#$mRk$cs7D-5<xb5=xzkJQs4e5rg$wwT|uGMG}Y{Gh4h--n*`pHMG8RE<iX^(
z)00G4q<FBGwQO`P2iukIyQ*}MD?DK531~K2_ZvUgbqf=te*@N>vwE1`A<o5FI1>)5
z+h4eJM;|^y>h~z}m2k(0I=i*Op2M&^j?;JgsX|j6jy8=)LVw8-U225NLFE{nc|**d
z3&-#HHr|0cm9?&4_nVx_A19ehF7)&h7n@T5)XENRNF*bXk#3p`M6_G&y}U1N)R1^*
z84BIS4Ng_x16+x8KS7vcE2C(AaAq-N<ALr@H>MxSf$_*+_R$!+)P1nH*}AwDVe-w4
z)eKd>kVZN!Hb@2#c|fp{Z?~q*VL8yf_T)1nsAqHOHRI`;c-=}6UBX7Txu9Dm_WNf{
z#0LL>KVz+oD2?)#3%t`nvPPuUgV{yU{7GdaNvSlvY0lP#j)&~Z;aswikC%Q^M1&Xg
zy?>5n*<CHjc}On`%!wMfRP<E*v;Cbsm3_mp<T~90W%b)MS1(GstoEQDoQmk0MwsY8
zHLD|o-UW;`<nY$%-U@)DNiq8;yvT#$+yxtjKur6OjY?=JlXYEfAwLDll4{4y^(!Us
zAEmhso0VUz7qGIb)Ik)bNy9@**2el@QUucvmnCTYda@mJE86MJRGpLA4~#ObXR*Dr
zqicIKT6kTrtgG(zKyJx63ShZ{EXnfjv#Q2BGUGF^#Yry(fY}zOkPUcx4LiYyW}|~h
z{P^Rkq;E(suZC@upTnZqV(`h<o|m1g>TW@cZ@2PVMl&9S3_n@NGRB?2?vO2(XVto$
zY~Y?v7hhRDJ;KNA<lw$8>g|HKVe?xNFv-K-AB;%s)+d|^?4-dDQM-tVX>mYCn8fML
zPJ52BN_+}4aG9gd(=J)*sdF7F9tUR*Pdl{za7g~PtSA}#nK?mVVqkD%Hdok>bw2Z!
zyiDq-bhQZ5QEw<qe57{2*1|bf{iFN#&Z3DJ^YJF@{ZF4-!%YQiMz$8R#2?h+3Uu@?
zkwB#Ck_kiT<Zv{J#oAn^XM(ryi=|42Ykp<x={G`k-&B0fGl0@v%hRhU1eRONsG|(?
zXw$OsIOVid3#gHf=5dHrbSeuA%lpQeeT@nb{$|+$#0Ga^LFKMOXYDH1oZOH5UsO%L
zDH?-@`ZofsUa!nut(-d1Nr;xCyVhFixC)|8fBw|nqERvv;e$VFGHv5LT^NzEbpx{|
z!OX!T!s))T$fSe%9&BZ4Npv|hGn3<#np6X4N+_kQS71paV+L9B&}5@nv1+xx;m|J`
z`UE~u>>|!^<xK7`Dq3Vn*vXg^JJ|z^0UP-Xko2U;8<_4m*iHlH$fMNE(>D}M=^mya
zW48F56y7$XH8xDhW0=%8p-T%)k7l%B?O{_j>HC7D2?ACtz#adF1gMJ7<xEZhr|$tJ
zHFB{#4ji?uyeL)48=Skkv$G>DEiHV@d5sVpB<=(8Zs;*By2>ay!50Kfw<Tp|tZt%d
zceuH8($mfNH)hTx!(Oe+5Sn8UyS`(-y{n5}(qq3q^IX4R*NjaQmM40t0D$7*J5Uj?
zWbm*cfN%?T7WQ=13P2kS#hmjs@F7uqpa{8h{W7!LWl?v{Jg>!-EZ#F2E%xFy-Ne0n
z_wIG)Um^-5AQ4t%@+R<Wq!Nt*0`bL|p{!{++;vDS!!_NXR!|^NT8V~VCK078tsjGf
zUXI#ukkQzPTD>g_0IQ_@nP*VGpEjfC%z#i@Z`hatH>{t@C+xoa<~)&O2}Zx{W!qLX
zy7D7W_e*Oz>G{s6@CpX4q}KNWJ6F=kZ@tpw)~$WjF;)4Id6AkzCE9Jgi;~cDr}C73
zby%n}Rgq`l)^KNy``56E0+)s^&ml3sa?e>JDTg7ZJuZXsB}Ja7I+rQ)(};`RG@Ov9
z&jibjXR6;@TKe2bo3<U%FS<+RF08@pZlmfb*mu4$N_;4ziJMo_ZV#MVzIX9M2dfeX
z?^VoXF|NUVAuoM7Ir3`m^V0o_@YQ#!oBQ$$omI}=K_4VnXlafmUl86#SC&<_U~z6c
zy~8Wqr$u5MhWSQ>kPk$Mt2ZCJImyj;T8LD^@2YTdBGgy6=3DWDb;eyu%_?s)EtPi{
zRHFD-OWTsAUt%jMQQQWq)DGb)Q7bw61~npcwbH0C6C0k)>E+F5M!krlmj`ZX0!R!K
zF^8SRrYu#br{U@ri)A|_+cnLulNq&XN@oe1o|lmqB0J-XGW!Iq`<TAb=Ei%`Ch2BI
zaO-GlP+u1NTr>aKtTUe9wJ%o3GUhQf&ucqN2!A@j3oH3q7RL$6xhm8_1*^y{<za4X
zW}y@??dIy*DHhJIz+&F#a$?duM=L#s4ij0;4znu;4&R8KqtON+NVK)wnfj<0Eiq8{
zs~}oq)rYczAyl35AuD6NKpGXysYk-Gw!M|1T<N(bCgwyc854K3`u>J}To%KZqLdZ^
zWZ!w((;Zg&g`BGzdy^-(Xc0P@dAf_d2BrJ)MF$p;1QAV0A{#1Cbb8flsuEXwfU40h
zG0mIS;deFCvB*_mUdq!c|5<>R>Yg~*P7D8GU#GJ%dkxuJ_h#n%e6Z?tkeGl%N@}Gr
zGqf9CM~q8vRS(Ds77D&2VP<5algoPQ->Ri4Rv<NU%W_58Rk@%Q;X7PoNp))aEgt4N
zb$n2iN->iCys$d;#o@%5n6jCj(?K=9+S<xg&5X2fn4TDUTp#`16P@k8*d5(pS#tQ6
z5Vd|)X0D;Y_QbwqYD=dm)$M$62Q}~5t(RAbKHT3SlFBz7a!V_FDX%m3Yb&;Xc;z|r
zDO}m{f+OrfLe@~nR!xI%&Z%K>Np4G?LZRTu;6ZX<eMHSem4`aMwIxR{FyxW`g4WMV
zMs)6Pm$I9!8bi9t!P;Sdi=s0MIlVLAe5y30fGpaGuc{OCT=2|#brar%s7e)1q1Kvu
zP*Cj9j<Xme&-5x81`kz70$EiOgl%WTXazc|+XB2UiGE{HVYztoxYA!_dc?8qZdE-e
z^t9%!y5rCsua7?uH0SL_<ZW#|F|)BP69G;;&x$byvdGpL#M7V4{g3B{waPByX4wT&
zm2$s`x*p;J4!$l#ub}7hzN~R3sESn>Z50PJ8%X@zyR=ig5AlAx_>2?s5c%5iHD7W{
z=Z#>~$Z)Zpmdt41ZrJ+r<rOa%Dhe%%r8~$R*weDy;m<G&yMQvM$tgoaYkhmRx@y7E
z?H4@IPqF%5)1LN#!X$_jAU484d~h`R7133jXI1K7_oB5@ON$3l;nc<yxJ}(dd~gCS
zv>1D5(Gh~p5IOV_dq}qV%SF0rervxP+R${BKEZrv#ko@D?gNH2|G%PPyT-(X$<SF`
zd~w7L%770paOU0t-p4Wz=d)=`0wc9}4a()<)d%zT*ckP-PzJ)|9O!J<9#GhFGPN=#
zm6cv((S<k7cWsu#o0gTR$n?#CNW8L{PZ?Sxly%clf0!q(#>wJ1G$(7gRGF4uWor_Z
z81znVlC&pw_Fi80v|81O`f3k*%yZ1uXF1s!IXn9-u4;11hL)s$75*x4z1nj;Vl9bq
zh<DP>SDBicLln=ZgiVTjBE=6EqAI#{OLMcgMK0~oC1}CrITpJsC1JHi9iPdv$2g%4
zE#Cg{<cCOafszv~)WBtHW!u8+*XcS~lxD0pp?QuDf_0XQZ9_~ym?u=qKA8vFVAvRt
zkXM$5xJaheTr5U8uuv?#rjMvGYO}YD<jQk3G%fXqSDhHRc+x`2(*qN>P^FlwA4ENC
z=WO3{+`FB-Na=098m*xl+jbyerh;0;<zz)<PZX!7zHmDxKZ*}YWFYPN<dIk8q*Ri{
z|6H=@cIyorZe3OV`A@$lKI!FURirgO&}M=v+uD6JdI|+6E%TTecA-m#RxQgEqqJk!
zEwXbma*3H26*+d@9yEUr{5*oy*V51uR=PRNg><wW!&M9fvYK|F(V6qSRDpxJnOBxN
zCl7M~vYQ6Qi&g;cUNS_?*b(J8&YX8)I8VE<Q21w8otJz;&yCK_`*DsXSq!?+c;6gH
zR(V?wiIaPZcDd1ehK|dFI_j(oF823gp*$${rg?`Cm^_`L+J&T8lz~XvuS0TdG+LuW
zlOm9}-0=Wi`D=~yF6B`Z!hKlsdLn*xGynDLY#jvk7GU~<1yF`@d%cn@VF@jLeO>;H
zMX%jl-NBO$2Uic1gDIt$Vez<wc`*Z2mS`)jcAeZ_MCXs4@|4!P?QPgd88I^r0p!D0
zxU#!pyjj~;_^Os<nPyYe8h34yT}$V(WTbzd6{cDzkct;k{<C!!7oie;zofc;j^m5F
z*8F#ttO&`{a*y`GfP)gtn>S7vY>3j>?sk9i!q(&vGw4-0jY(Ld@^J3k9gE#nU5n(l
z;oY%9^93wfuQG=fqa};f5Y^S14t){;E-!!JqQV<YvZ(L?d1Bk<Si8Q6)pX8>vVT^1
zrS;}{sd?K+tXIaihCXfbVt1W&+bnA&ug6p8yVR&UFU;Dwo&K|r1dIc7FLbL?@84FF
z%t$FBY1Ps*_*iX+jm}&MkeD_tOU(9bRBzJIQ@tG%EkXFLmLyWa!-OzCNB8`}d^5xH
z0oG%4TkF9^f&YoFe8R5ds^>mOPEL;JXpG0PaHuC*;IKa9L%`gzdl?s^I=@nw&#R^S
zC^dX@`~0Dgilh~RLwIPYZ9h{F3|}}vTeX}TQ;D7E>jO_TG&Cj%FV`Dxw+&oIJY2@n
zhPOd=Bf;TGzuGh`onlMg5{Oco;{TSBJicpvXgQGQ#6~&RjL@bV986?722Z$MdQz?;
zVMTzuBk%pu@O;q)AaC8~XCpZ0{n_?E2vuLd(EJxftlG;Y@}nh|T7OiXmw@8S##bW$
zOdkbQnUoN=ujMWtfAV<$?de$_$Rxkb_Feu=!3jAe1cpy={hPM#>A4Fm+Rq?hnd5(%
z^DM(#4KxxYkJt#_LDLC9?blxb*%AVIO7vUv_@5}pok8hxVxZOZ{?}^Axj4K*1#r+t
za7nSBiMzlu5e9ikHu(F?f4BDi+4DcG{aUgk^>;V#-6QJBzXS{gPqkfA{eawE|5NJ9
znff&G`tPp)Uzx}zU4q131xm~_$r?ai>cxv0+FdD#H+f;<7P$m~fVbD%GZpfGx6qt{
zLle9PmID8S;cG}b2gXGT{>NSu_6QU^v)5d?PVw;S{{ZTLkKunz!1z!!=zD_~|FxPh
zLsbIMs@qUt@duauo!<%3*9(_FBwjrG^1lw=m7JVQf4U<1F;vyXSK>M(@vraS1;CCj
zu&lTw?|oLqzv0;#6#g&!B}y&<`Drx@P73`S(};+P|6tn3@bJi`GYH^_!_E*CLiF#z
zkq=(`J$(OcW_Wmoic$(>LBF3Fogj&4x}!5JmG@4({K^~L{xj6ivj5rU_FW&8{%tF`
z{jb$r2qd}<ULpG@f@G0;dO=7EWc=&ko$(8Wzq|J@{9>lF2xyJ!e*)tLxX$S4kUfwW
z3#ffxFyTczSp0ztm<FZr%}{Vx&$@5*ndPjI(g3`vkjv=oncV%wC!6d87Bf6jOLdZs
zyn+BUMBOi=oBmNJDD}TaqKDMA$H2Jv(_R`P^^SiIP{i3nb%}bG-<uCqw&BVINv!kl
zIejhc#R>*TQdY6Fm-lQ(^YdfGAG4sL3`A<yaTq@;7<@KJ-aV9`xpBmsl#t(x<r@-I
z;8{aw=n?@0s((&uk*I#Vr!IE%4ycR-s0Wy}t4~2dt!|RrP%V88+x?9f1A^-6>c$1y
zx3A}OadLAj!O>_moLNF5PWUyt*kT}6Nw>kt-MuQ+0$4>%i|8fX2H%vC(%;9emrX|)
z44jh<!FgH#+%}B69@wln;Nd=*8py*Tr=TF9v<+f&#i`?6NH*MRHcS0`Q<Y+VSIIdP
zqH;11C;8FYSv<ZDt{4&PS}-@I#Ds)|d}heV%mho(fDzY4aB$e{2t<_bTH1g`*|<JW
zq=}B4oLq!S#pD|@IeB>_a9EvgsnuAahSRE3m5>s#Ut@G?g&t2#*Mf~G{FgQIC<b?p
z6TlV(9=V}FV4dr_*K#W_IN@l|ttP^RUd#>-2WkU&N=ZrhKf1c<WNMn4YOyKwwzIR7
z+Q4OIw$Qep7&}zm18iV~pgoZUP56N~W#j8k9ffq){7iI|(*&ld$j+K!a@L;avgp+2
zGN-DVBJZR<Z2~F0k<Rcf>)fiX_AQr|`3czHFpb&GKu1MIZ8|wR3UNYc((l(%a83D7
zQ?S*pA2a=<GLy2jX!;!n&<E#CtvdS-ZV_C9)!$GYNS*8%?|HDTh}D7s1o~ZI=6&*S
z<&8Ii@mx!A803W^Cl{CEZzg>)DEOAhu9w;PqR2IXHIS35XQU7LPbR$opZ9;lL<~Y@
zu6d;$98Hg^s}>lqjiNtftzf;_Cg_&OBenVQ2wpn-5D|f*aTp=WdLzNe&;G8S<F-nI
zmxRZPvP^Ks7uTL7bm<0bHDF7Si#+F~rio!yhCMLPlOHjM{%MGtVB6PHv-2$^q7s{M
zdZ0bmC+QKsOnkaGhVW2@PheDg1`m@%p9qo%$eh$wdlj1&IZi%&If!_5()T3A>7+2|
z@G9PMF|w}0d|fWiKgcZ=Yz<uU8E=7Wah<5nM^e*4&*lIUnE(<<-ItRtS`csHIAP45
z;c&7&)liWCalplhDRHySmh<|I#B?sJM@86ar|8H1BHXX{Py4^@Z$;pFOmG`dWc`f4
zkJ!~ce^r8XSvpPYti4tEBHFa`{#1y}cY6AnkdP;SN8j6HWL-ZiqZ@)`zRzs<7mOTt
z3>`oVXO<UF$a36S(I1bkJ+Y=`{>Vmk&eHv(H~FApOT6S%5ODBdMQr#sRgTN<7-f&-
zQ4`bNw>8Ahv`UW3sG%U(9PI4b3*yf<-7OtB@P~H2JwlrJGf!^#ge5r)@PT0PFKD{6
zdML?~7qBgT=><nam0SGd#Ke1ekIe>g4rhvxoGSMW+ayW0<GpW=BjMJ(TobO7BWTO$
zE?=#^kXuDH`8N2+NYXsLVtguR8Fk1c{v=J2tfMgd2CrrF>~pQUgHvf|kHysO{$DBd
zT%4xS`~yKcFUZKch7b1TjzrZ8Kf~eZ71T=F-W>pI!`n|@Lav8?`6~N;#zr*ulj_FM
zGUe-W%UP6&=hK})_r)pTTNh`K)vtVI&xgh>O;qq=B)Oms3#7Hkqjgj+ng>e$+Q0(~
zxDafjdNs!nli<D>D>hxRXU1Dwq&vHaT|BlL!y;W5V~<4Wt~pLWWUkD4wd}mmS-U;u
z&Un%h{qb&+1ta5ExU^H=!5nI#`(Rka42C<(lzJ911zX%#2!#76p}OOWthQxWFPaV<
zCNq`>maAK5<tqwER+Ykyx}Pb*p<Rc4=~??*owE*PSMsLf4^9XzTrnH%e$R*3$wD`Z
z_OLM}^{#V`#tAV@?!!W`<4^X#n5QY3q?wQR5SONUHazE^SHbUV@?2%aywFd|@mfDm
zD(Tz=MoSx&;JO~2#^An_=&$E^q~*)9lkdaQ?_`dM@&A$Ex5&J=YX%O<@_ySGIvQEV
z#Sgq@vb8&dn&H4o6ml?)Pned}+FEDiPG=(#su9Qg1!{%tH+)N0pF-O%Eo>K}hOGtd
z?9k4Ff7SA7K3`eAI^Cp*$8+u5&(QDTUm87Jof0DUI-PD~^0KQKe_gx|`*Mg4j4#J6
zHAKrI9k;GUij{GnY%jDkKG4&d9WOFnRzX}*ToQgD@ocZ*?JcSYlDd{tf_Oiaq)6!!
zn!OoSTUq;hYt$ia$e_-)PIF^^_61{2oCFpwEm&s#<YDTN7;za_QN<W}AM<3?LWGUI
ztS6j#Jr>cu9kds%6=ZcZK;_v=uzI}km^ePXIMDB8+++rJlE?nZqs=^^*l*<odhg|I
zb~Ry{d?TmR!DB_=(a)0Y9HBpI^YleIrWl-N^d&qyk7}J7e#|NDrB_9A9W3J%SkUT!
zjp8v(Fjq~uuZChCR~J>I=m{e`pf~cLHPL(S6=v_wOQlI|=hhw1>m$Y#$t*Gu&ZFvX
zlkbz0Lj5_9jx80`4f4bs=2?>CkB&}5+WU?~7}#oS?`hX;+AQ77IhB~yTCi~2^UlKQ
zQqN0&pBbDe<PAFQh*`avTmD?HZHn`5c+2;hU43ik>96L$7M{v1HxownJ$czwzAEEB
zy(GzzCg84S@?L<vuUdK}q}#=0`z<Y^ZuqE`RZ?`+$;1F1?|4g~J@qQ%?8h7So~s*x
z+BU}|7(Mf&se-EuG~jE})Z&vEZTH8cjC~VKaml`4ST(O$El(}Q;0O8``aI<P7Cn>K
z-$xfC4@@u<mPW0@(ko2R+RpJ@{$$nUH$FT@9h`RMlhD>cXTV}rUXR&q|0pi?%sWjG
z*RqVh%Q&>t6zt}-=o^adNpM*;4t-J|6=i{v$@#n|#z5Zh7kt=X=C#$^I8FB|nspt_
z!`@!2!xm*Y(=s#72MN89>q7`H!|o0!bXHNBH%4@Q+Pbc@5K7N|XOpCCJP2600*s%y
z*|A-3m&B6ysOK@7SDB9!7=It+KN{9rm+Zy3S>ydX>JrP=E(==kH>}-E^Y>q>j7Pd^
z-yqvescibtj7AkZPv4oCy4(GrYBH$VNVu<>L5tK;Kv^Y10Wie7A$OMB+$=@e*FOb(
z%N3c<th0JG?ECs_R-Ju(QO7fMd}LaHKfF>o&Ul^i;*|OI&|k}CqmxF$*kLBJ80-T-
z*5*PqF3yXr>}bMjyQfOJDLyjJX->=T)HsQ0fGk)hXJN8$*MDJG%#XByt7D?1gS-G$
zJ-XR<jDW*Ye>Ku~r@YXr+4$}lY9nfs&h4q~HnR6smWf5gV^3TQf6y@GcRD?}{l<0M
znL4EccB&~WQDompE&DCdBq}vSHo4&Qjk7uHqR(F!A(7h)*pof_Ip7Pa?c6Oc;K@!7
z46bB;{*+fPzGKJ}VK1>M-Ww}}?N5G-2ZHuRlpOrwvqU+&+AmSd>|5FB+DT8T7#quo
zJ#SWVv;KFo3opfuHWe<DG@9oj72vZHW-s^hA5Wrp$gj2_STg;d`}E;3OoKi-4e2S&
z^o+i(#?5qdc`^B0d)BY(`10B`wuBHLOgx{l&WR%B)zF{m*H3L8yZ3*|-uIzbIa$$m
zZ;E%G+t6(dFo_Bl^7UuR`++IVULYNJDjDCt>)v6<gzSSi>AMB)Eo5D7^p}A~oRzEe
z=gu2ka0qaKPmgg!b3fUapc3j)hznd$Q(4)jy4`Vn<t&O<63RH;&?|uT*k43);LALZ
zv`#k~BI6I52S4YY<AcuF{IHNa?l&|Aj)V{&^>=lb>Ia!ZLqhhsxq$fKK@}5^j8d6C
zL|;;Zl8fda1V2Cd)FGo2QoJ1~am&D!C0hN{f=#UbOuDCatsbkGabf>G;yfH-S#`0O
zJ2TxISh?|XBWYblR>f-8%lPreYZgqcVlicJMkl$TN5Yyz7avXfrLA^Z*H%bykXwxx
zl?rPMz6dkXp?!aY7#F9)o42Jez~8aCY2uT;6$-0WZJNG^R85h9l3$T<M>hIo2~9U2
zbRgGhjEcB8H3!(ByVdqW0d(%ib&u9D*@V;1VqJGW%fp$E`|%e`vB7H|*dIQmPJ*(X
z67F1N?gjykufgF7RpZi4j$YlY9w~k+WrM2>>vPnCf&L~sQO32n&(^^=LWNNHrRA%v
z)AIv`*?<O{jXF;O>0T^2wIj39lB50R?77DoNCop)>`xz9uECX7rBaxItzs*mY#Zt%
zH10Wu4HWiwSM&}Xe^NYN1RoE*f0&E)0?JBayrb%qCb83KynUlTiN!&BBZKo3`-q<S
z0?)o=n2WHhdD~yBd7XQ{JE-aXdmIebwmQQL_;UPmYU9`0fPpl9!HIh$vi%!!l(fWJ
zgmoUaQ*!nuoK*J6brBX<twC71`LqU-jLd!4Rc8<HHd;4fRM9L*q7*12nN1yPK2)uL
z!|P2CC+$I+RzGWqpu;4PKZ%5wcU0<%@n}nZ6RjgJ98*vJ9a+nj`6hP!XkSanp%a<d
zp<io1FJc3oJbgMdfcy*)j!q=|*gZP61_Y0^hUGtk!*{#Dk`H^@ia)|AH4k|0_s-5E
z^hTVPsz$V`g^xn<y2UfHb#DB%Jv9jYVb+M(TpBEXxKaL0=W~(xOi5~Fpgr)(m!uCc
z-SHe#Am@#(0~f&$Be^s(or2sQcA|8cloWGjBN|_G^v7Q>x8WH<U2mL4>4amHfcczV
zwHj|DE9;^0_2?SZsBD~GIn6xUBs#jwl*YG@<^1Tnle5~VT(GRvhbsby<;FrTr2(hf
z-PLJNzC*L=syi9FZheAX7#q<zWhHTgG~?*hudDnW<Q@G<!G0Xp_X`#5;`11sbl!9p
zlIV-5IIP-LtzYx=Z&FkraU9^AkdwQXrjC-CJJ0Yb)~aZXq|yJc#%q3!%XVXHyDrVj
zW)uN+4WFI(lmu=Dd`Yz^8uufiO|k%Ia11z3erS&6iJY9d-f@qlQIJGm<#-*R^=E0w
z>_!2AbG}8O=fQw0S-z>W({#f<RL>?k_+g?0<Y@JiPz#zD0~AWD&rxrpP1$IIu(u<I
z`o=<fz8DwGiEP36=`okz-%l9#yhO%N(il`HZzik%r9fMjjX8QaifFd#LiE(p+_vLL
zXN~a_uHhQZmizo^DC(KmXKL2cq_W3kWC;?+Ps)>%SDPjav(1^4q?7fh-olwe%>~h8
zk7d~?dMGtLYNxop9Go2cuW3e-a!`;kFzP-?_-l?@k&*EgivCQ-P0Uw3Ng?SKJ3=YE
zywb}$65VQckdTig#gFZTzNvA>ZagFP%JxIym)()asOe|)Z20zUc4>pv!Ll~&{UR*K
zaJ6_pL*Im?dusC0h@&HNSgui=ozG+C(&*eZR+w@daPq4E*)McHR`4kDFT{DipL%Ys
zDtX5d1HF#=BPz~Qbe8yDd=35{oO#P&ZhbGdXzA;nF^q~QP^&;}DradEkJb>EA!!}G
zJ1)|_W}?<_RCwEv%ldx6vuX3bmvSxePyK1%Kli)Ps$%L|gb5I0mI4mlf3r`~qstI8
z%55)D8Lr~1j!w<AKm+2!nXBth5`Fuf@Sbd!Q*~!|)8_3FJx`Y3I_r9G=hb4}DeaTt
lnTQDWbv{8(&QpB?JZvP{4w<Jt{@a^YPFfkB`^fO!e*@(S3lsnV

literal 83247
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%0D+_YWFxOZo^L`Y)8>!;
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

diff --git a/addons/survey/specification/survey_page.png b/addons/survey/specification/survey_page.png
index 2f8d19d5dd80381fdbecb3eae28c271d9e6826d3..4fceac4b81b89359ddf4db8c789dadbbd608b1ed 100644
GIT binary patch
literal 50072
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
E2cXMf&j0`b

literal 70614
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
XVwgs05e=tnBgjZ7h?l%D4EVnQP*w$H

diff --git a/addons/survey/specification/survey_question.png b/addons/survey/specification/survey_question.png
index b939ae2ad478a0a4e2cec709df864f914564aa10..516606902cb3a17d174f24220b23eaf69e806068 100644
GIT binary patch
literal 56641
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

literal 91547
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

diff --git a/addons/survey/specification/survey_response.png b/addons/survey/specification/survey_response.png
index 67bc1aa943276b70c9bb9e84654a42074c332869..af78bd1977d865710019388eba3c53bdb7e2e39d 100644
GIT binary patch
literal 56037
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

literal 75180
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

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index c50613f466b..2124042de84 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -23,6 +23,14 @@
                     <button name="survey_open" string="Open" states="cancel,close" type="object"/>
                     <button name="survey_close" string="Close" states="open" type="object"/>
                     <button name="survey_cancel" string="Cancel" states="open" type="object"/>
+                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
+                            string="Test Survey" icon="gtk-new" type="action"
+                            context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
+                    <button name="%(action_view_survey_question_message)d" states="open,draft"
+                            string="Answer Survey" type="action" icon="gtk-execute"
+                            context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}" />
+                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
+                            string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
                 <sheet>
@@ -30,13 +38,6 @@
                     <field name="title" select="1"/>
                         <field name="responsible_id"/>
                         <field name="id" invisible="1"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                            string="Test Survey" type="action" icon="gtk-new"
-                            context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                            string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                            string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
                     </group>
                     <notebook>
                         <page string="Survey">
@@ -238,15 +239,13 @@
                     <field name="tot_start_survey" string="Started"/>
                     <field name="tot_comp_survey" string="Completed"/>
                     <field name="state" select="1"/>
-                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                        string="Test Survey" type="action" icon="gtk-new"
-                        context="{'active':True,'survey_id': active_id}"/>
-                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
+                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}"/>
+                    <button name="%(action_view_survey_question_message)d" states="open,draft"
                         string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
                     <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                         string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
                     <button name="action_print_survey" states="open,draft,close,cancel"
-                                    string="Print Answer" type="object" icon="gtk-print"/>
+                        string="Print Answer" type="object" icon="gtk-print"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index a0c35be81cb..7df10729b61 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -146,7 +146,7 @@ class survey_question_wiz(osv.osv_memory):
                         pre_button = True
                 if flag:
                     pag_rec = page_obj.browse(cr, uid, p_id, context=context)
-                    xml_form = etree.Element('form', {'string': tools.ustr(pag_rec.title)})
+                    xml_form = etree.Element('form', {'string': tools.ustr(sur_rec.title)})
                     xml_header = etree.SubElement(xml_form, 'header', {'col': '6', 'colspan': '4'})
                     xml_header_title = etree.SubElement(xml_header, 'group', {'col': '6', 'colspan': '6'})
 
@@ -156,8 +156,9 @@ class survey_question_wiz(osv.osv_memory):
                     #fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
                   #  etree.SubElement(xml_group, 'label', {'string': tools.ustr(tools.ustr(pag_rec.note)), 'align':"0.0"})
 
-                    etree.SubElement(xml_header_title, 'label', {'string': tools.ustr(pag_rec.title) ,'colspan': '2' })
+                    etree.SubElement(xml_header_title, 'label', {'string': tools.ustr(pag_rec.title) ,'colspan': '2' ,'class':'oe_horizontal_separator'})
                     xml_header_group = etree.SubElement(xml_header_title, 'group', {'col': '4', 'colspan': '2'})
+                    #xml_header_page = etree.SubElement(xml_header_title, 'group', {'col': '1', 'colspan': '1'})
                     xml_group = etree.SubElement(xml_form, 'group', {'col': '8', 'colspan': '4'})
 
                     etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_right"})
@@ -175,7 +176,8 @@ class survey_question_wiz(osv.osv_memory):
                         etree.SubElement(xml_header_group, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_right"})
                     else:
                         etree.SubElement(xml_header_group, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right"})
-                    
+#                    etree.SubElement(xml_header_page, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_right"})
+
                     #############  PAGE HEADER : END ###################
 
                     if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index 162e820c059..b494c794545 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -28,7 +28,6 @@
         </record>
 
         <record id="action_view_survey_question_message" model="ir.actions.act_window">
-            <field name="name">Answer Survey</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">survey.question.wiz</field>
             <field name="view_type">form</field>

From d2ee78a0b25c2bb7278f770d28a4b20e20238cc6 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Tue, 3 Jul 2012 18:30:49 +0530
Subject: [PATCH 134/999] [FIX] l10n_in_hr_payroll: typos

bzr revid: mra@tinyerp.com-20120703130049-51f02u2civ1yhmtp
---
 addons/l10n_in_hr_payroll/__openerp__.py             |  4 ++--
 .../data/l10n_in_hr_payroll_data.xml                 | 12 ++++++------
 addons/l10n_in_hr_payroll/i18n/bn.po                 |  2 +-
 addons/l10n_in_hr_payroll/i18n/gu.po                 |  2 +-
 addons/l10n_in_hr_payroll/i18n/hi.po                 |  2 +-
 .../l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot   |  2 +-
 addons/l10n_in_hr_payroll/i18n/ta.po                 |  2 +-
 addons/l10n_in_hr_payroll/i18n/te.po                 |  2 +-
 .../l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml   |  2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 0b2ecd9756f..8eb4e3a500f 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 {
-    'name': 'Indian payroll',
+    'name': 'Indian Payroll',
     'category': 'Localization',
     'init_xml': [],
     'author': 'OpenERP SA',
@@ -34,7 +34,7 @@ Indian Payroll Salary Rules.
     -All main contributions rules for India payslip.
     * New payslip report
     * Employee Contracts
-    * Allow to configure Basic / Grows / Net Salary
+    * Allow to configure Basic / Gross / Net Salary
     * Employee PaySlip
     * Allowance / Deduction
     * Integrated with Holiday Management
diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index b5d5910cc3c..3bd5b50b096 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -415,7 +415,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
 
         <record id="hr_payslip_rule_cpt" model="hr.salary.rule">
             <field name="code">CPT</field>
-            <field name="name">Dedution for Company Provided Transport</field>
+            <field name="name">Deduction for Company Provided Transport</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(contract.company_transport)</field>
@@ -436,7 +436,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
 
         <record id="hr_payslip_rule_lwf" model="hr.salary.rule">
             <field name="code">LWF</field>
-            <field name="name">Dedution Towards State Labour Welfare Fund</field>
+            <field name="name">Deduction Towards State Labour Welfare Fund</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
@@ -446,7 +446,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
 
         <record id="hr_payslip_rule_cgti" model="hr.salary.rule">
             <field name="code">CGTI</field>
-            <field name="name">Dedution Towards Company Provided Group Term Insurance</field>
+            <field name="name">Deduction Towards Company Provided Group Term Insurance</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
@@ -455,7 +455,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
 
         <record id="hr_payslip_rule_dla" model="hr.salary.rule">
             <field name="code">DLA</field>
-            <field name="name">Dedution Towards Leave Availed</field>
+            <field name="name">Deduction Towards Leave Availed</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(contract.leave_avail_dedution)</field>
@@ -466,7 +466,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
 
         <record id="hr_payslip_rule_cmt" model="hr.salary.rule">
             <field name="code">CMT</field>
-            <field name="name">Dedution Towards Company Provided Medical Insurance</field>
+            <field name="name">Deduction Towards Company Provided Medical Insurance</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(contract.medical_insurance)</field>
@@ -478,7 +478,7 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
 
         <record id="hr_payslip_rule_ode" model="hr.salary.rule">
             <field name="code">ODE</field>
-            <field name="name">Other Dedution from Employer</field>
+            <field name="name">Other Deduction from Employer</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
             <field eval="-200.0" name="amount_fix"/>
diff --git a/addons/l10n_in_hr_payroll/i18n/bn.po b/addons/l10n_in_hr_payroll/i18n/bn.po
index c40a809c9fb..7857cc95d4e 100644
--- a/addons/l10n_in_hr_payroll/i18n/bn.po
+++ b/addons/l10n_in_hr_payroll/i18n/bn.po
@@ -139,7 +139,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
+msgid "Payment Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
diff --git a/addons/l10n_in_hr_payroll/i18n/gu.po b/addons/l10n_in_hr_payroll/i18n/gu.po
index 217fdb92ed8..ef9a79440fa 100644
--- a/addons/l10n_in_hr_payroll/i18n/gu.po
+++ b/addons/l10n_in_hr_payroll/i18n/gu.po
@@ -139,7 +139,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
+msgid "Payment Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
diff --git a/addons/l10n_in_hr_payroll/i18n/hi.po b/addons/l10n_in_hr_payroll/i18n/hi.po
index 09a12c4e6ec..10a7cf7f39e 100644
--- a/addons/l10n_in_hr_payroll/i18n/hi.po
+++ b/addons/l10n_in_hr_payroll/i18n/hi.po
@@ -139,7 +139,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
+msgid "Payment Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
diff --git a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
index f0743236825..f9312875e1c 100644
--- a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
+++ b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
@@ -139,7 +139,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
+msgid "Payment Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
diff --git a/addons/l10n_in_hr_payroll/i18n/ta.po b/addons/l10n_in_hr_payroll/i18n/ta.po
index 44455c501bb..859ff2874a3 100644
--- a/addons/l10n_in_hr_payroll/i18n/ta.po
+++ b/addons/l10n_in_hr_payroll/i18n/ta.po
@@ -139,7 +139,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
+msgid "Payment Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
diff --git a/addons/l10n_in_hr_payroll/i18n/te.po b/addons/l10n_in_hr_payroll/i18n/te.po
index 0a4d00f0044..2e50c615d9e 100644
--- a/addons/l10n_in_hr_payroll/i18n/te.po
+++ b/addons/l10n_in_hr_payroll/i18n/te.po
@@ -139,7 +139,7 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
+msgid "Payment Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index afe991b311c..29fb6fa4150 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -91,7 +91,7 @@
                             <field name="bank_id"/>
                         </group>
                         <notebook colspan="4">
-                            <page string="Paymeny Lines">
+                            <page string="Payment Lines">
                                 <field name="line_ids" colspan="4" nolabel="1">
                                     <tree string="Payment Lines" editable="bottom">
                                         <field name="employee_id"/>

From dbfac96abd78a419607dc48e2f1d95ee0b45452e Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Tue, 3 Jul 2012 19:02:20 +0530
Subject: [PATCH 135/999] [IMP]:improve in wizard of survey module

bzr revid: vba@tinyerp.com-20120703133220-9oqxvgn1c8aqg3p1
---
 addons/survey/__openerp__.py           |  1 +
 addons/survey/static/css/survey.css    | 11 +++++++++++
 addons/survey/wizard/survey_answer.py  | 11 +++--------
 addons/survey/wizard/survey_answer.xml |  1 +
 4 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 addons/survey/static/css/survey.css

diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index e4c83a37eee..8e54351e296 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -57,5 +57,6 @@ Partners are also sent mails with user name and password for the invitation of t
     'auto_install': False,
     'certificate' : '001131639736864143245',
     'images': ['images/survey_answers.jpeg','images/survey_pages.jpeg','images/surveys.jpeg'],
+    'css' : ['static/css/survey.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/static/css/survey.css b/addons/survey/static/css/survey.css
new file mode 100644
index 00000000000..20e76076eb3
--- /dev/null
+++ b/addons/survey/static/css/survey.css
@@ -0,0 +1,11 @@
+.oe_survey_title {
+    font-weight: bold;
+    font-size: 22px;
+    margin: 8px 0px 8px 0px;
+    color: #404040;
+}
+
+.oe_survey_title_page {
+{
+    width: 2%;
+}
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 7df10729b61..85383701408 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -152,13 +152,8 @@ class survey_question_wiz(osv.osv_memory):
 
                     #############  PAGE HEADER : START ###################
 
-                    #etree.SubElement(xml_group, 'field', {'name': 'progress_bar_' + tools.ustr(page_number) , 'widget':'progressbar'})
-                    #fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
-                  #  etree.SubElement(xml_group, 'label', {'string': tools.ustr(tools.ustr(pag_rec.note)), 'align':"0.0"})
-
-                    etree.SubElement(xml_header_title, 'label', {'string': tools.ustr(pag_rec.title) ,'colspan': '2' ,'class':'oe_horizontal_separator'})
+                    etree.SubElement(xml_header_title, 'label', {'string': tools.ustr(pag_rec.title) ,'colspan': '2' ,'class' : 'oe_survey_title'})
                     xml_header_group = etree.SubElement(xml_header_title, 'group', {'col': '4', 'colspan': '2'})
-                    #xml_header_page = etree.SubElement(xml_header_title, 'group', {'col': '1', 'colspan': '1'})
                     xml_group = etree.SubElement(xml_form, 'group', {'col': '8', 'colspan': '4'})
 
                     etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_right"})
@@ -176,7 +171,7 @@ class survey_question_wiz(osv.osv_memory):
                         etree.SubElement(xml_header_group, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_right"})
                     else:
                         etree.SubElement(xml_header_group, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right"})
-#                    etree.SubElement(xml_header_page, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_right"})
+                    #etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_right oe_survey_title_page"})
 
                     #############  PAGE HEADER : END ###################
 
@@ -204,7 +199,7 @@ class survey_question_wiz(osv.osv_memory):
 
                     if wiz_id:
                         fields["wizardid_" + str(wiz_id)] = {'type':'char', 'size' : 255, 'string':"", 'views':{}}
-                        etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0)})
+                        etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0), 'modifiers':'{"invisible":true}'})
 
                     if pag_rec.note:
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index b494c794545..162e820c059 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -28,6 +28,7 @@
         </record>
 
         <record id="action_view_survey_question_message" model="ir.actions.act_window">
+            <field name="name">Answer Survey</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">survey.question.wiz</field>
             <field name="view_type">form</field>

From bd0f2d046810dff445bbc7f09a61b75106207bc2 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 4 Jul 2012 09:53:27 +0530
Subject: [PATCH 136/999] [FIX] l10n_in_hr_payroll: if there is not bank
 account number on employee raise warning

bzr revid: mra@tinyerp.com-20120704042327-qiy2r3xza5xjeykh
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 1c7f10cc87d..22c9eafebc9 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -155,7 +155,7 @@ class payroll_advice(osv.osv):
                 advice_line_pool.unlink(cr, uid, old_line_ids, context=context)
             slip_ids = payslip_pool.search(cr, uid, [('date_from', '<=', advice.date), ('date_to', '>=', advice.date), ('state', '=', 'done')], context=context)
             for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
-                if not slip.employee_id.bank_account_id:
+                if not slip.employee_id.bank_account_id and not slip.employee_id.bank_account_id.acc_number:
                     raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
                 line_ids = payslip_line_pool.search(cr, uid, [ ('slip_id', '=', slip.id), ('code', '=', 'NET')], context=context)
                 if line_ids:

From c8741b7680be5e85af396d3e4cfbd10534f329b5 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 4 Jul 2012 10:03:52 +0530
Subject: [PATCH 137/999] [IMP] l10n_in_hr_payroll: Confirm advice and Compute
 advice buttons red in Payment Advice

bzr revid: mra@tinyerp.com-20120704043352-vsajq8v1f1lj2bv1
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 29fb6fa4150..ab4ed8ec3c7 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -72,8 +72,8 @@
             <field name="arch" type="xml">
                 <form string="Bank Advice" version="7.0">
                     <header>
-                        <button name="confirm_sheet"  string="Confirm Sheet" states="draft" type="object"/>
-                        <button name="compute_advice" string="Compute Advice" states="draft" type="object"/>
+                        <button name="confirm_sheet"  string="Confirm Sheet" states="draft" type="object" class="oe_highlight"/>
+                        <button name="compute_advice" string="Compute Advice" states="draft" type="object" class="oe_highlight"/>
                         <button name="cancel_sheet" string="Cancel" states="draft"  type="object"/>
                         <button name="set_to_draft" string="Set to Draft" states="cancel,confirm" type="object"/>
                         <div class="oe_right">

From c06b2854f70542ae724fe8c4d7ea558b0a3140d5 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 4 Jul 2012 10:47:41 +0530
Subject: [PATCH 138/999] [REM]: l10n_in_hr_payroll: Remove food coupan amount
 from contact it will work with qty now

bzr revid: mra@tinyerp.com-20120704051741-v5ab5xws4x8acsah
---
 .../data/l10n_in_hr_payroll_data.xml             | 16 ++++++++--------
 addons/l10n_in_hr_payroll/i18n/bn.po             | 10 ----------
 addons/l10n_in_hr_payroll/i18n/gu.po             | 10 ----------
 addons/l10n_in_hr_payroll/i18n/hi.po             | 10 ----------
 .../i18n/l10n_in_hr_payroll.pot                  | 10 ----------
 addons/l10n_in_hr_payroll/i18n/ta.po             | 10 ----------
 addons/l10n_in_hr_payroll/i18n/te.po             | 10 ----------
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py  |  1 -
 .../l10n_in_hr_payroll_view.xml                  |  1 -
 9 files changed, 8 insertions(+), 70 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 3bd5b50b096..5140dd84299 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -184,13 +184,13 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
         </record>
 
-        <record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
+         <record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
+            <field name="amount_select">fix</field>
+            <field eval="20" name="amount_fix"/>
+            <field name="quantity">worked_days.WORK100.number_of_days</field>
             <field name="code">FC</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="condition_select">none</field>
             <field name="name">Food Coupons Allowance</field>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = worked_days.WORK100.number_of_days * contract.food_coupon_amount</field>
             <field name="sequence" eval="33"/>
          </record>
 
@@ -424,13 +424,13 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="sequence" eval="165"/>
         </record>
         
-        <record id="hr_salary_rule_food_coupon_ded" model="hr.salary.rule">
+         <record id="hr_salary_rule_food_coupon_ded" model="hr.salary.rule">
+            <field name="amount_select">fix</field>
+            <field eval="-20" name="amount_fix"/>
+            <field name="quantity">worked_days.WORK100.number_of_days</field>
             <field name="code">FD</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="condition_select">none</field>
             <field name="name">Deduction Towards Food Coupons</field>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = -(worked_days.WORK100.number_of_days * contract.food_coupon_amount)</field>
             <field name="sequence" eval="166"/>
          </record>
 
diff --git a/addons/l10n_in_hr_payroll/i18n/bn.po b/addons/l10n_in_hr_payroll/i18n/bn.po
index 7857cc95d4e..42a4b326386 100644
--- a/addons/l10n_in_hr_payroll/i18n/bn.po
+++ b/addons/l10n_in_hr_payroll/i18n/bn.po
@@ -122,11 +122,6 @@ msgstr ""
 msgid "Professional Tax "
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,food_coupon_amount:0
-msgid "Food Coupons "
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
 msgid "By Salary"
@@ -165,11 +160,6 @@ msgstr ""
 msgid "Error !"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,food_coupon_amount:0
-msgid "Amount of food coupon per day."
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.contract,other_income:0
 msgid "Other Income "
diff --git a/addons/l10n_in_hr_payroll/i18n/gu.po b/addons/l10n_in_hr_payroll/i18n/gu.po
index ef9a79440fa..e50fe1c22b9 100644
--- a/addons/l10n_in_hr_payroll/i18n/gu.po
+++ b/addons/l10n_in_hr_payroll/i18n/gu.po
@@ -122,11 +122,6 @@ msgstr ""
 msgid "Professional Tax "
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,food_coupon_amount:0
-msgid "Food Coupons "
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
 msgid "By Salary"
@@ -165,11 +160,6 @@ msgstr ""
 msgid "Error !"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,food_coupon_amount:0
-msgid "Amount of food coupon per day."
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.contract,other_income:0
 msgid "Other Income "
diff --git a/addons/l10n_in_hr_payroll/i18n/hi.po b/addons/l10n_in_hr_payroll/i18n/hi.po
index 10a7cf7f39e..55eb291e05c 100644
--- a/addons/l10n_in_hr_payroll/i18n/hi.po
+++ b/addons/l10n_in_hr_payroll/i18n/hi.po
@@ -122,11 +122,6 @@ msgstr ""
 msgid "Professional Tax "
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,food_coupon_amount:0
-msgid "Food Coupons "
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
 msgid "By Salary"
@@ -165,11 +160,6 @@ msgstr ""
 msgid "Error !"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,food_coupon_amount:0
-msgid "Amount of food coupon per day."
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.contract,other_income:0
 msgid "Other Income "
diff --git a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
index f9312875e1c..88c54554960 100644
--- a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
+++ b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
@@ -122,11 +122,6 @@ msgstr ""
 msgid "Professional Tax "
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,food_coupon_amount:0
-msgid "Food Coupons "
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
 msgid "By Salary"
@@ -165,11 +160,6 @@ msgstr ""
 msgid "Error !"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,food_coupon_amount:0
-msgid "Amount of food coupon per day."
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.contract,other_income:0
 msgid "Other Income "
diff --git a/addons/l10n_in_hr_payroll/i18n/ta.po b/addons/l10n_in_hr_payroll/i18n/ta.po
index 859ff2874a3..614c2e98d4e 100644
--- a/addons/l10n_in_hr_payroll/i18n/ta.po
+++ b/addons/l10n_in_hr_payroll/i18n/ta.po
@@ -122,11 +122,6 @@ msgstr ""
 msgid "Professional Tax "
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,food_coupon_amount:0
-msgid "Food Coupons "
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
 msgid "By Salary"
@@ -165,11 +160,6 @@ msgstr ""
 msgid "Error !"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,food_coupon_amount:0
-msgid "Amount of food coupon per day."
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.contract,other_income:0
 msgid "Other Income "
diff --git a/addons/l10n_in_hr_payroll/i18n/te.po b/addons/l10n_in_hr_payroll/i18n/te.po
index 2e50c615d9e..d79a7271437 100644
--- a/addons/l10n_in_hr_payroll/i18n/te.po
+++ b/addons/l10n_in_hr_payroll/i18n/te.po
@@ -122,11 +122,6 @@ msgstr ""
 msgid "Professional Tax "
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,food_coupon_amount:0
-msgid "Food Coupons "
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
 msgid "By Salary"
@@ -165,11 +160,6 @@ msgstr ""
 msgid "Error !"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,food_coupon_amount:0
-msgid "Amount of food coupon per day."
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.contract,other_income:0
 msgid "Other Income "
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 22c9eafebc9..7465453df3c 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -46,7 +46,6 @@ class hr_contract(osv.osv):
         'other_income': fields.float('Other Income ', digits_compute=dp.get_precision('Payroll'), help="Other income of employee"),
         'short_term_gain':fields.float('Short Term Gain from Share Trading/Equity MFs ', digits_compute=dp.get_precision('Payroll'), help="Stocks/equity mutual funds are sold before one year"),
         'long_term_gain':fields.float('Long Term Gain from Share Trading/Equity MFs', digits_compute=dp.get_precision('Payroll'), help="Stocks/equity mutual funds are kept for more than a year"),
-        'food_coupon_amount': fields.float('Food Coupons ', digits_compute=dp.get_precision('Payroll'), help="Amount of food coupon per day"),
         'driver_salay': fields.boolean('Driver Salary', help=" Allowance for company provided driver"),
         'professional_tax': fields.float('Professional Tax ', digits_compute=dp.get_precision('Payroll'), help="Professional tax deducted from salary"),
         'leave_avail_dedution': fields.float('Leave Availed Deduction ', digits_compute=dp.get_precision('Payroll'), help="Deduction for emergency leave of employee"),
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index ab4ed8ec3c7..124c4f1553f 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -12,7 +12,6 @@
                  <xpath expr="//field[@name='struct_id']" position="after">
                  <group col="2" colspan="2" name="right_column">
                     <separator colspan="2" string="Allowance"/>
-                        <field name="food_coupon_amount"/>
                         <field name="house_rent_income"/>
                         <field name="saving_bank_account"/>
                         <field name="other_income"/>

From c49f2418c25d508cd74387ca47f9963f55640c4c Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 4 Jul 2012 10:47:48 +0530
Subject: [PATCH 139/999] [FIX] Typo in Portuguese official language names.

bzr revid: tpa@tinyerp.com-20120704051748-y41la206dwk67klv
---
 openerp/addons/base/i18n/base.pot | 4 ++--
 openerp/tools/misc.py             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/i18n/base.pot b/openerp/addons/base/i18n/base.pot
index b4d28052ba8..ae6825bfe8c 100644
--- a/openerp/addons/base/i18n/base.pot
+++ b/openerp/addons/base/i18n/base.pot
@@ -2155,7 +2155,7 @@ msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
-msgid "Portugese (BR) / Português (BR)"
+msgid "Portuguese (BR) / Português (BR)"
 msgstr ""
 
 #. module: base
@@ -3002,7 +3002,7 @@ msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
-msgid "Portugese / Português"
+msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 3aad91fb7b8..a81e1e1f647 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -612,8 +612,8 @@ def get_languages():
         'nl_BE': u'Flemish (BE) / Vlaams (BE)',
         'oc_FR': u'Occitan (FR, post 1500) / Occitan',
         'pl_PL': u'Polish / Język polski',
-        'pt_BR': u'Portugese (BR) / Português (BR)',
-        'pt_PT': u'Portugese / Português',
+        'pt_BR': u'Portuguese (BR) / Português (BR)',
+        'pt_PT': u'Portuguese / Português',
         'ro_RO': u'Romanian / română',
         'ru_RU': u'Russian / русский язык',
         'si_LK': u'Sinhalese / සිංහල',

From 21f7a7d46d59384bfe32369633450fda91aa41e5 Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Wed, 4 Jul 2012 12:21:03 +0530
Subject: [PATCH 140/999] [IMP]:improve in wizard of survey module

bzr revid: vba@tinyerp.com-20120704065103-4dxal1knmqftzjxo
---
 addons/survey/static/css/survey.css   | 9 ++++++---
 addons/survey/wizard/survey_answer.py | 9 ++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/survey/static/css/survey.css b/addons/survey/static/css/survey.css
index 20e76076eb3..72cd1d6e106 100644
--- a/addons/survey/static/css/survey.css
+++ b/addons/survey/static/css/survey.css
@@ -2,10 +2,13 @@
     font-weight: bold;
     font-size: 22px;
     margin: 8px 0px 8px 0px;
-    color: #404040;
+    color: #5B5B5B;
+}
+
+.oe_survey_title_height{
+    height: 33px;
 }
 
 .oe_survey_title_page {
-{
-    width: 2%;
+    font-size: 14px;
 }
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 85383701408..8e9710f929a 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -147,19 +147,18 @@ class survey_question_wiz(osv.osv_memory):
                 if flag:
                     pag_rec = page_obj.browse(cr, uid, p_id, context=context)
                     xml_form = etree.Element('form', {'string': tools.ustr(sur_rec.title)})
-                    xml_header = etree.SubElement(xml_form, 'header', {'col': '6', 'colspan': '4'})
+                    xml_header = etree.SubElement(xml_form, 'header', {'col': '6', 'colspan': '4' ,'class': 'oe_survey_title_height'})
                     xml_header_title = etree.SubElement(xml_header, 'group', {'col': '6', 'colspan': '6'})
 
                     #############  PAGE HEADER : START ###################
 
                     etree.SubElement(xml_header_title, 'label', {'string': tools.ustr(pag_rec.title) ,'colspan': '2' ,'class' : 'oe_survey_title'})
-                    xml_header_group = etree.SubElement(xml_header_title, 'group', {'col': '4', 'colspan': '2'})
+                    xml_header_group = etree.SubElement(xml_header_title, 'group', {'col': '4', 'colspan': '1'})
                     xml_group = etree.SubElement(xml_form, 'group', {'col': '8', 'colspan': '4'})
 
-                    etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_right"})
                     etree.SubElement(xml_header_group, 'button', {'special': "cancel",'string':"Exit", 'class':"oe_right"})
                     if pre_button:
-                        etree.SubElement(xml_header_group, 'button', {'colspan':"1",'name':"action_previous",'string':"Previous",'type':"object", 'class':"oe_right"})
+                        etree.SubElement(xml_header_group, 'button', {'name':"action_previous",'string':"Previous",'type':"object", 'class':"oe_right"})
                     but_string = "Next"
                     if int(page_number) + 1 == total_pages:
                         but_string = "Done"
@@ -171,7 +170,7 @@ class survey_question_wiz(osv.osv_memory):
                         etree.SubElement(xml_header_group, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_right"})
                     else:
                         etree.SubElement(xml_header_group, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right"})
-                    #etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_right oe_survey_title_page"})
+                    etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_right oe_survey_title_page"})
 
                     #############  PAGE HEADER : END ###################
 

From 3925f76ce85854e5d4834902a05f57bcfc5ace85 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Wed, 4 Jul 2012 15:16:18 +0530
Subject: [PATCH 141/999] [imp] enahnce css

bzr revid: tta@openerp.com-20120704094618-2eklkqhm1w3veynw
---
 addons/survey/static/css/survey.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/survey/static/css/survey.css b/addons/survey/static/css/survey.css
index 72cd1d6e106..812bbe32fa4 100644
--- a/addons/survey/static/css/survey.css
+++ b/addons/survey/static/css/survey.css
@@ -7,6 +7,7 @@
 
 .oe_survey_title_height{
     height: 33px;
+    border-top: 1px #EBEBEB solid;
 }
 
 .oe_survey_title_page {

From 6e6ef1ed0f7408639ff43434917fc4110ecbf850 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 5 Jul 2012 18:24:11 +0530
Subject: [PATCH 142/999] [IMP] remove res.payterm which is not in any part of
 code of server or addons.

bzr revid: tpa@tinyerp.com-20120705125411-fd1eazoofe5mpbvf
---
 openerp/addons/base/i18n/base.pot            | 10 ----------
 openerp/addons/base/res/res_partner.py       |  8 --------
 openerp/addons/base/res/res_partner_view.xml | 19 -------------------
 3 files changed, 37 deletions(-)

diff --git a/openerp/addons/base/i18n/base.pot b/openerp/addons/base/i18n/base.pot
index b4d28052ba8..6b97092d430 100644
--- a/openerp/addons/base/i18n/base.pot
+++ b/openerp/addons/base/i18n/base.pot
@@ -1317,11 +1317,6 @@ msgstr ""
 msgid "Create _Menu"
 msgstr ""
 
-#. module: base
-#: field:res.payterm,name:0
-msgid "Payment Term (short name)"
-msgstr ""
-
 #. module: base
 #: model:ir.model,name:base.model_res_bank
 #: view:res.bank:0
@@ -3206,11 +3201,6 @@ msgstr ""
 msgid "Error ! You cannot create recursive associated members."
 msgstr ""
 
-#. module: base
-#: view:res.payterm:0
-msgid "Payment Term"
-msgstr ""
-
 #. module: base
 #: selection:res.lang,direction:0
 msgid "Right-to-Left"
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 2165c8ad16d..66c5dea1b11 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -27,14 +27,6 @@ from tools.translate import _
 import logging
 import pooler
 
-class res_payterm(osv.osv):
-    _description = 'Payment term'
-    _name = 'res.payterm'
-    _order = 'name'
-    _columns = {
-        'name': fields.char('Payment Term (short name)', size=64),
-    }
-
 class res_partner_category(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 5159a7075cc..a6a4ad77c90 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -401,25 +401,6 @@
             <field name="filter" eval="True"/>
         </record>
 
-        <record id="view_payterm_form" model="ir.ui.view">
-            <field name="name">res.payterm</field>
-            <field name="model">res.payterm</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Payment Term" version="7.0">
-                    <group>
-                        <field name="name"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-        <record id="action_payterm_form" model="ir.actions.act_window">
-            <field name="name">Payment term</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.payterm</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_payterm_form"/>
-        </record>
         <!--
           ======================
           Categories

From 41c90e8755b5b12f8e6f4e3870eb3a7f8e2b7b5b Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 5 Jul 2012 18:34:55 +0530
Subject: [PATCH 143/999] [FIX] account: add else condition in
 onchange_chart_id

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

bzr revid: cha@tinyerp.com-20120705130455-iy00wseff3lroj25
---
 addons/account/wizard/account_report_common.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index fa3c195cfb7..f84c4e909a2 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -32,6 +32,8 @@ class account_common_report(osv.osv_memory):
     def onchange_chart_id(self, cr, uid, ids, chart_account_id=False, context=None):
         if chart_account_id:
             company_id = self.pool.get('account.account').browse(cr, uid, chart_account_id, context=context).company_id.id
+        else:
+            return {'value': {'company_id': False}}
         return {'value': {'company_id': company_id}}
 
     _columns = {

From 73cbeb50e24d53c2fe4bc2525d17c97c2e0b8154 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Thu, 5 Jul 2012 19:05:41 +0530
Subject: [PATCH 144/999] [IMP] l10n_in_hr_payroll: Remove Allowances from Gift
 from non relatives to Long term gain and loss and Remove deduction from
 contract and change the salary rule

bzr revid: jap@tinyerp.com-20120705133541-zkfrnugrun6hjywt
---
 .../data/l10n_in_hr_payroll_data.xml          | 106 ++----------------
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  |   8 --
 .../l10n_in_hr_payroll_view.xml               |   8 --
 3 files changed, 8 insertions(+), 114 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 5140dd84299..9080ca577bd 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -266,93 +266,6 @@ number of years of service (date of joining – date of retirement/leaving job)<
              <field name="note">Rs. 900 per month (non taxable)</field>
         </record>
 
-        <record id="hr_salary_rule_Gift_nr" model="hr.salary.rule">
-            <field name="code">GFNR</field>
-            <field name="name">Gifts From Non-Relatives</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="41"/>
-            <field name="note">Gift is from non relatives person worth more than Rs.50000, 
-one is liable to pay the tax what ever he received excess of the limit or Rs 50,000.</field>
-        </record>
-
-        <record id="hr_salary_rule_Gift_r" model="hr.salary.rule">
-            <field name="code">GFR</field>
-            <field name="name">Gifts From Relatives</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="42"/>
-            <field name="note"> gift is from relaives whould be non taxable with no limits.</field>
-        </record>
-
-        <record id="hr_salary_rule_agricultural" model="hr.salary.rule">
-            <field name="code">AI</field>
-            <field name="name">Agricultural Income</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
-            <field name="sequence" eval="44"/>
-        </record>
-
-        <record id="hr_salary_rule_hri" model="hr.salary.rule">
-            <field name="code">HRI</field>
-            <field name="name">House Rent Income</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = contract.house_rent_income</field>
-            <field name="condition_select">none</field>
-            <field name="sequence" eval="45"/>
-            <field name="note">Income from house property.30% of the rental income can be reduced as a standard deduction.</field>
-        </record>
-
-        <record id="hr_salary_rule_saving_bank" model="hr.salary.rule">
-            <field name="code">SBAI</field>
-            <field name="name">Saving Bank Account Interest</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = contract.saving_bank_account</field>
-            <field name="condition_select">python</field>
-            <field name="condition_python">result = bool(contract.saving_bank_account)</field>
-            <field name="sequence" eval="46"/>
-        </record>
-
-        <record id="hr_salary_rule_Other" model="hr.salary.rule">
-            <field name="code">OTI</field>
-            <field name="name">Other Income</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="condition_select">python</field>
-            <field name="condition_python">result = bool(contract.other_income)</field>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = contract.other_income</field>
-            <field name="note">Bank account/NSC/Post Office/SCSS interest</field>
-            <field name="sequence" eval="47"/>
-        </record>
-
-        <record id="hr_salary_rule_st_gains" model="hr.salary.rule">
-            <field name="code">STG</field>
-            <field name="name">Short Term Gains from Share Trading/Equity MFs</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = contract.short_term_gain</field>
-            <field name="condition_select">python</field>
-            <field name="condition_python">result = bool(contract.short_term_gain)</field>
-            <field name="sequence" eval="48"/>
-            <field name="note">If stocks/equity mutual funds are sold before one year, 15% tax would be payable on such gains. STT should have been on transaction.</field>
-        </record>
-
-        <record id="hr_salary_rule_lt_gains" model="hr.salary.rule">
-            <field name="code">LTG</field>
-            <field name="name">Long Term Gains from Share Trading/Equity MFs</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = contract.long_term_gain</field>
-            <field name="condition_select">python</field>
-            <field name="condition_python">result = bool(contract.long_term_gain)</field>
-            <field name="sequence" eval="49"/>
-            <field name="note">If stocks/equity mutual funds are kept for more than a year before sale,it would be long term gains and such gains would be fully exempt from income tax. Securities transaction tax (STT) must have been paid on transactions for availing this exemption.</field>
-        </record>
 
         <!--hr salary rules for Deductions -->
 
@@ -372,10 +285,9 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="code">PTD</field>
             <field name="name">Professional Tax</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="condition_select">python</field>
-            <field name="condition_python">result = bool(contract.professional_tax)</field>
+            <field name="condition_select">none</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = -(contract.professional_tax)</field>
+            <field name="amount_python_compute">result = -200 if contract.wage &gt;= 12000 else -150 if ((contract.wage &gt;= 9000) and (contract.wage &gt;= 11999)) else -80 if ((contract.wage &gt;= 6000) and (contract.wage &gt;= 8999)) else -20 if  ((contract.wage &gt;= 3000) and (contract.wage &lt;= 5999)) else 0</field>
             <field eval="145" name="sequence"/>
             <field eval="False" name="appears_on_payslip"/>
             <field name="note">Professional tax for company should be paid on or before 30th sept,The amount is Rs.2000 per year.There is no payment form to be filled.</field>
@@ -417,10 +329,9 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="code">CPT</field>
             <field name="name">Deduction for Company Provided Transport</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="condition_select">python</field>
-            <field name="condition_python">result = bool(contract.company_transport)</field>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = -(contract.company_transport)</field>
+            <field name="condition_select">none</field>			
+            <field name="amount_select">fix</field>
+            <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="165"/>
         </record>
         
@@ -457,10 +368,9 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
             <field name="code">DLA</field>
             <field name="name">Deduction Towards Leave Availed</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="condition_select">python</field>
-            <field name="condition_python">result = bool(contract.leave_avail_dedution)</field>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = -(contract.leave_avail_dedution)</field>
+            <field name="condition_select">none</field>			
+            <field name="amount_select">fix</field>
+            <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="180"/>
         </record>
 
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 7465453df3c..3f00ecf9c63 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -41,17 +41,9 @@ class hr_contract(osv.osv):
     
     _columns = {
         'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll'), help="Amount for Tax Deduction at Source"),
-        'house_rent_income': fields.float('House Rent Income ', digits_compute=dp.get_precision('Payroll'), help="Income from house property"),
-        'saving_bank_account': fields.float('Saving Bank Account Income ', digits_compute=dp.get_precision('Payroll'), help="Saving income for bank account"),
-        'other_income': fields.float('Other Income ', digits_compute=dp.get_precision('Payroll'), help="Other income of employee"),
-        'short_term_gain':fields.float('Short Term Gain from Share Trading/Equity MFs ', digits_compute=dp.get_precision('Payroll'), help="Stocks/equity mutual funds are sold before one year"),
-        'long_term_gain':fields.float('Long Term Gain from Share Trading/Equity MFs', digits_compute=dp.get_precision('Payroll'), help="Stocks/equity mutual funds are kept for more than a year"),
         'driver_salay': fields.boolean('Driver Salary', help=" Allowance for company provided driver"),
-        'professional_tax': fields.float('Professional Tax ', digits_compute=dp.get_precision('Payroll'), help="Professional tax deducted from salary"),
-        'leave_avail_dedution': fields.float('Leave Availed Deduction ', digits_compute=dp.get_precision('Payroll'), help="Deduction for emergency leave of employee"),
         'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance"),
         'voluntary_provident_fund': fields.float('Voluntary Provident Fund', digits_compute=dp.get_precision('Payroll'), help="VPF computed as percentage(%)"),
-        'company_transport': fields.float('Company Provided Transport', digits_compute=dp.get_precision('Payroll'), help="Deduction for company provided transport"),
     }
 
 hr_contract()
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 124c4f1553f..ddd6543df34 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -12,20 +12,12 @@
                  <xpath expr="//field[@name='struct_id']" position="after">
                  <group col="2" colspan="2" name="right_column">
                     <separator colspan="2" string="Allowance"/>
-                        <field name="house_rent_income"/>
-                        <field name="saving_bank_account"/>
-                        <field name="other_income"/>
-                        <field name="short_term_gain"/>
-                        <field name="long_term_gain"/>
                         <field name="driver_salay"/>
                  </group>
                  <group col="2" colspan="2" name="left_column">
                     <separator colspan="2" string="Deduction"/>
                         <field name="tds"/>
-                        <field name="professional_tax"/>
                         <field name="voluntary_provident_fund"/>
-                        <field name="company_transport"/>
-                        <field name="leave_avail_dedution"/>
                         <field name="medical_insurance"/>
                  </group>
                  </xpath>

From 4768c23336ac13d82123a955808fdbff6cd4da84 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Fri, 6 Jul 2012 10:52:01 +0530
Subject: [PATCH 145/999] [IMP] l10n_in_hr_payroll: Improve PT salary rule

bzr revid: jap@tinyerp.com-20120706052201-d6v1rp9bulfxvchk
---
 addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 9080ca577bd..08259d1232b 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -287,7 +287,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="condition_select">none</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = -200 if contract.wage &gt;= 12000 else -150 if ((contract.wage &gt;= 9000) and (contract.wage &gt;= 11999)) else -80 if ((contract.wage &gt;= 6000) and (contract.wage &gt;= 8999)) else -20 if  ((contract.wage &gt;= 3000) and (contract.wage &lt;= 5999)) else 0</field>
+            <field name="amount_python_compute">result = -200 if contract.wage &gt;= 12000 else -150 if ((contract.wage &gt;= 9000) and (contract.wage &lt; 11999)) else -80 if ((contract.wage &gt;= 6000) and (contract.wage &lt; 8999)) else -20 if  ((contract.wage &gt;= 3000) and (contract.wage &lt; 5999)) else -0</field>
             <field eval="145" name="sequence"/>
             <field eval="False" name="appears_on_payslip"/>
             <field name="note">Professional tax for company should be paid on or before 30th sept,The amount is Rs.2000 per year.There is no payment form to be filled.</field>

From f8cd704e890165c2d0b7def1b5f1d813143226c2 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Fri, 6 Jul 2012 10:58:36 +0530
Subject: [PATCH 146/999] [IMP] l10n_in_hr_payroll: Imp PT salary rule

bzr revid: jap@tinyerp.com-20120706052836-lhizhiqy9nbpnimi
---
 addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 08259d1232b..c9b19ee96e5 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -287,7 +287,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="condition_select">none</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = -200 if contract.wage &gt;= 12000 else -150 if ((contract.wage &gt;= 9000) and (contract.wage &lt; 11999)) else -80 if ((contract.wage &gt;= 6000) and (contract.wage &lt; 8999)) else -20 if  ((contract.wage &gt;= 3000) and (contract.wage &lt; 5999)) else -0</field>
+            <field name="amount_python_compute">result = -200 if contract.wage &gt;= 12000 else -150 if ((contract.wage &gt;= 9000) and (contract.wage &lt;= 11999)) else -80 if ((contract.wage &gt;= 6000) and (contract.wage &lt;= 8999)) else -20 if  ((contract.wage &gt;= 3000) and (contract.wage &lt;= 5999)) else -0</field>
             <field eval="145" name="sequence"/>
             <field eval="False" name="appears_on_payslip"/>
             <field name="note">Professional tax for company should be paid on or before 30th sept,The amount is Rs.2000 per year.There is no payment form to be filled.</field>

From 891ef5786ba7d35102d4ac491f043ac549a30aae Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Fri, 6 Jul 2012 15:36:41 +0530
Subject: [PATCH 147/999] [FIX]res_bank.py

bzr revid: tch@tinyerp.com-20120706100641-idkoar0ruwinlb8b
---
 openerp/addons/base/res/res_bank.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index c9010b64319..3ef9188475f 100644
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -190,7 +190,7 @@ class res_partner_bank(osv.osv):
                         result = t.format_layout % val._data[val.id]
                     except:
                         result += ' [Formatting Error]'
-                        raise
+                        raise osv.except_osv(_("Warning"), _("You cannot avoid default format_layout to result in True"))
             res.append((val.id, result))
         return res
 

From a5bfe8212a99d42d5edcd2e8fec59b24e714e14e Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Mon, 9 Jul 2012 11:59:05 +0530
Subject: [PATCH 148/999] [IMP]l10n_in_hr_payroll: add the required field and
 done some improvement in py,sxw and rml

bzr revid: dsi@tinyerp.com-20120709062905-l0c8rk4q7e3bp3mb
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  |  7 +-
 .../l10n_in_hr_payroll_view.xml               |  2 +-
 .../report/report_payroll_advice.py           |  3 +-
 .../report/report_payroll_advice.rml          | 64 ++++++++++++++-----
 4 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 7465453df3c..19275c36161 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -222,8 +222,13 @@ class payroll_advice_line(osv.osv):
         'name': fields.char('Bank Account No.', size=32, required=True),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
+        'debit_credit': fields.char('c/d', size=8, required=False),
         'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
     }
+    _defaults = {
+        'debit_credit': 'c',
+    }    
+    
 
 payroll_advice_line()
 
@@ -252,4 +257,4 @@ class res_company(osv.osv):
 
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 124c4f1553f..5906b49b38c 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -74,7 +74,6 @@
                         <button name="confirm_sheet"  string="Confirm Sheet" states="draft" type="object" class="oe_highlight"/>
                         <button name="compute_advice" string="Compute Advice" states="draft" type="object" class="oe_highlight"/>
                         <button name="cancel_sheet" string="Cancel" states="draft"  type="object"/>
-                        <button name="set_to_draft" string="Set to Draft" states="cancel,confirm" type="object"/>
                         <div class="oe_right">
                             <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft"/>
                         </div>
@@ -96,6 +95,7 @@
                                         <field name="employee_id"/>
                                         <field name="name"/>
                                         <field name="bysal"/>
+                                        <field name="debit_credit"/>
                                     </tree>
                                 </field>
                             </page>
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
index 86bdfe01998..052f3109e05 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -70,6 +70,7 @@ class payroll_advice_report(report_sxw.rml_parse):
                     'name': l.employee_id.name,
                     'acc_no': l.name,
                     'bysal': l.bysal,
+                    'debit_credit': l.debit_credit,
                     })
             self.total_bysal += l.bysal
             result.append(res) 
@@ -77,4 +78,4 @@ class payroll_advice_report(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'l10n_in_hr_payroll/report/report_payroll_advice.rml', parser=payroll_advice_report, header="external")
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
index 55014e3b1ee..5bdd9868d4b 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
@@ -33,6 +33,8 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
@@ -45,6 +47,8 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -57,6 +61,8 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
@@ -75,6 +81,10 @@
     <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P9" fontName="Helvetica" alignment="JUSTIFY"/>
     <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -131,23 +141,24 @@
   </stylesheet>
   <story>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
-    <blockTable colWidths="269.0,269.0" style="Table1">
+    <blockTable colWidths="234.0,305.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-          <para style="P10">Payment Advice </para>
+          <para style="P14">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
+          <para style="P10"/>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P6">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
+          <para style="P6">
+            <font color="white"> </font>
+          </para>
         </td>
       </tr>
       <tr>
         <td>
+          <para style="terp_default_Bold_9">To,</para>
           <para style="terp_default_Bold_9">The Manager</para>
         </td>
         <td>
@@ -183,7 +194,7 @@
     <blockTable colWidths="539.0" style="Table2">
       <tr>
         <td>
-          <para style="P8"><u>Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids and o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]]</u></para>
+          <para style="P8">Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids and o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -197,7 +208,7 @@
     <para style="terp_default_8_space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="61.0,189.0,165.0,124.0" style="Table4">
+    <blockTable colWidths="50.0,153.0,134.0,101.0,101.0,0.0" style="Table4">
       <tr>
         <td>
           <para style="P1">SI. No.</para>
@@ -211,15 +222,23 @@
         <td>
           <para style="P3">By Salary</para>
         </td>
+        <td>
+          <para style="P3">c/d</para>
+        </td>
+        <td>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
+        </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
-      <blockTable colWidths="61.0,189.0,165.0,124.0" style="Table5">
+      <blockTable colWidths="50.0,153.0,134.0,101.0,101.0" style="Table5">
         <tr>
           <td>
             <para style="P9" leftIndent="15" bulletIndent="0">
-              <bullet><seq id="L1"/></bullet>
+              <bullet><seq id="L1"/>.</bullet>
               <font color="white"> </font>
             </para>
           </td>
@@ -232,10 +251,18 @@
           <td>
             <para style="P7">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
           </td>
+           <td>
+            <para style="P5">[[ line['debit_credit'] ]]</para>
+          </td>
+          <td>
+            <para style="P7">
+              <font color="white"> </font>
+            </para>
+          </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="62.0,189.0,165.0,124.0" style="Table6">
+    <blockTable colWidths="50.0,153.0,135.0,101.0,101.0" style="Table6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">
@@ -254,6 +281,11 @@
         <td>
           <para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
         </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
       </tr>
     </blockTable>
     <para style="terp_default_0.30cmspace">
@@ -262,7 +294,7 @@
     <blockTable colWidths="269.0,269.0" style="Table7">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Yours Sincerely</para>
+          <para style="terp_default_9">Yours Sincerely</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">
@@ -272,7 +304,7 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_tblheader_Details">For [[ company.name ]]</para>
+          <para style="terp_default_9">For [[ company.name ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">
@@ -282,7 +314,7 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_tblheader_Details">
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
@@ -294,7 +326,7 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_tblheader_Details">
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
@@ -306,7 +338,7 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Authorized Signature</para>
+          <para style="terp_default_9">Authorized Signature</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">

From 3ce1e711c51cfbc66695d942707c1e928deb14a7 Mon Sep 17 00:00:00 2001
From: "Ankita Patel (OpenERP)" <pat@tinyerp.com>
Date: Mon, 9 Jul 2012 17:11:12 +0530
Subject: [PATCH 149/999] [IMP] l10n_in_hr_payroll : improve onchange event

bzr revid: pat@tinyerp.com-20120709114112-4vxp86voy9ys106d
---
 addons/hr_payroll/hr_payroll.py               |  2 +-
 addons/hr_payroll/hr_payroll_view.xml         |  2 +-
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 45 +++++++++++++++++--
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 676eedf4ebc..d25f167c020 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -278,7 +278,7 @@ class hr_payslip(osv.osv):
             \n* If the payslip is confirmed then state is set to \'Done\'.\
             \n* When user cancel payslip the state is \'Rejected\'.'),
 #        'line_ids': fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Line', required=False, readonly=True, states={'draft': [('readonly', False)]}),
-        'line_ids': one2many_mod2('hr.payslip.line', 'slip_id', 'Payslip Lines', readonly=True, states={'draft':[('readonly',False)]}),
+        'line_ids': fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'worked_days_line_ids': fields.one2many('hr.payslip.worked_days', 'payslip_id', 'Payslip Worked Days', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'input_line_ids': fields.one2many('hr.payslip.input', 'payslip_id', 'Payslip Inputs', required=False, readonly=True, states={'draft': [('readonly', False)]}),
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f52c420df8a..cd1b64d1c1c 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -726,7 +726,7 @@
                 <header>
                     <button name="close_payslip_run" type="object" string="Close" states="draft" class="oe_highlight"/>
                     <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" class="oe_highlight"/>
-                    <button string="Set to Draft" name="draft_payslip_run" type="object" states="close" />
+                    <button name="draft_payslip_run" string="Set to Draft" type="object" states="close" />
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 7465453df3c..6a545ded40f 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -109,7 +109,7 @@ class payroll_advice(osv.osv):
     _name = 'hr.payroll.advice'
     _description = 'Bank Advice'
     _columns = {
-        'name':fields.char('Name', size=32, readonly=True, required=True, states={'draft': [('readonly', False)]},),
+        'name':fields.char('Name', size=32, required=True, readonly=True, states={'draft': [('readonly', False)]},),
         'note': fields.text('Description'),
         'date': fields.date('Date', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Advice Date is used to search Payslips"),
         'state':fields.selection([
@@ -211,6 +211,45 @@ class payroll_advice(osv.osv):
 
 payroll_advice()
 
+class hr_payslip_run(osv.osv):
+
+    _inherit = 'hr.payslip.run'
+    _description = 'Payslip Batches'
+    _columns = {
+    }
+
+    def close_payslip_run(self, cr, uid, ids, context=None):
+
+        payslip_pool = self.pool.get('hr.payslip')
+        payslip_run_pool = self.pool.get('hr.payslip.run')
+        advice_line_pool = self.pool.get('hr.payroll.advice.line')
+        advice_pool = self.pool.get('hr.payroll.advice')
+        payslip_line_pool = self.pool.get('hr.payslip.line')
+
+        for advice in self.browse(cr, uid, ids, context=context):
+            for slip in advice.slip_ids:
+                if slip.id:
+                    line = payslip_line_pool.browse(cr, uid, ids, context=context)[0]
+                    advice_line = advice_pool.browse(cr, uid, ids, context=context)[0]
+                    adv = {
+                            'advice_id': advice.id,
+                            'name': slip.employee_id.name,
+                            'employee_id': slip.employee_id.id,
+                            }
+                    advice_record = advice_pool.create(cr, uid, adv, context=context)
+                    advice_line = {
+                            'advice_id': advice.id,
+                            'name': slip.employee_id.name,
+                            'employee_id': slip.employee_id.id,
+                            }
+                    adviceline_record = advice_line_pool.create(cr, uid, advice_line, context=context)
+                payslip_record = payslip_pool.write(cr, uid, ids, {'advice_id': advice.id, 'name': slip.employee_id.name, 'employee_id': slip.employee_id.id}, context=context)
+            return super(hr_payslip_run, self).close_payslip_run(cr, uid, ids, context=context)
+
+        return True
+
+hr_payslip_run()
+
 class payroll_advice_line(osv.osv):
     '''
     Bank Advice Lines
@@ -220,7 +259,7 @@ class payroll_advice_line(osv.osv):
     _columns = {
         'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice'),
         'name': fields.char('Bank Account No.', size=32, required=True),
-        'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
+        'employee_id': fields.many2one('hr.employee', required=True, 'Employee'),
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
         'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
     }
@@ -252,4 +291,4 @@ class res_company(osv.osv):
 
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From b982ea278b33132def3927417b7a854b98b5028a Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Mon, 9 Jul 2012 18:28:24 +0530
Subject: [PATCH 150/999] [IMP]adding js and css to modify title for survey
 answer

bzr revid: vba@tinyerp.com-20120709125824-wgowbnhqmk9guuub
---
 addons/survey/static/src/css/survey.css | 14 +++++++++++++
 addons/survey/static/src/js/survey.js   | 28 +++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 addons/survey/static/src/css/survey.css
 create mode 100644 addons/survey/static/src/js/survey.js

diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
new file mode 100644
index 00000000000..72cd1d6e106
--- /dev/null
+++ b/addons/survey/static/src/css/survey.css
@@ -0,0 +1,14 @@
+.oe_survey_title {
+    font-weight: bold;
+    font-size: 22px;
+    margin: 8px 0px 8px 0px;
+    color: #5B5B5B;
+}
+
+.oe_survey_title_height{
+    height: 33px;
+}
+
+.oe_survey_title_page {
+    font-size: 14px;
+}
diff --git a/addons/survey/static/src/js/survey.js b/addons/survey/static/src/js/survey.js
new file mode 100644
index 00000000000..e4711013156
--- /dev/null
+++ b/addons/survey/static/src/js/survey.js
@@ -0,0 +1,28 @@
+openerp.survey = function (instance) {
+    var QWeb = instance.web.qweb,
+    _t = instance.web._t;
+    instance.web.ViewManagerAction = instance.web.ViewManagerAction.extend({
+        init: function(parent, action) {
+            this._super.apply(this,arguments);
+            console.log('hello');
+        },
+        on_mode_switch: function (view_type, no_store, options) {
+            var self = this;
+            return $.when(this._super.apply(this, arguments)).then(function () {
+                var controller = self.views[self.active_view].controller,
+                    fvg = controller.fields_view,
+                    view_id = (fvg && fvg.view_id) || '--';
+                self.$element.find('.oe_debug_view').html(QWeb.render('ViewManagerDebug', {
+                    view: controller,
+                    view_manager: self
+                }));
+                if (!self.action.name && fvg) {
+                    var title = self.$element.find('.oe_view_title_text');
+                    if(!_.isEmpty(title))
+                        title = $('.ui-dialog-title');
+                        title.text(fvg.arch.attrs.string || fvg.name);
+                }
+            });
+        },
+    });
+};

From 4998983403668c8615d4b955eaa2af3f263e098a Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 9 Jul 2012 19:01:56 +0530
Subject: [PATCH 151/999] fix : title for form.

bzr revid: tta@openerp.com-20120709133156-fqw5eaq88bshwhj7
---
 addons/survey/wizard/survey_answer.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index 162e820c059..51fed46832b 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -5,8 +5,7 @@
         <!--
             Survey Question Wizard
          -->
-        <record id="view_survey_question_message" model="ir.ui.view">
-            <field name="name">Answer Survey</field>
+        <record id="view_survey_question_message" model="ir.ui.view">           
             <field name="model">survey.question.wiz</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
@@ -28,7 +27,6 @@
         </record>
 
         <record id="action_view_survey_question_message" model="ir.actions.act_window">
-            <field name="name">Answer Survey</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">survey.question.wiz</field>
             <field name="view_type">form</field>

From 7a1db8aa8691e2de0c350610bc207a00cafb976b Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Tue, 10 Jul 2012 10:39:29 +0530
Subject: [PATCH 152/999] link files and named action.

bzr revid: tta@openerp.com-20120710050929-l0dqqdsmv6tcjhkk
---
 addons/survey/__openerp__.py            |  6 +++---
 addons/survey/static/css/survey.css     | 15 ---------------
 addons/survey/static/src/css/survey.css |  1 +
 addons/survey/wizard/survey_answer.xml  |  1 +
 4 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 addons/survey/static/css/survey.css

diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 837645b1260..e6dffb9bd6a 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -53,11 +53,11 @@ Partners are also sent mails with user name and password for the invitation of t
         'test/survey_question_type.yml',
         'test/survey_report.yml',
     ],
-    'css': ['static/src/css/survey.css'],
     'installable': True,
     'auto_install': False,
     'certificate' : '001131639736864143245',
-    'images': ['images/survey_answers.jpeg','images/survey_pages.jpeg','images/surveys.jpeg'],
-    'css' : ['static/css/survey.css'],
+    'images': ['images/survey_answers.jpeg','images/survey_pages.jpeg','images/surveys.jpeg'],   
+    'css': ['static/src/css/survey.css','static/css/survey.css'],
+    'js' : ['static/src/js/survey.js'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/static/css/survey.css b/addons/survey/static/css/survey.css
deleted file mode 100644
index 812bbe32fa4..00000000000
--- a/addons/survey/static/css/survey.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.oe_survey_title {
-    font-weight: bold;
-    font-size: 22px;
-    margin: 8px 0px 8px 0px;
-    color: #5B5B5B;
-}
-
-.oe_survey_title_height{
-    height: 33px;
-    border-top: 1px #EBEBEB solid;
-}
-
-.oe_survey_title_page {
-    font-size: 14px;
-}
diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index 72cd1d6e106..812bbe32fa4 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -7,6 +7,7 @@
 
 .oe_survey_title_height{
     height: 33px;
+    border-top: 1px #EBEBEB solid;
 }
 
 .oe_survey_title_page {
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index 51fed46832b..4671c182096 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -6,6 +6,7 @@
             Survey Question Wizard
          -->
         <record id="view_survey_question_message" model="ir.ui.view">           
+            <field name="name">Survey Answer</field>
             <field name="model">survey.question.wiz</field>
             <field name="type">form</field>
             <field name="arch" type="xml">

From 221013aab171f77269f9ac9c26b8a49d8e9dfc2d Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Tue, 10 Jul 2012 11:18:11 +0530
Subject: [PATCH 153/999] [IMP]l10n_in_hr_payroll: gives bank account number of
 concerned person

bzr revid: dsi@tinyerp.com-20120710054811-j3xqxakm5jsod9ng
---
 addons/hr_payroll/hr_payroll_view.xml            |  2 +-
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 16 ++++++++++++----
 .../l10n_in_hr_payroll_view.xml                  |  2 +-
 .../report/report_payroll_advice.py              |  1 -
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f52c420df8a..736324e47b1 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -18,7 +18,7 @@
                     <page string="Miscellaneous" groups="base.group_hr_user">
                         <group colspan="2" col="2">
                             <separator string="Personal Info" colspan="2"/>
-                            <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
+                            <field name="bank_account_id"/>
                             <field name="place_of_birth"/>
                             <field name="children"/>
                             <!-- <field name="basic" invisible="0"/> -->
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 19275c36161..2cb0765ec3f 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -105,7 +105,7 @@ class payroll_advice(osv.osv):
     '''
     Bank Advice
     '''
-
+        
     _name = 'hr.payroll.advice'
     _description = 'Bank Advice'
     _columns = {
@@ -208,13 +208,21 @@ class payroll_advice(osv.osv):
         return {
             'value':res
         }
-
+        
 payroll_advice()
 
 class payroll_advice_line(osv.osv):
     '''
     Bank Advice Lines
-    '''
+    '''    
+    def get_account_number(self, cr, uid, ids, employee_id=False, context=None):
+        res = {}
+        if employee_id:
+            hr_obj = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context)
+            acc_number = hr_obj.bank_account_id.acc_number
+            res.update({'name': acc_number})
+        return {'value': res}  
+    
     _name = 'hr.payroll.advice.line'
     _description = 'Bank Advice Lines'
     _columns = {
@@ -226,7 +234,7 @@ class payroll_advice_line(osv.osv):
         'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
     }
     _defaults = {
-        'debit_credit': 'c',
+        'debit_credit': 'C',
     }    
     
 
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 5906b49b38c..58a5192c2e7 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -92,7 +92,7 @@
                             <page string="Payment Lines">
                                 <field name="line_ids" colspan="4" nolabel="1">
                                     <tree string="Payment Lines" editable="bottom">
-                                        <field name="employee_id"/>
+                                        <field name="employee_id" on_change="get_account_number(employee_id)"/>
                                         <field name="name"/>
                                         <field name="bysal"/>
                                         <field name="debit_credit"/>
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
index 052f3109e05..0c0e31c7f54 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -70,7 +70,6 @@ class payroll_advice_report(report_sxw.rml_parse):
                     'name': l.employee_id.name,
                     'acc_no': l.name,
                     'bysal': l.bysal,
-                    'debit_credit': l.debit_credit,
                     })
             self.total_bysal += l.bysal
             result.append(res) 

From 9c03b140ce4444479d64130a6b75f3b44db79701 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Tue, 10 Jul 2012 14:51:35 +0530
Subject: [PATCH 154/999] [FIX]event: add oe_google_map class

bzr revid: kjo@tinyerp.com-20120710092135-wskq7ga5da8jqdrc
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 142ba2bb2a4..a3a7bff8107 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -138,7 +138,7 @@
                                    </group>
                             </group>
                         </div>
-                        <!-- <div class="oe_right" style="height: 200px"></div> -->
+                        <div class="oe_google_map" style="height: 200px"></div>
                         <notebook>
                             <page string="Event Description">
                                 <field name="note" colspan="4" nolabel="1"/>

From e6f10a71baad610699447ff1628038fb7cdc98c4 Mon Sep 17 00:00:00 2001
From: Lorenzo Battistini <>
Date: Tue, 10 Jul 2012 17:33:16 +0530
Subject: [PATCH 155/999] [FIX] Added context in invoice's
 compute_invoice_totals method

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

bzr revid: rmu@tinyerp.com-20120710120316-xo1sk1u3fq3fqt9i
---
 addons/account/account_invoice.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index c6011979f8d..1563d7b3da7 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -767,17 +767,20 @@ class account_invoice(osv.osv):
                 if not key in tax_key:
                     raise osv.except_osv(_('Warning !'), _('Taxes are missing!\nClick on compute button.'))
 
-    def compute_invoice_totals(self, cr, uid, inv, company_currency, ref, invoice_move_lines):
+    def compute_invoice_totals(self, cr, uid, inv, company_currency, ref, invoice_move_lines,context=None):
+        if context is None:
+            context={}
         total = 0
         total_currency = 0
         cur_obj = self.pool.get('res.currency')
         for i in invoice_move_lines:
             if inv.currency_id.id != company_currency:
+                context.update({'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
                 i['currency_id'] = inv.currency_id.id
                 i['amount_currency'] = i['price']
                 i['price'] = cur_obj.compute(cr, uid, inv.currency_id.id,
                         company_currency, i['price'],
-                        context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
+                        context=context)
             else:
                 i['amount_currency'] = False
                 i['currency_id'] = False
@@ -887,7 +890,7 @@ class account_invoice(osv.osv):
             # create one move line for the total and possibly adjust the other lines amount
             total = 0
             total_currency = 0
-            total, total_currency, iml = self.compute_invoice_totals(cr, uid, inv, company_currency, ref, iml)
+            total, total_currency, iml = self.compute_invoice_totals(cr, uid, inv, company_currency, ref, iml,context=ctx)
             acc_id = inv.account_id.id
 
             name = inv['name'] or '/'

From 85ad7cf1c606a4f49272bcfd2fed85a140ad73fe Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Wed, 11 Jul 2012 16:08:22 +0530
Subject: [PATCH 156/999] [FIX] stock : Fixes the problem of Insufficient info
 at move from the picklist(dropdown).

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

bzr revid: amb@tinyerp.com-20120711103822-5rn1xx22v9j1fsls
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index a279b8bea6c..da18a7fb280 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1576,7 +1576,7 @@ class stock_move(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         res = []
         for line in self.browse(cr, uid, ids, context=context):
-            res.append((line.id, (line.product_id.code or '/')+': '+line.location_id.name+' > '+line.location_dest_id.name))
+            res.append((line.id, (line.picking_id.origin or '/')+ ' ' +(line.product_id.code or '/')+': '+line.location_id.name+' > '+line.location_dest_id.name))
         return res
 
     def _check_tracking(self, cr, uid, ids, context=None):

From be32270f9e2b5c126304dff7ee2672154c6ca812 Mon Sep 17 00:00:00 2001
From: "Ravish Murari (OpenERP)" <rmu@tinyerp.com>
Date: Thu, 12 Jul 2012 12:55:33 +0530
Subject: [PATCH 157/999] [FIX] priority sort in descending order

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

bzr revid: rmu@tinyerp.com-20120712072533-lauip67jq6y3oe2n
---
 addons/procurement/procurement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 1c83711abf7..e76f6216155 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -80,7 +80,7 @@ class procurement_order(osv.osv):
     """
     _name = "procurement.order"
     _description = "Procurement"
-    _order = 'priority,date_planned desc'
+    _order ='priority desc,date_planned'
     _inherit = ['mail.thread']
     _log_create = False
     _columns = {

From b3285b426f8bafba70f8e9f53bbd668565560ba7 Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Fri, 13 Jul 2012 12:08:31 +0530
Subject: [PATCH 158/999] [IMP]l10n_in_hr_payroll: gives IFSC code with bank
 account number of conc^Cned person

bzr revid: dsi@tinyerp.com-20120713063831-djo31ykbr3jve49h
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  |  15 ++-
 .../l10n_in_hr_payroll_view.xml               |   4 +-
 .../report/report_payroll_advice.py           |   4 +-
 .../report/report_payroll_advice.rml          | 103 +++++++++++++-----
 4 files changed, 89 insertions(+), 37 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 2cb0765ec3f..4b957e5f488 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -120,6 +120,7 @@ class payroll_advice(osv.osv):
         'number':fields.char('Number', size=16, readonly=True),
         'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}, readonly=True),
         'chaque_nos':fields.char('Cheque Numbers', size=256),
+        'neft':fields.boolean('NEFT', size=16, help="NEFT should be checked if you want IFSC code"),
         'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank from which the salary is going to be paid"),
     }
@@ -215,22 +216,26 @@ class payroll_advice_line(osv.osv):
     '''
     Bank Advice Lines
     '''    
-    def get_account_number(self, cr, uid, ids, employee_id=False, context=None):
+    def onchange_employee_id(self, cr, uid, ids, employee_id=False, context=None):
         res = {}
-        if employee_id:
+        if not (employee_id):
+            res = ''
+        else :  
             hr_obj = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context)
             acc_number = hr_obj.bank_account_id.acc_number
-            res.update({'name': acc_number})
+            ifsc_code_number = hr_obj.bank_account_id.bank_bic
+            res.update({'name': acc_number ,'ifsc_code': ifsc_code_number})
         return {'value': res}  
-    
+        
     _name = 'hr.payroll.advice.line'
     _description = 'Bank Advice Lines'
     _columns = {
         'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice'),
         'name': fields.char('Bank Account No.', size=32, required=True),
+        'ifsc_code': fields.char('IFSC', size=16, help="check neft if you want IFSC code"),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
-        'debit_credit': fields.char('c/d', size=8, required=False),
+        'debit_credit': fields.char('C/D', size=8, required=False),
         'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
     }
     _defaults = {
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 58a5192c2e7..8f9ee9d5a2a 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -92,8 +92,9 @@
                             <page string="Payment Lines">
                                 <field name="line_ids" colspan="4" nolabel="1">
                                     <tree string="Payment Lines" editable="bottom">
-                                        <field name="employee_id" on_change="get_account_number(employee_id)"/>
+                                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                                         <field name="name"/>
+                                        <field name="ifsc_code"/>
                                         <field name="bysal"/>
                                         <field name="debit_credit"/>
                                     </tree>
@@ -103,6 +104,7 @@
                                 <group colspan="4" col="6">
                                 <field name="company_id" on_change="onchange_company_id(company_id)" groups="base.group_multi_company" widget="selection"/>
                                 <field name="chaque_nos"/>
+                                <field name="neft"/>
                                 </group>
                                 <separator colspan="4" string="Letter Details"/>
                                 <field name="note" colspan="4" nolabel="1"/>
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
index 0c0e31c7f54..d4eeaf3d218 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -60,7 +60,7 @@ class payroll_advice_report(report_sxw.rml_parse):
 
     def get_bysal_total(self):
         return self.total_bysal
-
+        
     def get_detail(self, line_ids):
         result = []
         self.total_bysal = 0.00
@@ -69,7 +69,9 @@ class payroll_advice_report(report_sxw.rml_parse):
             res.update({
                     'name': l.employee_id.name,
                     'acc_no': l.name,
+                    'ifsc_code': l.ifsc_code,
                     'bysal': l.bysal,
+                    'debit_credit': l.debit_credit,
                     })
             self.total_bysal += l.bysal
             result.append(res) 
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
index 5bdd9868d4b..0101c179f79 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
@@ -35,6 +35,8 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
@@ -49,6 +51,8 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -77,14 +81,13 @@
     <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P9" fontName="Helvetica" alignment="JUSTIFY"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica" alignment="LEFT"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -144,8 +147,8 @@
     <blockTable colWidths="234.0,305.0" style="Table1">
       <tr>
         <td>
-          <para style="P14">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
-          <para style="P10"/>
+          <para style="P7">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
+          <para style="P9"/>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
@@ -158,7 +161,7 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_default_Bold_9">To,</para>
+          <para style="terp_default_Bold_9">To, </para>
           <para style="terp_default_Bold_9">The Manager</para>
         </td>
         <td>
@@ -194,7 +197,7 @@
     <blockTable colWidths="539.0" style="Table2">
       <tr>
         <td>
-          <para style="P8">Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids and o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]]</para>
+          <para style="P10">Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids and o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -208,7 +211,7 @@
     <para style="terp_default_8_space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="50.0,153.0,134.0,101.0,101.0,0.0" style="Table4">
+    <blockTable colWidths="70.0,200.0,107.0,81.0,81.0" style="Table4">[[ o.neft == True and removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="P1">SI. No.</para>
@@ -223,46 +226,86 @@
           <para style="P3">By Salary</para>
         </td>
         <td>
-          <para style="P3">c/d</para>
-        </td>
-        <td>
-          <para style="P3">
-            <font color="white"> </font>
-          </para>
+          <para style="P3">C/D</para>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
-      <blockTable colWidths="50.0,153.0,134.0,101.0,101.0" style="Table5">
+      <blockTable colWidths="70.0,200.0,107.0,81.0,81.0" style="Table5">[[ o.neft == True and removeParentNode('blockTable') ]]
         <tr>
           <td>
-            <para style="P9" leftIndent="15" bulletIndent="0">
+            <para style="P11" leftIndent="15" bulletIndent="0">
               <bullet><seq id="L1"/>.</bullet>
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="P7">[[ line['name'] ]]</para>
+            <para style="P8">[[ line['name'] ]]</para>
           </td>
           <td>
             <para style="P5">[[ line['acc_no'] ]]</para>
           </td>
           <td>
-            <para style="P7">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
-          </td>
-           <td>
-            <para style="P5">[[ line['debit_credit'] ]]</para>
+            <para style="P8">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
           </td>
           <td>
-            <para style="P7">
-              <font color="white"> </font>
-            </para>
+            <para style="P5">[[ line['debit_credit'] ]]</para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="50.0,153.0,135.0,101.0,101.0" style="Table6">
+        <blockTable colWidths="40.0,123.0,107.0,107.0,81.0,81.0" style="Table4">[[ o.neft != True and removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="P1">SI. No.</para>
+        </td>
+        <td>
+          <para style="P1">Name of the Employe</para>
+        </td>
+        <td>
+          <para style="P3">Bank Account No.</para>
+        </td>
+        <td>
+          <para style="P3">IFSC Code </para>
+        </td>
+        <td>
+          <para style="P3">By Salary</para>
+        </td>
+        <td>
+          <para style="P3">C/D</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
+      <blockTable colWidths="40.0,123.0,107.0,107.0,81.0,81.0" style="Table5">[[ o.neft !=True and removeParentNode('blockTable') ]]
+        <tr>
+          <td>
+            <para style="P11" leftIndent="15" bulletIndent="0">
+              <bullet><seq id="L1"/>.</bullet>
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="P8">[[ line['name'] ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['acc_no'] ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['ifsc_code'] ]]</para>
+          </td>
+          <td>
+            <para style="P8">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['debit_credit'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="58.0,251.0,67.0,94.0,70.0" style="Table6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">

From dcfbcaaaff5dd35b7aed8f596d1ef662a03747d7 Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Fri, 13 Jul 2012 14:08:46 +0530
Subject: [PATCH 159/999] [IMP] l10n_in_hr_payroll: minor changes in search
 view of 'Payment Advices'

bzr revid: mtr@tinyerp.com-20120713083846-1qpo7rjxego4012j
---
 .../l10n_in_hr_payroll_view.xml                | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 124c4f1553f..15672cfd7cf 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -32,7 +32,7 @@
             </data>
             </field>
         </record>
-        
+
         <record id="hr_employee_form_in_inherit" model="ir.ui.view">
             <field name="name">hr.employee.form.inherit</field>
             <field name="model">hr.employee</field>
@@ -63,7 +63,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_hr_bank_advice_form" model="ir.ui.view">
             <field name="name">hr.payroll.advice.form</field>
             <field name="model">hr.payroll.advice</field>
@@ -120,8 +120,8 @@
             <field name="arch" type="xml">
                 <search string="Search Payment advice">
                     <group>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Advice"/>
-                        <filter icon="terp-camera_test" string="Done" domain="[('state','=','confirm')]" help="Done Advice"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Advices"/>
+                        <filter icon="terp-camera_test" string="Confirm" domain="[('state','=','confirm')]" help="Confirm Advices"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <field name="number"/>
@@ -130,11 +130,11 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Bank" name="bank_id" icon="terp-folder-orange" context="{'group_by':'bank_id'}"/>
-                        <separator orientation="vertical" />
-                        <filter string="Companies" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
+                        <filter string="Bank" name="bank_id" icon="terp-go-home" context="{'group_by':'bank_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="States" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <filter string="Status" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Company" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
                     </group>
                 </search>
             </field>
@@ -148,7 +148,7 @@
             <field name="view_id" ref="view_hr_bank_advice_tree"/>
             <field name="search_view_id" ref="view_hr_payroll_advice_filter"/>
         </record>
-        
+
         <menuitem
             action="action_view_hr_bank_advice_tree"
             id="hr_menu_payment_advice"

From 771c0322c9f07ea4a340bbe090d766b5b1ce5941 Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Fri, 13 Jul 2012 14:17:55 +0530
Subject: [PATCH 160/999] [ADD] l10n_in_hr_payroll:-added Reporting(Analysis)
 for Payment Advices

bzr revid: mtr@tinyerp.com-20120713084755-b43bdg85rs7pzn28
---
 addons/l10n_in_hr_payroll/__openerp__.py      |  3 +-
 addons/l10n_in_hr_payroll/report/__init__.py  |  1 +
 .../report/payment_advice_report.py           | 81 ++++++++++++++++++
 .../report/payment_advice_report_view.xml     | 82 +++++++++++++++++++
 4 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 addons/l10n_in_hr_payroll/report/payment_advice_report.py
 create mode 100644 addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 8eb4e3a500f..41df9e24889 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -49,7 +49,8 @@ Indian Payroll Salary Rules.
          'data/hr.salary.rule.csv',
          'security/ir.model.access.csv',
          'l10n_in_hr_payroll_report.xml',
-         'l10n_in_hr_payroll_sequence.xml'
+         'l10n_in_hr_payroll_sequence.xml',
+         'report/payment_advice_report_view.xml',
      ],
     'demo_xml': ['l10n_in_hr_payroll_demo.xml'],
     'installable': True
diff --git a/addons/l10n_in_hr_payroll/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py
index 5768ce50d05..03985e50c54 100644
--- a/addons/l10n_in_hr_payroll/report/__init__.py
+++ b/addons/l10n_in_hr_payroll/report/__init__.py
@@ -24,5 +24,6 @@
 
 import report_payslip_details
 import report_payroll_advice
+import payment_advice_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report.py b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
new file mode 100644
index 00000000000..f952dc49d92
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-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/>.
+#
+##############################################################################
+
+import tools
+from osv import fields, osv
+
+class payment_advice_report(osv.osv):
+    _name = "payment.advice.report"
+    _description = "Payment Advice Analysis"
+    _auto = False
+    _rec_name = ''
+    _columns = {
+        'name':fields.char('Name', size=32, readonly=True),
+        'date': fields.date('Date', readonly=True,),
+        'year': fields.char('Year', size=4, readonly=True),
+        'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'),
+            ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'),
+            ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
+        'state':fields.selection([
+            ('draft', 'Draft'),
+            ('confirm', 'Confirmed'),
+            ('cancel', 'Cancelled'),
+        ], 'State', select=True, readonly=True),
+        'employee_id': fields.many2one('hr.employee', 'Employee', readonly=True),
+        'nbr': fields.integer('# of Lines', readonly=True),
+        'number':fields.char('Number', size=16, readonly=True),
+        'bysal': fields.float('By Salary', readonly=True),
+        'bank_id':fields.many2one('res.bank', 'Bank', readonly=True),
+        'company_id':fields.many2one('res.company', 'Company', readonly=True,),
+        'cheque_nos':fields.char('Cheque Numbers', size=256),
+
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'payment_advice_report')
+        cr.execute("""
+            create or replace view payment_advice_report as (
+                select
+                    min(l.id) as id,
+                    sum(l.bysal) as bysal,
+                    p.name,
+                    p.state,
+                    p.date,
+                    p.number,
+                    p.company_id,
+                    p.bank_id,
+                    l.employee_id,
+                    p.chaque_nos as cheque_nos,
+                    to_char(p.date, 'YYYY') as year,
+                    to_char(p.date, 'MM') as month,
+                    to_char(p.date, 'YYYY-MM-DD') as day,
+                    1 as nbr
+                from
+                    hr_payroll_advice as p, hr_payroll_advice_line as l
+                where
+                    (p.id=l.advice_id)
+                group by
+                    p.number,p.name,p.date,p.state,p.company_id,p.bank_id,p.chaque_nos,l.employee_id,l.advice_id,l.bysal
+            )
+        """)
+payment_advice_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
new file mode 100644
index 00000000000..f3069f8c460
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <record id="view_payment_advice_tree" model="ir.ui.view">
+        <field eval="1" name="priority"/>
+        <field name="name">payment.advice.report.tree</field>
+        <field name="model">payment.advice.report</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree colors="blue:state == 'draft';black:state == 'confirm';gray:state == 'cancel' " string="Advices Analysis">
+                <field name="nbr" sum="# of Lines"/>
+                <field name="name" invisible="1"/>
+                <field name="employee_id" invisible="1"/>
+                <field name="date" invisible="1"/>
+                <field name="bank_id" invisible="1"/>
+                <field name="state" invisible="1"/>
+                <field name="number" invisible="1"/>
+                <field name="bysal" sum="Total Salary"/>
+                <field name="year" invisible="1"/>
+                <field name="day" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="cheque_nos" invisible="1"/>
+            </tree>
+        </field>
+    </record>
+
+
+    <record id="view_payment_advice_search" model="ir.ui.view">
+        <field name="name">payment.advice.report.search</field>
+        <field name="model">payment.advice.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Advices Analysis">
+                 <group>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Payment Advices which are in draft state"/>
+                    <filter icon="terp-check" string="Confirm" name="confirm" domain="[('state','=','confirm')]" help="Payment Advices which are confirmed"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <field name="number"/>
+                    <field name="name"/>
+                    <field name="employee_id"/>
+                    <field name="cheque_nos"/>
+                </group>
+                <newline/>
+                 <group expand="0" string="Extended Filters...">
+                    <field name="bank_id" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By...">
+                    <filter string="Employee" icon="terp-personal" context="{'group_by':'employee_id'}" />
+                    <filter string="Bank" icon="terp-go-home" context="{'group_by':'bank_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Date of Payment Advices"/>
+                    <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Month of Payment Advices"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year of Payment Advices"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_payment_advice_report_all" model="ir.actions.act_window">
+        <field name="name">Advices Analysis</field>
+        <field name="res_model">payment.advice.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_payment_advice_tree"/>
+        <field name="context">{'search_default_confirm':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="help">This report performs analysis on your payment advices</field>
+    </record>
+
+    <menuitem id="menu_payroll_reporting" name="Payroll" parent="hr.menu_hr_reporting" sequence="7" groups="base.group_hr_manager"/>
+    <menuitem action="action_payment_advice_report_all" id="menu_reporting_payment_advice" parent="menu_payroll_reporting" sequence="10"/>
+
+</data>
+</openerp>

From 743634b4b0fdb592588b10fad9b88572d4d36ca7 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 13 Jul 2012 14:45:55 +0530
Subject: [PATCH 161/999] fix : list view survey problem.

bzr revid: tta@openerp.com-20120713091555-vxx0e13sdn48fagj
---
 addons/survey/wizard/survey_answer.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index 4671c182096..05beb9b2cc0 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -33,6 +33,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+            <field name="context">{'active':True,'survey_id': active_id}</field>
         </record>
 
     </data>

From 87bdb4895d7ad0f5cd59e8b8cf3695c8685d3a01 Mon Sep 17 00:00:00 2001
From: "Ankita Patel (OpenERP)" <pat@tinyerp.com>
Date: Fri, 13 Jul 2012 16:15:01 +0530
Subject: [PATCH 162/999] [IMP]hr_payroll: create button

bzr revid: pat@tinyerp.com-20120713104501-kp20pumuiyrwdaip
---
 addons/hr_payroll/hr_payroll.py               | 32 ++++++++++++++-
 addons/hr_payroll/hr_payroll_view.xml         |  3 +-
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 40 -------------------
 3 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index d25f167c020..e7cf6165f6e 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -236,7 +236,35 @@ class hr_payslip_run(osv.osv):
     def close_payslip_run(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'close'}, context=context)
 
-hr_payslip_run()
+    def create_advice_run(self, cr, uid, ids, context=None):
+        advice_pool = self.pool.get('hr.payroll.advice')
+        advice_line_pool = self.pool.get('hr.payroll.advice.line')
+        payslip_pool = self.pool.get('hr.payslip')
+        payslip_line_pool = self.pool.get('hr.payslip.line')
+        users = self.pool.get('res.users').browse(cr, uid, [uid], context=context)
+        for run in self.browse(cr, uid, ids, context=context):
+            advice_data = {
+                        'company_id': users[0].company_id.id,
+                        'name': run.name,
+                        'date': run.date_end,
+                        'bank_id': users[0].company_id.bank_ids and users[0].company_id.bank_ids[0].id or False
+                    }
+            advice_id = advice_pool.create(cr, uid, advice_data, context=context)
+            slip_ids = payslip_pool.search(cr, uid, [('payslip_run_id', '=', run.id), ('state', '=', 'done')], context=context)
+            for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
+                if not slip.employee_id.bank_account_id and not slip.employee_id.bank_account_id.acc_number:
+                    raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
+                line_ids = payslip_line_pool.search(cr, uid, [('slip_id', '=', slip.id), ('code', '=', 'NET')], context=context)
+                if line_ids:
+                    line = payslip_line_pool.browse(cr, uid, line_ids, context=context)[0]
+                    advice_line = {
+                            'advice_id': advice_id,
+                            'name': slip.employee_id.bank_account_id.acc_number,
+                            'employee_id': slip.employee_id.id,
+                            'bysal': line.total
+                    }
+                    advice_line_id = advice_line_pool.create(cr, uid, advice_line, context=context)
+        return True
 
 class hr_payslip(osv.osv):
     '''
@@ -278,7 +306,7 @@ class hr_payslip(osv.osv):
             \n* If the payslip is confirmed then state is set to \'Done\'.\
             \n* When user cancel payslip the state is \'Rejected\'.'),
 #        'line_ids': fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Line', required=False, readonly=True, states={'draft': [('readonly', False)]}),
-        'line_ids': fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Lines', readonly=True, states={'draft':[('readonly',False)]}),
+        'line_ids': one2many_mod2('hr.payslip.line', 'slip_id', 'Payslip Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'worked_days_line_ids': fields.one2many('hr.payslip.worked_days', 'payslip_id', 'Payslip Worked Days', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'input_line_ids': fields.one2many('hr.payslip.input', 'payslip_id', 'Payslip Inputs', required=False, readonly=True, states={'draft': [('readonly', False)]}),
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index cd1b64d1c1c..09cff40df49 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -18,7 +18,7 @@
                     <page string="Miscellaneous" groups="base.group_hr_user">
                         <group colspan="2" col="2">
                             <separator string="Personal Info" colspan="2"/>
-                            <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
+                            <field name="bank_account_id"/>
                             <field name="place_of_birth"/>
                             <field name="children"/>
                             <!-- <field name="basic" invisible="0"/> -->
@@ -727,6 +727,7 @@
                     <button name="close_payslip_run" type="object" string="Close" states="draft" class="oe_highlight"/>
                     <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" class="oe_highlight"/>
                     <button name="draft_payslip_run" string="Set to Draft" type="object" states="close" />
+                    <button name="create_advice_run" string="Create Advice" type="object" states="close" />
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 6a545ded40f..336841ce331 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -131,7 +131,6 @@ class payroll_advice(osv.osv):
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
         'note': "Please make the payroll transfer from above account number to the below mentioned account numbers towards employee salaries:"
-
     }
 
     def compute_advice(self, cr, uid, ids, context=None):
@@ -211,45 +210,6 @@ class payroll_advice(osv.osv):
 
 payroll_advice()
 
-class hr_payslip_run(osv.osv):
-
-    _inherit = 'hr.payslip.run'
-    _description = 'Payslip Batches'
-    _columns = {
-    }
-
-    def close_payslip_run(self, cr, uid, ids, context=None):
-
-        payslip_pool = self.pool.get('hr.payslip')
-        payslip_run_pool = self.pool.get('hr.payslip.run')
-        advice_line_pool = self.pool.get('hr.payroll.advice.line')
-        advice_pool = self.pool.get('hr.payroll.advice')
-        payslip_line_pool = self.pool.get('hr.payslip.line')
-
-        for advice in self.browse(cr, uid, ids, context=context):
-            for slip in advice.slip_ids:
-                if slip.id:
-                    line = payslip_line_pool.browse(cr, uid, ids, context=context)[0]
-                    advice_line = advice_pool.browse(cr, uid, ids, context=context)[0]
-                    adv = {
-                            'advice_id': advice.id,
-                            'name': slip.employee_id.name,
-                            'employee_id': slip.employee_id.id,
-                            }
-                    advice_record = advice_pool.create(cr, uid, adv, context=context)
-                    advice_line = {
-                            'advice_id': advice.id,
-                            'name': slip.employee_id.name,
-                            'employee_id': slip.employee_id.id,
-                            }
-                    adviceline_record = advice_line_pool.create(cr, uid, advice_line, context=context)
-                payslip_record = payslip_pool.write(cr, uid, ids, {'advice_id': advice.id, 'name': slip.employee_id.name, 'employee_id': slip.employee_id.id}, context=context)
-            return super(hr_payslip_run, self).close_payslip_run(cr, uid, ids, context=context)
-
-        return True
-
-hr_payslip_run()
-
 class payroll_advice_line(osv.osv):
     '''
     Bank Advice Lines

From 037b2d30b62c934e0e25669bcf151751c367fed8 Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Fri, 13 Jul 2012 16:22:18 +0530
Subject: [PATCH 163/999] [IMP]l10n_in_hr_payroll: gives IFSC code with bank
 account number of conc^Cned person

bzr revid: dsi@tinyerp.com-20120713105218-qp1v3w874ahzvpla
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 23 ++++++++-----------
 .../l10n_in_hr_payroll_view.xml               |  1 +
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 4b957e5f488..107b56b30db 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -104,8 +104,7 @@ hr_employee()
 class payroll_advice(osv.osv):
     '''
     Bank Advice
-    '''
-        
+    '''        
     _name = 'hr.payroll.advice'
     _description = 'Bank Advice'
     _columns = {
@@ -120,7 +119,7 @@ class payroll_advice(osv.osv):
         'number':fields.char('Number', size=16, readonly=True),
         'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}, readonly=True),
         'chaque_nos':fields.char('Cheque Numbers', size=256),
-        'neft':fields.boolean('NEFT', size=16, help="NEFT should be checked if you want IFSC code"),
+        'neft': fields.boolean('NEFT Transaction', help="Check NEFT For Online Transfer"),
         'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank from which the salary is going to be paid"),
     }
@@ -208,8 +207,7 @@ class payroll_advice(osv.osv):
                 res.update({'bank': company.partner_id.bank_ids[0].bank.name})
         return {
             'value':res
-        }
-        
+        }     
 payroll_advice()
 
 class payroll_advice_line(osv.osv):
@@ -218,13 +216,12 @@ class payroll_advice_line(osv.osv):
     '''    
     def onchange_employee_id(self, cr, uid, ids, employee_id=False, context=None):
         res = {}
-        if not (employee_id):
-            res = ''
-        else :  
-            hr_obj = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context)
-            acc_number = hr_obj.bank_account_id.acc_number
-            ifsc_code_number = hr_obj.bank_account_id.bank_bic
-            res.update({'name': acc_number ,'ifsc_code': ifsc_code_number})
+        if not employee_id:
+            res ['value'] = {}
+        hr_obj = self.pool.get('hr.employee').browse(cr, uid, [employee_id], context=context)[0]
+        acc_number = hr_obj.bank_account_id.acc_number
+        ifsc_code_number = hr_obj.bank_account_id.bank_bic
+        res.update({'name': acc_number ,'ifsc_code': ifsc_code_number})
         return {'value': res}  
         
     _name = 'hr.payroll.advice.line'
@@ -232,7 +229,7 @@ class payroll_advice_line(osv.osv):
     _columns = {
         'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice'),
         'name': fields.char('Bank Account No.', size=32, required=True),
-        'ifsc_code': fields.char('IFSC', size=16, help="check neft if you want IFSC code"),
+        'ifsc_code': fields.char('IFSC Code', size=16),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
         'debit_credit': fields.char('C/D', size=8, required=False),
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 8f9ee9d5a2a..8f5beb33495 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -74,6 +74,7 @@
                         <button name="confirm_sheet"  string="Confirm Sheet" states="draft" type="object" class="oe_highlight"/>
                         <button name="compute_advice" string="Compute Advice" states="draft" type="object" class="oe_highlight"/>
                         <button name="cancel_sheet" string="Cancel" states="draft"  type="object"/>
+                        <button name="set_to_draft" string="Set to Draft" states="cancel,confirm" type="object"/>
                         <div class="oe_right">
                             <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft"/>
                         </div>

From 8d94232e0a0f7271705d86b9e00f5446b6b1c8b0 Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Fri, 13 Jul 2012 17:25:44 +0530
Subject: [PATCH 164/999] [IMP] l10n_in_hr_payroll: added field on hr.contract
 object and modified salary rules of 'HRAM' and 'HRANM'

bzr revid: mtr@tinyerp.com-20120713115544-bc9sdi7so47j65t6
---
 .../data/l10n_in_hr_payroll_data.xml             | 16 ++++++++++------
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py  |  6 +++++-
 .../l10n_in_hr_payroll_view.xml                  |  7 ++++---
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 8816ee24412..780829aec4c 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -20,6 +20,8 @@
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance for metro city</field>
             <field name="sequence" eval="51"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = (contract.city_type=='metro')</field>
             <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
 Income tax exemption for HRA will be least of following:
     1. The actual amount of HRA received as a part of salary.
@@ -35,6 +37,8 @@ Income tax exemption for HRA will be least of following:
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance for non metro city</field>
             <field name="sequence" eval="52"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = (contract.city_type=='non-metro')</field>
             <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
 Income tax exemption for HRA will be least of following:
     1. The actual amount of HRA received as a part of salary.
@@ -121,7 +125,7 @@ Income tax exemption for HRA will be least of following:
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="28"/>
-            <field name="note">Generally arrears are fully taxable, but employee may claim exemption u/s 89(1). 
+            <field name="note">Generally arrears are fully taxable, but employee may claim exemption u/s 89(1).
 One would need to compute income tax on the arrears if it would have been received in actual year.
 Now difference of income tax between payment year and actual year would be allowed for deduction.</field>
         </record>
@@ -134,8 +138,8 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="amount_select">code</field>
              <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * 15 * employee.number_of_year / worked_days.WORK100.number_of_days) or (contract.wage * 15 * employee.number_of_year / worked_days.WORK100.number_of_days)</field>
             <field name="sequence" eval="57"/>
-            <field name="note">Covered under the Payment of Gratuity Act, 1971: 
-(Last drawn monthly basic salary + dearness allowance)/26 x 15 days x 
+            <field name="note">Covered under the Payment of Gratuity Act, 1971:
+(Last drawn monthly basic salary + dearness allowance)/26 x 15 days x
 number of years of service (date of joining – date of retirement/leaving job)</field>
         </record>
 
@@ -328,12 +332,12 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="code">CPT</field>
             <field name="name">Deduction for Company Provided Transport</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="condition_select">none</field>			
+            <field name="condition_select">none</field>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="165"/>
         </record>
-        
+
          <record id="hr_salary_rule_food_coupon_ded" model="hr.salary.rule">
             <field name="amount_select">fix</field>
             <field eval="-20" name="amount_fix"/>
@@ -367,7 +371,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="code">DLA</field>
             <field name="name">Deduction Towards Leave Availed</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="condition_select">none</field>			
+            <field name="condition_select">none</field>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="180"/>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 3f00ecf9c63..302611d9c92 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -44,6 +44,10 @@ class hr_contract(osv.osv):
         'driver_salay': fields.boolean('Driver Salary', help=" Allowance for company provided driver"),
         'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance"),
         'voluntary_provident_fund': fields.float('Voluntary Provident Fund', digits_compute=dp.get_precision('Payroll'), help="VPF computed as percentage(%)"),
+        'city_type': fields.selection([
+            ('metro', 'Metro'),
+            ('non-metro', 'Non-Metro'),
+            ], 'Type of City', readonly=False),
     }
 
 hr_contract()
@@ -244,4 +248,4 @@ class res_company(osv.osv):
 
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index ddd6543df34..b1b98adf967 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -13,6 +13,7 @@
                  <group col="2" colspan="2" name="right_column">
                     <separator colspan="2" string="Allowance"/>
                         <field name="driver_salay"/>
+                        <field name="city_type"/>
                  </group>
                  <group col="2" colspan="2" name="left_column">
                     <separator colspan="2" string="Deduction"/>
@@ -24,7 +25,7 @@
             </data>
             </field>
         </record>
-        
+
         <record id="hr_employee_form_in_inherit" model="ir.ui.view">
             <field name="name">hr.employee.form.inherit</field>
             <field name="model">hr.employee</field>
@@ -55,7 +56,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_hr_bank_advice_form" model="ir.ui.view">
             <field name="name">hr.payroll.advice.form</field>
             <field name="model">hr.payroll.advice</field>
@@ -140,7 +141,7 @@
             <field name="view_id" ref="view_hr_bank_advice_tree"/>
             <field name="search_view_id" ref="view_hr_payroll_advice_filter"/>
         </record>
-        
+
         <menuitem
             action="action_view_hr_bank_advice_tree"
             id="hr_menu_payment_advice"

From 1b4dd5856e76b90341ac3424fd39438b23b6c7cd Mon Sep 17 00:00:00 2001
From: "Ankita Patel (OpenERP)" <pat@tinyerp.com>
Date: Fri, 13 Jul 2012 17:39:27 +0530
Subject: [PATCH 165/999] [IMP]hr_payroll: create button

bzr revid: pat@tinyerp.com-20120713120927-pnx0qdmsjxgn9som
---
 addons/hr_payroll/hr_payroll.py               | 30 +-------------
 addons/hr_payroll/hr_payroll_view.xml         |  1 -
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 41 +++++++++++++++++++
 .../l10n_in_hr_payroll_view.xml               | 14 +++++++
 4 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index e7cf6165f6e..676eedf4ebc 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -236,35 +236,7 @@ class hr_payslip_run(osv.osv):
     def close_payslip_run(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'close'}, context=context)
 
-    def create_advice_run(self, cr, uid, ids, context=None):
-        advice_pool = self.pool.get('hr.payroll.advice')
-        advice_line_pool = self.pool.get('hr.payroll.advice.line')
-        payslip_pool = self.pool.get('hr.payslip')
-        payslip_line_pool = self.pool.get('hr.payslip.line')
-        users = self.pool.get('res.users').browse(cr, uid, [uid], context=context)
-        for run in self.browse(cr, uid, ids, context=context):
-            advice_data = {
-                        'company_id': users[0].company_id.id,
-                        'name': run.name,
-                        'date': run.date_end,
-                        'bank_id': users[0].company_id.bank_ids and users[0].company_id.bank_ids[0].id or False
-                    }
-            advice_id = advice_pool.create(cr, uid, advice_data, context=context)
-            slip_ids = payslip_pool.search(cr, uid, [('payslip_run_id', '=', run.id), ('state', '=', 'done')], context=context)
-            for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
-                if not slip.employee_id.bank_account_id and not slip.employee_id.bank_account_id.acc_number:
-                    raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
-                line_ids = payslip_line_pool.search(cr, uid, [('slip_id', '=', slip.id), ('code', '=', 'NET')], context=context)
-                if line_ids:
-                    line = payslip_line_pool.browse(cr, uid, line_ids, context=context)[0]
-                    advice_line = {
-                            'advice_id': advice_id,
-                            'name': slip.employee_id.bank_account_id.acc_number,
-                            'employee_id': slip.employee_id.id,
-                            'bysal': line.total
-                    }
-                    advice_line_id = advice_line_pool.create(cr, uid, advice_line, context=context)
-        return True
+hr_payslip_run()
 
 class hr_payslip(osv.osv):
     '''
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 09cff40df49..f4f60e26b4d 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -727,7 +727,6 @@
                     <button name="close_payslip_run" type="object" string="Close" states="draft" class="oe_highlight"/>
                     <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" class="oe_highlight"/>
                     <button name="draft_payslip_run" string="Set to Draft" type="object" states="close" />
-                    <button name="create_advice_run" string="Create Advice" type="object" states="close" />
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 336841ce331..b2668a0a3a4 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -210,6 +210,47 @@ class payroll_advice(osv.osv):
 
 payroll_advice()
 
+class hr_payslip_run(osv.osv):
+
+    _inherit = 'hr.payslip.run'
+    _description = 'Payslip Batches'
+    _columns = {
+    }
+
+    def create_advice_run(self, cr, uid, ids, context=None):
+        res = super(hr_payslip_run, self).close_payslip_run(cr, uid, ids, context=context)
+        payslip_pool = self.pool.get('hr.payslip')
+        payslip_line_pool = self.pool.get('hr.payslip.line')
+        advice_pool = self.pool.get('hr.payroll.advice')
+        advice_line_pool = self.pool.get('hr.payroll.advice.line')
+        users = self.pool.get('res.users').browse(cr, uid, [uid], context=context)
+        for run in self.browse(cr, uid, ids, context=context):
+            advice_data = {
+                        'company_id': users[0].company_id.id,
+                        'name': run.name,
+                        'date': run.date_end,
+                        'bank_id': users[0].company_id.bank_ids and users[0].company_id.bank_ids[0].id or False
+                    }
+            advice_id = advice_pool.create(cr, uid, advice_data, context=context)
+            
+            slip_ids = payslip_pool.search(cr, uid, [('payslip_run_id', '=', run.id), ('state', '=', 'done')], context=context)
+            for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
+                if not slip.employee_id.bank_account_id and not slip.employee_id.bank_account_id.acc_number:
+                    raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
+                line_ids = payslip_line_pool.search(cr, uid, [('slip_id', '=', slip.id), ('code', '=', 'NET')], context=context)
+                if line_ids:
+                    line = payslip_line_pool.browse(cr, uid, line_ids, context=context)[0]
+                    advice_line = {
+                            'advice_id': advice_id,
+                            'name': slip.employee_id.bank_account_id.acc_number,
+                            'employee_id': slip.employee_id.id,
+                            'bysal': line.total
+                    }
+                    advice_line_pool.create(cr, uid, advice_line, context=context)
+        return res
+
+hr_payslip_run()
+
 class payroll_advice_line(osv.osv):
     '''
     Bank Advice Lines
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 124c4f1553f..81bd9f19ae4 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -48,6 +48,20 @@
             </field>
         </record>
 
+        <record id="hr_payslip_run_form_inherit" model="ir.ui.view">
+            <field name="name">hr.payslip.run.form.inherit</field>
+            <field name="model">hr.payslip.run</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
+            <field name="arch" type="xml">
+            <data>
+                 <xpath expr="//button[@string='Set to Draft']" position="after">
+                    <button name="create_advice_run" string="Create Advice" type="object" states="close" />
+                 </xpath>
+            </data>
+            </field>
+        </record>
+
         <record id="view_hr_bank_advice_tree" model="ir.ui.view">
             <field name="name">hr.payroll.advice.tree</field>
             <field name="model">hr.payroll.advice</field>

From 08a411a6807d00d5bc40d36066e2c5b61b9a1c2a Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Fri, 13 Jul 2012 18:53:04 +0530
Subject: [PATCH 166/999] [IMP] l10n_in_hr_payroll: merged salary rules of
 'HRAM' and 'HRANM'

bzr revid: mtr@tinyerp.com-20120713132304-21dy22w9ytdbyt8g
---
 .../data/l10n_in_hr_payroll_data.xml          | 27 +++----------------
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 17 +++++++-----
 2 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 780829aec4c..8a3d99c9087 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -14,39 +14,20 @@
         </record>
 
         <record id="hr_salary_rule_houserentallowancemetro" model="hr.salary.rule">
-            <field name="code">HRAM</field>
+            <field name="code">HRA</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.50) or (contract.wage * 0.50)</field>
+            <field name="amount_python_compute">result=payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.50) or (contract.wage * 0.50) if (contract.city_type=='metro') else payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.40) or (contract.wage * 0.40) if (contract.city_type=='non-metro') else 0.00</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="name">House Rent Allowance for metro city</field>
+            <field name="name">House Rent Allowance</field>
             <field name="sequence" eval="51"/>
-            <field name="condition_select">python</field>
-            <field name="condition_python">result = (contract.city_type=='metro')</field>
             <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
 Income tax exemption for HRA will be least of following:
     1. The actual amount of HRA received as a part of salary.
-    2. 40% (if living in non-metro area).
+    2. 50% (if living in metro area) and 40% (if living in non-metro area) of (basic salary+Dearness allowance(if applicable)).
     3. Rent paid minus 10% of (basic salary+DA).
             </field>
         </record>
 
-        <record id="hr_salary_rule_houserentallowancenonmetro" model="hr.salary.rule">
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.40) or (contract.wage * 0.40)</field>
-            <field name="code">HRANM</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="name">House Rent Allowance for non metro city</field>
-            <field name="sequence" eval="52"/>
-            <field name="condition_select">python</field>
-            <field name="condition_python">result = (contract.city_type=='non-metro')</field>
-            <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
-Income tax exemption for HRA will be least of following:
-    1. The actual amount of HRA received as a part of salary.
-    2. 50% (if living in metro area) of (basic salary+Dearness allowance (DA)).
-    3. Rent paid minus 10% of (basic salary+DA).
-             </field>
-         </record>
-
         <record id="hr_salary_trans_allownce" model="hr.salary.rule">
             <field name="code">TCA</field>
             <field name="name">Transport/Conveyance Allownace</field>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 302611d9c92..9dcf69ef5b7 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -38,7 +38,7 @@ class hr_contract(osv.osv):
 
     _inherit = 'hr.contract'
     _description = 'HR Contract'
-    
+
     _columns = {
         'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll'), help="Amount for Tax Deduction at Source"),
         'driver_salay': fields.boolean('Driver Salary', help=" Allowance for company provided driver"),
@@ -49,12 +49,15 @@ class hr_contract(osv.osv):
             ('non-metro', 'Non-Metro'),
             ], 'Type of City', readonly=False),
     }
+    _defaults = {
+        'city_type': 'non-metro',
+    }
 
 hr_contract()
 
 class hr_employee(osv.osv):
     '''
-    Employee's Join date allows to compute total working 
+    Employee's Join date allows to compute total working
     experience of Employee and it is used to calculate Gratuity rule.
     '''
 
@@ -89,12 +92,12 @@ class hr_employee(osv.osv):
             else:
                 res[employee.id] = 0.0
         return res
-    
+
     _columns = {
         'join_date': fields.date('Join Date', help="Joining date of employee"),
         'number_of_year': fields.function(_compute_year, string='No. of Years of Service', type="float", store=True, help="Total years of work experience"),
         }
-    
+
 hr_employee()
 
 class payroll_advice(osv.osv):
@@ -119,7 +122,7 @@ class payroll_advice(osv.osv):
         'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank from which the salary is going to be paid"),
     }
-    
+
     _defaults = {
         'date': lambda * a: time.strftime('%Y-%m-%d'),
         'state': lambda * a: 'draft',
@@ -132,7 +135,7 @@ class payroll_advice(osv.osv):
 
     def compute_advice(self, cr, uid, ids, context=None):
         """
-        Advice - Create Advice lines in Payment Advice and 
+        Advice - Create Advice lines in Payment Advice and
         compute Advice lines.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -244,7 +247,7 @@ class res_company(osv.osv):
     }
     _defaults = {
         'dearness_allowance': True,
-    }    
+    }
 
 res_company()
 

From 2702e34cbee7f49c58350f1079ced047b35ccfad Mon Sep 17 00:00:00 2001
From: Ferdinand <>
Date: Sat, 14 Jul 2012 12:40:39 +0530
Subject: [PATCH 167/999] [FIX] portal : fixes the size problem on portal url

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

bzr revid: amp@tinyerp.com-20120714071039-8zwytluds0l5ltxn
---
 addons/portal/portal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 399377e8ccc..a550895c154 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -37,7 +37,7 @@ class portal(osv.osv):
         'group_id': fields.many2one('res.groups', required=True, ondelete='cascade',
             string='Group',
             help='The group corresponding to this portal'),
-        'url': fields.char('URL', size=64,
+        'url': fields.char('URL', size=256,
             help="The url where portal users can connect to the server"),
         'home_action_id': fields.many2one('ir.actions.actions',
             string='Home Action',

From feacc599ec391bf83207672251abc13745e5e4ed Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Mon, 16 Jul 2012 14:24:30 +0530
Subject: [PATCH 168/999] [IMP] l10n_in_hr_payroll: improved string of a note
 field

bzr revid: mtr@tinyerp.com-20120716085430-ko319y2c4ou56dpe
---
 addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 8a3d99c9087..20ed708cdec 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -23,7 +23,7 @@
             <field name="note">Rent receipts can be shown for taking tax benefit for living in a rented house.
 Income tax exemption for HRA will be least of following:
     1. The actual amount of HRA received as a part of salary.
-    2. 50% (if living in metro area) and 40% (if living in non-metro area) of (basic salary+Dearness allowance(if applicable)).
+    2. 50% (if living in metro area) and 40% (if living in non-metro area) of (basic salary+Dearness allowance).
     3. Rent paid minus 10% of (basic salary+DA).
             </field>
         </record>

From 499b09e46698fe8895395142368f2d1c8ce8a546 Mon Sep 17 00:00:00 2001
From: "Ankita Patel (OpenERP)" <pat@tinyerp.com>
Date: Mon, 16 Jul 2012 14:35:15 +0530
Subject: [PATCH 169/999] [IMP]l10n_in_hr_payroll,hr_payroll: remove
 unnecessary change

bzr revid: pat@tinyerp.com-20120716090515-n4e55i7ip5w2vvg4
---
 addons/hr_payroll/hr_payroll_view.xml                 | 3 +--
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py       | 9 +++------
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 6d28ed5d05f..bae89ed215b 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -7,7 +7,6 @@
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="30"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
 
-
         <!-- Contract View -->
         <record id="hr_contract_form_inherit" model="ir.ui.view">
             <field name="name">hr.contract.view.form.inherit</field>
@@ -733,7 +732,7 @@
                 <header>
                     <button name="close_payslip_run" type="object" string="Close" states="draft" class="oe_highlight"/>
                     <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" class="oe_highlight"/>
-                    <button name="draft_payslip_run" string="Set to Draft" type="object" states="close" />
+                    <button string="Set to Draft" name="draft_payslip_run" type="object" states="close" />
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 8d66ca150a4..bd8d4669576 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -101,7 +101,7 @@ class payroll_advice(osv.osv):
     _name = 'hr.payroll.advice'
     _description = 'Bank Advice'
     _columns = {
-        'name':fields.char('Name', size=32, required=True, readonly=True, states={'draft': [('readonly', False)]},),
+        'name':fields.char('Name', size=32, readonly=True, required=True, states={'draft': [('readonly', False)]},),
         'note': fields.text('Description'),
         'date': fields.date('Date', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Advice Date is used to search Payslips"),
         'state':fields.selection([
@@ -206,11 +206,8 @@ class hr_payslip_run(osv.osv):
 
     _inherit = 'hr.payslip.run'
     _description = 'Payslip Batches'
-    _columns = {
-    }
 
-    def create_advice_run(self, cr, uid, ids, context=None):
-        res = super(hr_payslip_run, self).close_payslip_run(cr, uid, ids, context=context)
+    def create_advice(self, cr, uid, ids, context=None):
         payslip_pool = self.pool.get('hr.payslip')
         payslip_line_pool = self.pool.get('hr.payslip.line')
         advice_pool = self.pool.get('hr.payroll.advice')
@@ -252,7 +249,7 @@ class payroll_advice_line(osv.osv):
     _columns = {
         'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice'),
         'name': fields.char('Bank Account No.', size=32, required=True),
-        'employee_id': fields.many2one('hr.employee', required=True, 'Employee'),
+        'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
         'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
     }
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 5b799eeea16..3a972562579 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -48,7 +48,7 @@
             <field name="arch" type="xml">
             <data>
                  <xpath expr="//button[@string='Set to Draft']" position="after">
-                    <button name="create_advice_run" string="Create Advice" type="object" states="close" />
+                    <button name="create_advice" string="Create Advice" type="object" states="close" />
                  </xpath>
             </data>
             </field>

From c50debfbd328c472c2c247bfb66d768256fe994b Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 16 Jul 2012 15:48:14 +0530
Subject: [PATCH 170/999] removed context

bzr revid: tta@openerp.com-20120716101814-2w72c1ge8azzc4zv
---
 addons/survey/wizard/survey_answer.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index 05beb9b2cc0..4671c182096 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -33,7 +33,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="context">{'active':True,'survey_id': active_id}</field>
         </record>
 
     </data>

From 8a4acb301832d77cbd785ba639c015a99ce92430 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 16 Jul 2012 18:00:36 +0530
Subject: [PATCH 171/999] [css] improve css for title

bzr revid: tta@openerp.com-20120716123036-asqd081tzmhjjmuy
---
 addons/survey/static/src/css/survey.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index 812bbe32fa4..b4cefd18a82 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -1,6 +1,6 @@
 .oe_survey_title {
     font-weight: bold;
-    font-size: 22px;
+    font-size: 19px;
     margin: 8px 0px 8px 0px;
     color: #5B5B5B;
 }

From c4493dae4b5984b89a3badf140c696e8c5f85ab9 Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Tue, 17 Jul 2012 12:51:28 +0530
Subject: [PATCH 172/999] [IMP] l10n_in_hr_payroll: added boolean field on
 payslip run to indicate that 'Payment Advice' exist or not.

bzr revid: mtr@tinyerp.com-20120717072128-fc9hxxlqnrnh6l6o
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 29 ++++++++++++++-----
 .../l10n_in_hr_payroll_view.xml               |  3 ++
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 57d7a492a97..912f7ca5c1e 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -104,7 +104,7 @@ hr_employee()
 class payroll_advice(osv.osv):
     '''
     Bank Advice
-    '''        
+    '''
     _name = 'hr.payroll.advice'
     _description = 'Bank Advice'
     _columns = {
@@ -206,13 +206,24 @@ class payroll_advice(osv.osv):
                 res.update({'bank': company.partner_id.bank_ids[0].bank.name})
         return {
             'value':res
-        }     
+        }
 payroll_advice()
 
 class hr_payslip_run(osv.osv):
 
     _inherit = 'hr.payslip.run'
     _description = 'Payslip Batches'
+    _columns = {
+        'payment_advice': fields.boolean('Payment Advice', help="If True,indicates that Payment Advice exists.", readonly=True),
+    }
+
+    _defaults = {
+        'payment_advice': False,
+    }
+
+    def draft_payslip_run(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'payment_advice': False}, context=context)
+        return super(hr_payslip_run, self).draft_payslip_run(cr, uid, ids, context=context)
 
     def create_advice(self, cr, uid, ids, context=None):
         wf_service = netsvc.LocalService("workflow")
@@ -247,6 +258,10 @@ class hr_payslip_run(osv.osv):
                             'bysal': line.total
                     }
                     advice_line_pool.create(cr, uid, advice_line, context=context)
+            if run.payment_advice == False:
+                self.write(cr, uid, ids, {'payment_advice' : True})
+            else:
+                raise osv.except_osv(_('Error !'), _("Payment advice already exists for %s, 'Set to Draft' to create a new advice.") %(run.name))
         return True
 
 hr_payslip_run()
@@ -254,7 +269,7 @@ hr_payslip_run()
 class payroll_advice_line(osv.osv):
     '''
     Bank Advice Lines
-    '''    
+    '''
     def onchange_employee_id(self, cr, uid, ids, employee_id=False, context=None):
         res = {}
         hr_obj = self.pool.get('hr.employee')
@@ -262,8 +277,8 @@ class payroll_advice_line(osv.osv):
             return {'value': res}
         employee = hr_obj.browse(cr, uid, [employee_id], context=context)[0]
         res.update({'name': employee.bank_account_id.acc_number ,'ifsc_code': employee.bank_account_id.bank_bic})
-        return {'value': res}  
-        
+        return {'value': res}
+
     _name = 'hr.payroll.advice.line'
     _description = 'Bank Advice Lines'
     _columns = {
@@ -277,8 +292,8 @@ class payroll_advice_line(osv.osv):
     }
     _defaults = {
         'debit_credit': 'C',
-    }    
-    
+    }
+
 
 payroll_advice_line()
 
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 84dc870e512..c2119eecefd 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -48,6 +48,9 @@
             <field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
             <field name="arch" type="xml">
             <data>
+                <xpath expr="//field[@name='credit_note']" position="after">
+                    <field name="payment_advice"/>
+                </xpath>
                  <xpath expr="//button[@string='Set to Draft']" position="after">
                     <button name="create_advice" string="Create Advice" type="object" states="close" />
                  </xpath>

From 6eca2822662d624e2d872bf1d3df6d7987858850 Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Tue, 17 Jul 2012 16:00:10 +0530
Subject: [PATCH 173/999] [IMP]l10n_in_hr_payroll: Set Total Under Bank Account
 number with Total Amount in rml Report

bzr revid: dsi@tinyerp.com-20120717103010-3rxeby7fjskvmu3v
---
 .../report/report_payroll_advice.rml          | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
index 123e856d780..7c88431485b 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
@@ -305,7 +305,33 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="58.0,251.0,67.0,94.0,70.0" style="Table6">
+     <blockTable colWidths="50.0,221.0,106.0,82.0,80.0" style="Table6">[[ o.neft == True and removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P1">Total : <font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font></para>
+          <para style="P4"/>
+        </td>
+        <td>
+          <para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="50.0,113.0,214.0,82.0,80.0" style="Table6">[[ o.neft !=True and removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">

From f6368e13f7eadbf0954e73a8dc7e1537376646a7 Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Tue, 17 Jul 2012 16:18:56 +0530
Subject: [PATCH 174/999] [IMP] l10n_in_hr_payroll: improved string and code
 for boolean field

bzr revid: mtr@tinyerp.com-20120717104856-pd8oox9jm9c25raq
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py   | 15 +++++----------
 .../l10n_in_hr_payroll_view.xml                   |  3 ++-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 912f7ca5c1e..36cbc1cc7cf 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -214,15 +214,11 @@ class hr_payslip_run(osv.osv):
     _inherit = 'hr.payslip.run'
     _description = 'Payslip Batches'
     _columns = {
-        'payment_advice': fields.boolean('Payment Advice', help="If True,indicates that Payment Advice exists.", readonly=True),
-    }
-
-    _defaults = {
-        'payment_advice': False,
+        'available_advice': fields.boolean('Made Payment Order?', help="If tick,indicates that Payment Advice exists.", readonly=True),
     }
 
     def draft_payslip_run(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'payment_advice': False}, context=context)
+        self.write(cr, uid, ids, {'available_advice': False}, context=context)
         return super(hr_payslip_run, self).draft_payslip_run(cr, uid, ids, context=context)
 
     def create_advice(self, cr, uid, ids, context=None):
@@ -233,6 +229,8 @@ class hr_payslip_run(osv.osv):
         advice_line_pool = self.pool.get('hr.payroll.advice.line')
         users = self.pool.get('res.users').browse(cr, uid, [uid], context=context)
         for run in self.browse(cr, uid, ids, context=context):
+            if run.available_advice:
+                raise osv.except_osv(_('Error !'), _("Payment advice already exists for %s, 'Set to Draft' to create a new advice.") %(run.name))
             advice_data = {
                         'company_id': users[0].company_id.id,
                         'name': run.name,
@@ -258,10 +256,7 @@ class hr_payslip_run(osv.osv):
                             'bysal': line.total
                     }
                     advice_line_pool.create(cr, uid, advice_line, context=context)
-            if run.payment_advice == False:
-                self.write(cr, uid, ids, {'payment_advice' : True})
-            else:
-                raise osv.except_osv(_('Error !'), _("Payment advice already exists for %s, 'Set to Draft' to create a new advice.") %(run.name))
+        self.write(cr, uid, ids, {'available_advice' : True})
         return True
 
 hr_payslip_run()
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index c2119eecefd..46d3ba5acbd 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -49,7 +49,8 @@
             <field name="arch" type="xml">
             <data>
                 <xpath expr="//field[@name='credit_note']" position="after">
-                    <field name="payment_advice"/>
+                    <newline/>
+                    <field name="available_advice"/>
                 </xpath>
                  <xpath expr="//button[@string='Set to Draft']" position="after">
                     <button name="create_advice" string="Create Advice" type="object" states="close" />

From 5884f6dabe1001adf37df3ca71a3f011e519b1c0 Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Tue, 17 Jul 2012 16:49:34 +0530
Subject: [PATCH 175/999] [IMP] l10n_in_hr_payroll: changed string

bzr revid: mtr@tinyerp.com-20120717111934-j6rkorvnaubk7rdm
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 36cbc1cc7cf..342e79c3948 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -214,7 +214,7 @@ class hr_payslip_run(osv.osv):
     _inherit = 'hr.payslip.run'
     _description = 'Payslip Batches'
     _columns = {
-        'available_advice': fields.boolean('Made Payment Order?', help="If tick,indicates that Payment Advice exists.", readonly=True),
+        'available_advice': fields.boolean('Made Payment Advice?', help="If tick,indicates that Payment Advice exists.", readonly=True),
     }
 
     def draft_payslip_run(self, cr, uid, ids, context=None):

From 783128639fd70fecadc6cab2696cc10b7fc79745 Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Tue, 17 Jul 2012 18:54:34 +0530
Subject: [PATCH 176/999] [IMP] l10n_in_hr_payroll: added 'To Advice' button in
 search view of payslip run

bzr revid: mtr@tinyerp.com-20120717132434-r2kvt0yx5ev18msa
---
 .../l10n_in_hr_payroll_view.xml                   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 46d3ba5acbd..dba42b30b1c 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -59,6 +59,21 @@
             </field>
         </record>
 
+        <record id="hr_payslip_run_search_inherit" model="ir.ui.view">
+            <field name="name">hr.payslip.run.search.inherit</field>
+            <field name="model">hr.payslip.run</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='date_end']" position="after">
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-document-new" string="To Advice" domain="[('available_advice','=', False)]" help="Payslip Batches whose payment advice doesn't exist"/>
+                </xpath>
+            </data>
+            </field>
+        </record>
+
         <record id="view_hr_bank_advice_tree" model="ir.ui.view">
             <field name="name">hr.payroll.advice.tree</field>
             <field name="model">hr.payroll.advice</field>

From dfb97e21410609119bd3362428c007a8cb068cb1 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 18 Jul 2012 10:54:54 +0530
Subject: [PATCH 177/999] [IMP] l10n_in_hr_payroll: Icon improved

bzr revid: mra@tinyerp.com-20120718052454-7qx9zgpl7k7h1xjd
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index dba42b30b1c..3e544758207 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -68,7 +68,7 @@
             <data>
                 <xpath expr="//field[@name='date_end']" position="after">
                     <separator orientation="vertical"/>
-                    <filter icon="terp-document-new" string="To Advice" domain="[('available_advice','=', False)]" help="Payslip Batches whose payment advice doesn't exist"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Advice" domain="[('available_advice','=', False)]" help="Payslip Batches ready to be Adviced"/>
                 </xpath>
             </data>
             </field>

From fe956809458a1182420941d55293b507a55ca738 Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Wed, 18 Jul 2012 11:12:26 +0530
Subject: [PATCH 178/999] [IMP] l10n_in_hr_payroll: added fields and modified
 query for NEFT and IFSC code

bzr revid: mtr@tinyerp.com-20120718054226-m8m2ubrcmho6p1ui
---
 .../report/payment_advice_report.py           | 19 +++++++++++--------
 .../report/payment_advice_report_view.xml     |  7 +++++++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report.py b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
index f952dc49d92..90feb4abd9f 100644
--- a/addons/l10n_in_hr_payroll/report/payment_advice_report.py
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
@@ -45,9 +45,10 @@ class payment_advice_report(osv.osv):
         'number':fields.char('Number', size=16, readonly=True),
         'bysal': fields.float('By Salary', readonly=True),
         'bank_id':fields.many2one('res.bank', 'Bank', readonly=True),
-        'company_id':fields.many2one('res.company', 'Company', readonly=True,),
-        'cheque_nos':fields.char('Cheque Numbers', size=256),
-
+        'company_id':fields.many2one('res.company', 'Company', readonly=True),
+        'cheque_nos':fields.char('Cheque Numbers', size=256, readonly=True),
+        'neft': fields.boolean('NEFT Transaction', readonly=True),
+        'ifsc_code': fields.char('IFSC Code', size=32, readonly=True),
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'payment_advice_report')
@@ -62,18 +63,20 @@ class payment_advice_report(osv.osv):
                     p.number,
                     p.company_id,
                     p.bank_id,
-                    l.employee_id,
                     p.chaque_nos as cheque_nos,
+                    p.neft,
+                    l.employee_id,
+                    l.ifsc_code,
                     to_char(p.date, 'YYYY') as year,
                     to_char(p.date, 'MM') as month,
                     to_char(p.date, 'YYYY-MM-DD') as day,
                     1 as nbr
                 from
-                    hr_payroll_advice as p, hr_payroll_advice_line as l
-                where
-                    (p.id=l.advice_id)
+                    hr_payroll_advice as p
+                    left join hr_payroll_advice_line as l on (p.id=l.advice_id)
                 group by
-                    p.number,p.name,p.date,p.state,p.company_id,p.bank_id,p.chaque_nos,l.employee_id,l.advice_id,l.bysal
+                    p.number,p.name,p.date,p.state,p.company_id,p.bank_id,p.chaque_nos,p.neft,
+                    l.employee_id,l.advice_id,l.bysal,l.ifsc_code
             )
         """)
 payment_advice_report()
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
index f3069f8c460..806cb1a82a0 100644
--- a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
@@ -22,6 +22,8 @@
                 <field name="month" invisible="1"/>
                 <field name="company_id" invisible="1"/>
                 <field name="cheque_nos" invisible="1"/>
+                <field name="neft" invisible="1"/>
+                <field name="ifsc_code" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -37,7 +39,10 @@
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Payment Advices which are in draft state"/>
                     <filter icon="terp-check" string="Confirm" name="confirm" domain="[('state','=','confirm')]" help="Payment Advices which are confirmed"/>
                     <separator orientation="vertical"/>
+                    <filter icon="terp-camera_test" string="NEFT" domain="[('neft','=',True)]"/>
+                    <separator orientation="vertical"/>
                     <field name="date"/>
+                    <separator orientation="vertical"/>
                     <field name="number"/>
                     <field name="name"/>
                     <field name="employee_id"/>
@@ -45,7 +50,9 @@
                 </group>
                 <newline/>
                  <group expand="0" string="Extended Filters...">
+                    <field name="ifsc_code"/>
                     <field name="bank_id" widget="selection"/>
+                    <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>

From a1f003ef35a509b790f77638e72280251e62b8b0 Mon Sep 17 00:00:00 2001
From: hsa-tinyerp <>
Date: Wed, 18 Jul 2012 13:04:43 +0530
Subject: [PATCH 179/999] [IMP]base:added country_data and currency_data xml
 files

bzr revid: help-20120718073443-sfo0odgz19biql39
---
 openerp/addons/base/__openerp__.py    |    2 +
 openerp/addons/base/base_data.xml     | 1664 -------------------------
 openerp/addons/base/country_data.xml  | 1032 +++++++++++++++
 openerp/addons/base/currency_data.xml | 1657 ++++++++++++++++++++++++
 4 files changed, 2691 insertions(+), 1664 deletions(-)
 create mode 100644 openerp/addons/base/country_data.xml
 create mode 100644 openerp/addons/base/currency_data.xml

diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 31e237a6a06..30497adcdea 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -32,6 +32,8 @@
     'depends': [],
     'init_xml': [
         'base_data.xml',
+        'currency_data.xml',
+        'country_data.xml',
         'security/base_security.xml',
         'base_menu.xml',
         'res/res_security.xml',
diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 7f5b4dec109..74a88454290 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -30,1031 +30,6 @@
 
         <function name="install_lang" model="res.lang"/>
 
-        <record id="ad" model="res.country">
-            <field name="name">Andorra, Principality of</field>
-            <field name="code">ad</field>
-        </record>
-        <record id="ae" model="res.country">
-            <field name="name">United Arab Emirates</field>
-            <field name="code">ae</field>
-        </record>
-        <record id="af" model="res.country">
-            <field name="name">Afghanistan, Islamic State of</field>
-            <field name="code">af</field>
-        </record>
-        <record id="ag" model="res.country">
-            <field name="name">Antigua and Barbuda</field>
-            <field name="code">ag</field>
-        </record>
-        <record id="ai" model="res.country">
-            <field name="name">Anguilla</field>
-            <field name="code">ai</field>
-        </record>
-        <record id="al" model="res.country">
-            <field name="name">Albania</field>
-            <field name="code">al</field>
-        </record>
-        <record id="am" model="res.country">
-            <field name="name">Armenia</field>
-            <field name="code">am</field>
-        </record>
-        <record id="an" model="res.country">
-            <field name="name">Netherlands Antilles</field>
-            <field name="code">an</field>
-        </record>
-        <record id="ao" model="res.country">
-            <field name="name">Angola</field>
-            <field name="code">ao</field>
-        </record>
-        <record id="aq" model="res.country">
-            <field name="name">Antarctica</field>
-            <field name="code">aq</field>
-        </record>
-        <record id="ar" model="res.country">
-            <field name="name">Argentina</field>
-            <field name="code">ar</field>
-        </record>
-        <record id="as" model="res.country">
-            <field name="name">American Samoa</field>
-            <field name="code">as</field>
-        </record>
-        <record id="at" model="res.country">
-            <field name="name">Austria</field>
-            <field name="code">at</field>
-        </record>
-        <record id="au" model="res.country">
-            <field name="name">Australia</field>
-            <field name="code">au</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s %(state_code)s %(zip)s\n%(country_name)s'" />
-        </record>
-        <record id="aw" model="res.country">
-            <field name="name">Aruba</field>
-            <field name="code">aw</field>
-        </record>
-        <record id="ax" model="res.country">
-            <field name="name">Åland Islands</field>
-            <field name="code">ax</field>
-        </record>
-        <record id="az" model="res.country">
-            <field name="name">Azerbaijan</field>
-            <field name="code">az</field>
-        </record>
-        <record id="ba" model="res.country">
-            <field name="name">Bosnia-Herzegovina</field>
-            <field name="code">ba</field>
-        </record>
-        <record id="bb" model="res.country">
-            <field name="name">Barbados</field>
-            <field name="code">bb</field>
-        </record>
-        <record id="bd" model="res.country">
-            <field name="name">Bangladesh</field>
-            <field name="code">bd</field>
-        </record>
-        <record id="be" model="res.country">
-            <field name="name">Belgium</field>
-            <field name="code">be</field>
-            <field name="address_format" eval="'%(street)s\n%(zip)s, %(city)s\n%(country_name)s'" />            
-        </record>
-        <record id="bf" model="res.country">
-            <field name="name">Burkina Faso</field>
-            <field name="code">bf</field>
-        </record>
-        <record id="bg" model="res.country">
-            <field name="name">Bulgaria</field>
-            <field name="code">bg</field>
-        </record>
-        <record id="bh" model="res.country">
-            <field name="name">Bahrain</field>
-            <field name="code">bh</field>
-        </record>
-        <record id="bi" model="res.country">
-            <field name="name">Burundi</field>
-            <field name="code">bi</field>
-        </record>
-        <record id="bj" model="res.country">
-            <field name="name">Benin</field>
-            <field name="code">bj</field>
-        </record>
-        <record id="bl" model="res.country">
-            <field name="name">Saint Barthélémy</field>
-            <field name="code">bl</field>
-        </record>
-        <record id="bm" model="res.country">
-            <field name="name">Bermuda</field>
-            <field name="code">bm</field>
-        </record>
-        <record id="bn" model="res.country">
-            <field name="name">Brunei Darussalam</field>
-            <field name="code">bn</field>
-        </record>
-        <record id="bo" model="res.country">
-            <field name="name">Bolivia</field>
-            <field name="code">bo</field>
-        </record>
-        <record id="bq" model="res.country">
-            <field name="name">Bonaire, Sint Eustatius and Saba</field>
-            <field name="code">bq</field>
-        </record>
-        <record id="br" model="res.country">
-            <field name="name">Brazil</field>
-            <field name="code">br</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s%(country_name)s'" />            
-        </record>
-        <record id="bs" model="res.country">
-            <field name="name">Bahamas</field>
-            <field name="code">bs</field>
-        </record>
-        <record id="bt" model="res.country">
-            <field name="name">Bhutan</field>
-            <field name="code">bt</field>
-        </record>
-        <record id="bv" model="res.country">
-            <field name="name">Bouvet Island</field>
-            <field name="code">bv</field>
-        </record>
-        <record id="bw" model="res.country">
-            <field name="name">Botswana</field>
-            <field name="code">bw</field>
-        </record>
-        <record id="by" model="res.country">
-            <field name="name">Belarus</field>
-            <field name="code">by</field>
-        </record>
-        <record id="bz" model="res.country">
-            <field name="name">Belize</field>
-            <field name="code">bz</field>
-        </record>
-        <record id="ca" model="res.country">
-            <field name="name">Canada</field>
-            <field name="code">ca</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'" />
-        </record>
-        <record id="cc" model="res.country">
-            <field name="name">Cocos (Keeling) Islands</field>
-            <field name="code">cc</field>
-        </record>
-        <record id="cf" model="res.country">
-            <field name="name">Central African Republic</field>
-            <field name="code">cf</field>
-        </record>
-        <record id="cd" model="res.country">
-            <field name="name">Congo, Democratic Republic of the</field>
-            <field name="code">cd</field>
-        </record>
-        <record id="cg" model="res.country">
-            <field name="name">Congo</field>
-            <field name="code">cg</field>
-        </record>
-        <record id="ch" model="res.country">
-            <field name="name">Switzerland</field>
-            <field name="code">ch</field>
-        </record>
-        <record id="ci" model="res.country">
-            <field name="name">Ivory Coast (Cote D'Ivoire)</field>
-            <field name="code">ci</field>
-        </record>
-        <record id="ck" model="res.country">
-            <field name="name">Cook Islands</field>
-            <field name="code">ck</field>
-        </record>
-        <record id="cl" model="res.country">
-            <field name="name">Chile</field>
-            <field name="code">cl</field>
-        </record>
-        <record id="cm" model="res.country">
-            <field name="name">Cameroon</field>
-            <field name="code">cm</field>
-        </record>
-        <record id="cn" model="res.country">
-            <field name="name">China</field>
-            <field name="code">cn</field>
-        </record>
-        <record id="co" model="res.country">
-            <field name="name">Colombia</field>
-            <field name="code">co</field>
-        </record>
-        <record id="cr" model="res.country">
-            <field name="name">Costa Rica</field>
-            <field name="code">cr</field>
-        </record>
-        <record id="cu" model="res.country">
-            <field name="name">Cuba</field>
-            <field name="code">cu</field>
-        </record>
-        <record id="cv" model="res.country">
-            <field name="name">Cape Verde</field>
-            <field name="code">cv</field>
-        </record>
-        <record id="cw" model="res.country">
-            <field name="name">Curaçao</field>
-            <field name="code">cw</field>
-        </record>
-        <record id="cx" model="res.country">
-            <field name="name">Christmas Island</field>
-            <field name="code">cx</field>
-        </record>
-        <record id="cy" model="res.country">
-            <field name="name">Cyprus</field>
-            <field name="code">cy</field>
-        </record>
-        <record id="cz" model="res.country">
-            <field name="name">Czech Republic</field>
-            <field name="code">cz</field>
-        </record>
-        <record id="de" model="res.country">
-            <field name="name">Germany</field>
-            <field name="code">de</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
-        </record>
-        <record id="dj" model="res.country">
-            <field name="name">Djibouti</field>
-            <field name="code">dj</field>
-        </record>
-        <record id="dk" model="res.country">
-            <field name="name">Denmark</field>
-            <field name="code">dk</field>
-        </record>
-        <record id="dm" model="res.country">
-            <field name="name">Dominica</field>
-            <field name="code">dm</field>
-        </record>
-        <record id="do" model="res.country">
-            <field name="name">Dominican Republic</field>
-            <field name="code">do</field>
-        </record>
-        <record id="dz" model="res.country">
-            <field name="name">Algeria</field>
-            <field name="code">dz</field>
-        </record>
-        <record id="ec" model="res.country">
-            <field name="name">Ecuador</field>
-            <field name="code">ec</field>
-        </record>
-        <record id="ee" model="res.country">
-            <field name="name">Estonia</field>
-            <field name="code">ee</field>
-        </record>
-        <record id="eg" model="res.country">
-            <field name="name">Egypt</field>
-            <field name="code">eg</field>
-        </record>
-        <record id="eh" model="res.country">
-            <field name="name">Western Sahara</field>
-            <field name="code">eh</field>
-        </record>
-        <record id="er" model="res.country">
-            <field name="name">Eritrea</field>
-            <field name="code">er</field>
-        </record>
-        <record id="es" model="res.country">
-            <field name="name">Spain</field>
-            <field name="code">es</field>
-            <field name="address_format" eval="'%(street)s\n%(zip)s %(city)s,%(state_name)s\n%(country_name)s'" />            
-        </record>
-        <record id="et" model="res.country">
-            <field name="name">Ethiopia</field>
-            <field name="code">et</field>
-        </record>
-        <record id="fi" model="res.country">
-            <field name="name">Finland</field>
-            <field name="code">fi</field>
-        </record>
-        <record id="fj" model="res.country">
-            <field name="name">Fiji</field>
-            <field name="code">fj</field>
-        </record>
-        <record id="fk" model="res.country">
-            <field name="name">Falkland Islands</field>
-            <field name="code">fk</field>
-        </record>
-        <record id="fm" model="res.country">
-            <field name="name">Micronesia</field>
-            <field name="code">fm</field>
-        </record>
-        <record id="fo" model="res.country">
-            <field name="name">Faroe Islands</field>
-            <field name="code">fo</field>
-        </record>
-        <record id="fr" model="res.country">
-            <field name="name">France</field>
-            <field name="code">fr</field>
-            <field name="address_format" eval="'%(street)s\n%(zip)s %(city)s\n%(country_name)s'" />            
-        </record>
-        <record id="ga" model="res.country">
-            <field name="name">Gabon</field>
-            <field name="code">ga</field>
-        </record>
-        <record id="gd" model="res.country">
-            <field name="name">Grenada</field>
-            <field name="code">gd</field>
-        </record>
-        <record id="ge" model="res.country">
-            <field name="name">Georgia</field>
-            <field name="code">ge</field>
-        </record>
-        <record id="gf" model="res.country">
-            <field name="name">French Guyana</field>
-            <field name="code">gf</field>
-        </record>
-        <record id="gh" model="res.country">
-            <field name="name">Ghana</field>
-            <field name="code">gh</field>
-        </record>
-        <record id="gi" model="res.country">
-            <field name="name">Gibraltar</field>
-            <field name="code">gi</field>
-        </record>
-        <record id="gg" model="res.country">
-            <field name="name">Guernsey</field>
-            <field name="code">gg</field>
-        </record>
-        <record id="gl" model="res.country">
-            <field name="name">Greenland</field>
-            <field name="code">gl</field>
-        </record>
-        <record id="gm" model="res.country">
-            <field name="name">Gambia</field>
-            <field name="code">gm</field>
-        </record>
-        <record id="gn" model="res.country">
-            <field name="name">Guinea</field>
-            <field name="code">gn</field>
-        </record>
-        <record id="gp" model="res.country">
-            <field name="name">Guadeloupe (French)</field>
-            <field name="code">gp</field>
-        </record>
-        <record id="gq" model="res.country">
-            <field name="name">Equatorial Guinea</field>
-            <field name="code">gq</field>
-        </record>
-        <record id="gr" model="res.country">
-            <field name="name">Greece</field>
-            <field name="code">gr</field>
-        </record>
-        <record id="gs" model="res.country">
-            <field name="name">South Georgia and the South Sandwich Islands</field>
-            <field name="code">gs</field>
-        </record>
-        <record id="gt" model="res.country">
-            <field name="name">Guatemala</field>
-            <field name="code">gt</field>
-        </record>
-        <record id="gu" model="res.country">
-            <field name="name">Guam (USA)</field>
-            <field name="code">gu</field>
-        </record>
-        <record id="gw" model="res.country">
-            <field name="name">Guinea Bissau</field>
-            <field name="code">gw</field>
-        </record>
-        <record id="gy" model="res.country">
-            <field name="name">Guyana</field>
-            <field name="code">gy</field>
-        </record>
-        <record id="hk" model="res.country">
-            <field name="name">Hong Kong</field>
-            <field name="code">hk</field>
-        </record>
-        <record id="hm" model="res.country">
-            <field name="name">Heard and McDonald Islands</field>
-            <field name="code">hm</field>
-        </record>
-        <record id="hn" model="res.country">
-            <field name="name">Honduras</field>
-            <field name="code">hn</field>
-        </record>
-        <record id="hr" model="res.country">
-            <field name="name">Croatia</field>
-            <field name="code">hr</field>
-        </record>
-        <record id="ht" model="res.country">
-            <field name="name">Haiti</field>
-            <field name="code">ht</field>
-        </record>
-        <record id="hu" model="res.country">
-            <field name="name">Hungary</field>
-            <field name="code">hu</field>
-        </record>
-        <record id="id" model="res.country">
-            <field name="name">Indonesia</field>
-            <field name="code">id</field>
-        </record>
-        <record id="ie" model="res.country">
-            <field name="name">Ireland</field>
-            <field name="code">ie</field>
-        </record>
-        <record id="il" model="res.country">
-            <field name="name">Israel</field>
-            <field name="code">il</field>
-        </record>
-        <record id="im" model="res.country">
-            <field name="name">Isle of Man</field>
-            <field name="code">im</field>
-        </record>
-        <record id="in" model="res.country">
-            <field name="name">India</field>
-            <field name="code">in</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(zip)s\n%(state_name)s%(country_name)s'" />            
-        </record>
-        <record id="io" model="res.country">
-            <field name="name">British Indian Ocean Territory</field>
-            <field name="code">io</field>
-        </record>
-        <record id="iq" model="res.country">
-            <field name="name">Iraq</field>
-            <field name="code">iq</field>
-        </record>
-        <record id="ir" model="res.country">
-            <field name="name">Iran</field>
-            <field name="code">ir</field>
-        </record>
-        <record id="is" model="res.country">
-            <field name="name">Iceland</field>
-            <field name="code">is</field>
-        </record>
-        <record id="it" model="res.country">
-            <field name="name">Italy</field>
-            <field name="code">it</field>
-        </record>
-        <record id="je" model="res.country">
-            <field name="name">Jersey</field>
-            <field name="code">je</field>
-        </record>
-        <record id="jm" model="res.country">
-            <field name="name">Jamaica</field>
-            <field name="code">jm</field>
-        </record>
-        <record id="jo" model="res.country">
-            <field name="name">Jordan</field>
-            <field name="code">jo</field>
-        </record>
-        <record id="jp" model="res.country">
-            <field name="name">Japan</field>
-            <field name="code">jp</field>
-        </record>
-        <record id="ke" model="res.country">
-            <field name="name">Kenya</field>
-            <field name="code">ke</field>
-        </record>
-        <record id="kg" model="res.country">
-            <field name="name">Kyrgyz Republic (Kyrgyzstan)</field>
-            <field name="code">kg</field>
-        </record>
-        <record id="kh" model="res.country">
-            <field name="name">Cambodia, Kingdom of</field>
-            <field name="code">kh</field>
-        </record>
-        <record id="ki" model="res.country">
-            <field name="name">Kiribati</field>
-            <field name="code">ki</field>
-        </record>
-        <record id="km" model="res.country">
-            <field name="name">Comoros</field>
-            <field name="code">km</field>
-        </record>
-        <record id="kn" model="res.country">
-            <field name="name">Saint Kitts &amp; Nevis Anguilla</field>
-            <field name="code">kn</field>
-        </record>
-        <record id="kp" model="res.country">
-            <field name="name">North Korea</field>
-            <field name="code">kp</field>
-        </record>
-        <record id="kr" model="res.country">
-            <field name="name">South Korea</field>
-            <field name="code">kr</field>
-        </record>
-        <record id="kw" model="res.country">
-            <field name="name">Kuwait</field>
-            <field name="code">kw</field>
-        </record>
-        <record id="ky" model="res.country">
-            <field name="name">Cayman Islands</field>
-            <field name="code">ky</field>
-        </record>
-        <record id="kz" model="res.country">
-            <field name="name">Kazakhstan</field>
-            <field name="code">kz</field>
-        </record>
-        <record id="la" model="res.country">
-            <field name="name">Laos</field>
-            <field name="code">la</field>
-        </record>
-        <record id="lb" model="res.country">
-            <field name="name">Lebanon</field>
-            <field name="code">lb</field>
-        </record>
-        <record id="lc" model="res.country">
-            <field name="name">Saint Lucia</field>
-            <field name="code">lc</field>
-        </record>
-        <record id="li" model="res.country">
-            <field name="name">Liechtenstein</field>
-            <field name="code">li</field>
-        </record>
-        <record id="lk" model="res.country">
-            <field name="name">Sri Lanka</field>
-            <field name="code">lk</field>
-        </record>
-        <record id="lr" model="res.country">
-            <field name="name">Liberia</field>
-            <field name="code">lr</field>
-        </record>
-        <record id="ls" model="res.country">
-            <field name="name">Lesotho</field>
-            <field name="code">ls</field>
-        </record>
-        <record id="lt" model="res.country">
-            <field name="name">Lithuania</field>
-            <field name="code">lt</field>
-        </record>
-        <record id="lu" model="res.country">
-            <field name="name">Luxembourg</field>
-            <field name="code">lu</field>
-        </record>
-        <record id="lv" model="res.country">
-            <field name="name">Latvia</field>
-            <field name="code">lv</field>
-        </record>
-        <record id="ly" model="res.country">
-            <field name="name">Libya</field>
-            <field name="code">ly</field>
-        </record>
-        <record id="ma" model="res.country">
-            <field name="name">Morocco</field>
-            <field name="code">ma</field>
-        </record>
-        <record id="mc" model="res.country">
-            <field name="name">Monaco</field>
-            <field name="code">mc</field>
-        </record>
-        <record id="md" model="res.country">
-            <field name="name">Moldavia</field>
-            <field name="code">md</field>
-        </record>
-        <record id="me" model="res.country">
-            <field name="name">Montenegro</field>
-            <field name="code">me</field>
-        </record>
-        <record id="mf" model="res.country">
-            <field name="name">Saint Martin (French part)</field>
-            <field name="code">mf</field>
-        </record>
-        <record id="mg" model="res.country">
-            <field name="name">Madagascar</field>
-            <field name="code">mg</field>
-        </record>
-        <record id="mh" model="res.country">
-            <field name="name">Marshall Islands</field>
-            <field name="code">mh</field>
-        </record>
-        <record id="mk" model="res.country">
-            <field name="name">Macedonia, the former Yugoslav Republic of</field>
-            <field name="code">mk</field>
-        </record>
-        <record id="ml" model="res.country">
-            <field name="name">Mali</field>
-            <field name="code">ml</field>
-        </record>
-        <record id="mm" model="res.country">
-            <field name="name">Myanmar</field>
-            <field name="code">mm</field>
-        </record>
-        <record id="mn" model="res.country">
-            <field name="name">Mongolia</field>
-            <field name="code">mn</field>
-        </record>
-        <record id="mo" model="res.country">
-            <field name="name">Macau</field>
-            <field name="code">mo</field>
-        </record>
-        <record id="mp" model="res.country">
-            <field name="name">Northern Mariana Islands</field>
-            <field name="code">mp</field>
-        </record>
-        <record id="mq" model="res.country">
-            <field name="name">Martinique (French)</field>
-            <field name="code">mq</field>
-        </record>
-        <record id="mr" model="res.country">
-            <field name="name">Mauritania</field>
-            <field name="code">mr</field>
-        </record>
-        <record id="ms" model="res.country">
-            <field name="name">Montserrat</field>
-            <field name="code">ms</field>
-        </record>
-        <record id="mt" model="res.country">
-            <field name="name">Malta</field>
-            <field name="code">mt</field>
-        </record>
-        <record id="mu" model="res.country">
-            <field name="name">Mauritius</field>
-            <field name="code">mu</field>
-        </record>
-        <record id="mv" model="res.country">
-            <field name="name">Maldives</field>
-            <field name="code">mv</field>
-        </record>
-        <record id="mw" model="res.country">
-            <field name="name">Malawi</field>
-            <field name="code">mw</field>
-        </record>
-        <record id="mx" model="res.country">
-            <field name="name">Mexico</field>
-            <field name="code">mx</field>
-        </record>
-        <record id="my" model="res.country">
-            <field name="name">Malaysia</field>
-            <field name="code">my</field>
-        </record>
-        <record id="mz" model="res.country">
-            <field name="name">Mozambique</field>
-            <field name="code">mz</field>
-        </record>
-        <record id="na" model="res.country">
-            <field name="name">Namibia</field>
-            <field name="code">na</field>
-        </record>
-        <record id="nc" model="res.country">
-            <field name="name">New Caledonia (French)</field>
-            <field name="code">nc</field>
-        </record>
-        <record id="ne" model="res.country">
-            <field name="name">Niger</field>
-            <field name="code">ne</field>
-        </record>
-        <record id="nf" model="res.country">
-            <field name="name">Norfolk Island</field>
-            <field name="code">nf</field>
-        </record>
-        <record id="ng" model="res.country">
-            <field name="name">Nigeria</field>
-            <field name="code">ng</field>
-        </record>
-        <record id="ni" model="res.country">
-            <field name="name">Nicaragua</field>
-            <field name="code">ni</field>
-        </record>
-        <record id="nl" model="res.country">
-            <field name="name">Netherlands</field>
-            <field name="code">nl</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
-        </record>
-        <record id="no" model="res.country">
-            <field name="name">Norway</field>
-            <field name="code">no</field>
-        </record>
-        <record id="np" model="res.country">
-            <field name="name">Nepal</field>
-            <field name="code">np</field>
-        </record>
-        <record id="nr" model="res.country">
-            <field name="name">Nauru</field>
-            <field name="code">nr</field>
-        </record>
-        <record id="nt" model="res.country">
-            <field name="name">Neutral Zone</field>
-            <field name="code">nt</field>
-        </record>
-        <record id="nu" model="res.country">
-            <field name="name">Niue</field>
-            <field name="code">nu</field>
-        </record>
-        <record id="nz" model="res.country">
-            <field name="name">New Zealand</field>
-            <field name="code">nz</field>
-        </record>
-        <record id="om" model="res.country">
-            <field name="name">Oman</field>
-            <field name="code">om</field>
-        </record>
-        <record id="pa" model="res.country">
-            <field name="name">Panama</field>
-            <field name="code">pa</field>
-        </record>
-        <record id="pe" model="res.country">
-            <field name="name">Peru</field>
-            <field name="code">pe</field>
-        </record>
-        <record id="pf" model="res.country">
-            <field name="name">Polynesia (French)</field>
-            <field name="code">pf</field>
-        </record>
-        <record id="pg" model="res.country">
-            <field name="name">Papua New Guinea</field>
-            <field name="code">pg</field>
-        </record>
-        <record id="ph" model="res.country">
-            <field name="name">Philippines</field>
-            <field name="code">ph</field>
-        </record>
-        <record id="pk" model="res.country">
-            <field name="name">Pakistan</field>
-            <field name="code">pk</field>
-        </record>
-        <record id="pl" model="res.country">
-            <field name="name">Poland</field>
-            <field name="code">pl</field>
-        </record>
-        <record id="pm" model="res.country">
-            <field name="name">Saint Pierre and Miquelon</field>
-            <field name="code">pm</field>
-        </record>
-        <record id="pn" model="res.country">
-            <field name="name">Pitcairn Island</field>
-            <field name="code">pn</field>
-        </record>
-        <record id="pr" model="res.country">
-            <field name="name">Puerto Rico</field>
-            <field name="code">pr</field>
-        </record>
-        <record id="ps" model="res.country">
-            <field name="name">Palestinian Territory, Occupied</field>
-            <field name="code">ps</field>
-        </record>
-        <record id="pt" model="res.country">
-            <field name="name">Portugal</field>
-            <field name="code">pt</field>
-        </record>
-        <record id="pw" model="res.country">
-            <field name="name">Palau</field>
-            <field name="code">pw</field>
-        </record>
-        <record id="py" model="res.country">
-            <field name="name">Paraguay</field>
-            <field name="code">py</field>
-        </record>
-        <record id="qa" model="res.country">
-            <field name="name">Qatar</field>
-            <field name="code">qa</field>
-        </record>
-        <record id="re" model="res.country">
-            <field name="name">Reunion (French)</field>
-            <field name="code">re</field>
-        </record>
-        <record id="ro" model="res.country">
-            <field name="name">Romania</field>
-            <field name="code">ro</field>
-        </record>
-        <record id="rs" model="res.country">
-            <field name="name">Serbia</field>
-            <field name="code">rs</field>
-        </record>
-        <record id="ru" model="res.country">
-            <field name="name">Russian Federation</field>
-            <field name="code">ru</field>
-        </record>
-        <record id="rw" model="res.country">
-            <field name="name">Rwanda</field>
-            <field name="code">rw</field>
-        </record>
-        <record id="sa" model="res.country">
-            <field name="name">Saudi Arabia</field>
-            <field name="code">sa</field>
-        </record>
-        <record id="sb" model="res.country">
-            <field name="name">Solomon Islands</field>
-            <field name="code">sb</field>
-        </record>
-        <record id="sc" model="res.country">
-            <field name="name">Seychelles</field>
-            <field name="code">sc</field>
-        </record>
-        <record id="sd" model="res.country">
-            <field name="name">Sudan</field>
-            <field name="code">sd</field>
-        </record>
-        <record id="se" model="res.country">
-            <field name="name">Sweden</field>
-            <field name="code">se</field>
-        </record>
-        <record id="sg" model="res.country">
-            <field name="name">Singapore</field>
-            <field name="code">sg</field>
-        </record>
-        <record id="sh" model="res.country">
-            <field name="name">Saint Helena</field>
-            <field name="code">sh</field>
-        </record>
-        <record id="si" model="res.country">
-            <field name="name">Slovenia</field>
-            <field name="code">si</field>
-        </record>
-        <record id="sj" model="res.country">
-            <field name="name">Svalbard and Jan Mayen Islands</field>
-            <field name="code">sj</field>
-        </record>
-        <record id="sk" model="res.country">
-            <field name="name">Slovakia</field>
-            <field name="code">sk</field>
-        </record>
-        <record id="sl" model="res.country">
-            <field name="name">Sierra Leone</field>
-            <field name="code">sl</field>
-        </record>
-        <record id="sm" model="res.country">
-            <field name="name">San Marino</field>
-            <field name="code">sm</field>
-        </record>
-        <record id="sn" model="res.country">
-            <field name="name">Senegal</field>
-            <field name="code">sn</field>
-        </record>
-        <record id="so" model="res.country">
-            <field name="name">Somalia</field>
-            <field name="code">so</field>
-        </record>
-        <record id="sr" model="res.country">
-            <field name="name">Suriname</field>
-            <field name="code">sr</field>
-        </record>
-        <record id="ss" model="res.country">
-            <field name="name">South Sudan</field>
-            <field name="code">ss</field>
-        </record>
-        <record id="st" model="res.country">
-            <field name="name">Saint Tome (Sao Tome) and Principe</field>
-            <field name="code">st</field>
-        </record>
-        <record id="sv" model="res.country">
-            <field name="name">El Salvador</field>
-            <field name="code">sv</field>
-        </record>
-        <record id="sx" model="res.country">
-            <field name="name">Sint Maarten (Dutch part)</field>
-            <field name="code">sx</field>
-        </record>
-        <record id="sy" model="res.country">
-            <field name="name">Syria</field>
-            <field name="code">sy</field>
-        </record>
-        <record id="sz" model="res.country">
-            <field name="name">Swaziland</field>
-            <field name="code">sz</field>
-        </record>
-        <record id="tc" model="res.country">
-            <field name="name">Turks and Caicos Islands</field>
-            <field name="code">tc</field>
-        </record>
-        <record id="td" model="res.country">
-            <field name="name">Chad</field>
-            <field name="code">td</field>
-        </record>
-        <record id="tf" model="res.country">
-            <field name="name">French Southern Territories</field>
-            <field name="code">tf</field>
-        </record>
-        <record id="tg" model="res.country">
-            <field name="name">Togo</field>
-            <field name="code">tg</field>
-        </record>
-        <record id="th" model="res.country">
-            <field name="name">Thailand</field>
-            <field name="code">th</field>
-        </record>
-        <record id="tj" model="res.country">
-            <field name="name">Tajikistan</field>
-            <field name="code">tj</field>
-        </record>
-        <record id="tk" model="res.country">
-            <field name="name">Tokelau</field>
-            <field name="code">tk</field>
-        </record>
-        <record id="tm" model="res.country">
-            <field name="name">Turkmenistan</field>
-            <field name="code">tm</field>
-        </record>
-        <record id="tn" model="res.country">
-            <field name="name">Tunisia</field>
-            <field name="code">tn</field>
-        </record>
-        <record id="to" model="res.country">
-            <field name="name">Tonga</field>
-            <field name="code">to</field>
-        </record>
-        <record id="tp" model="res.country">
-            <field name="name">East Timor</field>
-            <field name="code">tp</field>
-        </record>
-        <record id="tr" model="res.country">
-            <field name="name">Turkey</field>
-            <field name="code">tr</field>
-        </record>
-        <record id="tt" model="res.country">
-            <field name="name">Trinidad and Tobago</field>
-            <field name="code">tt</field>
-        </record>
-        <record id="tv" model="res.country">
-            <field name="name">Tuvalu</field>
-            <field name="code">tv</field>
-        </record>
-        <record id="tw" model="res.country">
-            <field name="name">Taiwan</field>
-            <field name="code">tw</field>
-        </record>
-        <record id="tz" model="res.country">
-            <field name="name">Tanzania</field>
-            <field name="code">tz</field>
-        </record>
-        <record id="ua" model="res.country">
-            <field name="name">Ukraine</field>
-            <field name="code">ua</field>
-        </record>
-        <record id="ug" model="res.country">
-            <field name="name">Uganda</field>
-            <field name="code">ug</field>
-        </record>
-        <record id="uk" model="res.country">
-            <field name="name">United Kingdom</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(country_name)s\n%(zip)s'" />            
-            <field name="code">gb</field>
-        </record>
-        <record id="um" model="res.country">
-            <field name="name">USA Minor Outlying Islands</field>
-            <field name="code">um</field>
-        </record>
-        <record id="us" model="res.country">
-            <field name="name">United States</field>
-            <field name="code">us</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'" />            
-        </record>
-        <record id="uy" model="res.country">
-            <field name="name">Uruguay</field>
-            <field name="code">uy</field>
-        </record>
-        <record id="uz" model="res.country">
-            <field name="name">Uzbekistan</field>
-            <field name="code">uz</field>
-        </record>
-        <record id="va" model="res.country">
-            <field name="name">Holy See (Vatican City State)</field>
-            <field name="code">va</field>
-        </record>
-        <record id="vc" model="res.country">
-            <field name="name">Saint Vincent &amp; Grenadines</field>
-            <field name="code">vc</field>
-        </record>
-        <record id="ve" model="res.country">
-            <field name="name">Venezuela</field>
-            <field name="code">ve</field>
-        </record>
-        <record id="vg" model="res.country">
-            <field name="name">Virgin Islands (British)</field>
-            <field name="code">vg</field>
-        </record>
-        <record id="vi" model="res.country">
-            <field name="name">Virgin Islands (USA)</field>
-            <field name="code">vi</field>
-        </record>
-        <record id="vn" model="res.country">
-            <field name="name">Vietnam</field>
-            <field name="code">vn</field>
-        </record>
-        <record id="vu" model="res.country">
-            <field name="name">Vanuatu</field>
-            <field name="code">vu</field>
-        </record>
-        <record id="wf" model="res.country">
-            <field name="name">Wallis and Futuna Islands</field>
-            <field name="code">wf</field>
-        </record>
-        <record id="ws" model="res.country">
-            <field name="name">Samoa</field>
-            <field name="code">ws</field>
-        </record>
-        <record id="ye" model="res.country">
-            <field name="name">Yemen</field>
-            <field name="code">ye</field>
-        </record>
-        <record id="yt" model="res.country">
-            <field name="name">Mayotte</field>
-            <field name="code">yt</field>
-        </record>
-        <record id="yu" model="res.country">
-            <field name="name">Yugoslavia</field>
-            <field name="code">yu</field>
-        </record>
-        <record id="za" model="res.country">
-            <field name="name">South Africa</field>
-            <field name="code">za</field>
-        </record>
-        <record id="zm" model="res.country">
-            <field name="name">Zambia</field>
-            <field name="code">zm</field>
-        </record>
-        <!-- DEPRECATED, New name of Zaire is Democratic Republic of the Congo ! -->
-        <record id="zr" model="res.country">
-            <field name="name">Zaire</field>
-            <field name="code">zr</field>
-        </record>
-        <record id="zw" model="res.country">
-            <field name="name">Zimbabwe</field>
-            <field name="code">zw</field>
-        </record>
-
         <record id="main_partner" model="res.partner">
             <field name="name">Your Company</field>
             <!-- Address and Company ID will be set later -->
@@ -1101,644 +76,5 @@
             <field name="company_id" ref="main_company"/>
         </record>
 
-        <!-- The Following currency rates are considered as on 1st Jan,2010 against EUR. -->
-        <!-- Currencies -->
-        <record id="EUR" model="res.currency">
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="USD" model="res.currency">
-            <field name="name">USD</field>
-            <field name="symbol">$</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateUSD" model="res.currency.rate">
-            <field name="rate">1.2834</field>
-            <field name="currency_id" ref="USD"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <!-- VEF was previously VEB -->
-        <record id="VEF" model="res.currency">
-            <field name="name">VEF</field>
-            <field name="symbol">Bs.F</field>
-            <field name="rounding">0.0001</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateVEF" model="res.currency.rate">
-            <field name="rate">5.864</field>
-            <field name="currency_id" ref="VEF"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="CAD" model="res.currency">
-            <field name="name">CAD</field>
-            <field name="symbol">$</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateCAD" model="res.currency.rate">
-            <field name="rate">1.3388</field>
-            <field name="currency_id" ref="CAD"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-
-        <record id="CHF" model="res.currency">
-            <field name="name">CHF</field>
-            <field name="symbol">CHF</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateCHF" model="res.currency.rate">
-            <field name="rate">1.3086</field>
-            <field name="currency_id" ref="CHF"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="BRL" model="res.currency">
-            <field name="name">BRL</field>
-            <field name="symbol">R$</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateBRL" model="res.currency.rate">
-            <field name="rate">2.2344</field>
-            <field name="currency_id" ref="BRL"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="CNY" model="res.currency">
-            <field name="name">CNY</field>
-            <field name="symbol">¥</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateCNY" model="res.currency.rate">
-            <field name="rate">8.7556</field>
-            <field name="currency_id" ref="CNY"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-
-        <record id="COP" model="res.currency">
-            <field name="name">COP</field>
-            <field name="symbol">$</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateCOP" model="res.currency.rate">
-            <field name="rate">2933.8378</field>
-            <field name="currency_id" ref="COP"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="CZK" model="res.currency">
-            <field name="name">CZK</field>
-            <field name="symbol">Kč</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateCZK" model="res.currency.rate">
-            <field name="rate">26.5634</field>
-            <field name="currency_id" ref="CZK"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="DKK" model="res.currency">
-            <field name="name">DKK</field>
-            <field name="symbol">kr</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateDKK" model="res.currency.rate">
-            <field name="rate">7.4445</field>
-            <field name="currency_id" ref="DKK"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-
-        <record id="HUF" model="res.currency">
-            <field name="name">HUF</field>
-            <field name="symbol">Ft</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateHUF" model="res.currency.rate">
-            <field name="rate">271.5621</field>
-            <field name="currency_id" ref="HUF"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="IDR" model="res.currency">
-            <field name="name">IDR</field>
-            <field name="symbol">Rp</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateIDR1" model="res.currency.rate">
-            <field name="rate">14352.00</field>
-            <field name="currency_id" ref="IDR"/>
-            <field eval="time.strftime('2009-01-01')" name="name"/>
-        </record>
-        <record id="rateIDR" model="res.currency.rate">
-            <field name="rate">11796.39</field>
-            <field name="currency_id" ref="IDR"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="LVL" model="res.currency">
-            <field name="name">LVL</field>
-            <field name="symbol">Ls</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateLVL" model="res.currency.rate">
-            <field name="rate">0.7086</field>
-            <field name="currency_id" ref="LVL"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-
-        <record id="NOK" model="res.currency">
-            <field name="name">NOK</field>
-            <field name="symbol">kr</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateNOK" model="res.currency.rate">
-            <field name="rate">7.8668</field>
-            <field name="currency_id" ref="NOK"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="XPF" model="res.currency">
-            <field name="name">XPF</field>
-            <field name="symbol">XPF</field>
-            <field name="rounding">1.00</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateXPF" model="res.currency.rate">
-            <field name="rate">119.331742</field>
-            <field name="currency_id" ref="XPF"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="PAB" model="res.currency">
-            <field name="name">PAB</field>
-            <field name="symbol">B/.</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="ratePAB" model="res.currency.rate">
-            <field name="rate">1.2676</field>
-            <field name="currency_id" ref="PAB"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="PLN" model="res.currency">
-            <field name="name">PLN</field>
-            <field name="symbol">zł</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="ratePLN" model="res.currency.rate">
-            <field name="rate">4.1005</field>
-            <field name="currency_id" ref="PLN"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="SEK" model="res.currency">
-            <field name="name">SEK</field>
-            <field name="symbol">kr</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateSEK" model="res.currency.rate">
-            <field name="rate">10.3004</field>
-            <field name="currency_id" ref="SEK"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="GBP" model="res.currency">
-            <field name="name">GBP</field>
-            <field name="symbol">£</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateGBP" model="res.currency.rate">
-            <field name="rate">0.8333</field>
-            <field name="currency_id" ref="GBP"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="ARS" model="res.currency">
-            <field name="name">ARS</field>
-            <field name="symbol">$</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateARS" model="res.currency.rate">
-            <field name="rate">5.0881</field>
-            <field name="currency_id" ref="ARS"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="INR" model="res.currency">
-            <field name="name">INR</field>
-            <field name="symbol">₹</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateINR" model="res.currency.rate">
-            <field name="rate">59.9739</field>
-            <field name="currency_id" ref="INR"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="AUD" model="res.currency">
-            <field name="name">AUD</field>
-            <field name="symbol">$</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateAUD" model="res.currency.rate">
-            <field name="rate">1.4070</field>
-            <field name="currency_id" ref="AUD"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="UAH" model="res.currency">
-            <field name="name">UAH</field>
-            <field name="symbol">₴</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateUAH" model="res.currency.rate">
-            <field name="rate">10.1969</field>
-            <field name="currency_id" ref="UAH"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="VND" model="res.currency">
-            <field name="name">VND</field>
-            <field name="symbol">₫</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateVND" model="res.currency.rate">
-            <field name="rate">26330.01</field>
-            <field name="currency_id" ref="VND"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="HKD" model="res.currency">
-            <field name="name">HKD</field>
-            <field name="symbol">$</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateHKD" model="res.currency.rate">
-            <field name="rate">11.1608</field>
-            <field name="currency_id" ref="HKD"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="JPY" model="res.currency">
-            <field name="name">JPY</field>
-            <field name="symbol">¥</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateJPY" model="res.currency.rate">
-            <field name="rate">133.62</field>
-            <field name="currency_id" ref="JPY"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="BGN" model="res.currency">
-            <field name="name">BGN</field>
-            <field name="symbol">лв</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateBGN" model="res.currency.rate">
-            <field name="rate">1.9558</field>
-            <field name="currency_id" ref="BGN"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="LTL" model="res.currency">
-            <field name="name">LTL</field>
-            <field name="symbol">Lt</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateLTL" model="res.currency.rate">
-            <field name="rate">3.4528</field>
-            <field name="currency_id" ref="LTL"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="RON" model="res.currency">
-            <field name="name">RON</field>
-            <field name="symbol">lei</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateRON" model="res.currency.rate">
-            <field name="rate">4.2253</field>
-            <field name="currency_id" ref="RON"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="HRK" model="res.currency">
-            <field name="name">HRK</field>
-            <field name="symbol">kn</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateHRK" model="res.currency.rate">
-            <field name="rate">7.2936</field>
-            <field name="currency_id" ref="HRK"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="RUB" model="res.currency">
-            <field name="name">RUB</field>
-            <field name="symbol">руб</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateRUB" model="res.currency.rate">
-            <field name="rate">43.16</field>
-            <field name="currency_id" ref="RUB"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="TRY" model="res.currency">
-            <field name="name">TRY</field>
-            <field name="symbol">TL</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateTRY" model="res.currency.rate">
-            <field name="rate">2.1411</field>
-            <field name="currency_id" ref="TRY"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="KRW" model="res.currency">
-            <field name="name">KRW</field>
-            <field name="symbol">₩</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateKRW" model="res.currency.rate">
-            <field name="rate">1662.37</field>
-            <field name="currency_id" ref="KRW"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="MXN" model="res.currency">
-            <field name="name">MXN</field>
-            <field name="symbol">$</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateMXN" model="res.currency.rate">
-            <field name="rate">18.6664</field>
-            <field name="currency_id" ref="MXN"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="MYR" model="res.currency">
-            <field name="name">MYR</field>
-            <field name="symbol">RM</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateMYR" model="res.currency.rate">
-            <field name="rate">4.8887</field>
-            <field name="currency_id" ref="MYR"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="NZD" model="res.currency">
-            <field name="name">NZD</field>
-            <field name="symbol">$</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateNZD" model="res.currency.rate">
-            <field name="rate">1.9764</field>
-            <field name="currency_id" ref="NZD"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="PHP" model="res.currency">
-            <field name="name">PHP</field>
-            <field name="symbol">Php</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="ratePHP" model="res.currency.rate">
-            <field name="rate">66.1</field>
-            <field name="currency_id" ref="PHP"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="SGD" model="res.currency">
-            <field name="name">SGD</field>
-            <field name="symbol">$</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateSGD" model="res.currency.rate">
-            <field name="rate">2.0126</field>
-            <field name="currency_id" ref="SGD"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="THB" model="res.currency">
-            <field name="name">THB</field>
-            <field name="symbol">฿</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateTHB" model="res.currency.rate">
-            <field name="rate">47.779</field>
-            <field name="currency_id" ref="THB"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="ZAR" model="res.currency">
-            <field name="name">ZAR</field>
-            <field name="symbol">R</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateZAR" model="res.currency.rate">
-            <field name="rate">10.5618</field>
-            <field name="currency_id" ref="ZAR"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="res_bank_1" model="res.bank">
-            <field name="name">Reserve</field>
-        </record>
-
-        <record id="CRC" model="res.currency">
-           <field name="name">CRC</field>
-           <field name="rounding">0.01</field>
-           <field name="accuracy">4</field>
-           <field name="symbol">¢</field>
-           <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateCRC" model="res.currency.rate">
-           <field name="rate">691.3153</field>
-           <field name="currency_id" ref="CRC"/>
-           <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="ir_mail_server_localhost0" model="ir.mail_server">
-            <field name="name">localhost</field>
-            <field name="smtp_host">localhost</field>
-            <field eval="25" name="smtp_port"/>
-            <field eval="10" name="sequence"/>
-	    </record>
-
-        <record id="MUR" model="res.currency">
-            <field name="name">MUR</field>
-            <field name="symbol">Rs</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateMUR" model="res.currency.rate">
-            <field name="rate">40.28</field>
-            <field name="currency_id" ref="MUR"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="XOF" model="res.currency">
-            <field name="name">XOF</field>
-            <field name="symbol">CFA</field>
-            <field name="rounding">1</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateXOF" model="res.currency.rate">
-           <field name="rate">655.957</field>
-           <field name="currency_id" ref="XOF"/>
-           <field eval="time.strftime('%Y-01-01')" name="name"/>
-       </record>
-
-        <record id="XAF" model="res.currency">
-            <field name="name">XAF</field>
-            <field name="symbol">FCFA</field>
-            <field name="rounding">1</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateXAF" model="res.currency.rate">
-           <field name="rate">655.957</field>
-           <field name="currency_id" ref="XAF"/>
-           <field eval="time.strftime('%Y-01-01')" name="name"/>
-       </record>
-
-        <record id="UGX" model="res.currency">
-            <field name="name">UGX</field>
-            <field name="symbol">USh</field>
-            <field name="rounding">1</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateUGX" model="res.currency.rate">
-            <field name="rate">3401.91388</field>
-            <field name="currency_id" ref="UGX"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <record id="HNL" model="res.currency">
-            <field name="name">HNL</field>
-            <field name="symbol">L</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateHNL" model="res.currency.rate">
-            <field name="rate">25</field>
-            <field name="currency_id" ref="HNL"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <!-- Chilean peso -->
-        <record id="CLP" model="res.currency">
-            <field name="name">CLP</field>
-            <field name="symbol">$</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateCLP" model="res.currency.rate">
-            <field name="rate">710</field>
-            <field name="currency_id" ref="CLP"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
-        <!--  Uruguayan peso -->
-        <record id="UYU" model="res.currency">
-            <field name="name">UYU</field>
-            <field name="symbol">$</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateUYU" model="res.currency.rate">
-            <field name="currency_id" ref="UYU" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">28.36</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/openerp/addons/base/country_data.xml b/openerp/addons/base/country_data.xml
new file mode 100644
index 00000000000..b991b28fad0
--- /dev/null
+++ b/openerp/addons/base/country_data.xml
@@ -0,0 +1,1032 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+ 
+        <record id="ad" model="res.country">
+            <field name="name">Andorra, Principality of</field>
+            <field name="code">ad</field>
+        </record>
+        <record id="ae" model="res.country">
+            <field name="name">United Arab Emirates</field>
+            <field name="code">ae</field>
+        </record>
+        <record id="af" model="res.country">
+            <field name="name">Afghanistan, Islamic State of</field>
+            <field name="code">af</field>
+        </record>
+        <record id="ag" model="res.country">
+            <field name="name">Antigua and Barbuda</field>
+            <field name="code">ag</field>
+        </record>
+        <record id="ai" model="res.country">
+            <field name="name">Anguilla</field>
+            <field name="code">ai</field>
+        </record>
+        <record id="al" model="res.country">
+            <field name="name">Albania</field>
+            <field name="code">al</field>
+        </record>
+        <record id="am" model="res.country">
+            <field name="name">Armenia</field>
+            <field name="code">am</field>
+        </record>
+        <record id="an" model="res.country">
+            <field name="name">Netherlands Antilles</field>
+            <field name="code">an</field>
+            <field name="currency_id" ref="NOK"/>
+        </record>
+        <record id="ao" model="res.country">
+            <field name="name">Angola</field>
+            <field name="code">ao</field>
+        </record>
+        <record id="aq" model="res.country">
+            <field name="name">Antarctica</field>
+            <field name="code">aq</field>
+        </record>
+        <record id="ar" model="res.country">
+            <field name="name">Argentina</field>
+            <field name="code">ar</field>
+        </record>
+        <record id="as" model="res.country">
+            <field name="name">American Samoa</field>
+            <field name="code">as</field>
+        </record>
+        <record id="at" model="res.country">
+            <field name="name">Austria</field>
+            <field name="code">at</field>
+        </record>
+        <record id="au" model="res.country">
+            <field name="name">Australia</field>
+            <field name="code">au</field>
+            <field name="address_format" eval="'%(street)s\n%(street2)s %(state_code)s %(zip)s\n%(country_name)s'" />
+        </record>
+        <record id="aw" model="res.country">
+            <field name="name">Aruba</field>
+            <field name="code">aw</field>
+        </record>
+        <record id="ax" model="res.country">
+            <field name="name">Åland Islands</field>
+            <field name="code">ax</field>
+        </record>
+        <record id="az" model="res.country">
+            <field name="name">Azerbaijan</field>
+            <field name="code">az</field>
+        </record>
+        <record id="ba" model="res.country">
+            <field name="name">Bosnia-Herzegovina</field>
+            <field name="code">ba</field>
+        </record>
+        <record id="bb" model="res.country">
+            <field name="name">Barbados</field>
+            <field name="code">bb</field>
+        </record>
+        <record id="bd" model="res.country">
+            <field name="name">Bangladesh</field>
+            <field name="code">bd</field>
+        </record>
+        <record id="be" model="res.country">
+            <field name="name">Belgium</field>
+            <field name="code">be</field>
+            <field name="address_format" eval="'%(street)s\n%(zip)s, %(city)s\n%(country_name)s'" />            
+        </record>
+        <record id="bf" model="res.country">
+            <field name="name">Burkina Faso</field>
+            <field name="code">bf</field>
+        </record>
+        <record id="bg" model="res.country">
+            <field name="name">Bulgaria</field>
+            <field name="code">bg</field>
+        </record>
+        <record id="bh" model="res.country">
+            <field name="name">Bahrain</field>
+            <field name="code">bh</field>
+        </record>
+        <record id="bi" model="res.country">
+            <field name="name">Burundi</field>
+            <field name="code">bi</field>
+        </record>
+        <record id="bj" model="res.country">
+            <field name="name">Benin</field>
+            <field name="code">bj</field>
+        </record>
+        <record id="bl" model="res.country">
+            <field name="name">Saint Barthélémy</field>
+            <field name="code">bl</field>
+        </record>
+        <record id="bm" model="res.country">
+            <field name="name">Bermuda</field>
+            <field name="code">bm</field>
+        </record>
+        <record id="bn" model="res.country">
+            <field name="name">Brunei Darussalam</field>
+            <field name="code">bn</field>
+        </record>
+        <record id="bo" model="res.country">
+            <field name="name">Bolivia</field>
+            <field name="code">bo</field>
+        </record>
+        <record id="bq" model="res.country">
+            <field name="name">Bonaire, Sint Eustatius and Saba</field>
+            <field name="code">bq</field>
+        </record>
+        <record id="br" model="res.country">
+            <field name="name">Brazil</field>
+            <field name="code">br</field>
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s%(country_name)s'" />            
+        </record>
+        <record id="bs" model="res.country">
+            <field name="name">Bahamas</field>
+            <field name="code">bs</field>
+        </record>
+        <record id="bt" model="res.country">
+            <field name="name">Bhutan</field>
+            <field name="code">bt</field>
+        </record>
+        <record id="bv" model="res.country">
+            <field name="name">Bouvet Island</field>
+            <field name="code">bv</field>
+        </record>
+        <record id="bw" model="res.country">
+            <field name="name">Botswana</field>
+            <field name="code">bw</field>
+        </record>
+        <record id="by" model="res.country">
+            <field name="name">Belarus</field>
+            <field name="code">by</field>
+        </record>
+        <record id="bz" model="res.country">
+            <field name="name">Belize</field>
+            <field name="code">bz</field>
+        </record>
+        <record id="ca" model="res.country">
+            <field name="name">Canada</field>
+            <field name="code">ca</field>
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'" />
+        </record>
+        <record id="cc" model="res.country">
+            <field name="name">Cocos (Keeling) Islands</field>
+            <field name="code">cc</field>
+        </record>
+        <record id="cf" model="res.country">
+            <field name="name">Central African Republic</field>
+            <field name="code">cf</field>
+        </record>
+        <record id="cd" model="res.country">
+            <field name="name">Congo, Democratic Republic of the</field>
+            <field name="code">cd</field>
+        </record>
+        <record id="cg" model="res.country">
+            <field name="name">Congo</field>
+            <field name="code">cg</field>
+        </record>
+        <record id="ch" model="res.country">
+            <field name="name">Switzerland</field>
+            <field name="code">ch</field>
+        </record>
+        <record id="ci" model="res.country">
+            <field name="name">Ivory Coast (Cote D'Ivoire)</field>
+            <field name="code">ci</field>
+        </record>
+        <record id="ck" model="res.country">
+            <field name="name">Cook Islands</field>
+            <field name="code">ck</field>
+        </record>
+        <record id="cl" model="res.country">
+            <field name="name">Chile</field>
+            <field name="code">cl</field>
+        </record>
+        <record id="cm" model="res.country">
+            <field name="name">Cameroon</field>
+            <field name="code">cm</field>
+        </record>
+        <record id="cn" model="res.country">
+            <field name="name">China</field>
+            <field name="code">cn</field>
+        </record>
+        <record id="co" model="res.country">
+            <field name="name">Colombia</field>
+            <field name="code">co</field>
+        </record>
+        <record id="cr" model="res.country">
+            <field name="name">Costa Rica</field>
+            <field name="code">cr</field>
+        </record>
+        <record id="cu" model="res.country">
+            <field name="name">Cuba</field>
+            <field name="code">cu</field>
+        </record>
+        <record id="cv" model="res.country">
+            <field name="name">Cape Verde</field>
+            <field name="code">cv</field>
+        </record>
+        <record id="cw" model="res.country">
+            <field name="name">Curaçao</field>
+            <field name="code">cw</field>
+        </record>
+        <record id="cx" model="res.country">
+            <field name="name">Christmas Island</field>
+            <field name="code">cx</field>
+        </record>
+        <record id="cy" model="res.country">
+            <field name="name">Cyprus</field>
+            <field name="code">cy</field>
+        </record>
+        <record id="cz" model="res.country">
+            <field name="name">Czech Republic</field>
+            <field name="code">cz</field>
+        </record>
+        <record id="de" model="res.country">
+            <field name="name">Germany</field>
+            <field name="code">de</field>
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
+        </record>
+        <record id="dj" model="res.country">
+            <field name="name">Djibouti</field>
+            <field name="code">dj</field>
+        </record>
+        <record id="dk" model="res.country">
+            <field name="name">Denmark</field>
+            <field name="code">dk</field>
+        </record>
+        <record id="dm" model="res.country">
+            <field name="name">Dominica</field>
+            <field name="code">dm</field>
+        </record>
+        <record id="do" model="res.country">
+            <field name="name">Dominican Republic</field>
+            <field name="code">do</field>
+        </record>
+        <record id="dz" model="res.country">
+            <field name="name">Algeria</field>
+            <field name="code">dz</field>
+        </record>
+        <record id="ec" model="res.country">
+            <field name="name">Ecuador</field>
+            <field name="code">ec</field>
+        </record>
+        <record id="ee" model="res.country">
+            <field name="name">Estonia</field>
+            <field name="code">ee</field>
+        </record>
+        <record id="eg" model="res.country">
+            <field name="name">Egypt</field>
+            <field name="code">eg</field>
+        </record>
+        <record id="eh" model="res.country">
+            <field name="name">Western Sahara</field>
+            <field name="code">eh</field>
+        </record>
+        <record id="er" model="res.country">
+            <field name="name">Eritrea</field>
+            <field name="code">er</field>
+        </record>
+        <record id="es" model="res.country">
+            <field name="name">Spain</field>
+            <field name="code">es</field>
+            <field name="address_format" eval="'%(street)s\n%(zip)s %(city)s,%(state_name)s\n%(country_name)s'" />            
+        </record>
+        <record id="et" model="res.country">
+            <field name="name">Ethiopia</field>
+            <field name="code">et</field>
+        </record>
+        <record id="fi" model="res.country">
+            <field name="name">Finland</field>
+            <field name="code">fi</field>
+        </record>
+        <record id="fj" model="res.country">
+            <field name="name">Fiji</field>
+            <field name="code">fj</field>
+        </record>
+        <record id="fk" model="res.country">
+            <field name="name">Falkland Islands</field>
+            <field name="code">fk</field>
+        </record>
+        <record id="fm" model="res.country">
+            <field name="name">Micronesia</field>
+            <field name="code">fm</field>
+        </record>
+        <record id="fo" model="res.country">
+            <field name="name">Faroe Islands</field>
+            <field name="code">fo</field>
+        </record>
+        <record id="fr" model="res.country">
+            <field name="name">France</field>
+            <field name="code">fr</field>
+            <field name="address_format" eval="'%(street)s\n%(zip)s %(city)s\n%(country_name)s'" />            
+        </record>
+        <record id="ga" model="res.country">
+            <field name="name">Gabon</field>
+            <field name="code">ga</field>
+        </record>
+        <record id="gd" model="res.country">
+            <field name="name">Grenada</field>
+            <field name="code">gd</field>
+        </record>
+        <record id="ge" model="res.country">
+            <field name="name">Georgia</field>
+            <field name="code">ge</field>
+        </record>
+        <record id="gf" model="res.country">
+            <field name="name">French Guyana</field>
+            <field name="code">gf</field>
+        </record>
+        <record id="gh" model="res.country">
+            <field name="name">Ghana</field>
+            <field name="code">gh</field>
+        </record>
+        <record id="gi" model="res.country">
+            <field name="name">Gibraltar</field>
+            <field name="code">gi</field>
+        </record>
+        <record id="gg" model="res.country">
+            <field name="name">Guernsey</field>
+            <field name="code">gg</field>
+        </record>
+        <record id="gl" model="res.country">
+            <field name="name">Greenland</field>
+            <field name="code">gl</field>
+        </record>
+        <record id="gm" model="res.country">
+            <field name="name">Gambia</field>
+            <field name="code">gm</field>
+        </record>
+        <record id="gn" model="res.country">
+            <field name="name">Guinea</field>
+            <field name="code">gn</field>
+        </record>
+        <record id="gp" model="res.country">
+            <field name="name">Guadeloupe (French)</field>
+            <field name="code">gp</field>
+        </record>
+        <record id="gq" model="res.country">
+            <field name="name">Equatorial Guinea</field>
+            <field name="code">gq</field>
+        </record>
+        <record id="gr" model="res.country">
+            <field name="name">Greece</field>
+            <field name="code">gr</field>
+        </record>
+        <record id="gs" model="res.country">
+            <field name="name">South Georgia and the South Sandwich Islands</field>
+            <field name="code">gs</field>
+        </record>
+        <record id="gt" model="res.country">
+            <field name="name">Guatemala</field>
+            <field name="code">gt</field>
+        </record>
+        <record id="gu" model="res.country">
+            <field name="name">Guam (USA)</field>
+            <field name="code">gu</field>
+        </record>
+        <record id="gw" model="res.country">
+            <field name="name">Guinea Bissau</field>
+            <field name="code">gw</field>
+        </record>
+        <record id="gy" model="res.country">
+            <field name="name">Guyana</field>
+            <field name="code">gy</field>
+        </record>
+        <record id="hk" model="res.country">
+            <field name="name">Hong Kong</field>
+            <field name="code">hk</field>
+        </record>
+        <record id="hm" model="res.country">
+            <field name="name">Heard and McDonald Islands</field>
+            <field name="code">hm</field>
+        </record>
+        <record id="hn" model="res.country">
+            <field name="name">Honduras</field>
+            <field name="code">hn</field>
+        </record>
+        <record id="hr" model="res.country">
+            <field name="name">Croatia</field>
+            <field name="code">hr</field>
+        </record>
+        <record id="ht" model="res.country">
+            <field name="name">Haiti</field>
+            <field name="code">ht</field>
+        </record>
+        <record id="hu" model="res.country">
+            <field name="name">Hungary</field>
+            <field name="code">hu</field>
+        </record>
+        <record id="id" model="res.country">
+            <field name="name">Indonesia</field>
+            <field name="code">id</field>
+        </record>
+        <record id="ie" model="res.country">
+            <field name="name">Ireland</field>
+            <field name="code">ie</field>
+        </record>
+        <record id="il" model="res.country">
+            <field name="name">Israel</field>
+            <field name="code">il</field>
+        </record>
+        <record id="im" model="res.country">
+            <field name="name">Isle of Man</field>
+            <field name="code">im</field>
+        </record>
+        <record id="in" model="res.country">
+            <field name="name">India</field>
+            <field name="code">in</field>
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(zip)s\n%(state_name)s%(country_name)s'" />            
+        </record>
+        <record id="io" model="res.country">
+            <field name="name">British Indian Ocean Territory</field>
+            <field name="code">io</field>
+        </record>
+        <record id="iq" model="res.country">
+            <field name="name">Iraq</field>
+            <field name="code">iq</field>
+        </record>
+        <record id="ir" model="res.country">
+            <field name="name">Iran</field>
+            <field name="code">ir</field>
+        </record>
+        <record id="is" model="res.country">
+            <field name="name">Iceland</field>
+            <field name="code">is</field>
+        </record>
+        <record id="it" model="res.country">
+            <field name="name">Italy</field>
+            <field name="code">it</field>
+        </record>
+        <record id="je" model="res.country">
+            <field name="name">Jersey</field>
+            <field name="code">je</field>
+        </record>
+        <record id="jm" model="res.country">
+            <field name="name">Jamaica</field>
+            <field name="code">jm</field>
+        </record>
+        <record id="jo" model="res.country">
+            <field name="name">Jordan</field>
+            <field name="code">jo</field>
+        </record>
+        <record id="jp" model="res.country">
+            <field name="name">Japan</field>
+            <field name="code">jp</field>
+        </record>
+        <record id="ke" model="res.country">
+            <field name="name">Kenya</field>
+            <field name="code">ke</field>
+        </record>
+        <record id="kg" model="res.country">
+            <field name="name">Kyrgyz Republic (Kyrgyzstan)</field>
+            <field name="code">kg</field>
+        </record>
+        <record id="kh" model="res.country">
+            <field name="name">Cambodia, Kingdom of</field>
+            <field name="code">kh</field>
+        </record>
+        <record id="ki" model="res.country">
+            <field name="name">Kiribati</field>
+            <field name="code">ki</field>
+        </record>
+        <record id="km" model="res.country">
+            <field name="name">Comoros</field>
+            <field name="code">km</field>
+        </record>
+        <record id="kn" model="res.country">
+            <field name="name">Saint Kitts &amp; Nevis Anguilla</field>
+            <field name="code">kn</field>
+        </record>
+        <record id="kp" model="res.country">
+            <field name="name">North Korea</field>
+            <field name="code">kp</field>
+        </record>
+        <record id="kr" model="res.country">
+            <field name="name">South Korea</field>
+            <field name="code">kr</field>
+        </record>
+        <record id="kw" model="res.country">
+            <field name="name">Kuwait</field>
+            <field name="code">kw</field>
+        </record>
+        <record id="ky" model="res.country">
+            <field name="name">Cayman Islands</field>
+            <field name="code">ky</field>
+        </record>
+        <record id="kz" model="res.country">
+            <field name="name">Kazakhstan</field>
+            <field name="code">kz</field>
+        </record>
+        <record id="la" model="res.country">
+            <field name="name">Laos</field>
+            <field name="code">la</field>
+        </record>
+        <record id="lb" model="res.country">
+            <field name="name">Lebanon</field>
+            <field name="code">lb</field>
+        </record>
+        <record id="lc" model="res.country">
+            <field name="name">Saint Lucia</field>
+            <field name="code">lc</field>
+        </record>
+        <record id="li" model="res.country">
+            <field name="name">Liechtenstein</field>
+            <field name="code">li</field>
+        </record>
+        <record id="lk" model="res.country">
+            <field name="name">Sri Lanka</field>
+            <field name="code">lk</field>
+        </record>
+        <record id="lr" model="res.country">
+            <field name="name">Liberia</field>
+            <field name="code">lr</field>
+        </record>
+        <record id="ls" model="res.country">
+            <field name="name">Lesotho</field>
+            <field name="code">ls</field>
+        </record>
+        <record id="lt" model="res.country">
+            <field name="name">Lithuania</field>
+            <field name="code">lt</field>
+        </record>
+        <record id="lu" model="res.country">
+            <field name="name">Luxembourg</field>
+            <field name="code">lu</field>
+        </record>
+        <record id="lv" model="res.country">
+            <field name="name">Latvia</field>
+            <field name="code">lv</field>
+        </record>
+        <record id="ly" model="res.country">
+            <field name="name">Libya</field>
+            <field name="code">ly</field>
+        </record>
+        <record id="ma" model="res.country">
+            <field name="name">Morocco</field>
+            <field name="code">ma</field>
+        </record>
+        <record id="mc" model="res.country">
+            <field name="name">Monaco</field>
+            <field name="code">mc</field>
+        </record>
+        <record id="md" model="res.country">
+            <field name="name">Moldavia</field>
+            <field name="code">md</field>
+        </record>
+        <record id="me" model="res.country">
+            <field name="name">Montenegro</field>
+            <field name="code">me</field>
+        </record>
+        <record id="mf" model="res.country">
+            <field name="name">Saint Martin (French part)</field>
+            <field name="code">mf</field>
+        </record>
+        <record id="mg" model="res.country">
+            <field name="name">Madagascar</field>
+            <field name="code">mg</field>
+        </record>
+        <record id="mh" model="res.country">
+            <field name="name">Marshall Islands</field>
+            <field name="code">mh</field>
+        </record>
+        <record id="mk" model="res.country">
+            <field name="name">Macedonia, the former Yugoslav Republic of</field>
+            <field name="code">mk</field>
+        </record>
+        <record id="ml" model="res.country">
+            <field name="name">Mali</field>
+            <field name="code">ml</field>
+        </record>
+        <record id="mm" model="res.country">
+            <field name="name">Myanmar</field>
+            <field name="code">mm</field>
+        </record>
+        <record id="mn" model="res.country">
+            <field name="name">Mongolia</field>
+            <field name="code">mn</field>
+        </record>
+        <record id="mo" model="res.country">
+            <field name="name">Macau</field>
+            <field name="code">mo</field>
+        </record>
+        <record id="mp" model="res.country">
+            <field name="name">Northern Mariana Islands</field>
+            <field name="code">mp</field>
+        </record>
+        <record id="mq" model="res.country">
+            <field name="name">Martinique (French)</field>
+            <field name="code">mq</field>
+        </record>
+        <record id="mr" model="res.country">
+            <field name="name">Mauritania</field>
+            <field name="code">mr</field>
+        </record>
+        <record id="ms" model="res.country">
+            <field name="name">Montserrat</field>
+            <field name="code">ms</field>
+        </record>
+        <record id="mt" model="res.country">
+            <field name="name">Malta</field>
+            <field name="code">mt</field>
+        </record>
+        <record id="mu" model="res.country">
+            <field name="name">Mauritius</field>
+            <field name="code">mu</field>
+        </record>
+        <record id="mv" model="res.country">
+            <field name="name">Maldives</field>
+            <field name="code">mv</field>
+        </record>
+        <record id="mw" model="res.country">
+            <field name="name">Malawi</field>
+            <field name="code">mw</field>
+        </record>
+        <record id="mx" model="res.country">
+            <field name="name">Mexico</field>
+            <field name="code">mx</field>
+        </record>
+        <record id="my" model="res.country">
+            <field name="name">Malaysia</field>
+            <field name="code">my</field>
+        </record>
+        <record id="mz" model="res.country">
+            <field name="name">Mozambique</field>
+            <field name="code">mz</field>
+        </record>
+        <record id="na" model="res.country">
+            <field name="name">Namibia</field>
+            <field name="code">na</field>
+        </record>
+        <record id="nc" model="res.country">
+            <field name="name">New Caledonia (French)</field>
+            <field name="code">nc</field>
+        </record>
+        <record id="ne" model="res.country">
+            <field name="name">Niger</field>
+            <field name="code">ne</field>
+        </record>
+        <record id="nf" model="res.country">
+            <field name="name">Norfolk Island</field>
+            <field name="code">nf</field>
+        </record>
+        <record id="ng" model="res.country">
+            <field name="name">Nigeria</field>
+            <field name="code">ng</field>
+        </record>
+        <record id="ni" model="res.country">
+            <field name="name">Nicaragua</field>
+            <field name="code">ni</field>
+        </record>
+        <record id="nl" model="res.country">
+            <field name="name">Netherlands</field>
+            <field name="code">nl</field>
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
+        </record>
+        <record id="no" model="res.country">
+            <field name="name">Norway</field>
+            <field name="code">no</field>
+        </record>
+        <record id="np" model="res.country">
+            <field name="name">Nepal</field>
+            <field name="code">np</field>
+        </record>
+        <record id="nr" model="res.country">
+            <field name="name">Nauru</field>
+            <field name="code">nr</field>
+        </record>
+        <record id="nt" model="res.country">
+            <field name="name">Neutral Zone</field>
+            <field name="code">nt</field>
+        </record>
+        <record id="nu" model="res.country">
+            <field name="name">Niue</field>
+            <field name="code">nu</field>
+        </record>
+        <record id="nz" model="res.country">
+            <field name="name">New Zealand</field>
+            <field name="code">nz</field>
+        </record>
+        <record id="om" model="res.country">
+            <field name="name">Oman</field>
+            <field name="code">om</field>
+        </record>
+        <record id="pa" model="res.country">
+            <field name="name">Panama</field>
+            <field name="code">pa</field>
+        </record>
+        <record id="pe" model="res.country">
+            <field name="name">Peru</field>
+            <field name="code">pe</field>
+        </record>
+        <record id="pf" model="res.country">
+            <field name="name">Polynesia (French)</field>
+            <field name="code">pf</field>
+        </record>
+        <record id="pg" model="res.country">
+            <field name="name">Papua New Guinea</field>
+            <field name="code">pg</field>
+        </record>
+        <record id="ph" model="res.country">
+            <field name="name">Philippines</field>
+            <field name="code">ph</field>
+        </record>
+        <record id="pk" model="res.country">
+            <field name="name">Pakistan</field>
+            <field name="code">pk</field>
+        </record>
+        <record id="pl" model="res.country">
+            <field name="name">Poland</field>
+            <field name="code">pl</field>
+        </record>
+        <record id="pm" model="res.country">
+            <field name="name">Saint Pierre and Miquelon</field>
+            <field name="code">pm</field>
+        </record>
+        <record id="pn" model="res.country">
+            <field name="name">Pitcairn Island</field>
+            <field name="code">pn</field>
+        </record>
+        <record id="pr" model="res.country">
+            <field name="name">Puerto Rico</field>
+            <field name="code">pr</field>
+        </record>
+        <record id="ps" model="res.country">
+            <field name="name">Palestinian Territory, Occupied</field>
+            <field name="code">ps</field>
+        </record>
+        <record id="pt" model="res.country">
+            <field name="name">Portugal</field>
+            <field name="code">pt</field>
+        </record>
+        <record id="pw" model="res.country">
+            <field name="name">Palau</field>
+            <field name="code">pw</field>
+        </record>
+        <record id="py" model="res.country">
+            <field name="name">Paraguay</field>
+            <field name="code">py</field>
+        </record>
+        <record id="qa" model="res.country">
+            <field name="name">Qatar</field>
+            <field name="code">qa</field>
+        </record>
+        <record id="re" model="res.country">
+            <field name="name">Reunion (French)</field>
+            <field name="code">re</field>
+        </record>
+        <record id="ro" model="res.country">
+            <field name="name">Romania</field>
+            <field name="code">ro</field>
+        </record>
+        <record id="rs" model="res.country">
+            <field name="name">Serbia</field>
+            <field name="code">rs</field>
+        </record>
+        <record id="ru" model="res.country">
+            <field name="name">Russian Federation</field>
+            <field name="code">ru</field>
+        </record>
+        <record id="rw" model="res.country">
+            <field name="name">Rwanda</field>
+            <field name="code">rw</field>
+        </record>
+        <record id="sa" model="res.country">
+            <field name="name">Saudi Arabia</field>
+            <field name="code">sa</field>
+        </record>
+        <record id="sb" model="res.country">
+            <field name="name">Solomon Islands</field>
+            <field name="code">sb</field>
+        </record>
+        <record id="sc" model="res.country">
+            <field name="name">Seychelles</field>
+            <field name="code">sc</field>
+        </record>
+        <record id="sd" model="res.country">
+            <field name="name">Sudan</field>
+            <field name="code">sd</field>
+        </record>
+        <record id="se" model="res.country">
+            <field name="name">Sweden</field>
+            <field name="code">se</field>
+        </record>
+        <record id="sg" model="res.country">
+            <field name="name">Singapore</field>
+            <field name="code">sg</field>
+        </record>
+        <record id="sh" model="res.country">
+            <field name="name">Saint Helena</field>
+            <field name="code">sh</field>
+        </record>
+        <record id="si" model="res.country">
+            <field name="name">Slovenia</field>
+            <field name="code">si</field>
+        </record>
+        <record id="sj" model="res.country">
+            <field name="name">Svalbard and Jan Mayen Islands</field>
+            <field name="code">sj</field>
+        </record>
+        <record id="sk" model="res.country">
+            <field name="name">Slovakia</field>
+            <field name="code">sk</field>
+        </record>
+        <record id="sl" model="res.country">
+            <field name="name">Sierra Leone</field>
+            <field name="code">sl</field>
+        </record>
+        <record id="sm" model="res.country">
+            <field name="name">San Marino</field>
+            <field name="code">sm</field>
+        </record>
+        <record id="sn" model="res.country">
+            <field name="name">Senegal</field>
+            <field name="code">sn</field>
+        </record>
+        <record id="so" model="res.country">
+            <field name="name">Somalia</field>
+            <field name="code">so</field>
+        </record>
+        <record id="sr" model="res.country">
+            <field name="name">Suriname</field>
+            <field name="code">sr</field>
+        </record>
+        <record id="ss" model="res.country">
+            <field name="name">South Sudan</field>
+            <field name="code">ss</field>
+        </record>
+        <record id="st" model="res.country">
+            <field name="name">Saint Tome (Sao Tome) and Principe</field>
+            <field name="code">st</field>
+        </record>
+        <record id="sv" model="res.country">
+            <field name="name">El Salvador</field>
+            <field name="code">sv</field>
+        </record>
+        <record id="sx" model="res.country">
+            <field name="name">Sint Maarten (Dutch part)</field>
+            <field name="code">sx</field>
+        </record>
+        <record id="sy" model="res.country">
+            <field name="name">Syria</field>
+            <field name="code">sy</field>
+        </record>
+        <record id="sz" model="res.country">
+            <field name="name">Swaziland</field>
+            <field name="code">sz</field>
+        </record>
+        <record id="tc" model="res.country">
+            <field name="name">Turks and Caicos Islands</field>
+            <field name="code">tc</field>
+        </record>
+        <record id="td" model="res.country">
+            <field name="name">Chad</field>
+            <field name="code">td</field>
+        </record>
+        <record id="tf" model="res.country">
+            <field name="name">French Southern Territories</field>
+            <field name="code">tf</field>
+        </record>
+        <record id="tg" model="res.country">
+            <field name="name">Togo</field>
+            <field name="code">tg</field>
+        </record>
+        <record id="th" model="res.country">
+            <field name="name">Thailand</field>
+            <field name="code">th</field>
+        </record>
+        <record id="tj" model="res.country">
+            <field name="name">Tajikistan</field>
+            <field name="code">tj</field>
+        </record>
+        <record id="tk" model="res.country">
+            <field name="name">Tokelau</field>
+            <field name="code">tk</field>
+        </record>
+        <record id="tm" model="res.country">
+            <field name="name">Turkmenistan</field>
+            <field name="code">tm</field>
+        </record>
+        <record id="tn" model="res.country">
+            <field name="name">Tunisia</field>
+            <field name="code">tn</field>
+        </record>
+        <record id="to" model="res.country">
+            <field name="name">Tonga</field>
+            <field name="code">to</field>
+        </record>
+        <record id="tp" model="res.country">
+            <field name="name">East Timor</field>
+            <field name="code">tp</field>
+        </record>
+        <record id="tr" model="res.country">
+            <field name="name">Turkey</field>
+            <field name="code">tr</field>
+        </record>
+        <record id="tt" model="res.country">
+            <field name="name">Trinidad and Tobago</field>
+            <field name="code">tt</field>
+        </record>
+        <record id="tv" model="res.country">
+            <field name="name">Tuvalu</field>
+            <field name="code">tv</field>
+        </record>
+        <record id="tw" model="res.country">
+            <field name="name">Taiwan</field>
+            <field name="code">tw</field>
+        </record>
+        <record id="tz" model="res.country">
+            <field name="name">Tanzania</field>
+            <field name="code">tz</field>
+        </record>
+        <record id="ua" model="res.country">
+            <field name="name">Ukraine</field>
+            <field name="code">ua</field>
+        </record>
+        <record id="ug" model="res.country">
+            <field name="name">Uganda</field>
+            <field name="code">ug</field>
+        </record>
+        <record id="uk" model="res.country">
+            <field name="name">United Kingdom</field>
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(country_name)s\n%(zip)s'" />            
+            <field name="code">gb</field>
+        </record>
+        <record id="um" model="res.country">
+            <field name="name">USA Minor Outlying Islands</field>
+            <field name="code">um</field>
+        </record>
+        <record id="us" model="res.country">
+            <field name="name">United States</field>
+            <field name="code">us</field>
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'" />            
+        </record>
+        <record id="uy" model="res.country">
+            <field name="name">Uruguay</field>
+            <field name="code">uy</field>
+        </record>
+        <record id="uz" model="res.country">
+            <field name="name">Uzbekistan</field>
+            <field name="code">uz</field>
+        </record>
+        <record id="va" model="res.country">
+            <field name="name">Holy See (Vatican City State)</field>
+            <field name="code">va</field>
+        </record>
+        <record id="vc" model="res.country">
+            <field name="name">Saint Vincent &amp; Grenadines</field>
+            <field name="code">vc</field>
+        </record>
+        <record id="ve" model="res.country">
+            <field name="name">Venezuela</field>
+            <field name="code">ve</field>
+        </record>
+        <record id="vg" model="res.country">
+            <field name="name">Virgin Islands (British)</field>
+            <field name="code">vg</field>
+        </record>
+        <record id="vi" model="res.country">
+            <field name="name">Virgin Islands (USA)</field>
+            <field name="code">vi</field>
+        </record>
+        <record id="vn" model="res.country">
+            <field name="name">Vietnam</field>
+            <field name="code">vn</field>
+        </record>
+        <record id="vu" model="res.country">
+            <field name="name">Vanuatu</field>
+            <field name="code">vu</field>
+        </record>
+        <record id="wf" model="res.country">
+            <field name="name">Wallis and Futuna Islands</field>
+            <field name="code">wf</field>
+        </record>
+        <record id="ws" model="res.country">
+            <field name="name">Samoa</field>
+            <field name="code">ws</field>
+        </record>
+        <record id="ye" model="res.country">
+            <field name="name">Yemen</field>
+            <field name="code">ye</field>
+        </record>
+        <record id="yt" model="res.country">
+            <field name="name">Mayotte</field>
+            <field name="code">yt</field>
+        </record>
+        <record id="yu" model="res.country">
+            <field name="name">Yugoslavia</field>
+            <field name="code">yu</field>
+        </record>
+        <record id="za" model="res.country">
+            <field name="name">South Africa</field>
+            <field name="code">za</field>
+        </record>
+        <record id="zm" model="res.country">
+            <field name="name">Zambia</field>
+            <field name="code">zm</field>
+        </record>
+        <!-- DEPRECATED, New name of Zaire is Democratic Republic of the Congo ! -->
+        <record id="zr" model="res.country">
+            <field name="name">Zaire</field>
+            <field name="code">zr</field>
+        </record>
+        <record id="zw" model="res.country">
+            <field name="name">Zimbabwe</field>
+            <field name="code">zw</field>
+        </record>
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/openerp/addons/base/currency_data.xml b/openerp/addons/base/currency_data.xml
new file mode 100644
index 00000000000..160749d3995
--- /dev/null
+++ b/openerp/addons/base/currency_data.xml
@@ -0,0 +1,1657 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- The Following currency rates are considered as on 1st Jan,2010 against EUR. -->
+        <!-- Currencies -->
+        <record id="EUR" model="res.currency">
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="USD" model="res.currency">
+            <field name="name">USD</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateUSD" model="res.currency.rate">
+            <field name="rate">1.2834</field>
+            <field name="currency_id" ref="USD"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <!-- VEF was previously VEB -->
+        <record id="VEF" model="res.currency">
+            <field name="name">VEF</field>
+            <field name="symbol">Bs.F</field>
+            <field name="rounding">0.0001</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateVEF" model="res.currency.rate">
+            <field name="rate">5.864</field>
+            <field name="currency_id" ref="VEF"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="CAD" model="res.currency">
+            <field name="name">CAD</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateCAD" model="res.currency.rate">
+            <field name="rate">1.3388</field>
+            <field name="currency_id" ref="CAD"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+
+        <record id="CHF" model="res.currency">
+            <field name="name">CHF</field>
+            <field name="symbol">CHF</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateCHF" model="res.currency.rate">
+            <field name="rate">1.3086</field>
+            <field name="currency_id" ref="CHF"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="BRL" model="res.currency">
+            <field name="name">BRL</field>
+            <field name="symbol">R$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateBRL" model="res.currency.rate">
+            <field name="rate">2.2344</field>
+            <field name="currency_id" ref="BRL"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="CNY" model="res.currency">
+            <field name="name">CNY</field>
+            <field name="symbol">¥</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateCNY" model="res.currency.rate">
+            <field name="rate">8.7556</field>
+            <field name="currency_id" ref="CNY"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+
+        <record id="COP" model="res.currency">
+            <field name="name">COP</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateCOP" model="res.currency.rate">
+            <field name="rate">2933.8378</field>
+            <field name="currency_id" ref="COP"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="CZK" model="res.currency">
+            <field name="name">CZK</field>
+            <field name="symbol">Kč</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateCZK" model="res.currency.rate">
+            <field name="rate">26.5634</field>
+            <field name="currency_id" ref="CZK"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="DKK" model="res.currency">
+            <field name="name">DKK</field>
+            <field name="symbol">kr</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateDKK" model="res.currency.rate">
+            <field name="rate">7.4445</field>
+            <field name="currency_id" ref="DKK"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+
+        <record id="HUF" model="res.currency">
+            <field name="name">HUF</field>
+            <field name="symbol">Ft</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateHUF" model="res.currency.rate">
+            <field name="rate">271.5621</field>
+            <field name="currency_id" ref="HUF"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="IDR" model="res.currency">
+            <field name="name">IDR</field>
+            <field name="symbol">Rp</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateIDR1" model="res.currency.rate">
+            <field name="rate">14352.00</field>
+            <field name="currency_id" ref="IDR"/>
+            <field eval="time.strftime('2009-01-01')" name="name"/>
+        </record>
+        <record id="rateIDR" model="res.currency.rate">
+            <field name="rate">11796.39</field>
+            <field name="currency_id" ref="IDR"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="LVL" model="res.currency">
+            <field name="name">LVL</field>
+            <field name="symbol">Ls</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateLVL" model="res.currency.rate">
+            <field name="rate">0.7086</field>
+            <field name="currency_id" ref="LVL"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+
+        <record id="NOK" model="res.currency">
+            <field name="name">NOK</field>
+            <field name="symbol">kr</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateNOK" model="res.currency.rate">
+            <field name="rate">7.8668</field>
+            <field name="currency_id" ref="NOK"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="XPF" model="res.currency">
+            <field name="name">XPF</field>
+            <field name="symbol">XPF</field>
+            <field name="rounding">1.00</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateXPF" model="res.currency.rate">
+            <field name="rate">119.331742</field>
+            <field name="currency_id" ref="XPF"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="PAB" model="res.currency">
+            <field name="name">PAB</field>
+            <field name="symbol">B/.</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="ratePAB" model="res.currency.rate">
+            <field name="rate">1.2676</field>
+            <field name="currency_id" ref="PAB"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="PLN" model="res.currency">
+            <field name="name">PLN</field>
+            <field name="symbol">zł</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="ratePLN" model="res.currency.rate">
+            <field name="rate">4.1005</field>
+            <field name="currency_id" ref="PLN"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="SEK" model="res.currency">
+            <field name="name">SEK</field>
+            <field name="symbol">kr</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSEK" model="res.currency.rate">
+            <field name="rate">10.3004</field>
+            <field name="currency_id" ref="SEK"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="GBP" model="res.currency">
+            <field name="name">GBP</field>
+            <field name="symbol">£</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateGBP" model="res.currency.rate">
+            <field name="rate">0.8333</field>
+            <field name="currency_id" ref="GBP"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="ARS" model="res.currency">
+            <field name="name">ARS</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateARS" model="res.currency.rate">
+            <field name="rate">5.0881</field>
+            <field name="currency_id" ref="ARS"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="INR" model="res.currency">
+            <field name="name">INR</field>
+            <field name="symbol">₹</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateINR" model="res.currency.rate">
+            <field name="rate">59.9739</field>
+            <field name="currency_id" ref="INR"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="AUD" model="res.currency">
+            <field name="name">AUD</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateAUD" model="res.currency.rate">
+            <field name="rate">1.4070</field>
+            <field name="currency_id" ref="AUD"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="UAH" model="res.currency">
+            <field name="name">UAH</field>
+            <field name="symbol">₴</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateUAH" model="res.currency.rate">
+            <field name="rate">10.1969</field>
+            <field name="currency_id" ref="UAH"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="VND" model="res.currency">
+            <field name="name">VND</field>
+            <field name="symbol">₫</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateVND" model="res.currency.rate">
+            <field name="rate">26330.01</field>
+            <field name="currency_id" ref="VND"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="HKD" model="res.currency">
+            <field name="name">HKD</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateHKD" model="res.currency.rate">
+            <field name="rate">11.1608</field>
+            <field name="currency_id" ref="HKD"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="JPY" model="res.currency">
+            <field name="name">JPY</field>
+            <field name="symbol">¥</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateJPY" model="res.currency.rate">
+            <field name="rate">133.62</field>
+            <field name="currency_id" ref="JPY"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="BGN" model="res.currency">
+            <field name="name">BGN</field>
+            <field name="symbol">лв</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateBGN" model="res.currency.rate">
+            <field name="rate">1.9558</field>
+            <field name="currency_id" ref="BGN"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="LTL" model="res.currency">
+            <field name="name">LTL</field>
+            <field name="symbol">Lt</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateLTL" model="res.currency.rate">
+            <field name="rate">3.4528</field>
+            <field name="currency_id" ref="LTL"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="RON" model="res.currency">
+            <field name="name">RON</field>
+            <field name="symbol">lei</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateRON" model="res.currency.rate">
+            <field name="rate">4.2253</field>
+            <field name="currency_id" ref="RON"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="HRK" model="res.currency">
+            <field name="name">HRK</field>
+            <field name="symbol">kn</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateHRK" model="res.currency.rate">
+            <field name="rate">7.2936</field>
+            <field name="currency_id" ref="HRK"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="RUB" model="res.currency">
+            <field name="name">RUB</field>
+            <field name="symbol">руб</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateRUB" model="res.currency.rate">
+            <field name="rate">43.16</field>
+            <field name="currency_id" ref="RUB"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="TRY" model="res.currency">
+            <field name="name">TRY</field>
+            <field name="symbol">TL</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateTRY" model="res.currency.rate">
+            <field name="rate">2.1411</field>
+            <field name="currency_id" ref="TRY"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="KRW" model="res.currency">
+            <field name="name">KRW</field>
+            <field name="symbol">₩</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateKRW" model="res.currency.rate">
+            <field name="rate">1662.37</field>
+            <field name="currency_id" ref="KRW"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="MXN" model="res.currency">
+            <field name="name">MXN</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateMXN" model="res.currency.rate">
+            <field name="rate">18.6664</field>
+            <field name="currency_id" ref="MXN"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="MYR" model="res.currency">
+            <field name="name">MYR</field>
+            <field name="symbol">RM</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateMYR" model="res.currency.rate">
+            <field name="rate">4.8887</field>
+            <field name="currency_id" ref="MYR"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="NZD" model="res.currency">
+            <field name="name">NZD</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateNZD" model="res.currency.rate">
+            <field name="rate">1.9764</field>
+            <field name="currency_id" ref="NZD"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="PHP" model="res.currency">
+            <field name="name">PHP</field>
+            <field name="symbol">Php</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="ratePHP" model="res.currency.rate">
+            <field name="rate">66.1</field>
+            <field name="currency_id" ref="PHP"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="SGD" model="res.currency">
+            <field name="name">SGD</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSGD" model="res.currency.rate">
+            <field name="rate">2.0126</field>
+            <field name="currency_id" ref="SGD"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="THB" model="res.currency">
+            <field name="name">THB</field>
+            <field name="symbol">฿</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateTHB" model="res.currency.rate">
+            <field name="rate">47.779</field>
+            <field name="currency_id" ref="THB"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="ZAR" model="res.currency">
+            <field name="name">ZAR</field>
+            <field name="symbol">R</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateZAR" model="res.currency.rate">
+            <field name="rate">10.5618</field>
+            <field name="currency_id" ref="ZAR"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="res_bank_1" model="res.bank">
+            <field name="name">Reserve</field>
+        </record>
+
+        <record id="CRC" model="res.currency">
+           <field name="name">CRC</field>
+           <field name="rounding">0.01</field>
+           <field name="accuracy">4</field>
+           <field name="symbol">¢</field>
+           <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateCRC" model="res.currency.rate">
+           <field name="rate">691.3153</field>
+           <field name="currency_id" ref="CRC"/>
+           <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="ir_mail_server_localhost0" model="ir.mail_server">
+            <field name="name">localhost</field>
+            <field name="smtp_host">localhost</field>
+            <field eval="25" name="smtp_port"/>
+            <field eval="10" name="sequence"/>
+	    </record>
+
+        <record id="MUR" model="res.currency">
+            <field name="name">MUR</field>
+            <field name="symbol">Rs</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateMUR" model="res.currency.rate">
+            <field name="rate">40.28</field>
+            <field name="currency_id" ref="MUR"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="XOF" model="res.currency">
+            <field name="name">XOF</field>
+            <field name="symbol">CFA</field>
+            <field name="rounding">1</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateXOF" model="res.currency.rate">
+           <field name="rate">655.957</field>
+           <field name="currency_id" ref="XOF"/>
+           <field eval="time.strftime('%Y-01-01')" name="name"/>
+       </record>
+
+        <record id="XAF" model="res.currency">
+            <field name="name">XAF</field>
+            <field name="symbol">FCFA</field>
+            <field name="rounding">1</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateXAF" model="res.currency.rate">
+           <field name="rate">655.957</field>
+           <field name="currency_id" ref="XAF"/>
+           <field eval="time.strftime('%Y-01-01')" name="name"/>
+       </record>
+
+        <record id="UGX" model="res.currency">
+            <field name="name">UGX</field>
+            <field name="symbol">USh</field>
+            <field name="rounding">1</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateUGX" model="res.currency.rate">
+            <field name="rate">3401.91388</field>
+            <field name="currency_id" ref="UGX"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <record id="HNL" model="res.currency">
+            <field name="name">HNL</field>
+            <field name="symbol">L</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateHNL" model="res.currency.rate">
+            <field name="rate">25</field>
+            <field name="currency_id" ref="HNL"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <!-- Chilean peso -->
+        <record id="CLP" model="res.currency">
+            <field name="name">CLP</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateCLP" model="res.currency.rate">
+            <field name="rate">710</field>
+            <field name="currency_id" ref="CLP"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
+        <!--  Uruguayan peso -->
+        <record id="UYU" model="res.currency">
+            <field name="name">UYU</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateUYU" model="res.currency.rate">
+            <field name="currency_id" ref="UYU" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">28.36</field>
+        </record>
+
+        <record id="AFN" model="res.currency">
+            <field name="name">AFN</field>
+            <field name="symbol">Afghani</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateAFN" model="res.currency.rate">
+            <field name="currency_id" ref="AFN" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">59.33</field>
+        </record>
+
+        <record id="AOA" model="res.currency">
+            <field name="name">AOA</field>
+            <field name="symbol">Kz</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateAOA" model="res.currency.rate">
+            <field name="currency_id" ref="AOA" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">117.080</field>
+        </record>
+
+        <record id="XCD" model="res.currency">
+            <field name="name">XCD</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateXCD" model="res.currency.rate">
+            <field name="currency_id" ref="XCD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">3.32</field>
+        </record>
+        
+        <record id="AMD" model="res.currency">
+            <field name="name">AMD</field>
+            <field name="symbol">դր.</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateAMD" model="res.currency.rate">
+            <field name="currency_id" ref="AMD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">506.02</field>
+        </record>
+        
+        <record id="AWG" model="res.currency">
+            <field name="name">AWG</field>
+            <field name="symbol">Afl.</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateAWG" model="res.currency.rate">
+            <field name="currency_id" ref="AWG" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.45</field>
+        </record>
+        
+        <record id="AZN" model="res.currency">
+            <field name="name">AZN</field>
+            <field name="symbol">m , man.</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateAZN" model="res.currency.rate">
+            <field name="currency_id" ref="AZN" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.96</field>
+        </record>
+        
+        <record id="BSD" model="res.currency">
+            <field name="name">BSD</field>
+            <field name="symbol">B$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateBSD" model="res.currency.rate">
+            <field name="currency_id" ref="BSD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1.23</field>
+        </record>
+        
+        <record id="BHD" model="res.currency">
+            <field name="name">BHD</field>
+            <field name="symbol">BD</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateBHD" model="res.currency.rate">
+            <field name="currency_id" ref="BHD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.46</field>
+        </record>
+        
+        <record id="BDT" model="res.currency">
+            <field name="name">BDT</field>
+            <field name="symbol"> ৳ </field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateBDT" model="res.currency.rate">
+            <field name="currency_id" ref="BDT" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">100.59</field>
+        </record>
+        
+        <record id="BBD" model="res.currency">
+            <field name="name">BBD</field>
+            <field name="symbol">Bds$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateBBD" model="res.currency.rate">
+            <field name="currency_id" ref="BBD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">2.46</field>
+        </record>
+        
+        <record id="BYR" model="res.currency">
+            <field name="name">BYR</field>
+            <field name="symbol">BR</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateBYR" model="res.currency.rate">
+            <field name="currency_id" ref="BYR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">10228.19</field>
+        </record>
+        
+        <record id="BZD" model="res.currency">
+            <field name="name">BZD</field>
+            <field name="symbol">BZ$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateBZD" model="res.currency.rate">
+            <field name="currency_id" ref="BZD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">2.33</field>
+        </record>
+        
+        <record id="BMD" model="res.currency">
+            <field name="name">BMD</field>
+            <field name="symbol">BD$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateBMD" model="res.currency.rate">
+            <field name="currency_id" ref="BMD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1.23</field>
+        </record>
+        
+        <record id="BTN" model="res.currency">
+            <field name="name">BTN</field>
+            <field name="symbol">Nu.</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateBTN" model="res.currency.rate">
+            <field name="currency_id" ref="BTN" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate"> 67.81</field>
+        </record>
+        
+        <record id="BOB" model="res.currency">
+            <field name="name">BOB</field>
+            <field name="symbol">Bs.</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateBOB" model="res.currency.rate">
+            <field name="currency_id" ref="BOB" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">8.50</field>
+        </record>
+        
+        <record id="BAM" model="res.currency">
+            <field name="name">BAM</field>
+            <field name="symbol">KM</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateBAM" model="res.currency.rate">
+            <field name="currency_id" ref="BAM" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1.96</field>
+        </record>
+        
+        <record id="BWP" model="res.currency">
+            <field name="name">BWP</field>
+            <field name="symbol">P</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateBWP" model="res.currency.rate">
+            <field name="currency_id" ref="BWP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">9.45</field>
+        </record>
+        
+        <record id="BGN" model="res.currency">
+            <field name="name">BGN</field>
+            <field name="symbol">lev</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateBGN" model="res.currency.rate">
+            <field name="currency_id" ref="BGN" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1.95</field>
+        </record>
+        
+        <record id="BIF" model="res.currency">
+            <field name="name">BIF</field>
+            <field name="symbol">FBu</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateBIF" model="res.currency.rate">
+            <field name="currency_id" ref="BIF" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1736.73</field>
+        </record>
+        
+        <record id="KHR" model="res.currency">
+            <field name="name">KHR</field>
+            <field name="symbol">៛</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateKHR" model="res.currency.rate">
+            <field name="currency_id" ref="KHR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">5054.53</field>
+        </record>
+        
+        <record id="KYD" model="res.currency">
+            <field name="name">KYD</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateKYD" model="res.currency.rate">
+            <field name="currency_id" ref="KYD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1.007</field>
+        </record>
+        
+        <record id="KMF" model="res.currency">
+            <field name="name">KMF</field>
+            <field name="symbol">CF</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateKMF" model="res.currency.rate">
+            <field name="currency_id" ref="KMF" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">492.23</field>
+        </record>
+        
+        <record id="CDF" model="res.currency">
+            <field name="name">CDF</field>
+            <field name="symbol">FC</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateCDF" model="res.currency.rate">
+            <field name="currency_id" ref="CDF" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1112.80</field>
+        </record>
+        
+        <record id="CUP" model="res.currency">
+            <field name="name">CUP</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateCUP" model="res.currency.rate">
+            <field name="currency_id" ref="CUP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1.226</field>
+        </record>
+        
+        <record id="ANG" model="res.currency">
+            <field name="name">ANG</field>
+            <field name="symbol">ƒ</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateANG" model="res.currency.rate">
+            <field name="currency_id" ref="ANG" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">2.11</field>
+        </record>
+        
+        <record id="CYP" model="res.currency">
+            <field name="name">CYP</field>
+            <field name="symbol">£</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateCYP" model="res.currency.rate">
+            <field name="currency_id" ref="CYP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.475</field>
+        </record>
+        
+        <record id="DJF" model="res.currency">
+            <field name="name">DJF</field>
+            <field name="symbol">Fdj</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateDJF" model="res.currency.rate">
+            <field name="currency_id" ref="DJF" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">222.22</field>
+        </record>
+        
+        <record id="DOP" model="res.currency">
+            <field name="name">DOP</field>
+            <field name="symbol">RD$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateDOP" model="res.currency.rate">
+            <field name="currency_id" ref="DOP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">48.09</field>
+        </record>
+        
+        <record id="TPE" model="res.currency">
+            <field name="name">TPE</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateTPE" model="res.currency.rate">
+            <field name="currency_id" ref="TPE" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.00</field>
+        </record>
+        
+        <record id="ECS" model="res.currency">
+            <field name="name">ECS</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateECS" model="res.currency.rate">
+            <field name="currency_id" ref="ECS" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.00</field>
+        </record>
+        
+        <record id="EGP" model="res.currency">
+            <field name="name">EGP</field>
+            <field name="symbol">E£</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateEGP" model="res.currency.rate">
+            <field name="currency_id" ref="EGP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">7.46</field>
+        </record>
+        
+        <record id="SVC" model="res.currency">
+            <field name="name">SVC</field>
+            <field name="symbol">¢</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSVC" model="res.currency.rate">
+            <field name="currency_id" ref="SVC" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">10.74</field>
+        </record>
+        
+        <record id="ERN" model="res.currency">
+            <field name="name">ERN</field>
+            <field name="symbol">Nfk</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateERN" model="res.currency.rate">
+            <field name="currency_id" ref="ERN" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">18.89</field>
+        </record>
+        
+        <record id="EEK" model="res.currency">
+            <field name="name">EEK</field>
+            <field name="symbol">kr</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateEEK" model="res.currency.rate">
+            <field name="currency_id" ref="EEK" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">14.41</field>
+        </record>
+        
+        <record id="ETB" model="res.currency">
+            <field name="name">ETB</field>
+            <field name="symbol">Br</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateEEB" model="res.currency.rate">
+            <field name="currency_id" ref="ETB" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">21.94</field>
+        </record>
+        
+        <record id="FKP" model="res.currency">
+            <field name="name">FKP</field>
+            <field name="symbol">£</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateFKP" model="res.currency.rate">
+            <field name="currency_id" ref="FKP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.78</field>
+        </record>
+        
+        <record id="FJD" model="res.currency">
+            <field name="name">FJD</field>
+            <field name="symbol">FJ$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateFJD" model="res.currency.rate">
+            <field name="currency_id" ref="FJD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">2.22</field>
+        </record>
+        
+        <record id="GEL" model="res.currency">
+            <field name="name">GEL</field>
+            <field name="symbol">ლ</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateGEL" model="res.currency.rate">
+            <field name="currency_id" ref="GEL" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">2.018</field>
+        </record>
+        
+        <record id="GIP" model="res.currency">
+            <field name="name">GIP</field>
+            <field name="symbol">£</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateGIP" model="res.currency.rate">
+            <field name="currency_id" ref="GIP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.786</field>
+        </record>
+        
+        <record id="QTQ" model="res.currency">
+            <field name="name">QTQ</field>
+            <field name="symbol">Q</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateQTQ" model="res.currency.rate">
+            <field name="currency_id" ref="QTQ" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">10.27</field>
+        </record>
+        
+        <record id="GGP" model="res.currency">
+            <field name="name">GGP</field>
+            <field name="symbol">£</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateGGP" model="res.currency.rate">
+            <field name="currency_id" ref="GGP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.786</field>
+        </record>
+        
+        <record id="GNF" model="res.currency">
+            <field name="name">GNF</field>
+            <field name="symbol">FG</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateGNF" model="res.currency.rate">
+            <field name="currency_id" ref="GNF" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">8835.85</field>
+        </record>
+        
+        <record id="GWP" model="res.currency">
+            <field name="name">GWP</field>
+            <field name="symbol">CFA</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateGWP" model="res.currency.rate">
+            <field name="currency_id" ref="GWP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">657.89</field>
+        </record>
+        
+        <record id="GYD" model="res.currency">
+            <field name="name">GYD</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateGYD" model="res.currency.rate">
+            <field name="currency_id" ref="GYD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">247.31</field>
+        </record>
+        
+        <record id="HTG" model="res.currency">
+            <field name="name">HTG</field>
+            <field name="symbol">G</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateHTG" model="res.currency.rate">
+            <field name="currency_id" ref="HTG" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">51.69</field>
+        </record>
+        
+        <record id="ISK" model="res.currency">
+            <field name="name">ISK</field>
+            <field name="symbol">kr</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateISK" model="res.currency.rate">
+            <field name="currency_id" ref="ISK" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">158.70</field>
+        </record>
+        
+        <record id="IRR" model="res.currency">
+            <field name="name">IRR</field>
+            <field name="symbol">﷼</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateIRR" model="res.currency.rate">
+            <field name="currency_id" ref="IRR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">15059.97</field>
+        </record>
+        
+        <record id="IQD" model="res.currency">
+            <field name="name">IQD</field>
+            <field name="symbol"> ع.د</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateIQD" model="res.currency.rate">
+            <field name="currency_id" ref="IQD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1432.27</field>
+        </record>
+        
+        <record id="ILS" model="res.currency">
+            <field name="name">ILS</field>
+            <field name="symbol"> ₪ </field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateILS" model="res.currency.rate">
+            <field name="currency_id" ref="ILS" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">4.89</field>
+        </record>
+        
+        <record id="JMD" model="res.currency">
+            <field name="name">JMD</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateJMD" model="res.currency.rate">
+            <field name="currency_id" ref="JMD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">108.94 </field>
+        </record>
+        
+        <record id="JOD" model="res.currency">
+            <field name="name">JOD</field>
+            <field name="symbol"> د.ا </field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateJOD" model="res.currency.rate">
+            <field name="currency_id" ref="JOD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.87</field>
+        </record>
+        
+        <record id="KZT" model="res.currency">
+            <field name="name">KZT</field>
+            <field name="symbol">Т</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateKZT" model="res.currency.rate">
+            <field name="currency_id" ref="KZT" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">184.09</field>
+        </record>
+        
+        <record id="KES" model="res.currency">
+            <field name="name">KES</field>
+            <field name="symbol">Sh</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateKES" model="res.currency.rate">
+            <field name="currency_id" ref="KES" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">103.43</field>
+        </record>
+        
+        <record id="KWD" model="res.currency">
+            <field name="name">KWD</field>
+            <field name="symbol"> د.ك </field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateKWD" model="res.currency.rate">
+            <field name="currency_id" ref="KWD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.35</field>
+        </record>
+        
+        <record id="KGS" model="res.currency">
+            <field name="name">KGS</field>
+            <field name="symbol">KGS</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateKGS" model="res.currency.rate">
+            <field name="currency_id" ref="KGS" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">57.93</field>
+        </record>
+        
+        <record id="LAK" model="res.currency">
+            <field name="name">LAK</field>
+            <field name="symbol">₭</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateLAK" model="res.currency.rate">
+            <field name="currency_id" ref="LAK" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">9847.72</field>
+        </record>
+        
+        <record id="LAK" model="res.currency">
+            <field name="name">LAK</field>
+            <field name="symbol">₭</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateLAK" model="res.currency.rate">
+            <field name="currency_id" ref="LAK" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">9847.72</field>
+        </record>
+        
+        <record id="LBP" model="res.currency">
+            <field name="name">LBP</field>
+            <field name="symbol">ل.ل</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateLBP" model="res.currency.rate">
+            <field name="currency_id" ref="LBP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1853.94</field>
+        </record>
+        
+        <record id="LSL" model="res.currency">
+            <field name="name">LSL</field>
+            <field name="symbol">L</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateLSL" model="res.currency.rate">
+            <field name="currency_id" ref="LSL" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">10.06</field>
+        </record>
+        
+        <record id="LRD" model="res.currency">
+            <field name="name">LRD</field>
+            <field name="symbol"> $ </field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateLRD" model="res.currency.rate">
+            <field name="currency_id" ref="LRD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">90.28</field>
+        </record>
+        
+        <record id="LYD" model="res.currency">
+            <field name="name">LYD</field>
+            <field name="symbol"> ل.د </field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateLYD" model="res.currency.rate">
+            <field name="currency_id" ref="LYD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1.54</field>
+        </record>
+        
+        <record id="MOP" model="res.currency">
+            <field name="name">MOP</field>
+            <field name="symbol">P</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateMOP" model="res.currency.rate">
+            <field name="currency_id" ref="MOP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">9.81</field>
+        </record>
+        
+        <record id="MKD" model="res.currency">
+            <field name="name">MKD</field>
+            <field name="symbol">ден</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateMKD" model="res.currency.rate">
+            <field name="currency_id" ref="MKD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">60.29</field>
+        </record>
+        
+        <record id="MGA" model="res.currency">
+            <field name="name">MGA</field>
+            <field name="symbol">MGA</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateMGA" model="res.currency.rate">
+            <field name="currency_id" ref="MGA" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">2775.86</field>
+        </record>
+        
+        <record id="MWK" model="res.currency">
+            <field name="name">MWK</field>
+            <field name="symbol">MK</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateMWK" model="res.currency.rate">
+            <field name="currency_id" ref="MWK" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">329.79</field>
+        </record>
+        
+        <record id="MVR" model="res.currency">
+            <field name="name">MVK</field>
+            <field name="symbol"> ރ. </field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateMVR" model="res.currency.rate">
+            <field name="currency_id" ref="MVR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">18.89</field>
+        </record>
+        
+        <record id="MRO" model="res.currency">
+            <field name="name">MRO</field>
+            <field name="symbol">UM</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateMRO" model="res.currency.rate">
+            <field name="currency_id" ref="MRO" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">362.23</field>
+        </record>
+        
+        <record id="MDL" model="res.currency">
+            <field name="name">MDL</field>
+            <field name="symbol">L</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateMDL" model="res.currency.rate">
+            <field name="currency_id" ref="MDL" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">15.27</field>
+        </record>
+        
+        <record id="MNT" model="res.currency">
+            <field name="name">MNT</field>
+            <field name="symbol"> ₮ </field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateMNT" model="res.currency.rate">
+            <field name="currency_id" ref="MNT" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1643.57</field>
+        </record>
+        
+        <record id="MAD" model="res.currency">
+            <field name="name">MAD</field>
+            <field name="symbol"> د.م. </field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateMAD" model="res.currency.rate">
+            <field name="currency_id" ref="MAD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">10.99</field>
+        </record>
+        
+        <record id="MZN" model="res.currency">
+            <field name="name">MZN</field>
+            <field name="symbol">MZN</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateMZN" model="res.currency.rate">
+            <field name="currency_id" ref="MZN" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">33.65</field>
+        </record>
+        
+        <record id="MMK" model="res.currency">
+            <field name="name">MMK</field>
+            <field name="symbol"> K </field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateMMK" model="res.currency.rate">
+            <field name="currency_id" ref="MMK" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1080.82</field>
+        </record>
+        
+        <record id="NAD" model="res.currency">
+            <field name="name">NAD</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateNAD" model="res.currency.rate">
+            <field name="currency_id" ref="NAD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">10.06</field>
+        </record>
+        
+        <record id="NPR" model="res.currency">
+            <field name="name">NPR</field>
+            <field name="symbol">₨</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateNPR" model="res.currency.rate">
+            <field name="currency_id" ref="NPR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">108.33</field>
+        </record>
+        
+        <record id="NIO" model="res.currency">
+            <field name="name">NIO</field>
+            <field name="symbol">C$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateNIO" model="res.currency.rate">
+            <field name="currency_id" ref="NIO" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">28.97</field>
+        </record>
+        
+        <record id="NGN" model="res.currency">
+            <field name="name">NGN</field>
+            <field name="symbol">₦</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateNGN" model="res.currency.rate">
+            <field name="currency_id" ref="NGN" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">196.77</field>
+        </record>
+        
+        <record id="KPW" model="res.currency">
+            <field name="name">KPW</field>
+            <field name="symbol">₩</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateKPW" model="res.currency.rate">
+            <field name="currency_id" ref="KPW" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">165.64</field>
+        </record>
+        
+        <record id="NOK" model="res.currency">
+            <field name="name">NOK</field>
+            <field name="symbol"> kr </field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateNOK" model="res.currency.rate">
+            <field name="currency_id" ref="NOK" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">7.47</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

From 780eac4177f8efebc1650a85dea4235aaaff28c7 Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Wed, 18 Jul 2012 14:22:18 +0530
Subject: [PATCH 180/999] [IMP] l10n_in_hr_payroll: changed menu sequence

bzr revid: mtr@tinyerp.com-20120718085218-6kgrkivfg7rgoofe
---
 .../l10n_in_hr_payroll/report/payment_advice_report_view.xml   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
index 806cb1a82a0..168dbd79298 100644
--- a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
@@ -82,8 +82,7 @@
         <field name="help">This report performs analysis on your payment advices</field>
     </record>
 
-    <menuitem id="menu_payroll_reporting" name="Payroll" parent="hr.menu_hr_reporting" sequence="7" groups="base.group_hr_manager"/>
-    <menuitem action="action_payment_advice_report_all" id="menu_reporting_payment_advice" parent="menu_payroll_reporting" sequence="10"/>
+    <menuitem action="action_payment_advice_report_all" id="menu_reporting_payment_advice" parent="hr.menu_hr_reporting" sequence="5" groups="base.group_hr_manager"/>
 
 </data>
 </openerp>

From b74ecc5e3589f7723ed8f9f56568f894e060aef8 Mon Sep 17 00:00:00 2001
From: help <>
Date: Wed, 18 Jul 2012 14:45:12 +0530
Subject: [PATCH 181/999] [IMP]base:added currency, currency rates and currency
 symbols of different countries

bzr revid: help-20120718091512-cqp9m72xubyf2w2p
---
 openerp/addons/base/currency_data.xml | 727 +++++++++++++++++++++++++-
 1 file changed, 725 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/currency_data.xml b/openerp/addons/base/currency_data.xml
index 160749d3995..10052f94479 100644
--- a/openerp/addons/base/currency_data.xml
+++ b/openerp/addons/base/currency_data.xml
@@ -612,7 +612,6 @@
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
 
-        <!-- Chilean peso -->
         <record id="CLP" model="res.currency">
             <field name="name">CLP</field>
             <field name="symbol">$</field>
@@ -626,7 +625,6 @@
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
 
-        <!--  Uruguayan peso -->
         <record id="UYU" model="res.currency">
             <field name="name">UYU</field>
             <field name="symbol">$</field>
@@ -1653,5 +1651,730 @@
             <field eval="time.strftime('%Y-01-01')" name="name"/>
             <field name="rate">7.47</field>
         </record>
+
+        <record id="ZWD" model="res.currency">
+            <field name="name">ZWD</field>
+            <field name="symbol">Z$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateZWD" model="res.currency.rate">
+            <field name="currency_id" ref="ZWD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.154336833379</field>
+        </record>		
+
+        <record id="ZMK" model="res.currency">
+            <field name="name">ZMK</field>
+            <field name="symbol">ZK</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateZMK" model="res.currency.rate">
+            <field name="currency_id" ref="ZMK" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.0113636364</field>
+        </record>
+
+        <record id="YER" model="res.currency">
+            <field name="name">YER</field>
+            <field name="symbol">﷼</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateYER" model="res.currency.rate">
+            <field name="currency_id" ref="YER" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.255957635</field>
+        </record>
+
+        <record id="MAD" model="res.currency">
+            <field name="name">MAD</field>
+            <field name="symbol">د.م.</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateMAD" model="res.currency.rate">
+            <field name="currency_id" ref="MAD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">6.15583628</field>
+        </record>
+
+        <record id="VND" model="res.currency">
+            <field name="name">VND</field>
+            <field name="symbol">₫</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateVND" model="res.currency.rate">
+            <field name="currency_id" ref="VND" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.0026478376</field>
+        </record>
+
+        <record id="VUB" model="res.currency">
+            <field name="name">VUB</field>
+            <field name="symbol">Bs</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateVUB" model="res.currency.rate">
+            <field name="currency_id" ref="VUB" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1.69638129</field>
+        </record>
+
+        <record id="EUR" model="res.currency">
+            <field name="name">EUR</field>
+            <field name="symbol">€</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateEUR" model="res.currency.rate">
+            <field name="currency_id" ref="EUR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">67.7680936</field>
+        </record>
+
+        <record id="VUV" model="res.currency">
+            <field name="name">VUV</field>
+            <field name="symbol">VT</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateVUV" model="res.currency.rate">
+            <field name="currency_id" ref="VUV" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.5941</field>
+        </record>		
+
+        <record id="UZS" model="res.currency">
+            <field name="name">UZS</field>
+            <field name="symbol">лв</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateUZS" model="res.currency.rate">
+            <field name="currency_id" ref="UZS" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.0291262136</field>
+        </record>
+
+        <record id="UYP" model="res.currency">
+            <field name="name">UYP</field>
+            <field name="symbol">$U</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateUYP" model="res.currency.rate">
+            <field name="currency_id" ref="UYP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.000000</field>
+        </record>
+
+        <record id="AED" model="res.currency">
+            <field name="name">AED</field>
+            <field name="symbol">د.إ</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateAED" model="res.currency.rate">
+            <field name="currency_id" ref="AED" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">15.0189762</field>
+        </record>
+
+        <record id="UAG" model="res.currency">
+            <field name="name">UAG</field>
+            <field name="symbol">₴</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateUAG" model="res.currency.rate">
+            <field name="currency_id" ref="UAG" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">6.81740953</field>
+        </record>
+
+        <record id="UGS" model="res.currency">
+            <field name="name">UGS</field>
+            <field name="symbol">USh</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateUGS" model="res.currency.rate">
+            <field name="currency_id" ref="UGS" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.000000</field>
+        </record>
+
+        <record id="GBP" model="res.currency">
+            <field name="name">GBP</field>
+            <field name="symbol">USh</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateGBP" model="res.currency.rate">
+            <field name="currency_id" ref="GBP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">86.35812</field>
+        </record>
+
+        <record id="AUD" model="res.currency">
+            <field name="name">AUD</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateAUD" model="res.currency.rate">
+            <field name="currency_id" ref="AUD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">56.7795675</field>
+        </record>		
+
+        <record id="TMM" model="res.currency">
+            <field name="name">TMM</field>
+            <field name="symbol">m</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateTMM" model="res.currency.rate">
+            <field name="currency_id" ref="TMM" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.00313859649123</field>
+        </record>
+
+        <record id="TRL" model="res.currency">
+            <field name="name">TRL</field>
+            <field name="symbol">TL</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateTRL" model="res.currency.rate">
+            <field name="currency_id" ref="TRL" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.000000</field>
+        </record>
+		
+        <record id="TND" model="res.currency">
+            <field name="name">TND</field>
+            <field name="symbol">DT</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateTND" model="res.currency.rate">
+            <field name="currency_id" ref="TND" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">34.0661408</field>
+        </record>		
+
+        <record id="TTD" model="res.currency">
+            <field name="name">TTD</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateTTD" model="res.currency.rate">
+            <field name="currency_id" ref="TTD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">8.61926302</field>
+        </record>
+
+        <record id="TOP" model="res.currency">
+            <field name="name">TOP</field>
+            <field name="symbol">PT,T$,¢</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateTOP" model="res.currency.rate">
+            <field name="currency_id" ref="TOP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">31.1217</field>
+        </record>
+
+        <record id="THB" model="res.currency">
+            <field name="name">THB</field>
+            <field name="symbol">฿</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateTHB" model="res.currency.rate">
+            <field name="currency_id" ref="THB" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1.74052094</field>
+        </record>
+
+        <record id="TZS" model="res.currency">
+            <field name="name">TZS</field>
+            <field name="symbol">x/y</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateTZS" model="res.currency.rate">
+            <field name="currency_id" ref="TZS" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.0346191889</field>
+        </record>		
+
+        <record id="TJR" model="res.currency">
+            <field name="name">TJR</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateTJR" model="res.currency.rate">
+            <field name="currency_id" ref="TJR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.000000</field>
+        </record>		
+
+        <record id="TWD" model="res.currency">
+            <field name="name">TWD</field>
+            <field name="symbol">$ or NT$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateTWD" model="res.currency.rate">
+            <field name="currency_id" ref="TWD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1.8341576</field>
+        </record>		
+
+        <record id="SYP" model="res.currency">
+            <field name="name">SYP</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSYP" model="res.currency.rate">
+            <field name="currency_id" ref="SYP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.86162</field>
+        </record>		
+
+        <record id="CHF" model="res.currency">
+            <field name="name">CHF</field>
+            <field name="symbol">Fr.</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateCHF" model="res.currency.rate">
+            <field name="currency_id" ref="CHF" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">56.2737663</field>
+        </record>
+
+        <record id="SEK" model="res.currency">
+            <field name="name">SEK</field>
+            <field name="symbol">kr</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSEK" model="res.currency.rate">
+            <field name="currency_id" ref="SEK" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">7.84097154</field>
+        </record>	
+
+        <record id="SZL" model="res.currency">
+            <field name="name">SZL</field>
+            <field name="symbol">E</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSZL" model="res.currency.rate">
+            <field name="currency_id" ref="SZL" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">6.7162</field>
+        </record>
+		
+        <record id="NOK" model="res.currency">
+            <field name="name">NOK</field>
+            <field name="symbol">kr</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateNOK" model="res.currency.rate">
+            <field name="currency_id" ref="NOK" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">9.02747555</field>
+        </record>
+		
+        <record id="SRG" model="res.currency">
+            <field name="name">SRG</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSRG" model="res.currency.rate">
+            <field name="currency_id" ref="SRG" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">43.5566546</field>
+        </record>
+		
+        <record id="SDD" model="res.currency">
+            <field name="name">SDD</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSDD" model="res.currency.rate">
+            <field name="currency_id" ref="SDD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">43.5566546</field>
+        </record>
+		
+        <record id="LKR" model="res.currency">
+            <field name="name">LKR</field>
+            <field name="symbol">Rs</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateLKR" model="res.currency.rate">
+            <field name="currency_id" ref="LKR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.410704473</field>
+        </record>		
+
+        <record id="SSP" model="res.currency">
+            <field name="name">SSP</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSSP" model="res.currency.rate">
+            <field name="currency_id" ref="SSP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.00000</field>
+        </record>	
+
+        <record id="GBP" model="res.currency">
+            <field name="name">GBP</field>
+            <field name="symbol">£,p</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateGBP" model="res.currency.rate">
+            <field name="currency_id" ref="GBP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">85.8445983</field>
+        </record>					
+
+        <record id="ZAR" model="res.currency">
+            <field name="name">ZAR</field>
+            <field name="symbol">R</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateZAR" model="res.currency.rate">
+            <field name="currency_id" ref="ZAR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">6.71485878</field>
+        </record>
+
+        <record id="SOD" model="res.currency">
+            <field name="name">SOD</field>
+            <field name="symbol">Sh.</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSOD" model="res.currency.rate">
+            <field name="currency_id" ref="SOD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.0339</field>
+        </record>
+
+        <record id="SBD" model="res.currency">
+            <field name="name">SBD</field>
+            <field name="symbol">SI$</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSBD" model="res.currency.rate">
+            <field name="currency_id" ref="SBD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">7.80427</field>
+        </record>
+
+        <record id="SLL" model="res.currency">
+            <field name="name">SLL</field>
+            <field name="symbol">Le</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSLL" model="res.currency.rate">
+            <field name="currency_id" ref="SLL" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.0125838004</field>
+        </record>
+
+        <record id="SCR" model="res.currency">
+            <field name="name">SCR</field>
+            <field name="symbol">SR</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSCR" model="res.currency.rate">
+            <field name="currency_id" ref="SCR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">3.723</field>
+        </record>
+
+        <record id="RSD" model="res.currency">
+            <field name="name">RSD</field>
+            <field name="symbol">din.</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateRSD" model="res.currency.rate">
+            <field name="currency_id" ref="RSD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.577920651</field>
+        </record>
+
+        <record id="SAR" model="res.currency">
+            <field name="name">SAR</field>
+            <field name="symbol">SR</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSAR" model="res.currency.rate">
+            <field name="currency_id" ref="SAR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">14.6532586</field>
+        </record>	
+
+        <!--  Sao Tome and Principe -->
+        <record id="STD" model="res.currency">
+            <field name="name">STD</field>
+            <field name="symbol">Db</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSTD" model="res.currency.rate">
+            <field name="currency_id" ref="STD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.0028</field>
+        </record>	
+
+        <record id="ITL" model="res.currency">
+            <field name="name">ITL</field>
+            <field name="symbol">₤</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateITL" model="res.currency.rate">
+            <field name="currency_id" ref="ITL" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.03</field>
+        </record>
+
+        <record id="WST" model="res.currency">
+            <field name="name">WST</field>
+            <field name="symbol">WS$,SAT,ST</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateWST" model="res.currency.rate">
+            <field name="currency_id" ref="WST" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">23.4662</field>
+        </record>						
+
+        <record id="SHP" model="res.currency">
+            <field name="name">SHP</field>
+            <field name="symbol">£</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSHP" model="res.currency.rate">
+            <field name="currency_id" ref="SHP" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">86.17</field>
+        </record>
+
+        <record id="RWF" model="res.currency">
+            <field name="name">RWF</field>
+            <field name="symbol">RF</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateRWF" model="res.currency.rate">
+            <field name="currency_id" ref="RWF" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.0897</field>
+        </record>		
+
+        <record id="RUR" model="res.currency">
+            <field name="name">RUR</field>
+            <field name="symbol">R</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateRUR" model="res.currency.rate">
+            <field name="currency_id" ref="RUR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1.69666996</field>
+        </record>
+
+        <record id="ROL" model="res.currency">
+            <field name="name">ROL</field>
+            <field name="symbol">L</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateROL" model="res.currency.rate">
+            <field name="currency_id" ref="ROL" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.00148271</field>
+        </record>
+
+        <record id="QAR" model="res.currency">
+            <field name="name">QAR</field>
+            <field name="symbol">QR</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateQAR" model="res.currency.rate">
+            <field name="currency_id" ref="QAR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">15.0939664</field>
+        </record>
+
+        <record id="PLZ" model="res.currency">
+            <field name="name">PLZ</field>
+            <field name="symbol">zł,gr</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="ratePLZ" model="res.currency.rate">
+            <field name="currency_id" ref="PLZ" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">16.1412243</field>
+        </record>
+
+        <record id="PEN" model="res.currency">
+            <field name="name">PEN</field>
+            <field name="symbol">S/.</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="ratePEN" model="res.currency.rate">
+            <field name="currency_id" ref="PEN" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">20.9297725</field>
+        </record>	
+
+        <record id="PYG" model="res.currency">
+            <field name="name">PYG</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="ratePYG" model="res.currency.rate">
+            <field name="currency_id" ref="PYG" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.0121991428</field>
+        </record>					
+
+        <record id="PGK" model="res.currency">
+            <field name="name">PGK</field>
+            <field name="symbol">K</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="ratePGK" model="res.currency.rate">
+            <field name="currency_id" ref="PGK" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">25.827014</field>
+        </record>		
+
+        <record id="PAB" model="res.currency">
+            <field name="name">PAB</field>
+            <field name="symbol">B./</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="ratePAB" model="res.currency.rate">
+            <field name="currency_id" ref="PAB" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">49.1639</field>
+        </record>
+
+        <record id="PKR" model="res.currency">
+            <field name="name">PKR</field>
+            <field name="symbol">Rs.</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="ratePKR" model="res.currency.rate">
+            <field name="currency_id" ref="PKR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.582096934</field>
+        </record>	
+
+        <record id="OMR" model="res.currency">
+            <field name="name">OMR</field>
+            <field name="symbol">ر.ع.</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateOMR" model="res.currency.rate">
+            <field name="currency_id" ref="OMR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">142.733817</field>
+        </record>				
+		
     </data>
 </openerp>
\ No newline at end of file

From c0cbde43f1cc5fbc942b65d3d236919f3dceed3c Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 18 Jul 2012 15:14:01 +0530
Subject: [PATCH 182/999] [IMP] l10n_in_hr_payroll: typo

bzr revid: mra@tinyerp.com-20120718094401-lxe5xava781vddle
---
 addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
index 98eb34001cb..7a023f09608 100644
--- a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
@@ -8,7 +8,7 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree colors="blue:state == 'draft';black:state == 'confirm';gray:state == 'cancel' " string="Advices Analysis">
-                <field name="nbr" sum="# of Lines"/>
+                <field name="nbr" sum="# Payment Lines"/>
                 <field name="name" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
                 <field name="date" invisible="1"/>

From 2e3611d77f8c05bbefb7dbbabaf6cafa1d1b6e23 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Wed, 18 Jul 2012 15:25:03 +0530
Subject: [PATCH 183/999] [FIX] Survey next, previous consistency problem.

bzr revid: tta@openerp.com-20120718095503-97ib19d7xrt202fi
---
 addons/survey/wizard/survey_answer.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 40ebbd1fdf3..817ee34ee09 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -32,6 +32,7 @@ from tools import to_xml
 from tools.translate import _
 import addons
 from tools.safe_eval import safe_eval
+import ast
 
 class survey_question_wiz(osv.osv_memory):
     _name = 'survey.question.wiz'
@@ -597,6 +598,7 @@ class survey_question_wiz(osv.osv_memory):
                     self.pool.get(context.get('object',False)).survey_req_done(cr, uid, [int(context.get('cur_id'))], context)
                 else:
                     self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
+        sur_name_read['store_ans'] = ast.literal_eval(sur_name_read['store_ans'])
         if sur_name_read['store_ans'] and type(sur_name_read['store_ans']) == dict:
             for key,val in sur_name_read['store_ans'].items():
                 for field in vals:

From 3ddfbce96e2e1ad0d865ba3a51da4cbcfe5e614e Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Wed, 18 Jul 2012 15:56:38 +0530
Subject: [PATCH 184/999] [IMP]l10n_in_hr_payroll: Set Total Below Bank Account
 number with Total Amount in rml Report

bzr revid: dsi@tinyerp.com-20120718102638-1a1jkjvh5tbtw7ot
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py      |  6 +++---
 .../report/report_payroll_advice.rml                 | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 57d7a492a97..9edfa0031ef 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -268,11 +268,11 @@ class payroll_advice_line(osv.osv):
     _description = 'Bank Advice Lines'
     _columns = {
         'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice'),
-        'name': fields.char('Bank Account No.', size=32, required=True),
-        'ifsc_code': fields.char('IFSC Code', size=32),
+        'name': fields.char('Bank Account No.', size=25, required=True),
+        'ifsc_code': fields.char('IFSC Code', size=16),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
-        'debit_credit': fields.char('C/D', size=8, required=False),
+        'debit_credit': fields.char('C/D', size=3, required=False),
         'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
     }
     _defaults = {
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
index 7c88431485b..76b5e00fe63 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
@@ -211,7 +211,7 @@
     <para style="terp_default_8_space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="70.0,200.0,107.0,81.0,81.0" style="Table4">[[ o.neft == True and removeParentNode('blockTable') ]]
+   <blockTable colWidths="47.0,146.0,158.0,105.0,83.0" style="Table4">[[ o.neft == True and removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="P1">SI. No.</para>
@@ -232,7 +232,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
-      <blockTable colWidths="70.0,200.0,107.0,81.0,81.0" style="Table5">[[ o.neft == True and removeParentNode('blockTable') ]]
+    <blockTable colWidths="47.0,146.0,158.0,105.0,83.0" style="Table5">[[ o.neft == True and removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P11" leftIndent="15" bulletIndent="0">
@@ -255,7 +255,7 @@
         </tr>
       </blockTable>
     </section>
-        <blockTable colWidths="40.0,123.0,107.0,107.0,81.0,81.0" style="Table4">[[ o.neft != True and removeParentNode('blockTable') ]]
+      <blockTable colWidths="40.0,129.0,141.0,104.0,77.0,49.0" style="Table4">[[ o.neft != True and removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="P1">SI. No.</para>
@@ -279,7 +279,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
-      <blockTable colWidths="40.0,123.0,107.0,107.0,81.0,81.0" style="Table5">[[ o.neft !=True and removeParentNode('blockTable') ]]
+    <blockTable colWidths="39.0,129.0,140.0,104.0,78.0,49.0" style="Table5">[[ o.neft !=True and removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P11" leftIndent="15" bulletIndent="0">
@@ -305,7 +305,7 @@
         </tr>
       </blockTable>
     </section>
-     <blockTable colWidths="50.0,221.0,106.0,82.0,80.0" style="Table6">[[ o.neft == True and removeParentNode('blockTable') ]]
+       <blockTable colWidths="50.0,144.0,158.0,107.0,80.0" style="Table6">[[ o.neft == True and removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">
@@ -331,7 +331,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="50.0,113.0,214.0,82.0,80.0" style="Table6">[[ o.neft !=True and removeParentNode('blockTable') ]]
+     <blockTable colWidths="50.0,119.0,244.0,99.0,27.0" style="Table6">[[ o.neft !=True and removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">

From c584cba75711adb91595825e28912795dba99971 Mon Sep 17 00:00:00 2001
From: vba <>
Date: Wed, 18 Jul 2012 16:47:04 +0530
Subject: [PATCH 185/999] fix : navigation buttons

bzr revid: tta@openerp.com-20120718111704-8atdici6zoafmr1u
---
 addons/survey/survey.py               |  1 +
 addons/survey/survey_view.xml         |  2 +-
 addons/survey/wizard/survey_answer.py | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 0ebaa2aa586..0525cc257a2 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -569,6 +569,7 @@ class survey_answer(osv.osv):
                 where question_id = %d and state = 'done'"\
                      % (rec.id, rec.question_id.id))
             res = cr.fetchone()
+            print("Records>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
             if res[0]:
                 avg = float(res[1]) * 100 / res[0]
             else:
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 20f6f42a929..62ed10106eb 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -260,7 +260,7 @@
                         string="Test Survey" type="action" icon="gtk-new"
                         context="{'active':True,'survey_id': active_id}"/>
                     <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                        string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
+                        string="Answer Survey" type="action" icon="gtk-execute" context="{'active':False,'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
                     <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                         string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
                     <button name="action_print_survey" states="open,draft,close,cancel"
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 817ee34ee09..4e9e3c7361c 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -162,14 +162,14 @@ class survey_question_wiz(osv.osv_memory):
                     if int(page_number) + 1 == total_pages:
                         but_string = "Done"
                     if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
-                        etree.SubElement(xml_header_group, 'button', {'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context), 'class':"oe_right"})
+                        etree.SubElement(xml_header_group, 'button', {'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
                     elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
-                        etree.SubElement(xml_header_group, 'button', {'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right"})
+                        etree.SubElement(xml_header_group, 'button', {'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
                     elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
-                        etree.SubElement(xml_header_group, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_right"})
+                        etree.SubElement(xml_header_group, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
                     else:
-                        etree.SubElement(xml_header_group, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right"})
-                    etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_right oe_survey_title_page"})
+                        etree.SubElement(xml_header_group, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
+                    etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_right1 oe_survey_title_page"})
 
                     if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
                         etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
@@ -397,7 +397,7 @@ class survey_question_wiz(osv.osv_memory):
 
                     # mark the survey request as done; call 'survey_req_done' on its actual model
                     survey_req_obj = self.pool.get(context.get('active_model'))
-                    if survey_req_obj and hasattr(survey_req_obj, 'survey_req_done'):
+                    if survey_req_obj and hasattr(survey_req_obj, 'survey_req_done'): 
                         survey_req_obj.survey_req_done(cr, uid, context.get('active_ids', []), context=context)
 
                     if sur_rec.send_response:
@@ -427,10 +427,12 @@ class survey_question_wiz(osv.osv_memory):
                             mail_message.schedule_with_attach(cr, uid, user_email, [resp_email], "Survey Answer Of " + str(user_name) , mail, attachments=attachments, context=context)
 
                     xml_form = etree.Element('form', {'string': _('Complete Survey Answer')})
+                    xml_header = etree.SubElement(xml_form, 'header', {'col': '6', 'colspan': '4' ,'class': 'oe_survey_title_height'})
+
                     etree.SubElement(xml_form, 'separator', {'string': 'Complete Survey', 'colspan': "4"})
                     etree.SubElement(xml_form, 'label', {'string': 'Thanks for your Answer'})
                     etree.SubElement(xml_form, 'newline')
-                    etree.SubElement(xml_form, 'button', {'icon': "gtk-go-forward", 'special':"cancel",'string':"OK",'colspan':"2"})
+                    etree.SubElement(xml_header, 'button', {'special':"cancel",'string':"OK",'colspan':"2",'class':'oe_highlight'})
                     root = xml_form.getroottree()
                     result['arch'] = etree.tostring(root)
                     result['fields'] = {}
@@ -484,7 +486,6 @@ class survey_question_wiz(osv.osv_memory):
                 value[field] = tot_per
         response_obj = self.pool.get('survey.response')
         surv_name_wiz = self.pool.get('survey.name.wiz')
-
         if context.has_key('response_id') and context.get('response_id') and int(context['response_id'][0]) > 0:
             data = super(survey_question_wiz, self).default_get(cr, uid, fields_list, context)
             response_ans = response_obj.browse(cr, uid, context['response_id'][context['response_no']])
@@ -531,11 +532,11 @@ class survey_question_wiz(osv.osv_memory):
                                     value[field] = ans.answer
 
         else:
+            
             if not context.has_key('sur_name_id'):
                 return value
             if context.has_key('active') and context.get('active',False):
                 return value
-            
             sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
             ans_list = []
 
@@ -543,7 +544,6 @@ class survey_question_wiz(osv.osv_memory):
                 for field in fields_list:
                     if field in list(val):
                         value[field] = val[field]
-
         return value
 
     def create(self, cr, uid, vals, context=None):

From 5f91b11c1c152b78af0bfa3d0718b66755747c45 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 18 Jul 2012 18:45:02 +0530
Subject: [PATCH 186/999] [ADD]l10n_in_hr_payroll:added report for salary rule
 by months

bzr revid: kbh@tinyerp.com-20120718131502-csfajf5yeqjsby07
---
 .../report/report_payslip_details.py          |   1 -
 addons/l10n_in_hr_payroll/__init__.py         |   1 +
 addons/l10n_in_hr_payroll/__openerp__.py      |   3 +-
 .../l10n_in_hr_payroll_report.xml             |   9 +-
 addons/l10n_in_hr_payroll/report/__init__.py  |   1 +
 .../report/report_payroll_advice.rml          |   4 +-
 .../report/report_payslip_details.py          |   1 +
 .../report/report_salary_rule_bymonth.py      | 127 ++++++++
 .../report/report_salary_rule_bymonth.rml     | 302 ++++++++++++++++++
 addons/l10n_in_hr_payroll/wizard/__init__.py  |  24 ++
 .../wizard/salary_rule_bymonth.py             |  66 ++++
 .../wizard/salary_rule_bymonth.xml            |  55 ++++
 12 files changed, 589 insertions(+), 5 deletions(-)
 create mode 100644 addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py
 create mode 100644 addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml
 create mode 100644 addons/l10n_in_hr_payroll/wizard/__init__.py
 create mode 100644 addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.py
 create mode 100644 addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml

diff --git a/addons/hr_payroll/report/report_payslip_details.py b/addons/hr_payroll/report/report_payslip_details.py
index 1e9839eaa6f..13867322a1d 100644
--- a/addons/hr_payroll/report/report_payslip_details.py
+++ b/addons/hr_payroll/report/report_payslip_details.py
@@ -37,7 +37,6 @@ class payslip_details_report(report_sxw.rml_parse):
     def get_details_by_rule_category(self, obj):
         payslip_line = self.pool.get('hr.payslip.line')
         rule_cate_obj = self.pool.get('hr.salary.rule.category')
-
         def get_recursive_parent(rule_categories):
             if not rule_categories:
                 return []
diff --git a/addons/l10n_in_hr_payroll/__init__.py b/addons/l10n_in_hr_payroll/__init__.py
index 9f1b6af533c..9631ccf0317 100644
--- a/addons/l10n_in_hr_payroll/__init__.py
+++ b/addons/l10n_in_hr_payroll/__init__.py
@@ -21,5 +21,6 @@
 
 import l10n_in_hr_payroll
 import report
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 8eb4e3a500f..a7ce421fdcb 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -49,7 +49,8 @@ Indian Payroll Salary Rules.
          'data/hr.salary.rule.csv',
          'security/ir.model.access.csv',
          'l10n_in_hr_payroll_report.xml',
-         'l10n_in_hr_payroll_sequence.xml'
+         'l10n_in_hr_payroll_sequence.xml',
+         'wizard/salary_rule_bymonth.xml'
      ],
     'demo_xml': ['l10n_in_hr_payroll_demo.xml'],
     'installable': True
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
index b6392871434..dceadc53a1e 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
@@ -17,6 +17,13 @@
             name="payroll.advice" 
             rml="l10n_in_hr_payroll/report/report_payroll_advice.rml"
             string="Print Advice" />
-
+            
+        <report
+            auto="False" 
+            id="salary_rule_bymonth" 
+            model="salary.rule.month" 
+            name="salary.rule.bymonth" 
+            rml="l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml"
+            string="rule by month" /> 
     </data>
 </openerp>
diff --git a/addons/l10n_in_hr_payroll/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py
index 5768ce50d05..70de220986a 100644
--- a/addons/l10n_in_hr_payroll/report/__init__.py
+++ b/addons/l10n_in_hr_payroll/report/__init__.py
@@ -24,5 +24,6 @@
 
 import report_payslip_details
 import report_payroll_advice
+import report_salary_rule_bymonth
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
index 55014e3b1ee..dafcc41130d 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template title="Invoices" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+      <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
     </pageTemplate>
   </template>
   <stylesheet>
diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.py b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
index 2732d5d09ae..9b56fab1d6b 100644
--- a/addons/l10n_in_hr_payroll/report/report_payslip_details.py
+++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
@@ -25,6 +25,7 @@ from hr_payroll import report
 class payslip_details_report_in(report.report_payslip_details.payslip_details_report):
 
     def __init__(self, cr, uid, name, context):
+        print "initttttttttttttttttttt"
         super(payslip_details_report_in, self).__init__(cr, uid, name, context)
         self.localcontext.update({
             'get_details_by_rule_category': self.get_details_by_rule_category,
diff --git a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py b/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py
new file mode 100644
index 00000000000..f565ca6ef19
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py
@@ -0,0 +1,127 @@
+#-*- coding:utf-8 -*-
+
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    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 datetime
+from report import report_sxw
+import time
+import pooler
+
+class report_salary_rule_bymonth(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(report_salary_rule_bymonth, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'get_employee': self.get_employee,
+            'get_periods': self.get_periods,
+            'get_months_tol': self.get_months_tol,
+            'get_total': self.get_total,
+        })
+
+        self.mnths =[]
+        self.mnths_tol = []
+        self.total=0.0
+
+    def get_periods(self,form):
+#       Get start year-month-date and end year-month-date
+        fy = int(form['start_date'][0:4])
+        ly = int(form['end_date'][0:4])
+
+        fm = int(form['start_date'][5:7])
+        lm = int(form['end_date'][5:7])
+        no_months = (ly-fy)*12+lm-fm + 1
+        cm = fm
+        cy = fy
+
+#       Get name of the months from integer
+        mnth_name = []
+        for count in range(0,no_months):
+            m = datetime.date(cy, cm, 1).strftime('%b')
+            mnth_name.append(m)
+            self.mnths.append(str(cm)+'-'+str(cy))
+            if cm == 12:
+                cm = 0
+                cy = ly
+            cm = cm +1
+        for c in range(0,(12-no_months)):
+            mnth_name.append('None')
+            self.mnths.append('None')
+        return [mnth_name]
+
+    def get_employee(self,form):
+        ls1=[]
+        ls = []
+        tol_mnths=['Total',0,0,0,0,0,0,0,0,0,0,0,0]
+        emp = pooler.get_pool(self.cr.dbname).get('hr.employee')
+        emp_ids = form['employee_ids']
+        empll  = emp.browse(self.cr,self.uid, emp_ids)
+        cnt = 1
+        for emp_id in empll:
+            ls1.append(emp_id.name)
+            tol = 0.0
+            for mnth in self.mnths:
+                if mnth <> 'None':
+                    if len(mnth) != 7:
+                        mnth = '0' + str(mnth)
+                    self.cr.execute('''select  sum(pl.total) 
+                            from hr_payslip_line as pl \
+                            left join hr_payslip as p on pl.slip_id = p.id \
+                            left join hr_employee as emp on emp.id = p.employee_id \
+                            left join resource_resource as r on r.id = emp.resource_id  \
+                            where (pl.code = 'NET')  and p.employee_id  = '''+str(emp_id.id)+''' \
+                            and to_char(date_to,'mm-yyyy') like '%'''+mnth+'''%'
+                            group by r.name, p.date_to,emp.id''')
+#                    self.cr.execute(query)
+                    sal = self.cr.fetchall()
+                    if sal:
+                        ls1.append(sal[0][0])
+                        tol += sal[0][0]
+                        tol_mnths[cnt] = tol_mnths[cnt] + sal[0][0]
+                    else:
+                        ls1.append(0.00)
+                        tol_mnths[cnt] = 0.0
+                else:
+                    ls1.append('')
+                    tol_mnths[cnt] = ''
+                cnt = cnt + 1
+            cnt = 1
+            ls1.append(tol)
+            ls.append(ls1)
+            ls1 = []
+        self.mnths_tol.append(tol_mnths)
+        return ls
+
+    def get_months_tol(self):
+        return self.mnths_tol
+
+    def get_total(self):
+        for item in self.mnths_tol:
+            for count in range(1,len(item)):
+              if item[count] == '':
+                  continue
+              self.total += item[count]
+        return self.total
+
+report_sxw.report_sxw('report.salary.rule.bymonth', 'salary.rule.month', 'l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml', parser=report_salary_rule_bymonth)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml
new file mode 100644
index 00000000000..e8c322d98b4
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml
@@ -0,0 +1,302 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="400" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="P1">Yearly Salary Details </para>
+    <para style="P5">From [[ formatLang(data['form']['start_date'], date=True) ]] To [[ formatLang(data['form']['end_date'], date=True) ]]</para>
+    <section>
+      <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
+      <blockTable colWidths="71.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,35.0" style="Table1">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Name</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[0] != 'None' and m[0] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[1] != 'None' and m[1] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[2] != 'None' and m[2] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[3] != 'None' and m[3] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[4] != 'None' and m[4] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[5] != 'None' and m[5] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[6] != 'None' and m[6] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[7] != 'None' and m[7] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[8] != 'None' and m[8] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[9] != 'None' and m[9] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[10] != 'None' and m[10] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[11] != 'None' and m[11] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Total</para>
+          </td>
+        </tr>
+      </blockTable>
+      <section>
+        <para style="terp_default_1">[[ repeatIn(get_employee(data['form']),'e') ]]</para>
+        <blockTable colWidths="71.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,35.0" style="Table2">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ e[0] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[1]!='' and formatLang(e[1])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[2]!='' and formatLang(e[2])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[3]!='' and formatLang(e[3])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[4]!='' and formatLang(e[4])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[5]!='' and formatLang(e[5])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[6]!='' and formatLang(e[6])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[7]!='' and formatLang(e[7])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[8]!='' and formatLang(e[8])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[9]!='' and formatLang(e[9])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[10]!='' and formatLang(e[10])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[11]!='' and formatLang(e[11])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[12]!='' and formatLang(e[12])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9_Bold">[[ formatLang(e[13]) ]] [[company.currency_id.symbol]]</para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="P2">
+          <font color="white"> </font>
+        </para>
+      </section>
+      <para style="P2">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <section>
+      <para style="terp_default_1">[[ repeatIn(get_months_tol(),'t') ]]</para>
+      <blockTable colWidths="71.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,35.0" style="Table6">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Total</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[2]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[3]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[4]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[5]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[6]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[7]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[8]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[9]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[10]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[11]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[12]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]] [[company.currency_id.symbol]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="P2">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="P6">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/l10n_in_hr_payroll/wizard/__init__.py b/addons/l10n_in_hr_payroll/wizard/__init__.py
new file mode 100644
index 00000000000..26d42354c53
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 salary_rule_bymonth
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.py b/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.py
new file mode 100644
index 00000000000..3c96c6c960e
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+###############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 time
+
+from osv import osv, fields
+
+class salary_rule_bymonth(osv.osv_memory):
+    _name = 'salary.rule.month'
+#    _inherit = 'hr.employee'
+    _description = 'Print Monthly Salary Rule Report'
+    _columns = {
+        'start_date': fields.date('Starting Date', required=True),
+        'end_date': fields.date('Ending Date', required=True),
+        'employee_ids': fields.many2many('hr.employee', 'payroll_year_rel','payroll_year_id','emp_id', 'Employees',required=True),
+#        'rule_id': fields.many2one('hr.salary.rule.category', 'Rule Category', required=True),
+    }
+    _defaults = {
+         'start_date': lambda *a: time.strftime('%Y-01-01'),
+         'end_date': lambda *a: time.strftime('%Y-%m-%d'),
+    }
+
+    def print_report(self, cr, uid, ids, context=None):
+        """
+         To get the date and print the report
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary
+         @return: return report
+        """
+        if context is None:
+            context = {}
+        datas = {'ids': context.get('active_ids', [])}
+
+        res = self.read(cr, uid, ids, ['employee_ids',  'start_date', 'end_date', ], context=context)
+        res = res and res[0] or {}
+        datas['form'] = res
+        datas['ids'] = res.get('employee_ids',[])
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'salary.rule.bymonth',
+            'datas': datas,
+       }
+
+salary_rule_bymonth()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml b/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml
new file mode 100644
index 00000000000..8c07e0e7bcc
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_salary_rule_month" model="ir.ui.view">
+            <field name="name">Salary rule monthly</field>
+            <field name="model">salary.rule.month</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Print Salary Rule Monthly" version="7.0">
+                <header>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </header>
+                <group>
+                    <field name="start_date"/>
+                    <field name="end_date"/>
+                    <field name="employee_ids"  nolabel="1" colspan="4"/>
+                </group>
+            </form>
+            </field>
+        </record>
+
+        <record id="action_salary_rule_month" model="ir.actions.act_window">
+            <field name="name">Salary rule monthly</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">salary.rule.month</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
+        <record model="ir.values" id="hr_attendance_week_values">
+            <field name="model_id" ref="hr_payroll.model_hr_salary_rule_category" />
+            <field name="name">Salary rule monthly</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_salary_rule_month'))" />
+            <field name="key">action</field>
+            <field name="model">salary.rule.month</field>
+        </record>
+        
+        <menuitem
+            name="Report"
+            parent="hr.menu_hr_root"
+            id="menu_monthly_salary_rule_report" sequence="50"
+           />
+
+        <menuitem
+            name="Monthly salary rule report"
+            parent="menu_monthly_salary_rule_report"
+            action="action_salary_rule_month"
+            id="menu_monthly_salary_rule"
+           />
+    </data>
+</openerp>

From e136fba798567ff50f7e9cec426feeb3c4bc74dc Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 18 Jul 2012 18:49:33 +0530
Subject: [PATCH 187/999] [FIX]remove print

bzr revid: kbh@tinyerp.com-20120718131933-mnyg1dpuchzmqb91
---
 addons/l10n_in_hr_payroll/report/report_payslip_details.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.py b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
index 9b56fab1d6b..2732d5d09ae 100644
--- a/addons/l10n_in_hr_payroll/report/report_payslip_details.py
+++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
@@ -25,7 +25,6 @@ from hr_payroll import report
 class payslip_details_report_in(report.report_payslip_details.payslip_details_report):
 
     def __init__(self, cr, uid, name, context):
-        print "initttttttttttttttttttt"
         super(payslip_details_report_in, self).__init__(cr, uid, name, context)
         self.localcontext.update({
             'get_details_by_rule_category': self.get_details_by_rule_category,

From adcd986ebf8a3c22981d2310f9df061b3b1bfce3 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 19 Jul 2012 11:00:53 +0530
Subject: [PATCH 188/999] [FIX]typo

bzr revid: kbh@tinyerp.com-20120719053053-ic63122f6fllw87c
---
 .../l10n_in_hr_payroll_report.xml             |  2 +-
 .../report/report_salary_rule_bymonth.py      | 22 +++++++++----------
 .../report/report_salary_rule_bymonth.rml     |  4 ++--
 .../wizard/salary_rule_bymonth.py             | 21 +++++++++---------
 .../wizard/salary_rule_bymonth.xml            | 16 ++++----------
 5 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
index dceadc53a1e..ec7272675c2 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
@@ -24,6 +24,6 @@
             model="salary.rule.month" 
             name="salary.rule.bymonth" 
             rml="l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml"
-            string="rule by month" /> 
+            string="Yearly Salary Report" /> 
     </data>
 </openerp>
diff --git a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py b/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py
index f565ca6ef19..29f58dfc4c1 100644
--- a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py
@@ -1,10 +1,8 @@
 #-*- coding:utf-8 -*-
-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    d$
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
 #
 #    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
@@ -22,8 +20,9 @@
 ##############################################################################
 
 import datetime
-from report import report_sxw
 import time
+
+from report import report_sxw
 import pooler
 
 class report_salary_rule_bymonth(report_sxw.rml_parse):
@@ -42,7 +41,7 @@ class report_salary_rule_bymonth(report_sxw.rml_parse):
         self.mnths_tol = []
         self.total=0.0
 
-    def get_periods(self,form):
+    def get_periods(self, form):
 #       Get start year-month-date and end year-month-date
         fy = int(form['start_date'][0:4])
         ly = int(form['end_date'][0:4])
@@ -55,7 +54,7 @@ class report_salary_rule_bymonth(report_sxw.rml_parse):
 
 #       Get name of the months from integer
         mnth_name = []
-        for count in range(0,no_months):
+        for count in range(0, no_months):
             m = datetime.date(cy, cm, 1).strftime('%b')
             mnth_name.append(m)
             self.mnths.append(str(cm)+'-'+str(cy))
@@ -63,18 +62,18 @@ class report_salary_rule_bymonth(report_sxw.rml_parse):
                 cm = 0
                 cy = ly
             cm = cm +1
-        for c in range(0,(12-no_months)):
+        for c in range(0, (12-no_months)):
             mnth_name.append('None')
             self.mnths.append('None')
         return [mnth_name]
 
-    def get_employee(self,form):
+    def get_employee(self, form):
         ls1=[]
         ls = []
-        tol_mnths=['Total',0,0,0,0,0,0,0,0,0,0,0,0]
+        tol_mnths=['Total', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
         emp = pooler.get_pool(self.cr.dbname).get('hr.employee')
         emp_ids = form['employee_ids']
-        empll  = emp.browse(self.cr,self.uid, emp_ids)
+        empll  = emp.browse(self.cr, self.uid, emp_ids)
         cnt = 1
         for emp_id in empll:
             ls1.append(emp_id.name)
@@ -91,7 +90,6 @@ class report_salary_rule_bymonth(report_sxw.rml_parse):
                             where (pl.code = 'NET')  and p.employee_id  = '''+str(emp_id.id)+''' \
                             and to_char(date_to,'mm-yyyy') like '%'''+mnth+'''%'
                             group by r.name, p.date_to,emp.id''')
-#                    self.cr.execute(query)
                     sal = self.cr.fetchall()
                     if sal:
                         ls1.append(sal[0][0])
@@ -116,7 +114,7 @@ class report_salary_rule_bymonth(report_sxw.rml_parse):
 
     def get_total(self):
         for item in self.mnths_tol:
-            for count in range(1,len(item)):
+            for count in range(1, len(item)):
               if item[count] == '':
                   continue
               self.total += item[count]
diff --git a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml
index e8c322d98b4..c3b19d4bd78 100644
--- a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml
+++ b/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="yearly salary report.pdf">
+  <template pageSize="(595.0,842.0)" title="Yearly Salary Report" author="OpenERP" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="400" height="786"/>
     </pageTemplate>
diff --git a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.py b/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.py
index 3c96c6c960e..e09fc1f885f 100644
--- a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.py
+++ b/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.py
@@ -1,13 +1,13 @@
-# -*- coding: utf-8 -*-
-###############################################################################
+#-*- coding:utf-8 -*-
+##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
 #
 #    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.
+#    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
@@ -24,15 +24,16 @@ import time
 from osv import osv, fields
 
 class salary_rule_bymonth(osv.osv_memory):
+
     _name = 'salary.rule.month'
-#    _inherit = 'hr.employee'
     _description = 'Print Monthly Salary Rule Report'
     _columns = {
         'start_date': fields.date('Starting Date', required=True),
         'end_date': fields.date('Ending Date', required=True),
-        'employee_ids': fields.many2many('hr.employee', 'payroll_year_rel','payroll_year_id','emp_id', 'Employees',required=True),
+        'employee_ids': fields.many2many('hr.employee', 'payroll_year_rel', 'payroll_year_id', 'emp_id', 'Employees', required=True),
 #        'rule_id': fields.many2one('hr.salary.rule.category', 'Rule Category', required=True),
     }
+
     _defaults = {
          'start_date': lambda *a: time.strftime('%Y-01-01'),
          'end_date': lambda *a: time.strftime('%Y-%m-%d'),
@@ -51,10 +52,10 @@ class salary_rule_bymonth(osv.osv_memory):
             context = {}
         datas = {'ids': context.get('active_ids', [])}
 
-        res = self.read(cr, uid, ids, ['employee_ids',  'start_date', 'end_date', ], context=context)
+        res = self.read(cr, uid, ids, ['employee_ids',  'start_date', 'end_date'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
-        datas['ids'] = res.get('employee_ids',[])
+        datas['ids'] = res.get('employee_ids', [])
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'salary.rule.bymonth',
diff --git a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml b/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml
index 8c07e0e7bcc..e1d4ef72af0 100644
--- a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml
+++ b/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml
@@ -29,27 +29,19 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        
-        <record model="ir.values" id="hr_attendance_week_values">
-            <field name="model_id" ref="hr_payroll.model_hr_salary_rule_category" />
-            <field name="name">Salary rule monthly</field>
-            <field name="key2">client_print_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_salary_rule_month'))" />
-            <field name="key">action</field>
-            <field name="model">salary.rule.month</field>
-        </record>
-        
+
         <menuitem
-            name="Report"
+            name="Reporting"
             parent="hr.menu_hr_root"
             id="menu_monthly_salary_rule_report" sequence="50"
            />
 
         <menuitem
-            name="Monthly salary rule report"
+            name="Monthly Salary Rule Report"
             parent="menu_monthly_salary_rule_report"
             action="action_salary_rule_month"
             id="menu_monthly_salary_rule"
            />
+
     </data>
 </openerp>

From 4ba54111096b3328495c295623d6c141211bf438 Mon Sep 17 00:00:00 2001
From: help <>
Date: Thu, 19 Jul 2012 12:25:04 +0530
Subject: [PATCH 189/999] [IMP]base:improved currency rates of different
 countries

bzr revid: help-20120719065504-yl42d4ildnjcmumd
---
 openerp/addons/base/currency_data.xml | 216 +++++++++++++++-----------
 1 file changed, 125 insertions(+), 91 deletions(-)

diff --git a/openerp/addons/base/currency_data.xml b/openerp/addons/base/currency_data.xml
index 10052f94479..179e7826957 100644
--- a/openerp/addons/base/currency_data.xml
+++ b/openerp/addons/base/currency_data.xml
@@ -640,7 +640,7 @@
 
         <record id="AFN" model="res.currency">
             <field name="name">AFN</field>
-            <field name="symbol">Afghani</field>
+            <field name="symbol">Af,Afs</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -926,7 +926,7 @@
         
         <record id="CDF" model="res.currency">
             <field name="name">CDF</field>
-            <field name="symbol">FC</field>
+            <field name="symbol">Fr</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1002,9 +1002,9 @@
             <field name="rate">48.09</field>
         </record>
         
+		<!-- East Timor -->
         <record id="TPE" model="res.currency">
             <field name="name">TPE</field>
-            <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1017,7 +1017,7 @@
         
         <record id="ECS" model="res.currency">
             <field name="name">ECS</field>
-            <field name="symbol">$</field>
+            <field name="symbol">S/.</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1025,7 +1025,7 @@
         <record id="rateECS" model="res.currency.rate">
             <field name="currency_id" ref="ECS" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.00</field>
+            <field name="rate">30,707.5</field>
         </record>
         
         <record id="EGP" model="res.currency">
@@ -1155,7 +1155,7 @@
         <record id="rateQTQ" model="res.currency.rate">
             <field name="currency_id" ref="QTQ" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">10.27</field>
+            <field name="rate">0.0000</field>
         </record>
         
         <record id="GGP" model="res.currency">
@@ -1168,7 +1168,7 @@
         <record id="rateGGP" model="res.currency.rate">
             <field name="currency_id" ref="GGP" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.786</field>
+            <field name="rate">0.00000</field>
         </record>
         
         <record id="GNF" model="res.currency">
@@ -1186,7 +1186,6 @@
         
         <record id="GWP" model="res.currency">
             <field name="name">GWP</field>
-            <field name="symbol">CFA</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1194,7 +1193,7 @@
         <record id="rateGWP" model="res.currency.rate">
             <field name="currency_id" ref="GWP" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">657.89</field>
+            <field name="rate">0.000000</field>
         </record>
         
         <record id="GYD" model="res.currency">
@@ -1303,7 +1302,7 @@
         
         <record id="KZT" model="res.currency">
             <field name="name">KZT</field>
-            <field name="symbol">Т</field>
+            <field name="symbol">лв</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1316,7 +1315,7 @@
         
         <record id="KES" model="res.currency">
             <field name="name">KES</field>
-            <field name="symbol">Sh</field>
+            <field name="symbol">KSh</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1342,7 +1341,7 @@
         
         <record id="KGS" model="res.currency">
             <field name="name">KGS</field>
-            <field name="symbol">KGS</field>
+            <field name="symbol">лв</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1366,19 +1365,6 @@
             <field name="rate">9847.72</field>
         </record>
         
-        <record id="LAK" model="res.currency">
-            <field name="name">LAK</field>
-            <field name="symbol">₭</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateLAK" model="res.currency.rate">
-            <field name="currency_id" ref="LAK" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">9847.72</field>
-        </record>
-        
         <record id="LBP" model="res.currency">
             <field name="name">LBP</field>
             <field name="symbol">ل.ل</field>
@@ -1407,7 +1393,7 @@
         
         <record id="LRD" model="res.currency">
             <field name="name">LRD</field>
-            <field name="symbol"> $ </field>
+            <field name="symbol">L$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1433,7 +1419,7 @@
         
         <record id="MOP" model="res.currency">
             <field name="name">MOP</field>
-            <field name="symbol">P</field>
+            <field name="symbol">MOP$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1459,7 +1445,6 @@
         
         <record id="MGA" model="res.currency">
             <field name="name">MGA</field>
-            <field name="symbol">MGA</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1484,8 +1469,8 @@
         </record>
         
         <record id="MVR" model="res.currency">
-            <field name="name">MVK</field>
-            <field name="symbol"> ރ. </field>
+            <field name="name">MVR</field>
+            <field name="symbol">.ރ</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1545,12 +1530,12 @@
         <record id="rateMAD" model="res.currency.rate">
             <field name="currency_id" ref="MAD" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">10.99</field>
+            <field name="rate">10.9962499</field>
         </record>
         
         <record id="MZN" model="res.currency">
             <field name="name">MZN</field>
-            <field name="symbol">MZN</field>
+            <field name="symbol">MT</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1636,7 +1621,7 @@
         <record id="rateKPW" model="res.currency.rate">
             <field name="currency_id" ref="KPW" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">165.64</field>
+            <field name="rate">1105.24376765</field>
         </record>
         
         <record id="NOK" model="res.currency">
@@ -1662,7 +1647,7 @@
         <record id="rateZWD" model="res.currency.rate">
             <field name="currency_id" ref="ZWD" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.154336833379</field>
+            <field name="rate">460.93</field>
         </record>		
 
         <record id="ZMK" model="res.currency">
@@ -1675,7 +1660,7 @@
         <record id="rateZMK" model="res.currency.rate">
             <field name="currency_id" ref="ZMK" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.0113636364</field>
+            <field name="rate">6022.54902</field>
         </record>
 
         <record id="YER" model="res.currency">
@@ -1688,20 +1673,7 @@
         <record id="rateYER" model="res.currency.rate">
             <field name="currency_id" ref="YER" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.255957635</field>
-        </record>
-
-        <record id="MAD" model="res.currency">
-            <field name="name">MAD</field>
-            <field name="symbol">د.م.</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateMAD" model="res.currency.rate">
-            <field name="currency_id" ref="MAD" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">6.15583628</field>
+            <field name="rate">264.784483</field>
         </record>
 
         <record id="VND" model="res.currency">
@@ -1714,7 +1686,7 @@
         <record id="rateVND" model="res.currency.rate">
             <field name="currency_id" ref="VND" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.0026478376</field>
+            <field name="rate">25595.8333</field>
         </record>
 
         <record id="VUB" model="res.currency">
@@ -1727,7 +1699,7 @@
         <record id="rateVUB" model="res.currency.rate">
             <field name="currency_id" ref="VUB" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">1.69638129</field>
+            <field name="rate">0.00000</field>
         </record>
 
         <record id="EUR" model="res.currency">
@@ -1740,7 +1712,7 @@
         <record id="rateEUR" model="res.currency.rate">
             <field name="currency_id" ref="EUR" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">67.7680936</field>
+            <field name="rate">1.0</field>
         </record>
 
         <record id="VUV" model="res.currency">
@@ -1753,7 +1725,7 @@
         <record id="rateVUV" model="res.currency.rate">
             <field name="currency_id" ref="VUV" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.5941</field>
+            <field name="rate">114.024315363</field>
         </record>		
 
         <record id="UZS" model="res.currency">
@@ -1766,7 +1738,7 @@
         <record id="rateUZS" model="res.currency.rate">
             <field name="currency_id" ref="UZS" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.0291262136</field>
+            <field name="rate">2331.3093</field>
         </record>
 
         <record id="UYP" model="res.currency">
@@ -1792,7 +1764,7 @@
         <record id="rateAED" model="res.currency.rate">
             <field name="currency_id" ref="AED" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">15.0189762</field>
+            <field name="rate">4.51253195</field>
         </record>
 
         <record id="UAG" model="res.currency">
@@ -1805,7 +1777,7 @@
         <record id="rateUAG" model="res.currency.rate">
             <field name="currency_id" ref="UAG" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">6.81740953</field>
+            <field name="rate">0.000000</field>
         </record>
 
         <record id="UGS" model="res.currency">
@@ -1935,7 +1907,7 @@
         <record id="rateTZS" model="res.currency.rate">
             <field name="currency_id" ref="TZS" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.0346191889</field>
+            <field name="rate">1947.06815</field>
         </record>		
 
         <record id="TJR" model="res.currency">
@@ -1960,7 +1932,7 @@
         <record id="rateTWD" model="res.currency.rate">
             <field name="currency_id" ref="TWD" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">1.8341576</field>
+            <field name="rate">36.8329536</field>
         </record>		
 
         <record id="SYP" model="res.currency">
@@ -1972,7 +1944,7 @@
         <record id="rateSYP" model="res.currency.rate">
             <field name="currency_id" ref="SYP" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.86162</field>
+            <field name="rate">78.8338</field>
         </record>		
 
         <record id="CHF" model="res.currency">
@@ -1985,7 +1957,7 @@
         <record id="rateCHF" model="res.currency.rate">
             <field name="currency_id" ref="CHF" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">56.2737663</field>
+            <field name="rate">1.20095404</field>
         </record>
 
         <record id="SEK" model="res.currency">
@@ -1998,7 +1970,7 @@
         <record id="rateSEK" model="res.currency.rate">
             <field name="currency_id" ref="SEK" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">7.84097154</field>
+            <field name="rate">8.52206122</field>
         </record>	
 
         <record id="SZL" model="res.currency">
@@ -2011,7 +1983,7 @@
         <record id="rateSZL" model="res.currency.rate">
             <field name="currency_id" ref="SZL" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">6.7162</field>
+            <field name="rate">10.07</field>
         </record>
 		
         <record id="NOK" model="res.currency">
@@ -2024,7 +1996,7 @@
         <record id="rateNOK" model="res.currency.rate">
             <field name="currency_id" ref="NOK" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">9.02747555</field>
+            <field name="rate">7.47900598</field>
         </record>
 		
         <record id="SRG" model="res.currency">
@@ -2037,7 +2009,7 @@
         <record id="rateSRG" model="res.currency.rate">
             <field name="currency_id" ref="SRG" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">43.5566546</field>
+            <field name="rate">3,980.29</field>
         </record>
 		
         <record id="SDD" model="res.currency">
@@ -2049,7 +2021,7 @@
         <record id="rateSDD" model="res.currency.rate">
             <field name="currency_id" ref="SDD" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">43.5566546</field>
+            <field name="rate">544.44</field>
         </record>
 		
         <record id="LKR" model="res.currency">
@@ -2062,7 +2034,7 @@
         <record id="rateLKR" model="res.currency.rate">
             <field name="currency_id" ref="LKR" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.410704473</field>
+            <field name="rate">163.552526</field>
         </record>		
 
         <record id="SSP" model="res.currency">
@@ -2087,7 +2059,7 @@
         <record id="rateGBP" model="res.currency.rate">
             <field name="currency_id" ref="GBP" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">85.8445983</field>
+            <field name="rate"> 0.784221994</field>
         </record>					
 
         <record id="ZAR" model="res.currency">
@@ -2100,7 +2072,7 @@
         <record id="rateZAR" model="res.currency.rate">
             <field name="currency_id" ref="ZAR" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">6.71485878</field>
+            <field name="rate">10.0171906</field>
         </record>
 
         <record id="SOD" model="res.currency">
@@ -2113,7 +2085,7 @@
         <record id="rateSOD" model="res.currency.rate">
             <field name="currency_id" ref="SOD" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.0339</field>
+            <field name="rate">0.00000</field>
         </record>
 
         <record id="SBD" model="res.currency">
@@ -2126,7 +2098,7 @@
         <record id="rateSBD" model="res.currency.rate">
             <field name="currency_id" ref="SBD" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">7.80427</field>
+            <field name="rate">8.6605</field>
         </record>
 
         <record id="SLL" model="res.currency">
@@ -2139,7 +2111,7 @@
         <record id="rateSLL" model="res.currency.rate">
             <field name="currency_id" ref="SLL" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.0125838004</field>
+            <field name="rate">5320.43478</field>
         </record>
 
         <record id="SCR" model="res.currency">
@@ -2152,7 +2124,7 @@
         <record id="rateSCR" model="res.currency.rate">
             <field name="currency_id" ref="SCR" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">3.723</field>
+            <field name="rate">18.2587287</field>
         </record>
 
         <record id="RSD" model="res.currency">
@@ -2165,7 +2137,7 @@
         <record id="rateRSD" model="res.currency.rate">
             <field name="currency_id" ref="RSD" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.577920651</field>
+            <field name="rate">117.381295</field>
         </record>
 
         <record id="SAR" model="res.currency">
@@ -2178,10 +2150,9 @@
         <record id="rateSAR" model="res.currency.rate">
             <field name="currency_id" ref="SAR" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">14.6532586</field>
+            <field name="rate">4.58898972</field>
         </record>	
 
-        <!--  Sao Tome and Principe -->
         <record id="STD" model="res.currency">
             <field name="name">STD</field>
             <field name="symbol">Db</field>			
@@ -2192,7 +2163,7 @@
         <record id="rateSTD" model="res.currency.rate">
             <field name="currency_id" ref="STD" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.0028</field>
+            <field name="rate">24,105.86</field>
         </record>	
 
         <record id="ITL" model="res.currency">
@@ -2205,7 +2176,7 @@
         <record id="rateITL" model="res.currency.rate">
             <field name="currency_id" ref="ITL" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.03</field>
+            <field name="rate">1,936.27</field>
         </record>
 
         <record id="WST" model="res.currency">
@@ -2218,7 +2189,7 @@
         <record id="rateWST" model="res.currency.rate">
             <field name="currency_id" ref="WST" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">23.4662</field>
+            <field name="rate">2.8628</field>
         </record>						
 
         <record id="SHP" model="res.currency">
@@ -2231,7 +2202,7 @@
         <record id="rateSHP" model="res.currency.rate">
             <field name="currency_id" ref="SHP" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">86.17</field>
+            <field name="rate">0.7856</field>
         </record>
 
         <record id="RWF" model="res.currency">
@@ -2244,7 +2215,7 @@
         <record id="rateRWF" model="res.currency.rate">
             <field name="currency_id" ref="RWF" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.0897</field>
+            <field name="rate">752.57</field>
         </record>		
 
         <record id="RUR" model="res.currency">
@@ -2257,7 +2228,7 @@
         <record id="rateRUR" model="res.currency.rate">
             <field name="currency_id" ref="RUR" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">1.69666996</field>
+            <field name="rate">39.6622695</field>
         </record>
 
         <record id="ROL" model="res.currency">
@@ -2270,7 +2241,7 @@
         <record id="rateROL" model="res.currency.rate">
             <field name="currency_id" ref="ROL" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.00148271</field>
+            <field name="rate">45,638.59</field>
         </record>
 
         <record id="QAR" model="res.currency">
@@ -2283,7 +2254,7 @@
         <record id="rateQAR" model="res.currency.rate">
             <field name="currency_id" ref="QAR" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">15.0939664</field>
+            <field name="rate">4.45500218</field>
         </record>
 
         <record id="PLZ" model="res.currency">
@@ -2296,7 +2267,7 @@
         <record id="ratePLZ" model="res.currency.rate">
             <field name="currency_id" ref="PLZ" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">16.1412243</field>
+            <field name="rate">4.17281888</field>
         </record>
 
         <record id="PEN" model="res.currency">
@@ -2309,7 +2280,7 @@
         <record id="ratePEN" model="res.currency.rate">
             <field name="currency_id" ref="PEN" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">20.9297725</field>
+            <field name="rate">3.20731573</field>
         </record>	
 
         <record id="PYG" model="res.currency">
@@ -2321,7 +2292,7 @@
         <record id="ratePYG" model="res.currency.rate">
             <field name="currency_id" ref="PYG" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.0121991428</field>
+            <field name="rate">5343.66812</field>
         </record>					
 
         <record id="PGK" model="res.currency">
@@ -2334,7 +2305,7 @@
         <record id="ratePGK" model="res.currency.rate">
             <field name="currency_id" ref="PGK" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">25.827014</field>
+            <field name="rate">2.5903895</field>
         </record>		
 
         <record id="PAB" model="res.currency">
@@ -2347,7 +2318,7 @@
         <record id="ratePAB" model="res.currency.rate">
             <field name="currency_id" ref="PAB" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">49.1639</field>
+            <field name="rate">1.2234</field>
         </record>
 
         <record id="PKR" model="res.currency">
@@ -2360,7 +2331,7 @@
         <record id="ratePKR" model="res.currency.rate">
             <field name="currency_id" ref="PKR" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.582096934</field>
+            <field name="rate">115.97432</field>
         </record>	
 
         <record id="OMR" model="res.currency">
@@ -2373,8 +2344,71 @@
         <record id="rateOMR" model="res.currency.rate">
             <field name="currency_id" ref="OMR" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">142.733817</field>
-        </record>				
+            <field name="rate">0.472921728</field>
+        </record>
+
+        <record id="CVE" model="res.currency">
+            <field name="name">CVE</field>
+            <field name="symbol">$,Esc</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateCVE" model="res.currency.rate">
+            <field name="currency_id" ref="CVE" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.61</field>
+        </record>						
+
+        <record id="SKK" model="res.currency">
+            <field name="name">SKK</field>
+            <field name="symbol">Sk</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSKK" model="res.currency.rate">
+            <field name="currency_id" ref="SKK" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">30.1263029</field>
+        </record>
+
+        <record id="SIT" model="res.currency">
+            <field name="name">SIT</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateSIT" model="res.currency.rate">
+            <field name="currency_id" ref="SIT" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">239.64</field>
+        </record>
+
+        <record id="YUM" model="res.currency">
+            <field name="name">YUM</field>
+            <field name="symbol">din.,дин.</field>			
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateYUM" model="res.currency.rate">
+            <field name="currency_id" ref="YUM" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.00000</field>
+        </record>		
+
+        <record id="ZRN" model="res.currency">
+            <field name="name">ZRN</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateZRN" model="res.currency.rate">
+            <field name="currency_id" ref="ZRN" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1128220.81</field>
+        </record>		
 		
     </data>
 </openerp>
\ No newline at end of file

From 38d732573ff328955d61374c96f8ff499766816e Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 19 Jul 2012 14:47:07 +0530
Subject: [PATCH 190/999] [IMP]country currency rate is changed

bzr revid: hsa@tinyerp.com-20120719091707-gi9czlsqw9s8co0o
---
 openerp/addons/base/currency_data.xml | 62 ++++++++++++++++++++++++---
 1 file changed, 57 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/currency_data.xml b/openerp/addons/base/currency_data.xml
index 9e0b224f6b1..7ffad588aae 100644
--- a/openerp/addons/base/currency_data.xml
+++ b/openerp/addons/base/currency_data.xml
@@ -1025,7 +1025,7 @@
         <record id="rateECS" model="res.currency.rate">
             <field name="currency_id" ref="ECS" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">30,707.5</field>
+            <field name="rate">30707.5</field>
         </record>
         
         <record id="EGP" model="res.currency">
@@ -1546,6 +1546,58 @@
             <field name="rate">1.54</field>
         </record>
         
+        <record id="DZD" model="res.currency">
+            <field name="name">DZD</field>
+            <field name="symbol">DZ</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateDZD" model="res.currency.rate">
+            <field name="currency_id" ref="DZD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">99.65</field>
+        </record>
+        
+        <record id="GHS" model="res.currency">
+            <field name="name">GHS</field>
+            <field name="symbol">GH¢</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateGHS" model="res.currency.rate">
+            <field name="currency_id" ref="GHS" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">2.39</field>
+        </record>
+        
+        <record id="GMD" model="res.currency">
+            <field name="name">GMD</field>
+            <field name="symbol">D</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateGMD" model="res.currency.rate">
+            <field name="currency_id" ref="GMD" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">38.89</field>
+        </record>
+        
+        <record id="ZRZ" model="res.currency">
+            <field name="name">ZRZ</field>
+            <field name="symbol">Ƶ</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateZRZ" model="res.currency.rate">
+            <field name="currency_id" ref="ZRZ" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">0.000000</field>
+        </record>
+        
         <record id="MZN" model="res.currency">
             <field name="name">MZN</field>
             <field name="symbol">MT</field>
@@ -2035,7 +2087,7 @@
         <record id="rateSRG" model="res.currency.rate">
             <field name="currency_id" ref="SRG" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">3,980.29</field>
+            <field name="rate">3980.29</field>
         </record>
 		
         <record id="SDD" model="res.currency">
@@ -2189,7 +2241,7 @@
         <record id="rateSTD" model="res.currency.rate">
             <field name="currency_id" ref="STD" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">24,105.86</field>
+            <field name="rate">24105.86</field>
         </record>	
 
         <record id="ITL" model="res.currency">
@@ -2202,7 +2254,7 @@
         <record id="rateITL" model="res.currency.rate">
             <field name="currency_id" ref="ITL" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">1,936.27</field>
+            <field name="rate">1936.27</field>
         </record>
 
         <record id="WST" model="res.currency">
@@ -2267,7 +2319,7 @@
         <record id="rateROL" model="res.currency.rate">
             <field name="currency_id" ref="ROL" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">45,638.59</field>
+            <field name="rate">45638.59</field>
         </record>
 
         <record id="QAR" model="res.currency">

From df4139ff08773307aa49218b3ae3671d8a411b90 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 19 Jul 2012 16:31:44 +0530
Subject: [PATCH 191/999] [FIX]reml updated

bzr revid: kbh@tinyerp.com-20120719110144-aul91plaakwa6h00
---
 .../report/report_salary_rule_bymonth.py      |  3 +-
 .../report/report_salary_rule_bymonth.rml     | 46 +++++++++----------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py b/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py
index 29f58dfc4c1..f6841034daf 100644
--- a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py
@@ -97,7 +97,6 @@ class report_salary_rule_bymonth(report_sxw.rml_parse):
                         tol_mnths[cnt] = tol_mnths[cnt] + sal[0][0]
                     else:
                         ls1.append(0.00)
-                        tol_mnths[cnt] = 0.0
                 else:
                     ls1.append('')
                     tol_mnths[cnt] = ''
@@ -120,6 +119,6 @@ class report_salary_rule_bymonth(report_sxw.rml_parse):
               self.total += item[count]
         return self.total
 
-report_sxw.report_sxw('report.salary.rule.bymonth', 'salary.rule.month', 'l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml', parser=report_salary_rule_bymonth)
+report_sxw.report_sxw('report.salary.rule.bymonth', 'salary.rule.month', 'l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml', parser=report_salary_rule_bymonth, header='internal')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml
index c3b19d4bd78..b50d53cfe9b 100644
--- a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml
+++ b/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="yearly salary report.pdf">
-  <template pageSize="(595.0,842.0)" title="Yearly Salary Report" author="OpenERP" allowSplitting="20">
+  <template pageSize="(620.0,842.0)" title="Yearly Salary Report" author="OpenERP" allowSplitting="50">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="400" height="786"/>
     </pageTemplate>
@@ -98,18 +98,18 @@
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Table Contents" fontName="Helvetica"/>
     <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="5.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="5.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
@@ -117,7 +117,7 @@
     <para style="P5">From [[ formatLang(data['form']['start_date'], date=True) ]] To [[ formatLang(data['form']['end_date'], date=True) ]]</para>
     <section>
       <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
-      <blockTable colWidths="71.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,35.0" style="Table1">
+      <blockTable colWidths="53.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table1">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Name</para>
@@ -165,69 +165,69 @@
       </blockTable>
       <section>
         <para style="terp_default_1">[[ repeatIn(get_employee(data['form']),'e') ]]</para>
-        <blockTable colWidths="71.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,35.0" style="Table2">
+        <blockTable colWidths="53.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table2">
           <tr>
             <td>
               <para style="terp_default_9">[[ e[0] ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[1]!='' and formatLang(e[1])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="5.0">[[ (e[1]!='' and formatLang(e[1])) or removeParentNode('font') ]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[2]!='' and formatLang(e[2])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="5.0">[[ (e[2]!='' and formatLang(e[2])) or removeParentNode('font') ]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[3]!='' and formatLang(e[3])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="5.0">[[ (e[3]!='' and formatLang(e[3])) or removeParentNode('font') ]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[4]!='' and formatLang(e[4])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="5.0">[[ (e[4]!='' and formatLang(e[4])) or removeParentNode('font') ]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[5]!='' and formatLang(e[5])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="5.0">[[ (e[5]!='' and formatLang(e[5])) or removeParentNode('font') ]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[6]!='' and formatLang(e[6])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="5.0">[[ (e[6]!='' and formatLang(e[6])) or removeParentNode('font') ]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[7]!='' and formatLang(e[7])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="5.0">[[ (e[7]!='' and formatLang(e[7])) or removeParentNode('font') ]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[8]!='' and formatLang(e[8])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="5.0">[[ (e[8]!='' and formatLang(e[8])) or removeParentNode('font') ]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[9]!='' and formatLang(e[9])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="5.0">[[ (e[9]!='' and formatLang(e[9])) or removeParentNode('font') ]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[10]!='' and formatLang(e[10])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="5.0">[[ (e[10]!='' and formatLang(e[10])) or removeParentNode('font') ]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[11]!='' and formatLang(e[11])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="5.0">[[ (e[11]!='' and formatLang(e[11])) or removeParentNode('font') ]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[12]!='' and formatLang(e[12])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="5.0">[[ (e[12]!='' and formatLang(e[12])) or removeParentNode('font') ]]</font>
               </para>
             </td>
             <td>
@@ -245,7 +245,7 @@
     </section>
     <section>
       <para style="terp_default_1">[[ repeatIn(get_months_tol(),'t') ]]</para>
-      <blockTable colWidths="71.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,31.0,35.0" style="Table6">
+      <blockTable colWidths="53.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table6">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Total</para>

From 2e777fa99ef34b5fabeb510eda49650ddf10b5fd Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 19 Jul 2012 16:49:30 +0530
Subject: [PATCH 192/999] [IMP]l10n_in_hr_payroll:query updated

bzr revid: kbh@tinyerp.com-20120719111930-gvuhcf6n5qkg9zk3
---
 addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py b/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py
index f6841034daf..4db8ce84c8f 100644
--- a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py
@@ -87,7 +87,7 @@ class report_salary_rule_bymonth(report_sxw.rml_parse):
                             left join hr_payslip as p on pl.slip_id = p.id \
                             left join hr_employee as emp on emp.id = p.employee_id \
                             left join resource_resource as r on r.id = emp.resource_id  \
-                            where (pl.code = 'NET')  and p.employee_id  = '''+str(emp_id.id)+''' \
+                            where pl.code = 'NET' and p.state = 'done' and p.employee_id  = '''+str(emp_id.id)+''' \
                             and to_char(date_to,'mm-yyyy') like '%'''+mnth+'''%'
                             group by r.name, p.date_to,emp.id''')
                     sal = self.cr.fetchall()

From 5fac058f75e353d56863e1598898bcd41cc7e7dc Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 19 Jul 2012 17:07:10 +0530
Subject: [PATCH 193/999] [IMP]l10n_in_hr_payroll:report name and id changed

bzr revid: kbh@tinyerp.com-20120719113710-5ovwnznclp2j0efd
---
 .../wizard/salary_rule_bymonth.xml                   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml b/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml
index e1d4ef72af0..780ac997a66 100644
--- a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml
+++ b/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml
@@ -21,7 +21,7 @@
             </field>
         </record>
 
-        <record id="action_salary_rule_month" model="ir.actions.act_window">
+        <record id="action_yearly_salary_rule" model="ir.actions.act_window">
             <field name="name">Salary rule monthly</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">salary.rule.month</field>
@@ -33,14 +33,14 @@
         <menuitem
             name="Reporting"
             parent="hr.menu_hr_root"
-            id="menu_monthly_salary_rule_report" sequence="50"
+            id="menu_yearly_salary_rule_report" sequence="50"
            />
 
         <menuitem
-            name="Monthly Salary Rule Report"
-            parent="menu_monthly_salary_rule_report"
-            action="action_salary_rule_month"
-            id="menu_monthly_salary_rule"
+            name="Yearly Salary Rule Report"
+            parent="menu_yearly_salary_rule_report"
+            action="action_yearly_salary_rule"
+            id="menu_yearly_salary_rule"
            />
 
     </data>

From b0508a59a8367c97957f41ede9b1f0443d6b2909 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 19 Jul 2012 17:09:57 +0530
Subject: [PATCH 194/999] [IMP]l10n_in_hr_payroll

bzr revid: kbh@tinyerp.com-20120719113957-82wtpw19p9h5ihjv
---
 addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml b/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml
index 780ac997a66..c1386f824be 100644
--- a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml
+++ b/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml
@@ -22,7 +22,7 @@
         </record>
 
         <record id="action_yearly_salary_rule" model="ir.actions.act_window">
-            <field name="name">Salary rule monthly</field>
+            <field name="name">Salary Register</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">salary.rule.month</field>
             <field name="view_type">form</field>

From 64c5fbe3d91ed049653823c010628a0df270454a Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Thu, 19 Jul 2012 17:16:56 +0530
Subject: [PATCH 195/999] [FIX] Survey List view issue

bzr revid: tta@openerp.com-20120719114656-ww90ra2g5qmd3l06
---
 addons/survey/static/src/css/survey.css | 3 +--
 addons/survey/survey_view.xml           | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index b4cefd18a82..746f7a1d465 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -6,8 +6,7 @@
 }
 
 .oe_survey_title_height{
-    height: 33px;
-    border-top: 1px #EBEBEB solid;
+    height: 33px;  
 }
 
 .oe_survey_title_page {
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 62ed10106eb..bfdb088d6ed 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -258,11 +258,9 @@
                     <field name="state"/>
                     <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                         string="Test Survey" type="action" icon="gtk-new"
-                        context="{'active':True,'survey_id': active_id}"/>
+                        context="{'active':False,'survey_id': active_id}"/>
                     <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                        string="Answer Survey" type="action" icon="gtk-execute" context="{'active':False,'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
-                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                        string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
+                        string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_active':False,'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>                   
                     <button name="action_print_survey" states="open,draft,close,cancel"
                                     string="Print Answer" type="object" icon="gtk-print"/>
                 </tree>

From 0837f1820347d7e0175e7c46f5f620a08c9ae01e Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 19 Jul 2012 17:33:11 +0530
Subject: [PATCH 196/999] []

bzr revid: kbh@tinyerp.com-20120719120311-6sat550rwf0kk1gg
---
 addons/hr_payroll/report/report_payslip_details.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_payroll/report/report_payslip_details.py b/addons/hr_payroll/report/report_payslip_details.py
index 13867322a1d..1e9839eaa6f 100644
--- a/addons/hr_payroll/report/report_payslip_details.py
+++ b/addons/hr_payroll/report/report_payslip_details.py
@@ -37,6 +37,7 @@ class payslip_details_report(report_sxw.rml_parse):
     def get_details_by_rule_category(self, obj):
         payslip_line = self.pool.get('hr.payslip.line')
         rule_cate_obj = self.pool.get('hr.salary.rule.category')
+
         def get_recursive_parent(rule_categories):
             if not rule_categories:
                 return []

From ee580b5bacb385d908de470d931a9873506528e2 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Thu, 19 Jul 2012 18:47:06 +0530
Subject: [PATCH 197/999] [IMP] code improve survey answer wizard.

bzr revid: tta@openerp.com-20120719131706-r9vwpaj1zs2c09xl
---
 addons/survey/wizard/survey_answer.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 4e9e3c7361c..e4414934524 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -32,7 +32,6 @@ from tools import to_xml
 from tools.translate import _
 import addons
 from tools.safe_eval import safe_eval
-import ast
 
 class survey_question_wiz(osv.osv_memory):
     _name = 'survey.question.wiz'
@@ -597,9 +596,9 @@ class survey_question_wiz(osv.osv_memory):
                     self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
                     self.pool.get(context.get('object',False)).survey_req_done(cr, uid, [int(context.get('cur_id'))], context)
                 else:
-                    self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
-        sur_name_read['store_ans'] = ast.literal_eval(sur_name_read['store_ans'])
-        if sur_name_read['store_ans'] and type(sur_name_read['store_ans']) == dict:
+                    self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})        
+        if sur_name_read['store_ans'] and type(safe_eval(sur_name_read['store_ans'])) == dict:
+            sur_name_read['store_ans'] = safe_eval(sur_name_read['store_ans'])
             for key,val in sur_name_read['store_ans'].items():
                 for field in vals:
                     if field.split('_')[0] == val['question_id']:

From 4b8f5ce491135987c950abfd70cdde7526afe6ac Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 19 Jul 2012 18:47:28 +0530
Subject: [PATCH 198/999] [FIX]remove unnecessay change

bzr revid: kbh@tinyerp.com-20120719131728-f70xb2umme3s8mz6
---
 addons/l10n_in_hr_payroll/report/report_payroll_advice.rml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
index 19afc4485d3..8ca1bae5ba5 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template title="Invoices" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
   </template>
   <stylesheet>

From 897bdafc9438129e16d85ee54fbc4e9a34cb8e5f Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 20 Jul 2012 10:57:24 +0530
Subject: [PATCH 199/999] [IMP] improved code for survey list and form

bzr revid: tta@openerp.com-20120720052724-jrpzgzj310dgqzwe
---
 addons/survey/survey_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index bfdb088d6ed..8dd99e9fe1f 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -28,7 +28,7 @@
                 <sheet>
                     <div class="oe_button_box oe_right">
                         <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
+                        <button name="%(action_view_survey_question_message)d" states="open" string="Answer Survey" type="action" icon="gtk-execute" context="{'active':False, 'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
                     </div>
                     <div class="oe_title">
                         <label for="title" class="oe_edit_only"/>
@@ -258,9 +258,9 @@
                     <field name="state"/>
                     <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                         string="Test Survey" type="action" icon="gtk-new"
-                        context="{'active':False,'survey_id': active_id}"/>
-                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                        string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_active':False,'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>                   
+                        context="{'active':True,'survey_id': active_id}"/>
+                    <button name="fill_survey" states="open"
+                        string="Answer Survey" type="object" icon="gtk-execute" context="{'active':False,'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>                   
                     <button name="action_print_survey" states="open,draft,close,cancel"
                                     string="Print Answer" type="object" icon="gtk-print"/>
                 </tree>

From 6f87b8efcd202fb99ed96bb9a97ed4dd4941a1e7 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 20 Jul 2012 11:36:56 +0530
Subject: [PATCH 200/999] [IMP]add field currency_id in res_country

bzr revid: hsa@tinyerp.com-20120720060656-wbdj7fx46oskxbe0
---
 openerp/addons/base/res/res_country.py       | 2 +-
 openerp/addons/base/res/res_country_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_country.py b/openerp/addons/base/res/res_country.py
index bbd469bd6b7..002a86896eb 100644
--- a/openerp/addons/base/res/res_country.py
+++ b/openerp/addons/base/res/res_country.py
@@ -55,7 +55,7 @@ addresses belonging to this country.\n\nYou can use the python-style string pate
             \n%(state_code)s: the code of the state
             \n%(country_name)s: the name of the country
             \n%(country_code)s: the code of the country"""),
-        'currency':fields.many2one('res.currency','Currency Code'),
+        'currency_id':fields.many2one('res.currency','Currency Code'),
     }
     _sql_constraints = [
         ('name_uniq', 'unique (name)',
diff --git a/openerp/addons/base/res/res_country_view.xml b/openerp/addons/base/res/res_country_view.xml
index ca4440a616d..06ebd73637f 100644
--- a/openerp/addons/base/res/res_country_view.xml
+++ b/openerp/addons/base/res/res_country_view.xml
@@ -27,7 +27,7 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="currency"/>
+                            <field name="currency_id"/>
                             <field name="address_format" groups="base.group_no_one"/>
                         </group>
                         <group>

From 6d3f9bf76de01dc29c08a0daf3f30ac422ff2c66 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 20 Jul 2012 14:25:38 +0530
Subject: [PATCH 201/999] [IMP] Unwanted statement removed.

bzr revid: tta@openerp.com-20120720085538-zdiznvwluz2gu47e
---
 addons/survey/survey.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 0525cc257a2..dcc7aedc9b8 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -45,6 +45,10 @@ class survey(osv.osv):
     _description = 'Survey'
     _rec_name = 'title'
 
+    def notify_survey_attempt(self, ids=False, args=None):
+        print "How it works !!!"
+        return True
+
     def default_get(self, cr, uid, fields, context=None):
         data = super(survey, self).default_get(cr, uid, fields, context)
         return data
@@ -569,7 +573,6 @@ class survey_answer(osv.osv):
                 where question_id = %d and state = 'done'"\
                      % (rec.id, rec.question_id.id))
             res = cr.fetchone()
-            print("Records>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
             if res[0]:
                 avg = float(res[1]) * 100 / res[0]
             else:

From e43a303093bf5ceff16f4316fe0c9df582b4b15d Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 20 Jul 2012 14:46:34 +0530
Subject: [PATCH 202/999] [IMP]l10n_in_hr_payroll:report improved

bzr revid: kbh@tinyerp.com-20120720091634-eyrajix3k2yh9xxg
---
 addons/l10n_in_hr_payroll/__openerp__.py      |  2 +-
 .../l10n_in_hr_payroll_report.xml             | 12 +--
 addons/l10n_in_hr_payroll/report/__init__.py  |  3 +-
 ...y => report_hr_salary_employee_bymonth.py} | 85 ++++++++++---------
 ... => report_hr_salary_employee_bymonth.rml} | 22 ++---
 addons/l10n_in_hr_payroll/wizard/__init__.py  |  2 +-
 ...month.py => hr_salary_employee_bymonth.py} | 13 ++-
 ...nth.xml => hr_salary_employee_bymonth.xml} | 24 +++---
 8 files changed, 75 insertions(+), 88 deletions(-)
 rename addons/l10n_in_hr_payroll/report/{report_salary_rule_bymonth.py => report_hr_salary_employee_bymonth.py} (59%)
 rename addons/l10n_in_hr_payroll/report/{report_salary_rule_bymonth.rml => report_hr_salary_employee_bymonth.rml} (96%)
 rename addons/l10n_in_hr_payroll/wizard/{salary_rule_bymonth.py => hr_salary_employee_bymonth.py} (86%)
 rename addons/l10n_in_hr_payroll/wizard/{salary_rule_bymonth.xml => hr_salary_employee_bymonth.xml} (59%)

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 9762fac72c4..2143e914f7f 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -50,7 +50,7 @@ Indian Payroll Salary Rules.
          'security/ir.model.access.csv',
          'l10n_in_hr_payroll_report.xml',
          'l10n_in_hr_payroll_sequence.xml',
-         'wizard/salary_rule_bymonth.xml',
+         'wizard/hr_salary_employee_bymonth.xml',
          'report/payment_advice_report_view.xml',
 
      ],
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
index ec7272675c2..04e7091e395 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
@@ -17,13 +17,13 @@
             name="payroll.advice" 
             rml="l10n_in_hr_payroll/report/report_payroll_advice.rml"
             string="Print Advice" />
-            
+
         <report
             auto="False" 
-            id="salary_rule_bymonth" 
-            model="salary.rule.month" 
-            name="salary.rule.bymonth" 
-            rml="l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml"
-            string="Yearly Salary Report" /> 
+            id="hr_salary_employee_bymonth" 
+            model="hr.salary.employee.month" 
+            name="salary.employee.bymonth" 
+            rml="l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml"
+            string="Salary Register" /> 
     </data>
 </openerp>
diff --git a/addons/l10n_in_hr_payroll/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py
index 344d91deb1a..3091692c2e8 100644
--- a/addons/l10n_in_hr_payroll/report/__init__.py
+++ b/addons/l10n_in_hr_payroll/report/__init__.py
@@ -24,8 +24,7 @@
 
 import report_payslip_details
 import report_payroll_advice
-import report_salary_rule_bymonth
+import report_hr_salary_employee_bymonth
 import payment_advice_report
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
similarity index 59%
rename from addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py
rename to addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
index 4db8ce84c8f..947f17ecdc3 100644
--- a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -23,12 +23,12 @@ import datetime
 import time
 
 from report import report_sxw
-import pooler
 
-class report_salary_rule_bymonth(report_sxw.rml_parse):
+class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(report_salary_rule_bymonth, self).__init__(cr, uid, name, context)
+        super(report_hr_salary_employee_bymonth, self).__init__(cr, uid, name, context=context)
+
         self.localcontext.update({
             'time': time,
             'get_employee': self.get_employee,
@@ -37,47 +37,48 @@ class report_salary_rule_bymonth(report_sxw.rml_parse):
             'get_total': self.get_total,
         })
 
+        self.context = context
         self.mnths =[]
-        self.mnths_tol = []
+        self.mnths_total = []
         self.total=0.0
 
     def get_periods(self, form):
 #       Get start year-month-date and end year-month-date
-        fy = int(form['start_date'][0:4])
-        ly = int(form['end_date'][0:4])
+        first_year = int(form['start_date'][0:4])
+        last_year = int(form['end_date'][0:4])
 
-        fm = int(form['start_date'][5:7])
-        lm = int(form['end_date'][5:7])
-        no_months = (ly-fy)*12+lm-fm + 1
-        cm = fm
-        cy = fy
+        first_month = int(form['start_date'][5:7])
+        last_month = int(form['end_date'][5:7])
+        no_months = (last_year-first_year) * 12 + last_month - first_month + 1
+        current_month = first_month
+        current_year = first_year
 
 #       Get name of the months from integer
         mnth_name = []
         for count in range(0, no_months):
-            m = datetime.date(cy, cm, 1).strftime('%b')
+            m = datetime.date(current_year, current_month, 1).strftime('%b')
             mnth_name.append(m)
-            self.mnths.append(str(cm)+'-'+str(cy))
-            if cm == 12:
-                cm = 0
-                cy = ly
-            cm = cm +1
+            self.mnths.append(str(current_month)+'-'+str(current_year))
+            if current_month == 12:
+                current_month = 0
+                current_year = last_year
+            current_month = current_month +1
         for c in range(0, (12-no_months)):
             mnth_name.append('None')
             self.mnths.append('None')
         return [mnth_name]
 
     def get_employee(self, form):
-        ls1=[]
-        ls = []
-        tol_mnths=['Total', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-        emp = pooler.get_pool(self.cr.dbname).get('hr.employee')
-        emp_ids = form['employee_ids']
-        empll  = emp.browse(self.cr, self.uid, emp_ids)
+        list1=[]
+        list = []
+        total_mnths=['Total', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+        emp_obj = self.pool.get('hr.employee')
+        emp_ids = form.get('employee_ids', [])
+        employees  = emp_obj.browse(self.cr, self.uid, emp_ids, context=self.context)
         cnt = 1
-        for emp_id in empll:
-            ls1.append(emp_id.name)
-            tol = 0.0
+        for emp_id in employees:
+            list1.append(emp_id.name)
+            total = 0.0
             for mnth in self.mnths:
                 if mnth <> 'None':
                     if len(mnth) != 7:
@@ -90,35 +91,35 @@ class report_salary_rule_bymonth(report_sxw.rml_parse):
                             where pl.code = 'NET' and p.state = 'done' and p.employee_id  = '''+str(emp_id.id)+''' \
                             and to_char(date_to,'mm-yyyy') like '%'''+mnth+'''%'
                             group by r.name, p.date_to,emp.id''')
-                    sal = self.cr.fetchall()
-                    if sal:
-                        ls1.append(sal[0][0])
-                        tol += sal[0][0]
-                        tol_mnths[cnt] = tol_mnths[cnt] + sal[0][0]
+                    salary = self.cr.fetchall()
+                    if salary:
+                        list1.append(salary[0][0])
+                        total += salary[0][0]
+                        total_mnths[cnt] = total_mnths[cnt] + salary[0][0]
                     else:
-                        ls1.append(0.00)
+                        list1.append(0.00)
                 else:
-                    ls1.append('')
-                    tol_mnths[cnt] = ''
+                    list1.append('')
+                    total_mnths[cnt] = ''
                 cnt = cnt + 1
             cnt = 1
-            ls1.append(tol)
-            ls.append(ls1)
-            ls1 = []
-        self.mnths_tol.append(tol_mnths)
-        return ls
+            list1.append(total)
+            list.append(list1)
+            list1 = []
+        self.mnths_total.append(total_mnths)
+        return list
 
     def get_months_tol(self):
-        return self.mnths_tol
+        return self.mnths_total
 
     def get_total(self):
-        for item in self.mnths_tol:
+        for item in self.mnths_total:
             for count in range(1, len(item)):
               if item[count] == '':
                   continue
               self.total += item[count]
         return self.total
 
-report_sxw.report_sxw('report.salary.rule.bymonth', 'salary.rule.month', 'l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml', parser=report_salary_rule_bymonth, header='internal')
+report_sxw.report_sxw('report.salary.employee.bymonth', 'hr.salary.employee.month', 'l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml', parser=report_hr_salary_employee_bymonth, header='internal')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
similarity index 96%
rename from addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml
rename to addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
index b50d53cfe9b..73d224e65b0 100644
--- a/addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
@@ -2,7 +2,7 @@
 <document filename="yearly salary report.pdf">
   <template pageSize="(620.0,842.0)" title="Yearly Salary Report" author="OpenERP" allowSplitting="50">
     <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="28.0" width="400" height="786"/>
+      <frame id="first" x1="28.0" y1="28.0"  width="539" height="772"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -106,7 +106,7 @@
     <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="5.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="5.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="5.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -117,7 +117,7 @@
     <para style="P5">From [[ formatLang(data['form']['start_date'], date=True) ]] To [[ formatLang(data['form']['end_date'], date=True) ]]</para>
     <section>
       <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
-      <blockTable colWidths="53.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table1">
+      <blockTable colWidths="55.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table1">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Name</para>
@@ -165,7 +165,7 @@
       </blockTable>
       <section>
         <para style="terp_default_1">[[ repeatIn(get_employee(data['form']),'e') ]]</para>
-        <blockTable colWidths="53.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table2">
+        <blockTable colWidths="55.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table2">
           <tr>
             <td>
               <para style="terp_default_9">[[ e[0] ]]</para>
@@ -235,17 +235,11 @@
             </td>
           </tr>
         </blockTable>
-        <para style="P2">
-          <font color="white"> </font>
-        </para>
       </section>
-      <para style="P2">
-        <font color="white"> </font>
-      </para>
     </section>
     <section>
       <para style="terp_default_1">[[ repeatIn(get_months_tol(),'t') ]]</para>
-      <blockTable colWidths="53.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table6">
+      <blockTable colWidths="55.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table6">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Total</para>
@@ -291,12 +285,6 @@
           </td>
         </tr>
       </blockTable>
-      <para style="P2">
-        <font color="white"> </font>
-      </para>
     </section>
-    <para style="P6">
-      <font color="white"> </font>
-    </para>
   </story>
 </document>
diff --git a/addons/l10n_in_hr_payroll/wizard/__init__.py b/addons/l10n_in_hr_payroll/wizard/__init__.py
index 26d42354c53..b08ed5a3f9c 100644
--- a/addons/l10n_in_hr_payroll/wizard/__init__.py
+++ b/addons/l10n_in_hr_payroll/wizard/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import salary_rule_bymonth
+import hr_salary_employee_bymonth
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.py b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
similarity index 86%
rename from addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.py
rename to addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
index e09fc1f885f..172824a77cb 100644
--- a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.py
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
@@ -23,15 +23,14 @@ import time
 
 from osv import osv, fields
 
-class salary_rule_bymonth(osv.osv_memory):
+class hr_salary_employee_bymonth(osv.osv_memory):
 
-    _name = 'salary.rule.month'
-    _description = 'Print Monthly Salary Rule Report'
+    _name = 'hr.salary.employee.month'
+    _description = 'Print Hr Salary Employee By Month Report'
     _columns = {
         'start_date': fields.date('Starting Date', required=True),
         'end_date': fields.date('Ending Date', required=True),
         'employee_ids': fields.many2many('hr.employee', 'payroll_year_rel', 'payroll_year_id', 'emp_id', 'Employees', required=True),
-#        'rule_id': fields.many2one('hr.salary.rule.category', 'Rule Category', required=True),
     }
 
     _defaults = {
@@ -55,13 +54,13 @@ class salary_rule_bymonth(osv.osv_memory):
         res = self.read(cr, uid, ids, ['employee_ids',  'start_date', 'end_date'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
-        datas['ids'] = res.get('employee_ids', [])
+        res['employee_ids'] = res.get('employee_ids', [])
         return {
             'type': 'ir.actions.report.xml',
-            'report_name': 'salary.rule.bymonth',
+            'report_name': 'salary.employee.bymonth',
             'datas': datas,
        }
 
-salary_rule_bymonth()
+hr_salary_employee_bymonth()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.xml
similarity index 59%
rename from addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml
rename to addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.xml
index c1386f824be..859506921e7 100644
--- a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_salary_rule_month" model="ir.ui.view">
-            <field name="name">Salary rule monthly</field>
-            <field name="model">salary.rule.month</field>
+        <record id="view_salary_employee_month" model="ir.ui.view">
+            <field name="name">Hr monthly Employee Salary</field>
+            <field name="model">hr.salary.employee.month</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Print Salary Rule Monthly" version="7.0">
+            <form string="Print Hr monthly Employee Salary" version="7.0">
                 <header>
                     <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
                     <button string="Cancel" class="oe_link" special="cancel" />
                 </header>
                 <group>
                     <field name="start_date"/>
                     <field name="end_date"/>
+                    <separator string="Employee" />
                     <field name="employee_ids"  nolabel="1" colspan="4"/>
                 </group>
             </form>
             </field>
         </record>
 
-        <record id="action_yearly_salary_rule" model="ir.actions.act_window">
+        <record id="action_salary_employee_month" model="ir.actions.act_window">
             <field name="name">Salary Register</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">salary.rule.month</field>
+            <field name="res_model">hr.salary.employee.month</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -33,14 +33,14 @@
         <menuitem
             name="Reporting"
             parent="hr.menu_hr_root"
-            id="menu_yearly_salary_rule_report" sequence="50"
+            id="menu_salary_employee_month_report" sequence="50"
            />
 
         <menuitem
-            name="Yearly Salary Rule Report"
-            parent="menu_yearly_salary_rule_report"
-            action="action_yearly_salary_rule"
-            id="menu_yearly_salary_rule"
+            name="Salary Register"
+            parent="menu_salary_employee_month_report"
+            action="action_salary_employee_month"
+            id="menu_salary_employee_month"
            />
 
     </data>

From ae1ed5900caf1d0429ef731343af4ae364d989ae Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 20 Jul 2012 15:07:44 +0530
Subject: [PATCH 203/999] Removed unwated .moved directory.

bzr revid: tta@openerp.com-20120720093744-74s59ca9wp3n6r7r
---
 addons/survey/static.moved/src/css/survey.css | 15 ----------
 addons/survey/static.moved/src/js/survey.js   | 28 -------------------
 2 files changed, 43 deletions(-)
 delete mode 100644 addons/survey/static.moved/src/css/survey.css
 delete mode 100644 addons/survey/static.moved/src/js/survey.js

diff --git a/addons/survey/static.moved/src/css/survey.css b/addons/survey/static.moved/src/css/survey.css
deleted file mode 100644
index 812bbe32fa4..00000000000
--- a/addons/survey/static.moved/src/css/survey.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.oe_survey_title {
-    font-weight: bold;
-    font-size: 22px;
-    margin: 8px 0px 8px 0px;
-    color: #5B5B5B;
-}
-
-.oe_survey_title_height{
-    height: 33px;
-    border-top: 1px #EBEBEB solid;
-}
-
-.oe_survey_title_page {
-    font-size: 14px;
-}
diff --git a/addons/survey/static.moved/src/js/survey.js b/addons/survey/static.moved/src/js/survey.js
deleted file mode 100644
index e4711013156..00000000000
--- a/addons/survey/static.moved/src/js/survey.js
+++ /dev/null
@@ -1,28 +0,0 @@
-openerp.survey = function (instance) {
-    var QWeb = instance.web.qweb,
-    _t = instance.web._t;
-    instance.web.ViewManagerAction = instance.web.ViewManagerAction.extend({
-        init: function(parent, action) {
-            this._super.apply(this,arguments);
-            console.log('hello');
-        },
-        on_mode_switch: function (view_type, no_store, options) {
-            var self = this;
-            return $.when(this._super.apply(this, arguments)).then(function () {
-                var controller = self.views[self.active_view].controller,
-                    fvg = controller.fields_view,
-                    view_id = (fvg && fvg.view_id) || '--';
-                self.$element.find('.oe_debug_view').html(QWeb.render('ViewManagerDebug', {
-                    view: controller,
-                    view_manager: self
-                }));
-                if (!self.action.name && fvg) {
-                    var title = self.$element.find('.oe_view_title_text');
-                    if(!_.isEmpty(title))
-                        title = $('.ui-dialog-title');
-                        title.text(fvg.arch.attrs.string || fvg.name);
-                }
-            });
-        },
-    });
-};

From 2e4fe7dee77ede1efb369289aea92151b3b33b50 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 20 Jul 2012 15:25:28 +0530
Subject: [PATCH 204/999] [IMP]l10n_in_hr_payroll:report rml improved

bzr revid: kbh@tinyerp.com-20120720095528-rencfiorrdvsh2vi
---
 .../report/report_hr_salary_employee_bymonth.rml         | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
index 73d224e65b0..939965dbcce 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
@@ -103,18 +103,21 @@
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Table Contents" fontName="Helvetica"/>
     <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="5.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="5.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="5.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="5.0" leading="2" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="5.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="6.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
     <para style="P1">Yearly Salary Details </para>
     <para style="P5">From [[ formatLang(data['form']['start_date'], date=True) ]] To [[ formatLang(data['form']['end_date'], date=True) ]]</para>
+    <para style="P6">
+      <font color="white"> </font>
+    </para>
     <section>
       <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
       <blockTable colWidths="55.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table1">

From bf57c5b1ed5c764a6af4ab13a7526b8c38a05d84 Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Fri, 20 Jul 2012 15:27:49 +0530
Subject: [PATCH 205/999] [IMP] l10n_in_hr_payroll: added related field 'ifsc'
 to set attrs on 'ifsc_code' and added view for advice lines

bzr revid: mtr@tinyerp.com-20120720095749-6z3h3iu2vvoizj4i
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  |  4 +-
 .../l10n_in_hr_payroll_view.xml               | 49 +++++++++++++++++--
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index db00008a9ba..079d456ed1f 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -243,7 +243,7 @@ class hr_payslip_run(osv.osv):
                 wf_service.trg_validate(uid, 'hr.payslip', slip_id.id, 'hr_verify_sheet', cr)
                 wf_service.trg_validate(uid, 'hr.payslip', slip_id.id, 'process_sheet', cr)
                 slip_ids.append(slip_id.id)
-                
+
             for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
                 if not slip.employee_id.bank_account_id and not slip.employee_id.bank_account_id.acc_number:
                     raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
@@ -284,6 +284,8 @@ class payroll_advice_line(osv.osv):
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
         'debit_credit': fields.char('C/D', size=3, required=False),
         'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
+        # used to set attrs on ifsc_code
+        'ifsc': fields.related('advice_id','neft',type='boolean', string='IFSC'),
     }
     _defaults = {
         'debit_credit': 'C',
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index dca2e74784a..923c43289b3 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -107,13 +107,15 @@
                         <div class="oe_clear"/>
                     </header>
                     <sheet>
-                        <group col="4" colspan="4">
+                        <group>
                             <label for="Name" class="oe_edit_only" string="Name"/>
                             <h2><field name="name"/></h2>
-                            <field name="number"/>
                             <label for="date" class="oe_edit_only"/>
                             <h2><field name="date"/></h2>
-                            <field name="bank_id"/>
+                            <group colspan="3" col="6">
+	                            <field name="bank_id"/>
+	                            <field name="number"/>
+                            </group>
                         </group>
                         <notebook colspan="4">
                             <page string="Payment Lines">
@@ -121,7 +123,8 @@
                                     <tree string="Payment Lines" editable="bottom">
                                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                                         <field name="name"/>
-                                        <field name="ifsc_code"/>
+                                        <field name="ifsc" invisible="1"/>
+                                        <field name="ifsc_code" attrs="{'invisible':[('ifsc','=', False)]}" />
                                         <field name="bysal"/>
                                         <field name="debit_credit"/>
                                     </tree>
@@ -185,6 +188,44 @@
             parent="hr_payroll.menu_hr_root_payroll"
         />
 
+        <record id="view_advice_line_tree" model="ir.ui.view">
+            <field name="name">advice.line.tree</field>
+            <field name="model">hr.payroll.advice.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Advice Lines" editable="bottom">
+                    <field name="employee_id" on_change="onchange_employee_id(employee_id)" />
+                    <field name="name" />
+                    <field name="ifsc" invisible="1" />
+                    <field name="ifsc_code" attrs="{'invisible':[('ifsc','=', False)]}" />
+                    <field name="bysal" />
+                    <field name="debit_credit" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_advice_line_form" model="ir.ui.view">
+            <field name="name">advice.line.form</field>
+            <field name="model">hr.payroll.advice.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Advice Lines" version="7.0">
+                    <sheet>
+                    <label for="advice_id" class="oe_edit_only"/>
+                    <h1><field name="advice_id"/></h1>
+                        <group>
+                            <field name="employee_id" on_change="onchange_employee_id(employee_id)" />
+                            <field name="name" />
+                            <field name="ifsc" invisible="1"/>
+                            <field name="ifsc_code" attrs="{'invisible':[('ifsc','=', False)]}" />
+                            <field name="bysal" />
+                            <field name="debit_credit" />
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
         <record id="view_res_company_da" model="ir.ui.view">
             <field name="name">res.company.inherit</field>
             <field name="model">res.company</field>

From cd203da095125833f203a4bd2b8ea6bccfad6aaa Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 20 Jul 2012 15:47:40 +0530
Subject: [PATCH 206/999] [IMP]l10n_in_hr_payroll:report rml improved

bzr revid: kbh@tinyerp.com-20120720101740-07frj5y57h79vx8z
---
 .../report/report_hr_salary_employee_bymonth.rml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
index 939965dbcce..9d1b4cb0e83 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
@@ -109,7 +109,7 @@
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="5.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="6.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="5.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>

From a89806dc059d27bb627646f3ab8ffb4ba89e652c Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 20 Jul 2012 15:54:19 +0530
Subject: [PATCH 207/999] [IMP]l10n_in_hr_payroll:typo

bzr revid: kbh@tinyerp.com-20120720102419-axh96q4li89y5qw8
---
 .../report/report_hr_salary_employee_bymonth.py                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
index 947f17ecdc3..267340c0d67 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -38,7 +38,7 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
         })
 
         self.context = context
-        self.mnths =[]
+        self.mnths = []
         self.mnths_total = []
         self.total=0.0
 

From 921db910e6a8cc6684bc70abdae82fbebe5dccf5 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 20 Jul 2012 16:04:01 +0530
Subject: [PATCH 208/999] [IMP]l10n_in_hr_payroll:typo

bzr revid: kbh@tinyerp.com-20120720103401-pzlg0jkcu3lw95aw
---
 .../report/report_hr_salary_employee_bymonth.py                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
index 267340c0d67..6785290c6c1 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -69,7 +69,7 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
         return [mnth_name]
 
     def get_employee(self, form):
-        list1=[]
+        list1 = []
         list = []
         total_mnths=['Total', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
         emp_obj = self.pool.get('hr.employee')

From 3ae4fd6bf74fe2d79c084ee18be3c9f6114330b9 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 20 Jul 2012 16:06:10 +0530
Subject: [PATCH 209/999] [IMP]l10n_in_hr_payroll:typo

bzr revid: kbh@tinyerp.com-20120720103610-exq3v9rnwg8xjsdz
---
 .../report/report_hr_salary_employee_bymonth.py               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
index 6785290c6c1..6c3c6a0f5eb 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -40,7 +40,7 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
         self.context = context
         self.mnths = []
         self.mnths_total = []
-        self.total=0.0
+        self.total = 0.0
 
     def get_periods(self, form):
 #       Get start year-month-date and end year-month-date
@@ -62,7 +62,7 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
             if current_month == 12:
                 current_month = 0
                 current_year = last_year
-            current_month = current_month +1
+            current_month = current_month + 1
         for c in range(0, (12-no_months)):
             mnth_name.append('None')
             self.mnths.append('None')

From c9895afa41755c52d7a8b978f83f8d04989d2e71 Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Fri, 20 Jul 2012 16:09:11 +0530
Subject: [PATCH 210/999] [IMP] l10n_in_hr_payroll: removed tree view for
 advice lines

bzr revid: mtr@tinyerp.com-20120720103911-x4i3250zjo3fpsot
---
 .../l10n_in_hr_payroll_view.xml               | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 923c43289b3..c31e7d527e7 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -113,8 +113,8 @@
                             <label for="date" class="oe_edit_only"/>
                             <h2><field name="date"/></h2>
                             <group colspan="3" col="6">
-	                            <field name="bank_id"/>
-	                            <field name="number"/>
+                                <field name="bank_id"/>
+                                <field name="number"/>
                             </group>
                         </group>
                         <notebook colspan="4">
@@ -188,22 +188,6 @@
             parent="hr_payroll.menu_hr_root_payroll"
         />
 
-        <record id="view_advice_line_tree" model="ir.ui.view">
-            <field name="name">advice.line.tree</field>
-            <field name="model">hr.payroll.advice.line</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Advice Lines" editable="bottom">
-                    <field name="employee_id" on_change="onchange_employee_id(employee_id)" />
-                    <field name="name" />
-                    <field name="ifsc" invisible="1" />
-                    <field name="ifsc_code" attrs="{'invisible':[('ifsc','=', False)]}" />
-                    <field name="bysal" />
-                    <field name="debit_credit" />
-                </tree>
-            </field>
-        </record>
-
         <record id="view_advice_line_form" model="ir.ui.view">
             <field name="name">advice.line.form</field>
             <field name="model">hr.payroll.advice.line</field>

From a0b08a77a6841020b997e9939986ae3380028995 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 20 Jul 2012 16:10:51 +0530
Subject: [PATCH 211/999] [IMP]l10n_in_hr_payroll:typo

bzr revid: kbh@tinyerp.com-20120720104051-sjfxjcq0kqegwrnp
---
 .../report/report_hr_salary_employee_bymonth.py             | 6 +++---
 .../wizard/hr_salary_employee_bymonth.xml                   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
index 6c3c6a0f5eb..52d77b6e331 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -58,7 +58,7 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
         for count in range(0, no_months):
             m = datetime.date(current_year, current_month, 1).strftime('%b')
             mnth_name.append(m)
-            self.mnths.append(str(current_month)+'-'+str(current_year))
+            self.mnths.append(str(current_month) + '-' + str(current_year))
             if current_month == 12:
                 current_month = 0
                 current_year = last_year
@@ -88,8 +88,8 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
                             left join hr_payslip as p on pl.slip_id = p.id \
                             left join hr_employee as emp on emp.id = p.employee_id \
                             left join resource_resource as r on r.id = emp.resource_id  \
-                            where pl.code = 'NET' and p.state = 'done' and p.employee_id  = '''+str(emp_id.id)+''' \
-                            and to_char(date_to,'mm-yyyy') like '%'''+mnth+'''%'
+                            where pl.code = 'NET' and p.state = 'done' and p.employee_id  = ''' + str(emp_id.id) + ''' \
+                            and to_char(date_to,'mm-yyyy') like '%'''+ mnth +'''%'
                             group by r.name, p.date_to,emp.id''')
                     salary = self.cr.fetchall()
                     if salary:
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.xml
index 859506921e7..bccacc05b33 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.xml
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.xml
@@ -9,6 +9,7 @@
             <form string="Print Hr monthly Employee Salary" version="7.0">
                 <header>
                     <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                        or
                     <button string="Cancel" class="oe_link" special="cancel" />
                 </header>
                 <group>

From f21d9702584c13965180640456ab17b3f3a5edf2 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 20 Jul 2012 16:40:10 +0530
Subject: [PATCH 212/999] [IMP]l10n_in_hr_payroll:file rename

bzr revid: kbh@tinyerp.com-20120720111010-2ckdznetj8ykd792
---
 addons/l10n_in_hr_payroll/__openerp__.py                        | 2 +-
 ...employee_bymonth.xml => hr_salary_employee_bymonth_view.xml} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename addons/l10n_in_hr_payroll/wizard/{hr_salary_employee_bymonth.xml => hr_salary_employee_bymonth_view.xml} (100%)

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 2143e914f7f..d1b81b6278d 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -50,7 +50,7 @@ Indian Payroll Salary Rules.
          'security/ir.model.access.csv',
          'l10n_in_hr_payroll_report.xml',
          'l10n_in_hr_payroll_sequence.xml',
-         'wizard/hr_salary_employee_bymonth.xml',
+         'wizard/hr_salary_employee_bymonth_view.xml',
          'report/payment_advice_report_view.xml',
 
      ],
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
similarity index 100%
rename from addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.xml
rename to addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml

From f96a13097b3ce5edd33357ca2ffe5831aa6161a0 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Mon, 23 Jul 2012 11:35:36 +0530
Subject: [PATCH 213/999] [IMP]account-option-wizard

bzr revid: pna@tinyerp.com-20120723060536-zb7yue9dm1o4wfx0
---
 addons/account/account.py       | 22 ++++++++++++++++++++++
 addons/account/account_view.xml |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 571ea40698d..6cb7e146870 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2985,6 +2985,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=True),
+        'currency_id': fields.many2one('res.currency', 'Currency', help="Currency as per company's country."),
         'only_one_chart_template': fields.boolean('Only One Chart Template Available'),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
         'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Cash and Banks', required=True),
@@ -2995,6 +2996,27 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'purchase_tax_rate': fields.float('Purchase Tax(%)'),
         'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'),
     }
+    def _default_company(self, cr, uid, context=None):
+        user_company = self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0].company_id.id
+        return user_company or False
+
+    def _default_currency(self, cr, uid, context=None):
+        company_id=self._default_company(cr, uid, context=context)
+        currency= self.pool.get('res.company').browse(cr, uid, company_id, context=context)
+        return currency.currency_id and currency.currency_id.id or False
+
+    _defaults = {
+        'company_id': _default_company,
+        'currency_id':_default_currency,
+    }
+
+    def onchange_company_id(self, cr, uid, ids, company_id):
+        if company_id:
+            company = self.pool.get('res.company').browse(cr, uid, company_id)
+            return {'value':{'currency_id':company.currency_id and company.currency_id.id}}
+        else :
+            return False
+
     def onchange_tax_rate(self, cr, uid, ids, rate=False, context=None):
         return {'value': {'purchase_tax_rate': rate or False}}
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 80202d97d6c..c2b3aa22a75 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2359,7 +2359,8 @@
                     <field name="complete_tax_set" invisible="1"/>
                     <div groups="base.group_multi_company">
                         <label for="company_id"/>
-                        <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+                        <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+                        <field name="currency_id" />
                     </div>
                     <group>
                         <div attrs="{'invisible': [('only_one_chart_template','=',True)]}">

From af91896fbdef9aee12826fad879945289f18ad14 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Mon, 23 Jul 2012 17:02:40 +0530
Subject: [PATCH 214/999] [IMP]view improved for country form and change label
 name of currency field

bzr revid: hsa@tinyerp.com-20120723113240-mopd8ufl80705o6m
---
 openerp/addons/base/res/res_country.py       | 2 +-
 openerp/addons/base/res/res_country_view.xml | 3 ++-
 openerp/addons/base/res/res_currency.py      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/res/res_country.py b/openerp/addons/base/res/res_country.py
index 002a86896eb..f1321605e5f 100644
--- a/openerp/addons/base/res/res_country.py
+++ b/openerp/addons/base/res/res_country.py
@@ -55,7 +55,7 @@ addresses belonging to this country.\n\nYou can use the python-style string pate
             \n%(state_code)s: the code of the state
             \n%(country_name)s: the name of the country
             \n%(country_code)s: the code of the country"""),
-        'currency_id':fields.many2one('res.currency','Currency Code'),
+        'currency_id': fields.many2one('res.currency', 'Currency'),
     }
     _sql_constraints = [
         ('name_uniq', 'unique (name)',
diff --git a/openerp/addons/base/res/res_country_view.xml b/openerp/addons/base/res/res_country_view.xml
index 06ebd73637f..896f731ea56 100644
--- a/openerp/addons/base/res/res_country_view.xml
+++ b/openerp/addons/base/res/res_country_view.xml
@@ -28,12 +28,13 @@
                         <group>
                             <field name="name"/>
                             <field name="currency_id"/>
-                            <field name="address_format" groups="base.group_no_one"/>
                         </group>
                         <group>
                             <field name="code"/>
                         </group>
                     </group>
+                    <label for="address_format" string="Address Format"/>
+                    <field name="address_format" colspan="4" groups="base.group_no_one"/>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py
index ac8ce1758cf..d8053c39c4a 100644
--- a/openerp/addons/base/res/res_currency.py
+++ b/openerp/addons/base/res/res_currency.py
@@ -56,7 +56,7 @@ class res_currency(osv.osv):
     _columns = {
         # Note: 'code' column was removed as of v6.0, the 'name' should now hold the ISO code.
         'name': fields.char('Currency', size=32, required=True, help="Currency Code (ISO 4217)"),
-        'symbol': fields.char('Symbol', size=3, help="Currency sign, to be used when printing amounts."),
+        'symbol': fields.char('Symbol', size=4, help="Currency sign, to be used when printing amounts."),
         'rate': fields.function(_current_rate, string='Current Rate', digits=(12,6),
             help='The rate of the currency to the currency of rate 1.'),
         'rate_ids': fields.one2many('res.currency.rate', 'currency_id', 'Rates'),

From d0827a266b767ecca3d45bf9013d544a9e18c240 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 24 Jul 2012 18:24:58 +0530
Subject: [PATCH 215/999] [FIX]l10n_in_hr_payroll:salary register report of
 employee improved

bzr revid: kbh@tinyerp.com-20120724125458-o5zcve0l3qbq8ubj
---
 .../report_hr_salary_employee_bymonth.py      | 74 +++++++++++--------
 1 file changed, 44 insertions(+), 30 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
index 52d77b6e331..8e115a0724b 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -68,46 +68,60 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
             self.mnths.append('None')
         return [mnth_name]
 
+    def get_salary(self, form, emp_id,emp_salary):
+        emp_obj = self.pool.get('hr.employee')
+        emp_ids = form.get('employee_ids', [])
+        date_from = form.get('start_date', [])
+        date_to = form.get('end_date', [])
+        employees  = emp_obj.browse(self.cr, self.uid, emp_ids, context=self.context)
+        self.cr.execute("select to_char(date_to,'mm-yyyy') as to_date ,sum(pl.total) as net \
+                             from hr_payslip_line as pl \
+                             left join hr_payslip as p on pl.slip_id = p.id \
+                             left join hr_employee as emp on emp.id = p.employee_id \
+                             left join resource_resource as r on r.id = emp.resource_id  \
+                            where pl.code = 'NET' and p.state = 'done' and p.employee_id in %s \
+                            group by r.name, p.date_to,emp.id",(tuple([emp_id]),))
+        salary = self.cr.fetchall()
+        salary1 = dict(salary)
+        total = 0.0
+        total_mnths=['Total', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+        cnt = 1
+        for month in self.mnths:
+            if month <> 'None':
+                if len(month) != 7:
+                    month = '0' + str(month)
+                if month in salary1 and salary1[month]:
+                    emp_salary.append(salary1[month])
+                    total += salary1[month]
+                    total_mnths[cnt] = total_mnths[cnt] + salary1[month]
+                else:
+                    emp_salary.append(0.00)
+            else:
+                emp_salary.append('')
+                total_mnths[cnt] = ''
+            cnt = cnt + 1
+        return emp_salary,total,total_mnths
+
     def get_employee(self, form):
-        list1 = []
-        list = []
+        emp_salary = []
+        salary_list = []
         total_mnths=['Total', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
         emp_obj = self.pool.get('hr.employee')
         emp_ids = form.get('employee_ids', [])
         employees  = emp_obj.browse(self.cr, self.uid, emp_ids, context=self.context)
         cnt = 1
+
         for emp_id in employees:
-            list1.append(emp_id.name)
+            emp_salary.append(emp_id.name)
             total = 0.0
-            for mnth in self.mnths:
-                if mnth <> 'None':
-                    if len(mnth) != 7:
-                        mnth = '0' + str(mnth)
-                    self.cr.execute('''select  sum(pl.total) 
-                            from hr_payslip_line as pl \
-                            left join hr_payslip as p on pl.slip_id = p.id \
-                            left join hr_employee as emp on emp.id = p.employee_id \
-                            left join resource_resource as r on r.id = emp.resource_id  \
-                            where pl.code = 'NET' and p.state = 'done' and p.employee_id  = ''' + str(emp_id.id) + ''' \
-                            and to_char(date_to,'mm-yyyy') like '%'''+ mnth +'''%'
-                            group by r.name, p.date_to,emp.id''')
-                    salary = self.cr.fetchall()
-                    if salary:
-                        list1.append(salary[0][0])
-                        total += salary[0][0]
-                        total_mnths[cnt] = total_mnths[cnt] + salary[0][0]
-                    else:
-                        list1.append(0.00)
-                else:
-                    list1.append('')
-                    total_mnths[cnt] = ''
-                cnt = cnt + 1
+            emp_salary,total,total_mnths = self.get_salary(form,emp_id.id,emp_salary)
+            emp_salary.append(total)
             cnt = 1
-            list1.append(total)
-            list.append(list1)
-            list1 = []
+            emp_salary.append(total)
+            salary_list.append(emp_salary)
+            emp_salary = []
         self.mnths_total.append(total_mnths)
-        return list
+        return salary_list
 
     def get_months_tol(self):
         return self.mnths_total

From 7e6d5474f4ee12f4f55420b37639066878a57988 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 24 Jul 2012 18:31:49 +0530
Subject: [PATCH 216/999] [FIX]l10n_in_hr_payroll:variable name changed

bzr revid: kbh@tinyerp.com-20120724130149-7foqh69oevgzwd9s
---
 .../report/report_hr_salary_employee_bymonth.py      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
index 8e115a0724b..ac2521b2ec5 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -81,8 +81,8 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
                              left join resource_resource as r on r.id = emp.resource_id  \
                             where pl.code = 'NET' and p.state = 'done' and p.employee_id in %s \
                             group by r.name, p.date_to,emp.id",(tuple([emp_id]),))
-        salary = self.cr.fetchall()
-        salary1 = dict(salary)
+        sal = self.cr.fetchall()
+        salary = dict(sal)
         total = 0.0
         total_mnths=['Total', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
         cnt = 1
@@ -90,10 +90,10 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
             if month <> 'None':
                 if len(month) != 7:
                     month = '0' + str(month)
-                if month in salary1 and salary1[month]:
-                    emp_salary.append(salary1[month])
-                    total += salary1[month]
-                    total_mnths[cnt] = total_mnths[cnt] + salary1[month]
+                if month in salary and salary[month]:
+                    emp_salary.append(salary[month])
+                    total += salary[month]
+                    total_mnths[cnt] = total_mnths[cnt] + salary[month]
                 else:
                     emp_salary.append(0.00)
             else:

From e7288247b6e419e1c60b8e85740f671f4c7bb23b Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 25 Jul 2012 11:38:14 +0530
Subject: [PATCH 217/999] [FIX]l10n_in_hr_payroll:total of salary

bzr revid: kbh@tinyerp.com-20120725060814-jech1omb9vquin7v
---
 .../report/report_hr_salary_employee_bymonth.py      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
index ac2521b2ec5..6cc5d0068d0 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -68,12 +68,15 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
             self.mnths.append('None')
         return [mnth_name]
 
-    def get_salary(self, form, emp_id,emp_salary):
+    def get_salary(self, form, emp_id, emp_salary, total_mnths):
+#       Get salary of the employee
+
         emp_obj = self.pool.get('hr.employee')
         emp_ids = form.get('employee_ids', [])
         date_from = form.get('start_date', [])
         date_to = form.get('end_date', [])
         employees  = emp_obj.browse(self.cr, self.uid, emp_ids, context=self.context)
+
         self.cr.execute("select to_char(date_to,'mm-yyyy') as to_date ,sum(pl.total) as net \
                              from hr_payslip_line as pl \
                              left join hr_payslip as p on pl.slip_id = p.id \
@@ -84,8 +87,8 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
         sal = self.cr.fetchall()
         salary = dict(sal)
         total = 0.0
-        total_mnths=['Total', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
         cnt = 1
+
         for month in self.mnths:
             if month <> 'None':
                 if len(month) != 7:
@@ -109,14 +112,11 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
         emp_obj = self.pool.get('hr.employee')
         emp_ids = form.get('employee_ids', [])
         employees  = emp_obj.browse(self.cr, self.uid, emp_ids, context=self.context)
-        cnt = 1
 
         for emp_id in employees:
             emp_salary.append(emp_id.name)
             total = 0.0
-            emp_salary,total,total_mnths = self.get_salary(form,emp_id.id,emp_salary)
-            emp_salary.append(total)
-            cnt = 1
+            emp_salary, total, total_mnths = self.get_salary(form, emp_id.id, emp_salary, total_mnths)
             emp_salary.append(total)
             salary_list.append(emp_salary)
             emp_salary = []

From a6e272a5e71394ce9d8d0841a2b7de2e6cd5c2af Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Wed, 25 Jul 2012 16:35:20 +0530
Subject: [PATCH 218/999] [IMP]l10n_in_hr_payroll: add yaml file for payment
 advice

bzr revid: dsi@tinyerp.com-20120725110520-w3rmgy0kbwa5kmdg
---
 addons/l10n_in_hr_payroll/__openerp__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 41df9e24889..38085ada54c 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -53,6 +53,7 @@ Indian Payroll Salary Rules.
          'report/payment_advice_report_view.xml',
      ],
     'demo_xml': ['l10n_in_hr_payroll_demo.xml'],
+    'test': ['test/payment_advice.yml'],
     'installable': True
 }
 

From bf015bbf361d8da00c1dcdc5c9b28ede95b876a5 Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Wed, 25 Jul 2012 16:44:51 +0530
Subject: [PATCH 219/999] [IMP]l10n_in_hr_payroll: add yaml file for payment
 advice

bzr revid: dsi@tinyerp.com-20120725111451-k7sfc5rj73njvdgr
---
 .../test/payment_advice.yml                   | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 addons/l10n_in_hr_payroll/test/payment_advice.yml

diff --git a/addons/l10n_in_hr_payroll/test/payment_advice.yml b/addons/l10n_in_hr_payroll/test/payment_advice.yml
new file mode 100644
index 00000000000..790b8bd46a5
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/test/payment_advice.yml
@@ -0,0 +1,56 @@
+-
+  import time
+-
+  I create a new Payment Advice For Month june and july 
+-
+  !record {model: hr.payroll.advice, id: payment_advice_1}: 
+    name: 'June'
+    date: !eval time.strftime( "%Y-%m-%d" )
+    bank_id: 'base.res_bank_1'
+    chaque_nos: '007667'
+    line_ids:
+      - employee_id: 'hr.employee_fp'
+        name: '90125452'
+        ifsc_code: 'abn45215145'
+        bysal: '25000'
+        debit_credit: 'C'
+      - employee_id: 'hr.employee_al'
+        name: '00014521111232'
+        ifsc_code: 'sbi45452145'
+        bysal: '20000'
+        debit_credit: 'C'            
+-
+  !record {model: hr.payroll.advice, id: payment_advice_2}: 
+    name: 'July'
+    date: !eval time.strftime( "%Y-%m-%d" )
+    chaque_nos: '007568'
+    line_ids:
+      - employee_id: 'hr.employee_fp'
+        name: '90125452'
+        bysal: '25000'
+        debit_credit: 'C'
+      - employee_id: 'hr.employee_al'
+        name: '00014521111232'
+        bysal: '20000'
+        debit_credit: 'C'            
+-
+  I check my payment order state is Confirmed
+-
+  !assert {model: hr.payroll.advice, id: payment_advice_1, string: state is confirmed}:
+    - state == 'draft'
+-
+  In order to test the PDF reports defined on a Payment Advice,we will print a Payment Advice Detail Summary Report when NEFT is checked
+-
+  !python {model: hr.payroll.advice}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.payroll.advice').create(cr, uid, [ref('l10n_in_hr_payroll.payment_advice_1')], {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'l10n_in_hr_payroll_summary report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Payment Advice,we will print a Payment Advice Detail Summary Report when NEFT is Not checked
+-
+  !python {model: hr.payroll.advice}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.payroll.advice').create(cr, uid, [ref('l10n_in_hr_payroll.payment_advice_2')], {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'l10n_in_hr_payroll_summary report'+format), 'wb+').write(data)

From 2c8c4e3becc86d217300d816f4c067e51b64540b Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Thu, 26 Jul 2012 10:35:18 +0530
Subject: [PATCH 220/999] [IMP]l10n_in_hr_payroll: add yaml file for payment
 advice

bzr revid: dsi@tinyerp.com-20120726050518-ew9n44q0fs4vfze1
---
 addons/l10n_in_hr_payroll/test/payment_advice.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/test/payment_advice.yml b/addons/l10n_in_hr_payroll/test/payment_advice.yml
index 790b8bd46a5..033b276c40d 100644
--- a/addons/l10n_in_hr_payroll/test/payment_advice.yml
+++ b/addons/l10n_in_hr_payroll/test/payment_advice.yml
@@ -1,11 +1,11 @@
 -
-  import time
+  import datetime
 -
   I create a new Payment Advice For Month june and july 
 -
   !record {model: hr.payroll.advice, id: payment_advice_1}: 
     name: 'June'
-    date: !eval time.strftime( "%Y-%m-%d" )
+    date: !eval "'%s-06-01' %(datetime.now().year)"
     bank_id: 'base.res_bank_1'
     chaque_nos: '007667'
     line_ids:
@@ -22,7 +22,7 @@
 -
   !record {model: hr.payroll.advice, id: payment_advice_2}: 
     name: 'July'
-    date: !eval time.strftime( "%Y-%m-%d" )
+    date: !eval "'%s-07-01' %(datetime.now().year)"
     chaque_nos: '007568'
     line_ids:
       - employee_id: 'hr.employee_fp'
@@ -34,9 +34,9 @@
         bysal: '20000'
         debit_credit: 'C'            
 -
-  I check my payment order state is Confirmed
+  I check that the Payment Advice is in draft
 -
-  !assert {model: hr.payroll.advice, id: payment_advice_1, string: state is confirmed}:
+  !assert {model: hr.payroll.advice, id: payment_advice_1, string: Payment Advice is in draft state}:
     - state == 'draft'
 -
   In order to test the PDF reports defined on a Payment Advice,we will print a Payment Advice Detail Summary Report when NEFT is checked
@@ -53,4 +53,4 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.payroll.advice').create(cr, uid, [ref('l10n_in_hr_payroll.payment_advice_2')], {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'l10n_in_hr_payroll_summary report'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'l10n_in_hr_payroll_summary report'+format), 'wb+').write(data)    

From 7fa1140ca62782ee298eb9250c1db7cde2a6a6d6 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 26 Jul 2012 11:11:02 +0530
Subject: [PATCH 221/999] [IMP] l10n_in_hr_payroll: Improve Report of salary
 register

bzr revid: mra@tinyerp.com-20120726054102-w4xqw5u08r3lg0ii
---
 .../report/report_hr_salary_employee_bymonth.py       | 10 ++++------
 .../wizard/hr_salary_employee_bymonth.py              |  9 ++++-----
 .../wizard/hr_salary_employee_bymonth_view.xml        | 11 +++--------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
index 6cc5d0068d0..f2c693ef6d1 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -69,12 +69,10 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
         return [mnth_name]
 
     def get_salary(self, form, emp_id, emp_salary, total_mnths):
-#       Get salary of the employee
-
         emp_obj = self.pool.get('hr.employee')
-        emp_ids = form.get('employee_ids', [])
         date_from = form.get('start_date', [])
         date_to = form.get('end_date', [])
+        emp_ids = form.get('employee_ids', [])
         employees  = emp_obj.browse(self.cr, self.uid, emp_ids, context=self.context)
 
         self.cr.execute("select to_char(date_to,'mm-yyyy') as to_date ,sum(pl.total) as net \
@@ -82,8 +80,8 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
                              left join hr_payslip as p on pl.slip_id = p.id \
                              left join hr_employee as emp on emp.id = p.employee_id \
                              left join resource_resource as r on r.id = emp.resource_id  \
-                            where pl.code = 'NET' and p.state = 'done' and p.employee_id in %s \
-                            group by r.name, p.date_to,emp.id",(tuple([emp_id]),))
+                            where pl.code = 'NET' and p.state = 'done' and p.employee_id = %s \
+                            group by r.name, p.date_to,emp.id",(emp_id,))
         sal = self.cr.fetchall()
         salary = dict(sal)
         total = 0.0
@@ -103,7 +101,7 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
                 emp_salary.append('')
                 total_mnths[cnt] = ''
             cnt = cnt + 1
-        return emp_salary,total,total_mnths
+        return emp_salary, total, total_mnths
 
     def get_employee(self, form):
         emp_salary = []
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
index 172824a77cb..43bfa4da177 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
@@ -26,10 +26,10 @@ from osv import osv, fields
 class hr_salary_employee_bymonth(osv.osv_memory):
 
     _name = 'hr.salary.employee.month'
-    _description = 'Print Hr Salary Employee By Month Report'
+    _description = 'Hr Salary Employee By Month Report'
     _columns = {
-        'start_date': fields.date('Starting Date', required=True),
-        'end_date': fields.date('Ending Date', required=True),
+        'start_date': fields.date('Start Date', required=True),
+        'end_date': fields.date('End Date', required=True),
         'employee_ids': fields.many2many('hr.employee', 'payroll_year_rel', 'payroll_year_id', 'emp_id', 'Employees', required=True),
     }
 
@@ -53,8 +53,7 @@ class hr_salary_employee_bymonth(osv.osv_memory):
 
         res = self.read(cr, uid, ids, ['employee_ids',  'start_date', 'end_date'], context=context)
         res = res and res[0] or {}
-        datas['form'] = res
-        res['employee_ids'] = res.get('employee_ids', [])
+        datas.update({'form': res})
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'salary.employee.bymonth',
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
index bccacc05b33..2c73811f7f4 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
@@ -15,7 +15,7 @@
                 <group>
                     <field name="start_date"/>
                     <field name="end_date"/>
-                    <separator string="Employee" />
+                    <separator string="Employees" />
                     <field name="employee_ids"  nolabel="1" colspan="4"/>
                 </group>
             </form>
@@ -31,15 +31,10 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem
-            name="Reporting"
-            parent="hr.menu_hr_root"
-            id="menu_salary_employee_month_report" sequence="50"
-           />
-
         <menuitem
             name="Salary Register"
-            parent="menu_salary_employee_month_report"
+            parent="hr.menu_hr_reporting_timesheet"
+            sequence="200" icon="STOCK_PRINT"
             action="action_salary_employee_month"
             id="menu_salary_employee_month"
            />

From 56e10a0ef06c2f239d1eac7db0d3d7496f212d66 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 26 Jul 2012 11:22:37 +0530
Subject: [PATCH 222/999] [IMP] l10n_in_hr_payroll: Small improvement

bzr revid: mra@tinyerp.com-20120726055237-fe2trv4lispbqx2o
---
 .../wizard/hr_salary_employee_bymonth_view.xml                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
index 2c73811f7f4..2e25fc32ee9 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
@@ -7,11 +7,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Hr monthly Employee Salary" version="7.0">
-                <header>
+                <footer>
                     <button name="print_report" string="Print" type="object" class="oe_highlight"/>
                         or
                     <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
+                </footer>
                 <group>
                     <field name="start_date"/>
                     <field name="end_date"/>

From 8a9c1618f2666e2e3b472e5f5c2169e0347e645f Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 26 Jul 2012 11:24:06 +0530
Subject: [PATCH 223/999] [IMP] l10n_in_hr_payroll: Small improvement

bzr revid: mra@tinyerp.com-20120726055406-h3pibgj7fw5r038v
---
 .../wizard/hr_salary_employee_bymonth_view.xml                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
index 2e25fc32ee9..15ef3c0a2be 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
@@ -23,7 +23,7 @@
         </record>
 
         <record id="action_salary_employee_month" model="ir.actions.act_window">
-            <field name="name">Salary Register</field>
+            <field name="name">Payroll Statement</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.salary.employee.month</field>
             <field name="view_type">form</field>

From c77fecd8f772c57dff66fb07460f3dbc294b37ce Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 26 Jul 2012 11:26:02 +0530
Subject: [PATCH 224/999] [IMP] l10n_in_hr_payroll: Menu name chagne to payroll
 statement

bzr revid: mra@tinyerp.com-20120726055602-ny4ldaoxg1mog2gw
---
 .../wizard/hr_salary_employee_bymonth_view.xml                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
index 15ef3c0a2be..23308b56c7c 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
@@ -32,7 +32,7 @@
         </record>
 
         <menuitem
-            name="Salary Register"
+            name="Payroll Statement"
             parent="hr.menu_hr_reporting_timesheet"
             sequence="200" icon="STOCK_PRINT"
             action="action_salary_employee_month"

From 286cb1fdb9d5bec495663d9a187a246e7648c84e Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 26 Jul 2012 11:59:17 +0530
Subject: [PATCH 225/999] [FIX] l10n_in_hr_payroll: Fix access rights [IMP]
 l10n_in_hr_payroll: Code clean

bzr revid: mra@tinyerp.com-20120726062917-2l6hb3y0nh9svda1
---
 addons/l10n_in_hr_payroll/__openerp__.py               | 2 +-
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py        | 8 ++++----
 addons/l10n_in_hr_payroll/security/ir.model.access.csv | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index d1b81b6278d..9f51abe939e 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -40,8 +40,8 @@ Indian Payroll Salary Rules.
     * Integrated with Holiday Management
     * Medical Allowance, Travel Allowance, Child Allowance, ...
     - Payroll Advice and Report
+    - Payroll Statement and Payroll Register Report
     """,
-
     'active': False,
     'update_xml': [
          'l10n_in_hr_payroll_view.xml',
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 404844f02cd..a484aca45a5 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -42,7 +42,7 @@ class hr_contract(osv.osv):
 
     _columns = {
         'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll'), help="Amount for Tax Deduction at Source"),
-        'driver_salay': fields.boolean('Driver Salary', help=" Allowance for company provided driver"),
+        'driver_salay': fields.boolean('Driver Salary', help="Check this box if you provide allowance for driver"),
         'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance"),
         'voluntary_provident_fund': fields.float('Voluntary Provident Fund', digits_compute=dp.get_precision('Payroll'), help="VPF computed as percentage(%)"),
         'city_type': fields.selection([
@@ -218,9 +218,10 @@ class hr_payslip_run(osv.osv):
     }
 
     def draft_payslip_run(self, cr, uid, ids, context=None):
+        res = super(hr_payslip_run, self).draft_payslip_run(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'available_advice': False}, context=context)
-        return super(hr_payslip_run, self).draft_payslip_run(cr, uid, ids, context=context)
-
+        return res
+    
     def create_advice(self, cr, uid, ids, context=None):
         wf_service = netsvc.LocalService("workflow")
         payslip_pool = self.pool.get('hr.payslip')
@@ -284,7 +285,6 @@ class payroll_advice_line(osv.osv):
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
         'debit_credit': fields.char('C/D', size=3, required=False),
         'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
-        # used to set attrs on ifsc_code
         'ifsc': fields.related('advice_id', 'neft', type='boolean', string='IFSC'),
     }
     _defaults = {
diff --git a/addons/l10n_in_hr_payroll/security/ir.model.access.csv b/addons/l10n_in_hr_payroll/security/ir.model.access.csv
index 0bb7d35c0c5..5b440b569e4 100644
--- a/addons/l10n_in_hr_payroll/security/ir.model.access.csv
+++ b/addons/l10n_in_hr_payroll/security/ir.model.access.csv
@@ -1,5 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_payroll_advice","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_manager",1,1,1,1
-"access_hr_payroll_advice_line","hr.payroll.advice.line","model_hr_payroll_advice_line","base.group_hr_manager",1,1,1,1
 "access_hr_payroll_advice_user","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_user",1,1,1,1
 "access_hr_payroll_advice_line_user","hr.payroll.advice.line","model_hr_payroll_advice_line","base.group_hr_user",1,1,1,1
+"access_hr_payroll_advice_report_user","payment.advice.report","model_payment_advice_report","base.group_hr_manager",1,1,1,1

From e6d0b95665947e535f3aebcd130ceb5343a014ce Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 26 Jul 2012 12:03:14 +0530
Subject: [PATCH 226/999] [IMP] l10n_in_hr_payroll: typo

bzr revid: mra@tinyerp.com-20120726063314-67w4cbokejy6eat7
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index a484aca45a5..de8adec7d87 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -214,7 +214,7 @@ class hr_payslip_run(osv.osv):
     _inherit = 'hr.payslip.run'
     _description = 'Payslip Batches'
     _columns = {
-        'available_advice': fields.boolean('Made Payment Advice?', help="If this box is checked which means that Payment Advice exists", readonly=False),
+        'available_advice': fields.boolean('Made Payment Advice?', help="If this box is checked which means that Payment Advice exists for current batch", readonly=False),
     }
 
     def draft_payslip_run(self, cr, uid, ids, context=None):

From 533e5d8bdc7ec33acc4a439d0a22303fb9ea0bb8 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 26 Jul 2012 12:07:57 +0530
Subject: [PATCH 227/999] [IMP] l10n_in_hr_payroll: Code clean

bzr revid: mra@tinyerp.com-20120726063757-mwagbj21a8hg8rc8
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml     | 2 +-
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml   | 2 +-
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
index 90413c79ea9..6aaef2c9069 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <!-- Hr Salary structure-->
+        <!-- Salary Structure -->
 
         <record id="hr_payroll_salary_structure_ind_emp" model="hr.payroll.structure">
             <field name="code">NE</field>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
index 04e7091e395..7604f34e32e 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
@@ -24,6 +24,6 @@
             model="hr.salary.employee.month" 
             name="salary.employee.bymonth" 
             rml="l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml"
-            string="Salary Register" /> 
+            string="Payroll Statement" /> 
     </data>
 </openerp>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
index 7e4b0fce7ad..3941d6461c9 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
@@ -10,7 +10,6 @@
         <record id="seq_payment_advice" model="ir.sequence">
             <field name="name">Payment Advice</field>
             <field name="code">payment.advice</field>
-            <field name="prefix"></field>
             <field name="padding">3</field>
         </record>
         

From cbde761af6d0b3923534f83c97f4c0cc98f13759 Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Thu, 26 Jul 2012 12:21:30 +0530
Subject: [PATCH 228/999] [IMP]l10n_in_hr_payroll: add yaml file for payment
 advice

bzr revid: dsi@tinyerp.com-20120726065130-xdhi6vnqinwu3i98
---
 .../test/payment_advice.yml                   | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/test/payment_advice.yml b/addons/l10n_in_hr_payroll/test/payment_advice.yml
index 033b276c40d..ecbd9f47385 100644
--- a/addons/l10n_in_hr_payroll/test/payment_advice.yml
+++ b/addons/l10n_in_hr_payroll/test/payment_advice.yml
@@ -9,30 +9,27 @@
     bank_id: 'base.res_bank_1'
     chaque_nos: '007667'
     line_ids:
-      - employee_id: 'hr.employee_fp'
+      - employee_id: hr.employee_fp
         name: '90125452'
         ifsc_code: 'abn45215145'
-        bysal: '25000'
-        debit_credit: 'C'
-      - employee_id: 'hr.employee_al'
+        bysal: '25000.00'
+      - employee_id: hr.employee_al
         name: '00014521111232'
         ifsc_code: 'sbi45452145'
-        bysal: '20000'
-        debit_credit: 'C'            
+        bysal: '20000.00'                
 -
   !record {model: hr.payroll.advice, id: payment_advice_2}: 
     name: 'July'
     date: !eval "'%s-07-01' %(datetime.now().year)"
     chaque_nos: '007568'
+    bank_id: 'base.res_bank_1'
     line_ids:
-      - employee_id: 'hr.employee_fp'
+      - employee_id: hr.employee_fp
         name: '90125452'
-        bysal: '25000'
-        debit_credit: 'C'
-      - employee_id: 'hr.employee_al'
+        bysal: '25000.00'
+      - employee_id: hr.employee_al
         name: '00014521111232'
-        bysal: '20000'
-        debit_credit: 'C'            
+        bysal: '20000.00'            
 -
   I check that the Payment Advice is in draft
 -

From 806ddaec0fbc74944526d5d0d499d8428173c59a Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 26 Jul 2012 13:10:34 +0530
Subject: [PATCH 229/999] [FIX]  l10n_in_hr_payroll: Fix payment advice report
 if the employee is not present

bzr revid: mra@tinyerp.com-20120726074034-w9sryg62d4x0no2k
---
 addons/l10n_in_hr_payroll/report/payment_advice_report.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report.py b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
index 40058e02d2d..838334913a5 100644
--- a/addons/l10n_in_hr_payroll/report/payment_advice_report.py
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
@@ -75,6 +75,8 @@ class payment_advice_report(osv.osv):
                 from
                     hr_payroll_advice as p
                     left join hr_payroll_advice_line as l on (p.id=l.advice_id)
+                where 
+                    l.employee_id IS NOT NULL
                 group by
                     p.number,p.name,p.date,p.state,p.company_id,p.bank_id,p.chaque_nos,p.neft,
                     l.employee_id,l.advice_id,l.bysal,l.ifsc_code, l.name

From 5206fc9527a937d21f885e18958cd83182abb854 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 26 Jul 2012 14:30:18 +0530
Subject: [PATCH 230/999] [FIX]  l10n_in_hr_payroll: Removed unnecessary empty
 line

bzr revid: mra@tinyerp.com-20120726090018-mbnjl1t4oglgdrqx
---
 addons/l10n_in_hr_payroll/data/hr.salary.rule.csv | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
index 04e265e136f..f13dc346065 100644
--- a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
+++ b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
@@ -1,7 +1,5 @@
 "id","amount_select","condition_range_min","condition_range_max","amount_percentage","amount_fix","name","category_id","sequence","code","parent_rule_id/id","condition_select","condition_range","amount_percentage_base"
 1,"fix",1,1,,1200,"Education Allowance For One Child","Allowance",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
 2,"fix",2,10,,2400,"Education Allowance For Two Child","Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
-,,,,,,,,,,,,,
 3,"fix",1,1,,300,"Child Hostel Allowance For One Child","Allowance",26,"CHOONE","hr_payroll_rule_child2","range","employee.children",
 4,"fix",2,10,,600,"Child Hostel Allowance For Two Child","Allowance",27,"CHOTWO","hr_payroll_rule_child2","range","employee.children",
-,,,,,,,,,,,,,

From f9638a71321531e2af62ccb81df39d92a59c9c24 Mon Sep 17 00:00:00 2001
From: "Saurang Suthar(OpenERP)" <>
Date: Thu, 26 Jul 2012 16:17:44 +0530
Subject: [PATCH 231/999] [IMP] base: Improved currency and country data

bzr revid: pso@tinyerp.com-20120726104744-uhr0q3aq3g5r07i4
---
 openerp/addons/base/country_data.xml  |   3 +-
 openerp/addons/base/currency_data.xml | 215 +++-----------------------
 2 files changed, 21 insertions(+), 197 deletions(-)

diff --git a/openerp/addons/base/country_data.xml b/openerp/addons/base/country_data.xml
index aa5729ae917..13df5ff5a8f 100644
--- a/openerp/addons/base/country_data.xml
+++ b/openerp/addons/base/country_data.xml
@@ -1166,10 +1166,11 @@
             <field name="code">ua</field>
             <field name="currency_id" ref="UAG"/>
         </record>
+        <!-- DEPRECATED, New currency code of Uganda is UGX ! -->
         <record id="ug" model="res.country">
             <field name="name">Uganda</field>
             <field name="code">ug</field>
-            <field name="currency_id" ref="UGS"/>
+            <field name="currency_id" ref="UGX"/>
         </record>
         <record id="uk" model="res.country">
             <field name="name">United Kingdom</field>
diff --git a/openerp/addons/base/currency_data.xml b/openerp/addons/base/currency_data.xml
index 7ffad588aae..2fad6810285 100644
--- a/openerp/addons/base/currency_data.xml
+++ b/openerp/addons/base/currency_data.xml
@@ -171,7 +171,6 @@
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
 
-
         <record id="NOK" model="res.currency">
             <field name="name">NOK</field>
             <field name="symbol">kr</field>
@@ -237,19 +236,6 @@
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
 
-        <record id="GBP" model="res.currency">
-            <field name="name">GBP</field>
-            <field name="symbol">£</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateGBP" model="res.currency.rate">
-            <field name="rate">0.8333</field>
-            <field name="currency_id" ref="GBP"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
         <record id="ARS" model="res.currency">
             <field name="name">ARS</field>
             <field name="symbol">$</field>
@@ -497,19 +483,6 @@
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
 
-        <record id="THB" model="res.currency">
-            <field name="name">THB</field>
-            <field name="symbol">฿</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateTHB" model="res.currency.rate">
-            <field name="rate">47.779</field>
-            <field name="currency_id" ref="THB"/>
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-        </record>
-
         <record id="ZAR" model="res.currency">
             <field name="name">ZAR</field>
             <field name="symbol">R</field>
@@ -640,7 +613,7 @@
 
         <record id="AFN" model="res.currency">
             <field name="name">AFN</field>
-            <field name="symbol">Af,Afs</field>
+            <field name="symbol">Afs</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -705,7 +678,7 @@
         
         <record id="AZN" model="res.currency">
             <field name="name">AZN</field>
-            <field name="symbol">m , man.</field>
+            <field name="symbol">m</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -744,7 +717,7 @@
         
         <record id="BDT" model="res.currency">
             <field name="name">BDT</field>
-            <field name="symbol"> ৳ </field>
+            <field name="symbol">৳</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -859,19 +832,6 @@
             <field name="rate">9.45</field>
         </record>
         
-        <record id="BGN" model="res.currency">
-            <field name="name">BGN</field>
-            <field name="symbol">lev</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateBGN" model="res.currency.rate">
-            <field name="currency_id" ref="BGN" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">1.95</field>
-        </record>
-        
         <record id="BIF" model="res.currency">
             <field name="name">BIF</field>
             <field name="symbol">FBu</field>
@@ -1263,7 +1223,7 @@
         
         <record id="ILS" model="res.currency">
             <field name="name">ILS</field>
-            <field name="symbol"> ₪ </field>
+            <field name="symbol">₪</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1445,6 +1405,7 @@
         
         <record id="MGA" model="res.currency">
             <field name="name">MGA</field>
+            <field name="symbol">Ar</field>            
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1509,7 +1470,7 @@
         
         <record id="MNT" model="res.currency">
             <field name="name">MNT</field>
-            <field name="symbol"> ₮ </field>
+            <field name="symbol">₮</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1613,7 +1574,7 @@
         
         <record id="MMK" model="res.currency">
             <field name="name">MMK</field>
-            <field name="symbol"> K </field>
+            <field name="symbol">K</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1701,19 +1662,6 @@
             <field eval="time.strftime('%Y-01-01')" name="name"/>
             <field name="rate">1105.24376765</field>
         </record>
-        
-        <record id="NOK" model="res.currency">
-            <field name="name">NOK</field>
-            <field name="symbol"> kr </field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateNOK" model="res.currency.rate">
-            <field name="currency_id" ref="NOK" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">7.47</field>
-        </record>
 
         <record id="ZWD" model="res.currency">
             <field name="name">ZWD</field>
@@ -1754,19 +1702,6 @@
             <field name="rate">264.784483</field>
         </record>
 
-        <record id="VND" model="res.currency">
-            <field name="name">VND</field>
-            <field name="symbol">₫</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateVND" model="res.currency.rate">
-            <field name="currency_id" ref="VND" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">25595.8333</field>
-        </record>
-
         <record id="VUB" model="res.currency">
             <field name="name">VUB</field>
             <field name="symbol">Bs</field>
@@ -1858,45 +1793,6 @@
             <field name="rate">0.000000</field>
         </record>
 
-        <record id="UGS" model="res.currency">
-            <field name="name">UGS</field>
-            <field name="symbol">USh</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateUGS" model="res.currency.rate">
-            <field name="currency_id" ref="UGS" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.000000</field>
-        </record>
-
-        <record id="GBP" model="res.currency">
-            <field name="name">GBP</field>
-            <field name="symbol">USh</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateGBP" model="res.currency.rate">
-            <field name="currency_id" ref="GBP" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">86.35812</field>
-        </record>
-
-        <record id="AUD" model="res.currency">
-            <field name="name">AUD</field>
-            <field name="symbol">$</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateAUD" model="res.currency.rate">
-            <field name="currency_id" ref="AUD" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">56.7795675</field>
-        </record>		
-
         <record id="TMM" model="res.currency">
             <field name="name">TMM</field>
             <field name="symbol">m</field>
@@ -1951,7 +1847,7 @@
 
         <record id="TOP" model="res.currency">
             <field name="name">TOP</field>
-            <field name="symbol">PT,T$,¢</field>
+            <field name="symbol">T$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -1972,7 +1868,7 @@
         <record id="rateTHB" model="res.currency.rate">
             <field name="currency_id" ref="THB" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">1.74052094</field>
+            <field name="rate">38.4070124</field>
         </record>
 
         <record id="TZS" model="res.currency">
@@ -2002,7 +1898,7 @@
 
         <record id="TWD" model="res.currency">
             <field name="name">TWD</field>
-            <field name="symbol">$ or NT$</field>
+            <field name="symbol">NT$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -2015,6 +1911,7 @@
 
         <record id="SYP" model="res.currency">
             <field name="name">SYP</field>
+            <field name="symbol">£</field>            
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -2025,32 +1922,6 @@
             <field name="rate">78.8338</field>
         </record>		
 
-        <record id="CHF" model="res.currency">
-            <field name="name">CHF</field>
-            <field name="symbol">Fr.</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateCHF" model="res.currency.rate">
-            <field name="currency_id" ref="CHF" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">1.20095404</field>
-        </record>
-
-        <record id="SEK" model="res.currency">
-            <field name="name">SEK</field>
-            <field name="symbol">kr</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateSEK" model="res.currency.rate">
-            <field name="currency_id" ref="SEK" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">8.52206122</field>
-        </record>	
-
         <record id="SZL" model="res.currency">
             <field name="name">SZL</field>
             <field name="symbol">E</field>
@@ -2064,19 +1935,6 @@
             <field name="rate">10.07</field>
         </record>
 		
-        <record id="NOK" model="res.currency">
-            <field name="name">NOK</field>
-            <field name="symbol">kr</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateNOK" model="res.currency.rate">
-            <field name="currency_id" ref="NOK" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">7.47900598</field>
-        </record>
-		
         <record id="SRG" model="res.currency">
             <field name="name">SRG</field>
             <field name="symbol">$</field>
@@ -2092,6 +1950,7 @@
 		
         <record id="SDD" model="res.currency">
             <field name="name">SDD</field>
+            <field name="symbol">£Sd</field>            
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -2117,6 +1976,7 @@
 
         <record id="SSP" model="res.currency">
             <field name="name">SSP</field>
+            <field name="symbol">£</field>            
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -2129,7 +1989,7 @@
 
         <record id="GBP" model="res.currency">
             <field name="name">GBP</field>
-            <field name="symbol">£,p</field>			
+            <field name="symbol">£</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -2140,19 +2000,6 @@
             <field name="rate"> 0.784221994</field>
         </record>					
 
-        <record id="ZAR" model="res.currency">
-            <field name="name">ZAR</field>
-            <field name="symbol">R</field>			
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateZAR" model="res.currency.rate">
-            <field name="currency_id" ref="ZAR" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">10.0171906</field>
-        </record>
-
         <record id="SOD" model="res.currency">
             <field name="name">SOD</field>
             <field name="symbol">Sh.</field>			
@@ -2259,7 +2106,7 @@
 
         <record id="WST" model="res.currency">
             <field name="name">WST</field>
-            <field name="symbol">WS$,SAT,ST</field>			
+            <field name="symbol">WS$</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -2337,7 +2184,7 @@
 
         <record id="PLZ" model="res.currency">
             <field name="name">PLZ</field>
-            <field name="symbol">zł,gr</field>			
+            <field name="symbol">zł</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -2363,6 +2210,7 @@
 
         <record id="PYG" model="res.currency">
             <field name="name">PYG</field>
+            <field name="symbol">₲</field>			            
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -2386,19 +2234,6 @@
             <field name="rate">2.5903895</field>
         </record>		
 
-        <record id="PAB" model="res.currency">
-            <field name="name">PAB</field>
-            <field name="symbol">B./</field>			
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="ratePAB" model="res.currency.rate">
-            <field name="currency_id" ref="PAB" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">1.2234</field>
-        </record>
-
         <record id="PKR" model="res.currency">
             <field name="name">PKR</field>
             <field name="symbol">Rs.</field>			
@@ -2427,7 +2262,7 @@
 
         <record id="CVE" model="res.currency">
             <field name="name">CVE</field>
-            <field name="symbol">$,Esc</field>			
+            <field name="symbol">$</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -2465,7 +2300,7 @@
 
         <record id="YUM" model="res.currency">
             <field name="name">YUM</field>
-            <field name="symbol">din.,дин.</field>			
+            <field name="symbol">дин.</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
@@ -2475,18 +2310,6 @@
             <field eval="time.strftime('%Y-01-01')" name="name"/>
             <field name="rate">0.00000</field>
         </record>		
-
-        <record id="ZRN" model="res.currency">
-            <field name="name">ZRN</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateZRN" model="res.currency.rate">
-            <field name="currency_id" ref="ZRN" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">1128220.81</field>
-        </record>		
 		
     </data>
 </openerp>
\ No newline at end of file

From f4ee139ba1f6fb0686ecbf2fdddd5e05464c95df Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Thu, 26 Jul 2012 17:01:10 +0530
Subject: [PATCH 232/999] [IMP]l10n_in_hr_payroll: add yaml file for payment
 advice

bzr revid: dsi@tinyerp.com-20120726113110-stmumo4w50usxeo5
---
 .../test/payment_advice.yml                   | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/test/payment_advice.yml b/addons/l10n_in_hr_payroll/test/payment_advice.yml
index ecbd9f47385..c9d8cb9b287 100644
--- a/addons/l10n_in_hr_payroll/test/payment_advice.yml
+++ b/addons/l10n_in_hr_payroll/test/payment_advice.yml
@@ -1,12 +1,14 @@
+-
+  In order to test Advice Line I create a new Advice Line Record  
 -
   import datetime
 -
-  I create a new Payment Advice For Month june and july 
+  I create a new Payment Advice with IFSC Code
 -
   !record {model: hr.payroll.advice, id: payment_advice_1}: 
     name: 'June'
     date: !eval "'%s-06-01' %(datetime.now().year)"
-    bank_id: 'base.res_bank_1'
+    bank_id: base.res_bank_1
     chaque_nos: '007667'
     line_ids:
       - employee_id: hr.employee_fp
@@ -17,12 +19,14 @@
         name: '00014521111232'
         ifsc_code: 'sbi45452145'
         bysal: '20000.00'                
+-
+  I create a new Payment Advice without IFSC Code
 -
   !record {model: hr.payroll.advice, id: payment_advice_2}: 
     name: 'July'
     date: !eval "'%s-07-01' %(datetime.now().year)"
     chaque_nos: '007568'
-    bank_id: 'base.res_bank_1'
+    bank_id: base.res_bank_1
     line_ids:
       - employee_id: hr.employee_fp
         name: '90125452'
@@ -35,6 +39,15 @@
 -
   !assert {model: hr.payroll.advice, id: payment_advice_1, string: Payment Advice is in draft state}:
     - state == 'draft'
+-
+  I check that payment advice is confirmed
+-    
+  !python {model: hr.payroll.advice}: |
+    advice_line = self.confirm_sheet(cr, uid, [ref('payment_advice_1')])
+-
+  !python {model: hr.payroll.advice}: |
+    advice_line = self.browse(cr, uid, ref("payment_advice_1"))
+    assert (advice_line.state == 'confirm')
 -
   In order to test the PDF reports defined on a Payment Advice,we will print a Payment Advice Detail Summary Report when NEFT is checked
 -

From 3ccd26a21b61a1051f6872b06ff3dd25e2020cf3 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Fri, 27 Jul 2012 11:30:19 +0530
Subject: [PATCH 233/999] [ADD] l10n_in_hr_payroll: Template for yml advice
 from batch

bzr revid: mra@tinyerp.com-20120727060019-508eayln49i2c7qs
---
 addons/l10n_in_hr_payroll/__openerp__.py                | 1 +
 addons/l10n_in_hr_payroll/test/payment_advice_batch.yml | 0
 2 files changed, 1 insertion(+)
 create mode 100644 addons/l10n_in_hr_payroll/test/payment_advice_batch.yml

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 9fb18e0b887..1eca0d3ceba 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -56,6 +56,7 @@ Indian Payroll Salary Rules.
      ],
     'test': [
         'test/payment_advice.yml',
+        'test/payment_advice_batch.yml'
     ],
 
     'demo_xml': ['l10n_in_hr_payroll_demo.xml'],
diff --git a/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml b/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
new file mode 100644
index 00000000000..e69de29bb2d

From a2a638551614f552d6fcb6c593357d673eb30440 Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Fri, 27 Jul 2012 12:56:27 +0530
Subject: [PATCH 234/999] [IMP]l10n_in_hr_payroll: check box will not make
 duplicate for made payment order and payslip advice id

bzr revid: dsi@tinyerp.com-20120727072627-n79gah7ncve01ecv
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index de8adec7d87..87264f6d84f 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -216,6 +216,12 @@ class hr_payslip_run(osv.osv):
     _columns = {
         'available_advice': fields.boolean('Made Payment Advice?', help="If this box is checked which means that Payment Advice exists for current batch", readonly=False),
     }
+    def copy(self, cr, uid, id, default={}, context=None, done_list=[], local=False):
+        if not default:
+            default = {}
+        default = default.copy()
+        default['available_advice'] = False
+        return super(hr_payslip_run, self).copy(cr, uid, id, default, context=context)    
 
     def draft_payslip_run(self, cr, uid, ids, context=None):
         res = super(hr_payslip_run, self).draft_payslip_run(cr, uid, ids, context=context)
@@ -302,6 +308,13 @@ class hr_payslip(osv.osv):
     _columns = {
         'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice')
     }
+    def copy(self, cr, uid, id, default={}, context=None, done_list=[], local=False):
+        if not default:
+            default = {}
+        default = default.copy()
+        default['advice_id'] = False
+        return super(hr_payslip, self).copy(cr, uid, id, default, context=context)
+    
 
 hr_payslip()
 
@@ -317,4 +330,4 @@ class res_company(osv.osv):
 
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From e223851436cffd5ae521420f17506822d7157c45 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Fri, 27 Jul 2012 15:10:51 +0530
Subject: [PATCH 235/999] [IMP] base: Improved _get_euro method to fetch
 correct default value of currency

bzr revid: pso@tinyerp.com-20120727094051-9oss7x3acsl79j3s
---
 openerp/addons/base/res/res_company.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 54835258283..4815721c758 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -230,7 +230,9 @@ class res_company(osv.osv):
 
     def _get_euro(self, cr, uid, context=None):
         try:
-            return self.pool.get('res.currency').search(cr, uid, [])[0]
+            data_obj = self.pool.get('ir.model.data')
+            data_id = data_obj._get_id(cr, uid, 'base', 'EUR')
+            return data_obj.browse(cr, uid, data_id, context=context).res_id
         except:
             return False
 

From 3e28c5fb00c2191af5f0e9f8368ef25203837ee4 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 3 Aug 2012 11:49:02 +0530
Subject: [PATCH 236/999] [ADD]l10n_in_hr_payroll:added report for employee
 salary details by categories

bzr revid: kbh@tinyerp.com-20120803061902-msvh29tr3fnog9tr
---
 addons/l10n_in_hr_payroll/__openerp__.py      |   1 +
 .../l10n_in_hr_payroll_report.xml             |   9 +
 addons/l10n_in_hr_payroll/report/__init__.py  |   1 +
 .../report/report_yearly_salary_detail.py     | 224 +++++++
 .../report/report_yearly_salary_detail.rml    | 563 ++++++++++++++++++
 addons/l10n_in_hr_payroll/wizard/__init__.py  |   1 +
 .../wizard/yearly_salary_detail.py            |  66 ++
 .../wizard/yearly_salary_detail_view.xml      |  43 ++
 8 files changed, 908 insertions(+)
 create mode 100644 addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py
 create mode 100644 addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.rml
 create mode 100644 addons/l10n_in_hr_payroll/wizard/yearly_salary_detail.py
 create mode 100644 addons/l10n_in_hr_payroll/wizard/yearly_salary_detail_view.xml

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 1eca0d3ceba..4f5a54d8583 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -51,6 +51,7 @@ Indian Payroll Salary Rules.
          'l10n_in_hr_payroll_report.xml',
          'l10n_in_hr_payroll_sequence.xml',
          'wizard/hr_salary_employee_bymonth_view.xml',
+         'wizard/yearly_salary_detail_view.xml',
          'report/payment_advice_report_view.xml',
 
      ],
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
index 7604f34e32e..0b8df3880dd 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
@@ -25,5 +25,14 @@
             name="salary.employee.bymonth" 
             rml="l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml"
             string="Payroll Statement" /> 
+
+        <report
+            auto="False" 
+            id="yearly_salary" 
+            model="yearly.salary.detail" 
+            name="salary.detail.byyear" 
+            rml="l10n_in_hr_payroll/report/report_yearly_salary_detail.rml"
+            string="Yearly Salary Report" /> 
+
     </data>
 </openerp>
diff --git a/addons/l10n_in_hr_payroll/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py
index 3091692c2e8..b8dfa2eeaaf 100644
--- a/addons/l10n_in_hr_payroll/report/__init__.py
+++ b/addons/l10n_in_hr_payroll/report/__init__.py
@@ -26,5 +26,6 @@ import report_payslip_details
 import report_payroll_advice
 import report_hr_salary_employee_bymonth
 import payment_advice_report
+import report_yearly_salary_detail
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py
new file mode 100644
index 00000000000..7edd2e6d319
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py
@@ -0,0 +1,224 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    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 time
+import datetime
+from report import report_sxw
+
+class employees_yearly_salary_report(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(employees_yearly_salary_report, self).__init__(cr, uid, name, context)
+
+        self.localcontext.update({
+            'time': time,
+            'get_employee': self.get_employee,
+            'get_employee_detail': self.get_employee_detail,
+            'cal_monthly_amt': self.cal_monthly_amt,
+            'get_periods': self.get_periods,
+            'get_total': self.get_total,
+            'get_allow': self.get_allow,
+            'get_deduct': self.get_deduct,
+        })
+
+        self.context = context
+        self.mnths = []
+        self.allow_list = []
+        self.deduct_list = []
+        self.other_list = []
+        self.month_total_list = []
+        self.total = 0.00
+
+    def get_periods(self, form):
+#       Get start year-month-date and end year-month-date
+        first_year = int(form['date_from'][0:4])
+        last_year = int(form['date_to'][0:4])
+
+        first_month = int(form['date_from'][5:7])
+        last_month = int(form['date_to'][5:7])
+        no_months = (last_year-first_year) * 12 + last_month - first_month + 1
+        current_month = first_month
+        current_year = first_year
+
+#       Get name of the months from integer
+        mnth_name = []
+        for count in range(0, no_months):
+            m = datetime.date(current_year, current_month, 1).strftime('%b')
+            mnth_name.append(m)
+            self.mnths.append(str(current_month) + '-' + str(current_year))
+            if current_month == 12:
+                current_month = 0
+                current_year = last_year
+            current_month = current_month + 1
+        for c in range(0, (12-no_months)):
+            mnth_name.append('None')
+            self.mnths.append('None')
+        return [mnth_name]
+
+    def get_employee(self, form):
+        result = []
+        emp_obj = self.pool.get('hr.employee')
+        emp_ids = form.get('employee_ids', [])
+        result = emp_obj.browse(self.cr,self.uid, emp_ids, context=self.context)
+        return result
+
+    def get_employee_detail(self, form, obj):
+        self.allow_list = []
+        self.deduct_list = []
+        self.total = 0.00
+
+        #for Basic Salary
+        res = self.cal_monthly_amt(form, obj.id)
+        basic = res[0]
+        self.total += basic[0][len(basic[0])-1]
+        self.allow_list.append(basic[0])
+
+        #for allowance
+        allow = res[1]
+        gross = res[3]
+        for i in range(1, len(allow)+1):
+            self.allow_list.append(allow[i-1])
+            self.total += allow[i-1][len(allow[i-1])-1]
+        self.total += gross[0][len(gross[0])-1]
+        self.allow_list.append(gross[0])
+
+        #for Deduction
+        deduct = res[2] 
+        net = res[4]
+        for i in range(1, len(deduct)+1):
+            self.deduct_list.append(deduct[i-1])
+            self.total -= deduct[i-1][len(deduct[i-1])-1]
+        self.total += net[0][len(net[0])-1]
+        self.deduct_list.append(net[0])
+        return None
+
+    def cal_monthly_amt(self, form, emp_id):
+
+        result = []
+        salaries = {}
+        tot = 0.0
+
+        payslip_line_obj = self.pool.get('hr.payslip.line')
+
+        line_ids = payslip_line_obj.search(self.cr, self.uid, [], context=self.context)
+        lines  = payslip_line_obj.browse(self.cr, self.uid, line_ids, context=self.context)
+
+        self.cr.execute('''SELECT rc.code, pl.name, sum(pl.total), \
+                to_char(date_to,'mm-yyyy') as to_date  FROM hr_payslip_line as pl \
+                LEFT JOIN hr_salary_rule_category AS rc on (pl.category_id = rc.id) \
+                LEFT JOIN hr_payslip as p on pl.slip_id = p.id \
+                LEFT JOIN hr_employee as emp on emp.id = p.employee_id \
+                WHERE pl.id in %s and p.employee_id = %s \
+                GROUP BY rc.parent_id, pl.sequence, pl.id, pl.category_id,pl.name,p.date_to,rc.code \
+                ORDER BY pl.sequence, rc.parent_id''',(tuple(line_ids),emp_id))
+        sal = self.cr.fetchall()
+
+        for x in sal:
+            if x[0] == 'BASIC':
+                if x[0] not in salaries:
+                    salaries[x[0]] = {}
+                    salaries[x[0]].update({x[1]: {x[3]: x[2]}})
+                elif x[1] not in salaries[x[0]]:
+                    salaries[x[0]][x[1]] = {}
+                    salaries[x[0]][x[1]].update({x[3]: x[2]})
+                else:
+                    salaries[x[0]][x[1]].update({x[3]: x[2]})
+            if x[0] == 'ALW':
+                if x[0] not in salaries:
+                    salaries[x[0]] = {}
+                    salaries[x[0]].update({x[1]: {x[3]: x[2]}})
+                elif x[1] not in salaries[x[0]]:
+                    salaries[x[0]][x[1]] = {}
+                    salaries[x[0]][x[1]].update({x[3]: x[2]})
+                else:
+                    salaries[x[0]][x[1]].update({x[3]: x[2]})
+            if x[0] == 'DED':
+                if x[0] not in salaries:
+                    salaries[x[0]] = {}
+                    salaries[x[0]].update({x[1]: {x[3]: x[2]}})
+                elif x[1] not in salaries[x[0]]:
+                    salaries[x[0]][x[1]] = {}
+                    salaries[x[0]][x[1]].update({x[3]: x[2]})
+                else:
+                    salaries[x[0]][x[1]].update({x[3]: x[2]})
+            if x[0] == 'GROSS':
+                if x[0] not in salaries:
+                    salaries[x[0]] = {}
+                    salaries[x[0]].update({x[1]: {x[3]: x[2]}})
+                elif x[1] not in salaries[x[0]]:
+                    salaries[x[0]][x[1]] = {}
+                    salaries[x[0]][x[1]].update({x[3]: x[2]})
+                else:
+                    salaries[x[0]][x[1]].update({x[3]: x[2]})
+            if x[0] == 'NET':
+                if x[0] not in salaries:
+                    salaries[x[0]] = {}
+                    salaries[x[0]].update({x[1]: {x[3]: x[2]}})
+                elif x[1] not in salaries[x[0]]:
+                    salaries[x[0]][x[1]] = {}
+                    salaries[x[0]][x[1]].update({x[3]: x[2]})
+                else:
+                    salaries[x[0]][x[1]].update({x[3]: x[2]})
+
+        for code in ['BASIC', 'ALW', 'DED', 'GROSS', 'NET']:
+            if code in salaries:
+                res = self.salary_list(salaries[code])
+            else:
+                res = []
+            result.append(res)
+        return result
+
+    def salary_list(self, salaries):
+        cnt = 0
+        cat_salary_all = []
+        for category_name,amount in salaries.items():
+            cat_salary = []
+            cnt += 1
+            tot = 0.0
+            cat_salary.append(category_name)
+            for mnth in self.mnths:
+                if mnth <> 'None':
+                    if len(mnth) != 7:
+                        mnth = '0' + str(mnth)
+                    if mnth in amount and amount[mnth]:
+                        cat_salary.append(amount[mnth])
+                        tot += amount[mnth]
+                    else:
+                        cat_salary.append(0.00)
+                else:
+                    cat_salary.append('')
+            cat_salary.append(tot)
+            cat_salary_all.append(cat_salary)
+        cnt = 1
+        return cat_salary_all
+
+    def get_allow(self):
+        return self.allow_list
+
+    def get_deduct(self):
+        return self.deduct_list
+
+    def get_total(self):
+        return self.total
+
+report_sxw.report_sxw('report.salary.detail.byyear', 'yearly.salary.detail', 'hr_payroll/report/report_yearly_salary_detail.rml', parser=employees_yearly_salary_report, header='internal landscape')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.rml
new file mode 100644
index 00000000000..0f150d56575
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.rml
@@ -0,0 +1,563 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(842.0,595.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="57.0" width="786" height="481"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table12">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table10">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table11">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table9">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Drawing" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Helvetica"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Helvetica"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="terp_default_8">[[ repeatIn(get_employee(data['form']), 'o') ]] </para>
+    <blockTable colWidths="785.0" style="Table12">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">Employees Salary Details </para>
+          <para style="terp_default_Centre_9">From [[ formatLang(data['form']['date_from'], date=True) ]] To [[ formatLang(data['form']['date_to'], date=True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_Centre_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Employee Code</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.ssnid ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Department</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.company_id and o.company_id.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Bank</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.otherid or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Employee Name</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Other No.</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.otherid or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Address</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[o.address_home_id and o.address_home_id.name or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table5">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Designation</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.contract_ids and o.contract_ids[0].job_id.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Phone No.</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.work_phone or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">E-mail Address</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[o.work_email or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]] [[ get_employee_detail((data['form']),o) ]]</para>
+      <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table4">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Title</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[0] != 'None' and m[0] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[1] != 'None' and m[1] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[2] != 'None' and m[2] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[3] != 'None' and m[3] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[4] != 'None' and m[4] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[5] != 'None' and m[5] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[6] != 'None' and m[6] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[7] != 'None' and m[7] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[8] != 'None' and m[8] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[9] != 'None' and m[9] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[10] != 'None' and m[10] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[11] != 'None' and m[11] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Total</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <section>
+        <blockTable colWidths="785.0" style="Table7">
+          <tr>
+            <td>
+              <para style="terp_tblheader_Details">Allowances with Basic: </para>
+            </td>
+          </tr>
+        </blockTable>
+        <section>
+          <para style="terp_default_1">[[ repeatIn(get_allow(),'e1') ]]</para>
+          <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table6">
+            <tr>
+              <td>
+                <para style="terp_default_9">[[ e1[0] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+        </section>
+        <blockTable colWidths="785.0" style="Table10">
+          <tr>
+            <td>
+              <para style="terp_tblheader_Details">Deductions: </para>
+            </td>
+          </tr>
+        </blockTable>
+        <section>
+          <para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
+          <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table8">
+            <tr>
+              <td>
+                <para style="terp_default_9">[[ e2[0] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+        </section>
+      </section>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/l10n_in_hr_payroll/wizard/__init__.py b/addons/l10n_in_hr_payroll/wizard/__init__.py
index b08ed5a3f9c..358c0cfa906 100644
--- a/addons/l10n_in_hr_payroll/wizard/__init__.py
+++ b/addons/l10n_in_hr_payroll/wizard/__init__.py
@@ -20,5 +20,6 @@
 ##############################################################################
 
 import hr_salary_employee_bymonth
+import yearly_salary_detail
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/wizard/yearly_salary_detail.py b/addons/l10n_in_hr_payroll/wizard/yearly_salary_detail.py
new file mode 100644
index 00000000000..1329d5a2ed7
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/wizard/yearly_salary_detail.py
@@ -0,0 +1,66 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    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 time
+
+from osv import fields, osv
+
+class yearly_salary_detail(osv.osv_memory):
+
+   _name ='yearly.salary.detail'
+   _description = 'Hr Salary Employee By Category Report'
+   _columns = {
+        'employee_ids': fields.many2many('hr.employee', 'payroll_emp_rel', 'payroll_id', 'emp_id', 'Employees', required=True),
+        'date_from': fields.date('Start Date', required=True),
+        'date_to': fields.date('End Date', required=True),
+    }
+
+   _defaults = {
+        'date_from': lambda *a: time.strftime('%Y-01-01'),
+        'date_to': lambda *a: time.strftime('%Y-%m-%d'),
+
+    }
+
+   def print_report(self, cr, uid, ids, context=None):
+        """
+         To get the date and print the report
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary
+         @return: return report
+        """
+        if context is None:
+            context = {}
+        datas = {'ids': context.get('active_ids', [])}
+
+        res = self.read(cr, uid, ids, ['employee_ids', 'date_from', 'date_to'], context=context)
+        res = res and res[0] or {}
+        datas.update({'form': res})
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'salary.detail.byyear',
+            'datas': datas,
+       }
+
+yearly_salary_detail()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/wizard/yearly_salary_detail_view.xml b/addons/l10n_in_hr_payroll/wizard/yearly_salary_detail_view.xml
new file mode 100644
index 00000000000..a2369895237
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/wizard/yearly_salary_detail_view.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_yearly_salary_detail" model="ir.ui.view">
+            <field name="name">Employee Yearly Salary</field>
+            <field name="model">yearly.salary.detail</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Print Yearly Salary" version="7.0">
+                <header>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </header>
+                <group>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <separator string="Employees" />
+                    <field name="employee_ids"  nolabel="1" colspan="4"/>
+                </group>
+            </form>
+            </field>
+        </record>
+
+        <record id="action_yearly_salary_detail" model="ir.actions.act_window">
+            <field name="name">Employee Yearly Salary</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">yearly.salary.detail</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+            name="Employee Salary Statement"
+            parent="hr.menu_hr_reporting_timesheet"
+            action="action_yearly_salary_detail"
+            sequence="250" icon="STOCK_PRINT"
+            id="menu_yearly_salary_detail"
+           />
+
+</data>
+</openerp>

From a7232ac79f4d8e6cbf09338864f8a9b4dc02aa16 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 3 Aug 2012 11:59:30 +0530
Subject: [PATCH 237/999] [REM]l10n_in_hr_payroll:unnesesary list removed

bzr revid: kbh@tinyerp.com-20120803062930-u2hsy4m8s3nqfy9x
---
 addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py
index 7edd2e6d319..217c06a8031 100644
--- a/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py
@@ -43,7 +43,6 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
         self.mnths = []
         self.allow_list = []
         self.deduct_list = []
-        self.other_list = []
         self.month_total_list = []
         self.total = 0.00
 

From 498f0ae6ea039287541d1e5c629998de041315bf Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 3 Aug 2012 12:09:00 +0530
Subject: [PATCH 238/999] [REM]l10n_in_hr_payroll:unnesesary list removed

bzr revid: kbh@tinyerp.com-20120803063900-j31qbhjmsecojbke
---
 addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py
index 217c06a8031..15c7279c477 100644
--- a/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py
@@ -43,7 +43,6 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
         self.mnths = []
         self.allow_list = []
         self.deduct_list = []
-        self.month_total_list = []
         self.total = 0.00
 
     def get_periods(self, form):

From 2386cb96c98edaa805cdf83af654494abdf4ccb6 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 3 Aug 2012 14:47:29 +0530
Subject: [PATCH 239/999] [FIX]l10n_in_hr_payroll:report name changed,file name
 changed,rml improved

bzr revid: kbh@tinyerp.com-20120803091729-sal3w4dltoxbxu5w
---
 addons/l10n_in_hr_payroll/__openerp__.py      |  2 +-
 .../l10n_in_hr_payroll_report.xml             |  4 +-
 addons/l10n_in_hr_payroll/report/__init__.py  |  2 +-
 ...l.py => report_hr_yearly_salary_detail.py} | 21 ++++---
 ...rml => report_hr_yearly_salary_detail.rml} | 63 ++++++++++---------
 addons/l10n_in_hr_payroll/wizard/__init__.py  |  2 +-
 ...y_detail.py => hr_yearly_salary_detail.py} |  0
 ...w.xml => hr_yearly_salary_detail_view.xml} |  4 +-
 8 files changed, 50 insertions(+), 48 deletions(-)
 rename addons/l10n_in_hr_payroll/report/{report_yearly_salary_detail.py => report_hr_yearly_salary_detail.py} (94%)
 rename addons/l10n_in_hr_payroll/report/{report_yearly_salary_detail.rml => report_hr_yearly_salary_detail.rml} (92%)
 rename addons/l10n_in_hr_payroll/wizard/{yearly_salary_detail.py => hr_yearly_salary_detail.py} (100%)
 rename addons/l10n_in_hr_payroll/wizard/{yearly_salary_detail_view.xml => hr_yearly_salary_detail_view.xml} (93%)

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 4f5a54d8583..199dc0a232c 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -51,7 +51,7 @@ Indian Payroll Salary Rules.
          'l10n_in_hr_payroll_report.xml',
          'l10n_in_hr_payroll_sequence.xml',
          'wizard/hr_salary_employee_bymonth_view.xml',
-         'wizard/yearly_salary_detail_view.xml',
+         'wizard/hr_yearly_salary_detail_view.xml',
          'report/payment_advice_report_view.xml',
 
      ],
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
index 0b8df3880dd..4a0c9ded0b9 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
@@ -31,8 +31,8 @@
             id="yearly_salary" 
             model="yearly.salary.detail" 
             name="salary.detail.byyear" 
-            rml="l10n_in_hr_payroll/report/report_yearly_salary_detail.rml"
-            string="Yearly Salary Report" /> 
+            rml="l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml"
+            string="Payroll Register" /> 
 
     </data>
 </openerp>
diff --git a/addons/l10n_in_hr_payroll/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py
index b8dfa2eeaaf..5c76aa37e1c 100644
--- a/addons/l10n_in_hr_payroll/report/__init__.py
+++ b/addons/l10n_in_hr_payroll/report/__init__.py
@@ -26,6 +26,6 @@ import report_payslip_details
 import report_payroll_advice
 import report_hr_salary_employee_bymonth
 import payment_advice_report
-import report_yearly_salary_detail
+import report_hr_yearly_salary_detail
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
similarity index 94%
rename from addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py
rename to addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
index 15c7279c477..c642e297de5 100644
--- a/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
@@ -46,6 +46,7 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
         self.total = 0.00
 
     def get_periods(self, form):
+        self.mnths =[]
 #       Get start year-month-date and end year-month-date
         first_year = int(form['date_from'][0:4])
         last_year = int(form['date_to'][0:4])
@@ -86,8 +87,9 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
         #for Basic Salary
         res = self.cal_monthly_amt(form, obj.id)
         basic = res[0]
-        self.total += basic[0][len(basic[0])-1]
-        self.allow_list.append(basic[0])
+        if basic:
+            self.total += basic[0][len(basic[0])-1]
+            self.allow_list.append(basic[0])
 
         #for allowance
         allow = res[1]
@@ -95,8 +97,9 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
         for i in range(1, len(allow)+1):
             self.allow_list.append(allow[i-1])
             self.total += allow[i-1][len(allow[i-1])-1]
-        self.total += gross[0][len(gross[0])-1]
-        self.allow_list.append(gross[0])
+        if gross:
+            self.total += gross[0][len(gross[0])-1]
+            self.allow_list.append(gross[0])
 
         #for Deduction
         deduct = res[2] 
@@ -104,8 +107,9 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
         for i in range(1, len(deduct)+1):
             self.deduct_list.append(deduct[i-1])
             self.total -= deduct[i-1][len(deduct[i-1])-1]
-        self.total += net[0][len(net[0])-1]
-        self.deduct_list.append(net[0])
+        if net:
+            self.total += net[0][len(net[0])-1]
+            self.deduct_list.append(net[0])
         return None
 
     def cal_monthly_amt(self, form, emp_id):
@@ -185,11 +189,9 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
         return result
 
     def salary_list(self, salaries):
-        cnt = 0
         cat_salary_all = []
         for category_name,amount in salaries.items():
             cat_salary = []
-            cnt += 1
             tot = 0.0
             cat_salary.append(category_name)
             for mnth in self.mnths:
@@ -205,7 +207,6 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
                     cat_salary.append('')
             cat_salary.append(tot)
             cat_salary_all.append(cat_salary)
-        cnt = 1
         return cat_salary_all
 
     def get_allow(self):
@@ -217,6 +218,6 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
     def get_total(self):
         return self.total
 
-report_sxw.report_sxw('report.salary.detail.byyear', 'yearly.salary.detail', 'hr_payroll/report/report_yearly_salary_detail.rml', parser=employees_yearly_salary_report, header='internal landscape')
+report_sxw.report_sxw('report.salary.detail.byyear', 'yearly.salary.detail', 'hr_payroll/report/report_hr_yearly_salary_detail.rml', parser=employees_yearly_salary_report, header='internal landscape')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
similarity index 92%
rename from addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.rml
rename to addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
index 0f150d56575..3a9412d7008 100644
--- a/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(842.0,595.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="hr_yearly_salary_detail_report.pdf">
+  <template pageSize="(842.0,595.0)" title="hr_yearly_salary_detail_report" author="Openerp S.A." allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="57.0" width="786" height="481"/>
     </pageTemplate>
@@ -252,7 +252,7 @@
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
     <images/>
@@ -340,8 +340,9 @@
       <font color="white"> </font>
     </para>
     <section>
-      <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]] [[ get_employee_detail((data['form']),o) ]]</para>
-      <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table4">
+    <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
+      <para style="terp_default_1">[[ get_employee_detail((data['form']),o) ]]</para>
+      <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table4">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Title</para>
@@ -400,69 +401,69 @@
         </blockTable>
         <section>
           <para style="terp_default_1">[[ repeatIn(get_allow(),'e1') ]]</para>
-          <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table6">
+          <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table6">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e1[0] ]]</para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
@@ -480,69 +481,69 @@
         </blockTable>
         <section>
           <para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
-          <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table8">
+          <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table8">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e2[0] ]]</para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="9.0">[[ (e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
diff --git a/addons/l10n_in_hr_payroll/wizard/__init__.py b/addons/l10n_in_hr_payroll/wizard/__init__.py
index 358c0cfa906..36635aec3c2 100644
--- a/addons/l10n_in_hr_payroll/wizard/__init__.py
+++ b/addons/l10n_in_hr_payroll/wizard/__init__.py
@@ -20,6 +20,6 @@
 ##############################################################################
 
 import hr_salary_employee_bymonth
-import yearly_salary_detail
+import hr_yearly_salary_detail
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/wizard/yearly_salary_detail.py b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
similarity index 100%
rename from addons/l10n_in_hr_payroll/wizard/yearly_salary_detail.py
rename to addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
diff --git a/addons/l10n_in_hr_payroll/wizard/yearly_salary_detail_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
similarity index 93%
rename from addons/l10n_in_hr_payroll/wizard/yearly_salary_detail_view.xml
rename to addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
index a2369895237..0f9cf9de7ff 100644
--- a/addons/l10n_in_hr_payroll/wizard/yearly_salary_detail_view.xml
+++ b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
@@ -23,7 +23,7 @@
         </record>
 
         <record id="action_yearly_salary_detail" model="ir.actions.act_window">
-            <field name="name">Employee Yearly Salary</field>
+            <field name="name">Payroll Register</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">yearly.salary.detail</field>
             <field name="view_type">form</field>
@@ -32,7 +32,7 @@
         </record>
 
         <menuitem
-            name="Employee Salary Statement"
+            name="Payroll Register"
             parent="hr.menu_hr_reporting_timesheet"
             action="action_yearly_salary_detail"
             sequence="250" icon="STOCK_PRINT"

From 2438b3e7ed530994c25b66f0b8fade4a200eae1f Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 3 Aug 2012 14:56:36 +0530
Subject: [PATCH 240/999] [FIX]l10n_in_hr_payroll:typo

bzr revid: kbh@tinyerp.com-20120803092636-po1r5jg1e0bgh8gc
---
 .../l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
index c642e297de5..23173dc5f8d 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
@@ -46,7 +46,7 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
         self.total = 0.00
 
     def get_periods(self, form):
-        self.mnths =[]
+        self.mnths = []
 #       Get start year-month-date and end year-month-date
         first_year = int(form['date_from'][0:4])
         last_year = int(form['date_to'][0:4])

From 562fb910cd46acc932df28a2259401266a72b83a Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 3 Aug 2012 15:38:43 +0530
Subject: [PATCH 241/999] [FIX]l10n_in_hr_payroll:replace header with footer

bzr revid: kbh@tinyerp.com-20120803100843-byyg3x1szmqtc41i
---
 .../wizard/hr_yearly_salary_detail_view.xml                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
index 0f9cf9de7ff..9540af8b332 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
+++ b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
@@ -7,11 +7,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Yearly Salary" version="7.0">
-                <header>
+                <footer>
                     <button name="print_report" string="Print" type="object" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
+                </footer>
                 <group>
                     <field name="date_from"/>
                     <field name="date_to"/>

From 6b7fda8d2b1082fed0664454a2fdf3f997413c78 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 3 Aug 2012 16:03:49 +0530
Subject: [PATCH 242/999] [FIX]l10n_in_hr_payroll:removed unnecesary if
 condition and rename variable

bzr revid: kbh@tinyerp.com-20120803103349-na0dtvidp8tn0u7v
---
 .../report/report_hr_yearly_salary_detail.py  | 66 ++++---------------
 1 file changed, 13 insertions(+), 53 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
index 23173dc5f8d..dd7282b8a68 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
@@ -116,12 +116,9 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
 
         result = []
         salaries = {}
-        tot = 0.0
+        total = 0.0
 
-        payslip_line_obj = self.pool.get('hr.payslip.line')
-
-        line_ids = payslip_line_obj.search(self.cr, self.uid, [], context=self.context)
-        lines  = payslip_line_obj.browse(self.cr, self.uid, line_ids, context=self.context)
+        line_ids = self.pool.get('hr.payslip.line').search(self.cr, self.uid, [], context=self.context)
 
         self.cr.execute('''SELECT rc.code, pl.name, sum(pl.total), \
                 to_char(date_to,'mm-yyyy') as to_date  FROM hr_payslip_line as pl \
@@ -134,51 +131,14 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
         sal = self.cr.fetchall()
 
         for x in sal:
-            if x[0] == 'BASIC':
-                if x[0] not in salaries:
-                    salaries[x[0]] = {}
-                    salaries[x[0]].update({x[1]: {x[3]: x[2]}})
-                elif x[1] not in salaries[x[0]]:
-                    salaries[x[0]][x[1]] = {}
-                    salaries[x[0]][x[1]].update({x[3]: x[2]})
-                else:
-                    salaries[x[0]][x[1]].update({x[3]: x[2]})
-            if x[0] == 'ALW':
-                if x[0] not in salaries:
-                    salaries[x[0]] = {}
-                    salaries[x[0]].update({x[1]: {x[3]: x[2]}})
-                elif x[1] not in salaries[x[0]]:
-                    salaries[x[0]][x[1]] = {}
-                    salaries[x[0]][x[1]].update({x[3]: x[2]})
-                else:
-                    salaries[x[0]][x[1]].update({x[3]: x[2]})
-            if x[0] == 'DED':
-                if x[0] not in salaries:
-                    salaries[x[0]] = {}
-                    salaries[x[0]].update({x[1]: {x[3]: x[2]}})
-                elif x[1] not in salaries[x[0]]:
-                    salaries[x[0]][x[1]] = {}
-                    salaries[x[0]][x[1]].update({x[3]: x[2]})
-                else:
-                    salaries[x[0]][x[1]].update({x[3]: x[2]})
-            if x[0] == 'GROSS':
-                if x[0] not in salaries:
-                    salaries[x[0]] = {}
-                    salaries[x[0]].update({x[1]: {x[3]: x[2]}})
-                elif x[1] not in salaries[x[0]]:
-                    salaries[x[0]][x[1]] = {}
-                    salaries[x[0]][x[1]].update({x[3]: x[2]})
-                else:
-                    salaries[x[0]][x[1]].update({x[3]: x[2]})
-            if x[0] == 'NET':
-                if x[0] not in salaries:
-                    salaries[x[0]] = {}
-                    salaries[x[0]].update({x[1]: {x[3]: x[2]}})
-                elif x[1] not in salaries[x[0]]:
-                    salaries[x[0]][x[1]] = {}
-                    salaries[x[0]][x[1]].update({x[3]: x[2]})
-                else:
-                    salaries[x[0]][x[1]].update({x[3]: x[2]})
+            if x[0] not in salaries:
+                salaries[x[0]] = {}
+                salaries[x[0]].update({x[1]: {x[3]: x[2]}})
+            elif x[1] not in salaries[x[0]]:
+                salaries[x[0]][x[1]] = {}
+                salaries[x[0]][x[1]].update({x[3]: x[2]})
+            else:
+                salaries[x[0]][x[1]].update({x[3]: x[2]})
 
         for code in ['BASIC', 'ALW', 'DED', 'GROSS', 'NET']:
             if code in salaries:
@@ -192,7 +152,7 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
         cat_salary_all = []
         for category_name,amount in salaries.items():
             cat_salary = []
-            tot = 0.0
+            total = 0.0
             cat_salary.append(category_name)
             for mnth in self.mnths:
                 if mnth <> 'None':
@@ -200,12 +160,12 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
                         mnth = '0' + str(mnth)
                     if mnth in amount and amount[mnth]:
                         cat_salary.append(amount[mnth])
-                        tot += amount[mnth]
+                        total += amount[mnth]
                     else:
                         cat_salary.append(0.00)
                 else:
                     cat_salary.append('')
-            cat_salary.append(tot)
+            cat_salary.append(total)
             cat_salary_all.append(cat_salary)
         return cat_salary_all
 

From 05f7b700dee2c9a203b5c4ac368091ff24de34ca Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 3 Aug 2012 17:18:53 +0530
Subject: [PATCH 243/999] [FIX]l10n_in_hr_payroll:query updated

bzr revid: kbh@tinyerp.com-20120803114853-7ra17yebqim6ct39
---
 .../report/report_hr_yearly_salary_detail.py  | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
index dd7282b8a68..af37c8bb3a9 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
@@ -41,9 +41,6 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
 
         self.context = context
         self.mnths = []
-        self.allow_list = []
-        self.deduct_list = []
-        self.total = 0.00
 
     def get_periods(self, form):
         self.mnths = []
@@ -113,32 +110,28 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
         return None
 
     def cal_monthly_amt(self, form, emp_id):
-
         result = []
         salaries = {}
         total = 0.0
-
-        line_ids = self.pool.get('hr.payslip.line').search(self.cr, self.uid, [], context=self.context)
-
         self.cr.execute('''SELECT rc.code, pl.name, sum(pl.total), \
                 to_char(date_to,'mm-yyyy') as to_date  FROM hr_payslip_line as pl \
                 LEFT JOIN hr_salary_rule_category AS rc on (pl.category_id = rc.id) \
                 LEFT JOIN hr_payslip as p on pl.slip_id = p.id \
                 LEFT JOIN hr_employee as emp on emp.id = p.employee_id \
-                WHERE pl.id in %s and p.employee_id = %s \
+                WHERE p.employee_id = %s \
                 GROUP BY rc.parent_id, pl.sequence, pl.id, pl.category_id,pl.name,p.date_to,rc.code \
-                ORDER BY pl.sequence, rc.parent_id''',(tuple(line_ids),emp_id))
-        sal = self.cr.fetchall()
+                ORDER BY pl.sequence, rc.parent_id''',([emp_id]))
+        salary = self.cr.fetchall()
 
-        for x in sal:
-            if x[0] not in salaries:
-                salaries[x[0]] = {}
-                salaries[x[0]].update({x[1]: {x[3]: x[2]}})
-            elif x[1] not in salaries[x[0]]:
-                salaries[x[0]][x[1]] = {}
-                salaries[x[0]][x[1]].update({x[3]: x[2]})
+        for category in salary:
+            if category[0] not in salaries:
+                salaries[category[0]] = {}
+                salaries[category[0]].update({category[1]: {category[3]: category[2]}})
+            elif category[1] not in salaries[category[0]]:
+                salaries[category[0]][category[1]] = {}
+                salaries[category[0]][category[1]].update({category[3]: category[2]})
             else:
-                salaries[x[0]][x[1]].update({x[3]: x[2]})
+                salaries[category[0]][category[1]].update({category[3]: category[2]})
 
         for code in ['BASIC', 'ALW', 'DED', 'GROSS', 'NET']:
             if code in salaries:

From fb8cedcaf469affad42a2630e3406b662680852b Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 3 Aug 2012 17:22:18 +0530
Subject: [PATCH 244/999] [REM]l10n_in_hr_payroll:unnecessary list

bzr revid: kbh@tinyerp.com-20120803115218-idsjn31q1wavlsjx
---
 .../l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
index af37c8bb3a9..8c673f1acb5 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
@@ -40,7 +40,6 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
         })
 
         self.context = context
-        self.mnths = []
 
     def get_periods(self, form):
         self.mnths = []

From 2a7f04c40c32af99d7d8216eb3906682eb9e28c0 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 7 Aug 2012 11:43:29 +0530
Subject: [PATCH 245/999] [IMP]l10n_in_hr_payroll:batch_id field added on
 advice and use it as batch reference

bzr revid: kbh@tinyerp.com-20120807061329-jtrwqgpzs4fg0kir
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py       | 2 ++
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 975d51a5306..2fddafde6e6 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -122,6 +122,7 @@ class payroll_advice(osv.osv):
         'neft': fields.boolean('NEFT Transaction', help="Check this box if your company use online transfer for salary"),
         'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank from which the salary is going to be paid"),
+        'batch_id': fields.many2one('hr.payslip.run', 'Batch', readonly=True)
     }
 
     _defaults = {
@@ -238,6 +239,7 @@ class hr_payslip_run(osv.osv):
             if run.available_advice:
                 raise osv.except_osv(_('Error !'), _("Payment advice already exists for %s, 'Set to Draft' to create a new advice.") %(run.name))
             advice_data = {
+                        'batch_id': run.id,
                         'company_id': users[0].company_id.id,
                         'name': run.name,
                         'date': run.date_end,
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index c31e7d527e7..4af0995fa92 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -136,6 +136,7 @@
                                 <field name="chaque_nos"/>
                                 <newline/>
                                 <field name="neft"/>
+                                <field name="batch_id"/>
                                 </group>
                                 <separator colspan="4" string="Letter Details"/>
                                 <field name="note" colspan="4" nolabel="1"/>

From 77cb23551b092c1746df64c290a303bb0d68b3d6 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 7 Aug 2012 11:45:55 +0530
Subject: [PATCH 246/999] [ADD/IMP]l10n_in_hr_payroll:added data for
 contribution register and used its reference in rules

bzr revid: kbh@tinyerp.com-20120807061555-n8s44w4crx2gh9pa
---
 .../data/l10n_in_hr_payroll_data.xml          | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index bccf03137be..1633b20d627 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <!-- Contribution Register -->
+
+        <record id="hr_houserent_allowance_register" model="hr.contribution.register">
+            <field name="name">House Rent Allowance Register for Metro and Non Metro city</field>
+        </record>
+
+        <record id="hr_provident_fund_employee_register" model="hr.contribution.register">
+            <field name="name">Employee's Provident Fund Register</field>
+        </record>
+
+        <record id="hr_provident_fund_employer_register" model="hr.contribution.register">
+            <field name="name">Employer's Provident Fund Register</field>
+        </record>
+
+        <record id="hr_professional_tax_deduction_register" model="hr.contribution.register">
+            <field name="name">Professional Tax Deduction Register</field>
+        </record>
+
+        <record id="hr_food_coupen_register" model="hr.contribution.register">
+            <field name="name">Food Coupen Register</field>
+        </record>
+
         <!-- Hr Salary Rules for allowance-->
 
         <record id="hr_salary_rule_da" model="hr.salary.rule">
@@ -19,6 +41,7 @@
             <field name="amount_python_compute">result=payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.50) or (contract.wage * 0.50) if (contract.city_type=='metro') else payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.40) or (contract.wage * 0.40) if (contract.city_type=='non-metro') else 0.00</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance for metro and nonmetro city</field>
+            <field name="register_id" ref="hr_houserent_allowance_register"/>
             <field name="sequence" eval="51"/>
         </record>
 
@@ -170,6 +193,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="code">FC</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">Food Coupons Allowance</field>
+            <field name="register_id" ref="hr_food_coupen_register"/>
             <field name="sequence" eval="33"/>
          </record>
 
@@ -268,6 +292,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="condition_python">result = contract.wage &gt;= 3000 </field>
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = -200 if contract.wage &gt;= 12000 else -150 if ((contract.wage &gt;= 9000) and (contract.wage &lt;= 11999)) else -80 if ((contract.wage &gt;= 6000) and (contract.wage &lt;= 8999)) else -20 if  ((contract.wage &gt;= 3000) and (contract.wage &lt;= 5999)) else -0</field>
+            <field name="register_id" ref="hr_professional_tax_deduction_register"/>
             <field eval="145" name="sequence"/>
         </record>
 
@@ -278,6 +303,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 8.33 / 100) or - (contract.wage * 8.33 / 100)</field>
             <field name= "note">Employer contribution does not become part of employee’s income and hence income tax is not payable on this part.</field>
+            <field name="register_id" ref="hr_provident_fund_employee_register"/>
             <field name="sequence" eval="150"/>
         </record>
 
@@ -390,6 +416,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) or - (contract.wage * 0.12)</field>
             <field name="sequence" eval="195"/>
+            <field name="register_id" ref="hr_provident_fund_employer_register"/>
             <field name="note">Both the employees and employer contribute to the fund at the rate of 12% of the basic wages, dearness allowance and retaining allowance, if any, payable to employees per month.</field>
         </record>
 

From 669449534323f2656656317e4c01ed9bc7b4babb Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 7 Aug 2012 14:07:34 +0530
Subject: [PATCH 247/999] [FIX]l10n_in_hr_payroll:register name changed

bzr revid: kbh@tinyerp.com-20120807083734-yhob146pybjykuex
---
 .../data/l10n_in_hr_payroll_data.xml           | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 1633b20d627..61a0b4e4352 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -4,23 +4,19 @@
         <!-- Contribution Register -->
 
         <record id="hr_houserent_allowance_register" model="hr.contribution.register">
-            <field name="name">House Rent Allowance Register for Metro and Non Metro city</field>
+            <field name="name">Register for House Rent Allowance</field>
         </record>
 
-        <record id="hr_provident_fund_employee_register" model="hr.contribution.register">
-            <field name="name">Employee's Provident Fund Register</field>
-        </record>
-
-        <record id="hr_provident_fund_employer_register" model="hr.contribution.register">
-            <field name="name">Employer's Provident Fund Register</field>
+        <record id="hr_register_provident_fund" model="hr.contribution.register">
+            <field name="name">Register for Provident Fund</field>
         </record>
 
         <record id="hr_professional_tax_deduction_register" model="hr.contribution.register">
-            <field name="name">Professional Tax Deduction Register</field>
+            <field name="name">Register for Professional Tax</field>
         </record>
 
         <record id="hr_food_coupen_register" model="hr.contribution.register">
-            <field name="name">Food Coupen Register</field>
+            <field name="name">Register for Food Coupen</field>
         </record>
 
         <!-- Hr Salary Rules for allowance-->
@@ -303,7 +299,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 8.33 / 100) or - (contract.wage * 8.33 / 100)</field>
             <field name= "note">Employer contribution does not become part of employee’s income and hence income tax is not payable on this part.</field>
-            <field name="register_id" ref="hr_provident_fund_employee_register"/>
+            <field name="register_id" ref="hr_register_provident_fund"/>
             <field name="sequence" eval="150"/>
         </record>
 
@@ -416,7 +412,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) or - (contract.wage * 0.12)</field>
             <field name="sequence" eval="195"/>
-            <field name="register_id" ref="hr_provident_fund_employer_register"/>
+            <field name="register_id" ref="hr_register_provident_fund"/>
             <field name="note">Both the employees and employer contribute to the fund at the rate of 12% of the basic wages, dearness allowance and retaining allowance, if any, payable to employees per month.</field>
         </record>
 

From 28a28a425cae868aa7af4684b251aaee30daed5f Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 7 Aug 2012 14:12:01 +0530
Subject: [PATCH 248/999] [ADD]l10n_in_hr_payroll:batch_id field added in
 search view

bzr revid: kbh@tinyerp.com-20120807084201-sp61nrnqx4bvfcm9
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 4af0995fa92..c6aa9edc29c 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -161,6 +161,7 @@
                         <field name="number"/>
                         <field name="name"/>
                         <field name="bank_id"/>
+                        <field name="batch_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">

From 1756ab23edc80fe4b49cfdb5a26a048da4ee9847 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 7 Aug 2012 15:42:04 +0530
Subject: [PATCH 249/999] [ADD] added onchange on country_id

bzr revid: bde@tinyerp.com-20120807101204-s7feg9o31fzodfty
---
 openerp/addons/base/res/res_company.py       | 9 ++++++++-
 openerp/addons/base/res/res_company_view.xml | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 4815721c758..4f65a91acc2 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -145,7 +145,14 @@ class res_company(osv.osv):
         if vat: val.append(_('VAT: ')+vat)
         if reg: val.append(_('Reg: ')+reg)
         return {'value': {'rml_footer1':' | '.join(val)}}
-
+    
+    def on_change_country(self, cr, uid, ids, country_id, context=None):
+        res_country_obj = self.pool.get('res.country')
+        if not country_id:
+            default_currency_id = self._get_euro(cr, uid, context=context)
+            return {'value': {'currency_id': default_currency_id}}
+        currency_id = res_country_obj.browse(cr, uid, country_id, context=context).currency_id.id
+        return {'value': {'currency_id': currency_id}}
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False, access_rights_uid=None):
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index c3e2501ccbb..29312fbf782 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -54,7 +54,7 @@
                                             <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
                                             <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                         </div>
-                                        <field name="country_id" placeholder="Country" class="oe_no_button"/>
+                                        <field name="country_id" placeholder="Country" class="oe_no_button" on_change="on_change_country(country_id)"/>
                                     </div>
                                     <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                                 </group>

From 116191f725f2a47d4db4811ddc9c60c6fd2ac381 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 7 Aug 2012 18:24:07 +0530
Subject: [PATCH 250/999] [IMP]l10n_in_hr_payroll:code improved

bzr revid: kbh@tinyerp.com-20120807125407-f3jhkju13qru50y0
---
 .../report/report_hr_yearly_salary_detail.py  | 70 ++++++++-----------
 1 file changed, 31 insertions(+), 39 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
index 8c673f1acb5..9b4dfbebc46 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
@@ -69,43 +69,35 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
         return [mnth_name]
 
     def get_employee(self, form):
-        result = []
-        emp_obj = self.pool.get('hr.employee')
-        emp_ids = form.get('employee_ids', [])
-        result = emp_obj.browse(self.cr,self.uid, emp_ids, context=self.context)
-        return result
+        return self.pool.get('hr.employee').browse(self.cr,self.uid, form.get('employee_ids', []), context=self.context)
 
     def get_employee_detail(self, form, obj):
         self.allow_list = []
         self.deduct_list = []
         self.total = 0.00
 
-        #for Basic Salary
-        res = self.cal_monthly_amt(form, obj.id)
-        basic = res[0]
-        if basic:
-            self.total += basic[0][len(basic[0])-1]
-            self.allow_list.append(basic[0])
-
-        #for allowance
-        allow = res[1]
-        gross = res[3]
-        for i in range(1, len(allow)+1):
-            self.allow_list.append(allow[i-1])
-            self.total += allow[i-1][len(allow[i-1])-1]
-        if gross:
-            self.total += gross[0][len(gross[0])-1]
-            self.allow_list.append(gross[0])
-
-        #for Deduction
-        deduct = res[2] 
-        net = res[4]
-        for i in range(1, len(deduct)+1):
-            self.deduct_list.append(deduct[i-1])
-            self.total -= deduct[i-1][len(deduct[i-1])-1]
-        if net:
-            self.total += net[0][len(net[0])-1]
-            self.deduct_list.append(net[0])
+        lines = []
+        lines = self.cal_monthly_amt(form, obj.id)
+        if lines:
+            for line in lines:
+                for line[0] in line:
+                    if line[0][13] > 0.0 and line[0][0] != "Net":
+                        self.total += line[0][len(line[0])-1]
+                        self.allow_list.append(line[0])
+                        if line[0][0]  == "Gross":
+                            self.allow_list.remove(line[0])
+                    if line[0][0] == "Net" or line[0][13] < 0.0:
+                        self.total += line[0][len(line[0])-1]
+                        self.deduct_list.append(line[0])
+                        if line[0][0]  == "Net":
+                            self.deduct_list.remove(line[0])
+                if line:
+                    if line[0][0]  == "Gross":
+                        gross = line[0]
+                    if line[0][0]  == "Net":
+                        net = line[0]
+            self.allow_list.append(gross)
+            self.deduct_list.append(net)
         return None
 
     def cal_monthly_amt(self, form, emp_id):
@@ -121,22 +113,22 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
                 GROUP BY rc.parent_id, pl.sequence, pl.id, pl.category_id,pl.name,p.date_to,rc.code \
                 ORDER BY pl.sequence, rc.parent_id''',([emp_id]))
         salary = self.cr.fetchall()
-
         for category in salary:
             if category[0] not in salaries:
-                salaries[category[0]] = {}
+                salaries.setdefault(category[0], {})
                 salaries[category[0]].update({category[1]: {category[3]: category[2]}})
             elif category[1] not in salaries[category[0]]:
-                salaries[category[0]][category[1]] = {}
+                salaries[category[0]].setdefault(category[1], {})
                 salaries[category[0]][category[1]].update({category[3]: category[2]})
             else:
                 salaries[category[0]][category[1]].update({category[3]: category[2]})
 
-        for code in ['BASIC', 'ALW', 'DED', 'GROSS', 'NET']:
-            if code in salaries:
-                res = self.salary_list(salaries[code])
-            else:
-                res = []
+        category_obj = self.pool.get('hr.salary.rule.category')
+        category_ids = category_obj.search(self.cr,self.uid, [], context=self.context)
+        res = []
+        for code in category_obj.read(self.cr,self.uid, category_ids, context=self.context):
+            if code['code'] in salaries:
+                res = self.salary_list(salaries[code['code']])
             result.append(res)
         return result
 

From b7e50727cc49679a43a05f37e32da20b1564ef72 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 7 Aug 2012 18:59:05 +0530
Subject: [PATCH 251/999] [IMP]l10n_in_hr_payroll:code improved

bzr revid: kbh@tinyerp.com-20120807132905-9cz330v0fmjzyjuq
---
 .../report/report_hr_yearly_salary_detail.py              | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
index 9b4dfbebc46..1e0b38101fc 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
@@ -77,6 +77,7 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
         self.total = 0.00
 
         lines = []
+        flag = False
         lines = self.cal_monthly_amt(form, obj.id)
         if lines:
             for line in lines:
@@ -93,11 +94,14 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
                             self.deduct_list.remove(line[0])
                 if line:
                     if line[0][0]  == "Gross":
+                        flag = True
                         gross = line[0]
                     if line[0][0]  == "Net":
+                        flag = True
                         net = line[0]
-            self.allow_list.append(gross)
-            self.deduct_list.append(net)
+            if flag:
+                self.allow_list.append(gross)
+                self.deduct_list.append(net)
         return None
 
     def cal_monthly_amt(self, form, emp_id):

From 3ace48df648c9c58328eb01cc8e422f40a5d80b7 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 8 Aug 2012 10:26:47 +0530
Subject: [PATCH 252/999] [FIX]l10n_in_hr_payroll:list added

bzr revid: kbh@tinyerp.com-20120808045647-b0sm9nut4kii35j0
---
 .../l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
index 1e0b38101fc..f1b7a8d93d7 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
@@ -106,6 +106,7 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
 
     def cal_monthly_amt(self, form, emp_id):
         result = []
+        res = []
         salaries = {}
         total = 0.0
         self.cr.execute('''SELECT rc.code, pl.name, sum(pl.total), \
@@ -129,7 +130,6 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
 
         category_obj = self.pool.get('hr.salary.rule.category')
         category_ids = category_obj.search(self.cr,self.uid, [], context=self.context)
-        res = []
         for code in category_obj.read(self.cr,self.uid, category_ids, context=self.context):
             if code['code'] in salaries:
                 res = self.salary_list(salaries[code['code']])

From 51441df034553f4a197ce98427c4bee78ea5af32 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 8 Aug 2012 12:34:14 +0530
Subject: [PATCH 253/999] [IMP] l10n_in_hr_payroll: Rename reports and change
 the strings add lable

bzr revid: mra@tinyerp.com-20120808070414-6cl8gi7cdh3fdpib
---
 addons/l10n_in_hr_payroll/__openerp__.py                   | 2 +-
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml    | 4 ++--
 .../wizard/hr_salary_employee_bymonth_view.xml             | 7 ++++---
 .../wizard/hr_yearly_salary_detail_view.xml                | 7 ++++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 199dc0a232c..616996bbe05 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -40,7 +40,7 @@ Indian Payroll Salary Rules.
     * Integrated with Holiday Management
     * Medical Allowance, Travel Allowance, Child Allowance, ...
     - Payroll Advice and Report
-    - Payroll Statement and Payroll Register Report
+    - Yearly Salary by Head and Yearly Salary by Employee Report
     """,
     'active': False,
     'update_xml': [
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
index 4a0c9ded0b9..7f27291051f 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
@@ -24,7 +24,7 @@
             model="hr.salary.employee.month" 
             name="salary.employee.bymonth" 
             rml="l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml"
-            string="Payroll Statement" /> 
+            string="Yearly Salary by Head" /> 
 
         <report
             auto="False" 
@@ -32,7 +32,7 @@
             model="yearly.salary.detail" 
             name="salary.detail.byyear" 
             rml="l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml"
-            string="Payroll Register" /> 
+            string="Yearly Salary by Employee" /> 
 
     </data>
 </openerp>
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
index 23308b56c7c..10088dd2265 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
@@ -6,7 +6,8 @@
             <field name="model">hr.salary.employee.month</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Print Hr monthly Employee Salary" version="7.0">
+            <form string="Employee Pay Head Breakup" version="7.0">
+                <label string="This wizard will print report which displays employees break-up of Net Head for a specified dates."/>
                 <footer>
                     <button name="print_report" string="Print" type="object" class="oe_highlight"/>
                         or
@@ -23,7 +24,7 @@
         </record>
 
         <record id="action_salary_employee_month" model="ir.actions.act_window">
-            <field name="name">Payroll Statement</field>
+            <field name="name">Yearly Salary by Head</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.salary.employee.month</field>
             <field name="view_type">form</field>
@@ -32,7 +33,7 @@
         </record>
 
         <menuitem
-            name="Payroll Statement"
+            name="Yearly Salary by Head"
             parent="hr.menu_hr_reporting_timesheet"
             sequence="200" icon="STOCK_PRINT"
             action="action_salary_employee_month"
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
index 9540af8b332..ec70e8b41e0 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
+++ b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
@@ -6,7 +6,8 @@
             <field name="model">yearly.salary.detail</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Print Yearly Salary" version="7.0">
+            <form string="Pay Head Employee Breakup" version="7.0">
+                <label string="This wizard will print report which display a pay head employee breakup for a specified dates."/>
                 <footer>
                     <button name="print_report" string="Print" type="object" class="oe_highlight"/>
                     or
@@ -23,7 +24,7 @@
         </record>
 
         <record id="action_yearly_salary_detail" model="ir.actions.act_window">
-            <field name="name">Payroll Register</field>
+            <field name="name">Yearly Salary by Employee</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">yearly.salary.detail</field>
             <field name="view_type">form</field>
@@ -32,7 +33,7 @@
         </record>
 
         <menuitem
-            name="Payroll Register"
+            name="Yearly Salary by Employee"
             parent="hr.menu_hr_reporting_timesheet"
             action="action_yearly_salary_detail"
             sequence="250" icon="STOCK_PRINT"

From 3bd4660e92f57d1bd1a8b985f2590e13db31f710 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 8 Aug 2012 12:36:12 +0530
Subject: [PATCH 254/999] [IMP] account : Convert invoice line to editable list
 and call the onchange method to set all the information.

bzr revid: mdi@tinyerp.com-20120808070612-20q3wyqkevgtjnx6
---
 addons/account/account_invoice.py       | 6 ++++++
 addons/account/account_invoice_view.xml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index b1c5db23df6..7000ca189dc 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1361,10 +1361,16 @@ class account_invoice_line(osv.osv):
         'company_id': fields.related('invoice_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
         'partner_id': fields.related('invoice_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True)
     }
+
+    def default_account_id(self, cr, uid, ids, context=None):
+        prop = self.pool.get('ir.property').get(cr, uid, 'property_account_income_categ', 'product.category', context=context)
+        return prop and prop.id or False
+
     _defaults = {
         'quantity': 1,
         'discount': 0.0,
         'price_unit': _price_unit_default,
+        'account_id': default_account_id,
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 501a50b96c2..8fbd85f2599 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -347,7 +347,7 @@
                             <field name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}">
                                 <tree string="Invoice Lines" editable="bottom">
                                     <field name="invoice_line_tax_id" invisible="1"/>
-                                    <field name="product_id" invisible="1"/>
+                                    <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                                     <field name="name"/>
                                     <field name="account_id" groups="account.group_account_user"
                                         domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]"

From 8131e1062d0f177c1b6814975c984f4fe5bffed3 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 8 Aug 2012 12:49:52 +0530
Subject: [PATCH 255/999] [IMP]l10n_in_hr_payroll:improved employees details in
 report

bzr revid: kbh@tinyerp.com-20120808071952-38uom3wvlkgwa1i7
---
 .../report/report_hr_yearly_salary_detail.rml               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
index 3a9412d7008..b4c9f43d661 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
@@ -276,19 +276,19 @@
           <para style="terp_tblheader_Details">Employee Code</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.ssnid ]]</para>
+          <para style="terp_default_9">[[ o.identification_id ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Department</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.company_id and o.company_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.department_id and o.department_id.name or '' ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Bank</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.otherid or '' ]]</para>
+          <para style="terp_default_9">[[ o.bank_account_id and o.bank_account_id.name or '' ]]</para>
         </td>
       </tr>
     </blockTable>

From 55f9a34a1e0992c708dcc2fb0f01499e76de6d48 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 8 Aug 2012 14:14:40 +0530
Subject: [PATCH 256/999] [IMP]l10n_in_hr_payroll:changed bank and designation
 of employee in report

bzr revid: kbh@tinyerp.com-20120808084440-uwyxden2svma5fak
---
 .../report/report_hr_yearly_salary_detail.rml                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
index b4c9f43d661..e97f3c96f46 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
@@ -288,7 +288,7 @@
           <para style="terp_tblheader_Details">Bank</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.bank_account_id and o.bank_account_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.bank_account_id.bank.name or '' ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -320,7 +320,7 @@
           <para style="terp_tblheader_Details">Designation</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.contract_ids and o.contract_ids[0].job_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.job_id and o.job_id.name or '' ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Phone No.</para>

From c5c07ee51764c8c9b97b4ea2005a6abdc177b1e8 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 8 Aug 2012 14:17:59 +0530
Subject: [PATCH 257/999] [IMP]l10n_in_hr_payroll:update for  bank in rml

bzr revid: kbh@tinyerp.com-20120808084759-wiyd4hglrpc8ln57
---
 .../report/report_hr_yearly_salary_detail.rml                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
index e97f3c96f46..e1fcf7251f6 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
@@ -288,7 +288,7 @@
           <para style="terp_tblheader_Details">Bank</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.bank_account_id.bank.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.bank_account_id and o.bank_account_id.bank.name or '' ]]</para>
         </td>
       </tr>
     </blockTable>

From 957022363eaf1830dca13c49d0e8fdf7632f51f7 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 9 Aug 2012 10:57:30 +0530
Subject: [PATCH 258/999] [FIX]purchase :set a po line editable

bzr revid: mma@tinyerp.com-20120809052730-4c0ykb7k54v6ju44
---
 addons/purchase/purchase_view.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 47216a11cac..9c8b508553d 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -218,11 +218,12 @@
                     <notebook>
                         <page string="Purchase Order">
                             <field name="order_line">
-                                <tree string="Purchase Order Lines">
+                                <tree string="Purchase Order Lines" editable="bottom">
+                                    <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)"/>
                                     <field name="date_planned"/>
                                     <field name="name"/>
-                                    <field name="product_qty"/>
-                                    <field name="product_uom" groups="product.group_uom"/>
+                                    <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)"/>
+                                    <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)"/>
                                     <field name="price_unit"/>
                                     <field name="price_subtotal"/>
                                 </tree>

From 3cef19e55561b8c8c7e4d80792cb28f866f50c6b Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 9 Aug 2012 12:52:35 +0530
Subject: [PATCH 259/999] [IMP/ADD]l10n_in_hr_payroll:added category field on
 wizard and improved code of report by using this field

bzr revid: kbh@tinyerp.com-20120809072235-a7a1cifqsveuu33k
---
 .../report_hr_salary_employee_bymonth.py      | 19 +++++++++----------
 .../wizard/hr_salary_employee_bymonth.py      |  3 ++-
 .../hr_salary_employee_bymonth_view.xml       |  1 +
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
index f2c693ef6d1..cf66edccbf5 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -68,20 +68,18 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
             self.mnths.append('None')
         return [mnth_name]
 
-    def get_salary(self, form, emp_id, emp_salary, total_mnths):
-        emp_obj = self.pool.get('hr.employee')
-        date_from = form.get('start_date', [])
-        date_to = form.get('end_date', [])
-        emp_ids = form.get('employee_ids', [])
-        employees  = emp_obj.browse(self.cr, self.uid, emp_ids, context=self.context)
+    def get_salary(self, form, emp_id, emp_salary, total_mnths, category):
+        ids = []
+        category_ids = form.get('category_id', [])
+        ids.append(category_ids[0])
 
-        self.cr.execute("select to_char(date_to,'mm-yyyy') as to_date ,sum(pl.total) as net \
+        self.cr.execute("select to_char(date_to,'mm-yyyy') as to_date ,sum(pl.total) \
                              from hr_payslip_line as pl \
                              left join hr_payslip as p on pl.slip_id = p.id \
                              left join hr_employee as emp on emp.id = p.employee_id \
                              left join resource_resource as r on r.id = emp.resource_id  \
-                            where pl.code = 'NET' and p.state = 'done' and p.employee_id = %s \
-                            group by r.name, p.date_to,emp.id",(emp_id,))
+                            where p.state = 'done' and p.employee_id = %s and pl.category_id in %s \
+                            group by r.name, p.date_to,emp.id",(emp_id,tuple(ids),))
         sal = self.cr.fetchall()
         salary = dict(sal)
         total = 0.0
@@ -107,6 +105,7 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
         emp_salary = []
         salary_list = []
         total_mnths=['Total', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+        category = form.get('category_id', [])
         emp_obj = self.pool.get('hr.employee')
         emp_ids = form.get('employee_ids', [])
         employees  = emp_obj.browse(self.cr, self.uid, emp_ids, context=self.context)
@@ -114,7 +113,7 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
         for emp_id in employees:
             emp_salary.append(emp_id.name)
             total = 0.0
-            emp_salary, total, total_mnths = self.get_salary(form, emp_id.id, emp_salary, total_mnths)
+            emp_salary, total, total_mnths = self.get_salary(form, emp_id.id, emp_salary, total_mnths, category)
             emp_salary.append(total)
             salary_list.append(emp_salary)
             emp_salary = []
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
index f8be2799f35..e939273d40a 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
@@ -31,6 +31,7 @@ class hr_salary_employee_bymonth(osv.osv_memory):
         'start_date': fields.date('Start Date', required=True),
         'end_date': fields.date('End Date', required=True),
         'employee_ids': fields.many2many('hr.employee', 'payroll_year_rel', 'payroll_year_id', 'employee_id', 'Employees', required=True),
+        'category_id': fields.many2one('hr.salary.rule.category', 'Category', required=True),
     }
 
     _defaults = {
@@ -51,7 +52,7 @@ class hr_salary_employee_bymonth(osv.osv_memory):
             context = {}
         datas = {'ids': context.get('active_ids', [])}
 
-        res = self.read(cr, uid, ids, ['employee_ids',  'start_date', 'end_date'], context=context)
+        res = self.read(cr, uid, ids, ['category_id', 'employee_ids', 'start_date', 'end_date'], context=context)
         res = res and res[0] or {}
         datas.update({'form': res})
         return {
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
index 10088dd2265..e05519b08db 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
@@ -16,6 +16,7 @@
                 <group>
                     <field name="start_date"/>
                     <field name="end_date"/>
+                    <field name="category_id"/>
                     <separator string="Employees" />
                     <field name="employee_ids"  nolabel="1" colspan="4"/>
                 </group>

From 9c87c50576107c93bcff650f1cedac5a78da93bb Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 9 Aug 2012 14:12:38 +0530
Subject: [PATCH 260/999] [IMP]l10n_in_hr_payroll:code improved

bzr revid: kbh@tinyerp.com-20120809084238-h6vbx225ed3mxlv1
---
 .../report/report_hr_salary_employee_bymonth.py   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
index cf66edccbf5..27f46d1972c 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -68,18 +68,18 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
             self.mnths.append('None')
         return [mnth_name]
 
-    def get_salary(self, form, emp_id, emp_salary, total_mnths, category):
-        ids = []
-        category_ids = form.get('category_id', [])
-        ids.append(category_ids[0])
+    def get_salary(self, form, emp_id, emp_salary, total_mnths):
+        categories = form.get('category_id', [])
+        category_ids = []
+        category_ids.append(categories[0])
 
         self.cr.execute("select to_char(date_to,'mm-yyyy') as to_date ,sum(pl.total) \
                              from hr_payslip_line as pl \
                              left join hr_payslip as p on pl.slip_id = p.id \
                              left join hr_employee as emp on emp.id = p.employee_id \
                              left join resource_resource as r on r.id = emp.resource_id  \
-                            where p.state = 'done' and p.employee_id = %s and pl.category_id in %s \
-                            group by r.name, p.date_to,emp.id",(emp_id,tuple(ids),))
+                            where p.state = 'done' and p.employee_id = %s and pl.category_id = %s \
+                            group by r.name, p.date_to,emp.id",(emp_id,tuple(category_ids),))
         sal = self.cr.fetchall()
         salary = dict(sal)
         total = 0.0
@@ -105,7 +105,6 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
         emp_salary = []
         salary_list = []
         total_mnths=['Total', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-        category = form.get('category_id', [])
         emp_obj = self.pool.get('hr.employee')
         emp_ids = form.get('employee_ids', [])
         employees  = emp_obj.browse(self.cr, self.uid, emp_ids, context=self.context)
@@ -113,7 +112,7 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
         for emp_id in employees:
             emp_salary.append(emp_id.name)
             total = 0.0
-            emp_salary, total, total_mnths = self.get_salary(form, emp_id.id, emp_salary, total_mnths, category)
+            emp_salary, total, total_mnths = self.get_salary(form, emp_id.id, emp_salary, total_mnths)
             emp_salary.append(total)
             salary_list.append(emp_salary)
             emp_salary = []

From 1a36733f5be49a3de6d45548cf5b4f41caad7ceb Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 9 Aug 2012 14:14:30 +0530
Subject: [PATCH 261/999] [IMP]hr_expense : made expense line editable

bzr revid: cha@tinyerp.com-20120809084430-fvhy9nfph9xiwwna
---
 addons/hr_expense/hr_expense.py       | 29 ++++++++++++++++++++++-----
 addons/hr_expense/hr_expense_view.xml | 16 +++++++++++++--
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index b1192701dfb..74eac5d99c2 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -253,15 +253,23 @@ class hr_expense_line(osv.osv):
         res = dict(cr.fetchall())
         return res
 
+    def _get_uom_id(self, cr, uid, context=None):
+        try:
+            proxy = self.pool.get('ir.model.data')
+            result = proxy.get_object_reference(cr, uid, 'product', 'product_uom_unit')
+            return result[1]
+        except Exception, ex:
+            return False
+
     _columns = {
         'name': fields.char('Expense Note', size=128, required=True),
         'date_value': fields.date('Date', required=True),
         'expense_id': fields.many2one('hr.expense.expense', 'Expense', ondelete='cascade', select=True),
         'total_amount': fields.function(_amount, string='Total', digits_compute=dp.get_precision('Account')),
         'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Account')),
-        'unit_quantity': fields.float('Quantities' ),
+        'unit_quantity': fields.float('Quantities'),
         'product_id': fields.many2one('product.product', 'Product', domain=[('hr_expense_ok','=',True)]),
-        'uom_id': fields.many2one('product.uom', 'Unit of Measure'),
+        'uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True),
         'description': fields.text('Description'),
         'analytic_account': fields.many2one('account.analytic.account','Analytic account'),
         'ref': fields.char('Reference', size=32),
@@ -270,20 +278,31 @@ class hr_expense_line(osv.osv):
     _defaults = {
         'unit_quantity': 1,
         'date_value': lambda *a: time.strftime('%Y-%m-%d'),
+        'uom_id': _get_uom_id,
     }
     _order = "sequence, date_value desc"
 
-    def onchange_product_id(self, cr, uid, ids, product_id, uom_id, employee_id, context=None):
+    def onchange_product_id(self, cr, uid, ids, product_id, context=None):
         res = {}
         if product_id:
             product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             res['name'] = product.name
             amount_unit = product.price_get('standard_price')[product.id]
             res['unit_amount'] = amount_unit
-            if not uom_id:
-                res['uom_id'] = product.uom_id.id
+            res['uom_id'] = product.uom_id.id
         return {'value': res}
 
+    def onchange_uom(self, cr, uid, ids, product_id, uom_id, context=None):
+        res = {'value':{}}
+        if product_id:
+            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            uom = self.pool.get('product.uom').browse(cr, uid, uom_id, context=context)
+            if uom.category_id.id != product.uom_id.category_id.id:
+                res['warning'] = {'title': _('Warning'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure')}
+                uom_id = product.uom_id.id
+        res['value'].update({'uom_id': uom_id})
+        return res
+
 hr_expense_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 67c08ee8a65..57b7a4cc37f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -92,7 +92,7 @@
                                 <form string="Expense Lines" version="7.0">
                                     <group>
                                         <group>
-                                            <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/>
+                                            <field name="product_id" on_change="onchange_product_id(product_id, context)" context="{'default_hr_expense_ok':1}"/>
                                             <field name="name"/>
                                             <field name="ref"/>
                                             <field domain="[('type','=','normal')]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
@@ -102,12 +102,24 @@
                                             <label for="unit_quantity"/>
                                             <div>
                                                 <field name="unit_quantity" class="oe_inline"/> 
-                                                <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" class="oe_inline"/>
+                                                <field name="uom_id" on_change="onchange_uom(product_id, uom_id, context)" class="oe_inline"/>
                                             </div>
                                             <field name="date_value" />
                                         </group>
                                     </group>
                                 </form>
+                                <tree string="Expense Lines" editable="bottom">
+                                    <field name="sequence" invisible="1"/>
+                                    <field name="product_id" on_change="onchange_product_id(product_id, context)" context="{'default_hr_expense_ok':1}"/>
+                                    <field name="date_value" string="Expense Date"/>
+                                    <field name="name" invisible="1"/>
+                                    <field name="ref"/>
+                                    <field domain="[('type','in',['normal','contract']), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
+                                    <field name="uom_id" on_change="onchange_uom(product_id, uom_id, context)"/>
+                                    <field name="unit_amount"/>
+                                    <field name="unit_quantity"/>
+                                    <field name="total_amount" sum="Total"/>
+                                </tree>
                             </field>
                             <separator string="Notes"/>
                             <field name="note" placeholder="Free Notes"/>

From 4cc8dce4ec176928cf7d092f587f9c1b6ec9db75 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 9 Aug 2012 16:21:03 +0530
Subject: [PATCH 262/999] [IMP] hr_expense : added condition to function

bzr revid: cha@tinyerp.com-20120809105103-tm0m7g854zglxfrg
---
 addons/hr_expense/hr_expense.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 74eac5d99c2..d822d466901 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -294,13 +294,14 @@ class hr_expense_line(osv.osv):
 
     def onchange_uom(self, cr, uid, ids, product_id, uom_id, context=None):
         res = {'value':{}}
-        if product_id:
-            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            uom = self.pool.get('product.uom').browse(cr, uid, uom_id, context=context)
-            if uom.category_id.id != product.uom_id.category_id.id:
-                res['warning'] = {'title': _('Warning'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure')}
-                uom_id = product.uom_id.id
-        res['value'].update({'uom_id': uom_id})
+        if uom_id:
+            if product_id:
+                product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+                uom = self.pool.get('product.uom').browse(cr, uid, uom_id, context=context)
+                if uom.category_id.id != product.uom_id.category_id.id:
+                    res['warning'] = {'title': _('Warning'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure')}
+                    uom_id = product.uom_id.id
+            res['value'].update({'uom_id': uom_id})
         return res
 
 hr_expense_line()

From 25e8f30e2df5d65a07df8000631ad43e0c0b04b8 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 9 Aug 2012 16:30:10 +0530
Subject: [PATCH 263/999] [FIX]l10n_in_hr_payroll:default category set

bzr revid: kbh@tinyerp.com-20120809110010-7v74el735iu6lhe3
---
 .../report/report_hr_salary_employee_bymonth.py            | 7 ++-----
 .../wizard/hr_salary_employee_bymonth.py                   | 4 ++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
index 27f46d1972c..7a414b4d509 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -69,17 +69,14 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
         return [mnth_name]
 
     def get_salary(self, form, emp_id, emp_salary, total_mnths):
-        categories = form.get('category_id', [])
-        category_ids = []
-        category_ids.append(categories[0])
-
+        categories = form.get('category_id', [])[0]
         self.cr.execute("select to_char(date_to,'mm-yyyy') as to_date ,sum(pl.total) \
                              from hr_payslip_line as pl \
                              left join hr_payslip as p on pl.slip_id = p.id \
                              left join hr_employee as emp on emp.id = p.employee_id \
                              left join resource_resource as r on r.id = emp.resource_id  \
                             where p.state = 'done' and p.employee_id = %s and pl.category_id = %s \
-                            group by r.name, p.date_to,emp.id",(emp_id,tuple(category_ids),))
+                            group by r.name, p.date_to,emp.id",(emp_id,categories,))
         sal = self.cr.fetchall()
         salary = dict(sal)
         total = 0.0
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
index e939273d40a..94082517b83 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
@@ -34,9 +34,13 @@ class hr_salary_employee_bymonth(osv.osv_memory):
         'category_id': fields.many2one('hr.salary.rule.category', 'Category', required=True),
     }
 
+    def _get_default_category(self, cr, uid, context=None):
+        return self.pool.get('hr.salary.rule.category').search(cr, uid, [('code', '=', 'NET')], context=context)
+
     _defaults = {
          'start_date': lambda *a: time.strftime('%Y-01-01'),
          'end_date': lambda *a: time.strftime('%Y-%m-%d'),
+         'category_id': _get_default_category
     }
 
     def print_report(self, cr, uid, ids, context=None):

From 4b9b862ea532da084cd18acc988acc3ea64423f0 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 9 Aug 2012 16:34:15 +0530
Subject: [PATCH 264/999] [FIX]l10n_in_hr_payroll:category_id removed from res

bzr revid: kbh@tinyerp.com-20120809110415-hsu7knpuz2kzx6ya
---
 addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
index 94082517b83..22004c21a6d 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
@@ -56,7 +56,7 @@ class hr_salary_employee_bymonth(osv.osv_memory):
             context = {}
         datas = {'ids': context.get('active_ids', [])}
 
-        res = self.read(cr, uid, ids, ['category_id', 'employee_ids', 'start_date', 'end_date'], context=context)
+        res = self.read(cr, uid, ids, ['employee_ids', 'start_date', 'end_date'], context=context)
         res = res and res[0] or {}
         datas.update({'form': res})
         return {

From 5fb76192cd088e6d68b672d1c6db63053014dd40 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 9 Aug 2012 16:48:51 +0530
Subject: [PATCH 265/999] [FIX]l10n_in_hr_payroll:removed list from read

bzr revid: kbh@tinyerp.com-20120809111851-9hxicpudhsdj0jvb
---
 addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py | 2 +-
 addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
index 22004c21a6d..59ec95db0d4 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
@@ -56,7 +56,7 @@ class hr_salary_employee_bymonth(osv.osv_memory):
             context = {}
         datas = {'ids': context.get('active_ids', [])}
 
-        res = self.read(cr, uid, ids, ['employee_ids', 'start_date', 'end_date'], context=context)
+        res = self.read(cr, uid, ids, context=context)
         res = res and res[0] or {}
         datas.update({'form': res})
         return {
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
index 6efceb875db..16bfd63bdc9 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
@@ -52,7 +52,7 @@ class yearly_salary_detail(osv.osv_memory):
             context = {}
         datas = {'ids': context.get('active_ids', [])}
 
-        res = self.read(cr, uid, ids, ['employee_ids', 'date_from', 'date_to'], context=context)
+        res = self.read(cr, uid, ids, context=context)
         res = res and res[0] or {}
         datas.update({'form': res})
         return {

From b34767381b64dc5ec4f6b87b23b1869ae6938fce Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 10 Aug 2012 09:35:13 +0200
Subject: [PATCH 266/999] [ADD] fields fetching and filtering method for import

bzr revid: xmo@openerp.com-20120810073513-zidmkuw6yjhtuwpj
---
 addons/base_import/__init__.py         |   2 +
 addons/base_import/__openerp__.py      |  30 ++++++
 addons/base_import/models.py           | 127 +++++++++++++++++++++++++
 addons/base_import/tests/__init__.py   |   3 +
 addons/base_import/tests/models.py     |  92 ++++++++++++++++++
 addons/base_import/tests/test_cases.py |  73 ++++++++++++++
 6 files changed, 327 insertions(+)
 create mode 100644 addons/base_import/__init__.py
 create mode 100644 addons/base_import/__openerp__.py
 create mode 100644 addons/base_import/models.py
 create mode 100644 addons/base_import/tests/__init__.py
 create mode 100644 addons/base_import/tests/models.py
 create mode 100644 addons/base_import/tests/test_cases.py

diff --git a/addons/base_import/__init__.py b/addons/base_import/__init__.py
new file mode 100644
index 00000000000..f0736de3bd1
--- /dev/null
+++ b/addons/base_import/__init__.py
@@ -0,0 +1,2 @@
+import models
+import tests.models
diff --git a/addons/base_import/__openerp__.py b/addons/base_import/__openerp__.py
new file mode 100644
index 00000000000..7f117349ba9
--- /dev/null
+++ b/addons/base_import/__openerp__.py
@@ -0,0 +1,30 @@
+{
+    'name': 'Base import',
+    'description': """
+New extensible file import for OpenERP
+======================================
+
+Re-implement openerp's file import system:
+
+* Server side, the previous system forces most of the logic into the
+  client which duplicates the effort (between clients), makes the
+  import system much harder to use without a client (direct RPC or
+  other forms of automation) and makes knowledge about the
+  import/export system much harder to gather as it is spread over
+  3+ different projects.
+
+* In a more extensible manner, so users and partners can build their
+  own front-end to import from other file formats (e.g. OpenDocument
+  files) which may be simpler to handle in their work flow or from
+  their data production sources.
+
+* In a module, so that administrators and users of OpenERP who do not
+  need or want an online import can avoid it being available to users.
+""",
+    'category': 'Uncategorized',
+    'website': 'http://www.openerp.com',
+    'author': 'OpenERP SA',
+    'depends': ['base'],
+    'installable': True,
+    'auto_install': False, # set to true and allow uninstall?
+}
diff --git a/addons/base_import/models.py b/addons/base_import/models.py
new file mode 100644
index 00000000000..a5e2678cd73
--- /dev/null
+++ b/addons/base_import/models.py
@@ -0,0 +1,127 @@
+import csv
+import itertools
+
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from StringIO import StringIO
+
+from openerp.osv import orm, fields
+from openerp.tools.translate import _
+
+FIELDS_RECURSION_LIMIT = 2
+class ir_import(orm.TransientModel):
+    _name = 'base_import.import'
+
+    _columns = {
+        'res_model': fields.char('Model', size=64),
+        'file': fields.binary('File'),
+        'file_name': fields.char('File Name', size=None),
+    }
+
+    def get_fields(self, cr, uid, model, context=None,
+                   depth=FIELDS_RECURSION_LIMIT):
+        """ Recursively get fields for the provided model (through
+        fields_get) and filter them according to importability
+
+        The output format is a list of ``Field``, with ``Field``
+        defined as:
+
+        .. class:: Field
+
+            .. attribute:: id (str)
+
+                A non-unique identifier for the field, used to compute
+                the span of the ``required`` attribute: if multiple
+                ``required`` fields have the same id, only one of them
+                is necessary.
+
+            .. attribute:: name (str)
+
+                The field's logical (OpenERP) name within the scope of
+                its parent.
+
+            .. attribute:: string (str)
+
+                The field's human-readable name (``@string``)
+
+            .. attribute:: required (bool)
+
+                Whether the field is marked as required in the
+                model. Clients must provide non-empty import values
+                for all required fields or the import will error out.
+
+            .. attribute:: fields (list(Field))
+
+                The current field's subfields. The database and
+                external identifiers for m2o and m2m fields; a
+                filtered and transformed fields_get for o2m fields (to
+                a variable depth defined by ``depth``).
+
+                Fields with no sub-fields will have an empty list of
+                sub-fields.
+
+        :param str model: name of the model to get fields form
+        :param int landing: depth of recursion into o2m fields
+        """
+        fields = [{
+            'id': 'id',
+            'name': 'id',
+            'string': _("External ID"),
+            'required': False,
+            'fields': [],
+        }]
+        fields_got = self.pool[model].fields_get(cr, uid, context=context)
+        for name, field in fields_got.iteritems():
+            if field.get('readonly'):
+                states = field.get('states')
+                if not states:
+                    continue
+                # states = {state: [(attr, value), (attr2, value2)], state2:...}
+                if not any(attr == 'readonly' and value is False
+                           for attr, value in itertools.chain.from_iterable(
+                                states.itervalues())):
+                    continue
+
+            f = {
+                'id': name,
+                'name': name,
+                'string': field['string'],
+                # Y U NO ALWAYS HAVE REQUIRED
+                'required': bool(field.get('required')),
+                'fields': [],
+            }
+
+            if field['type'] in ('many2many', 'many2one'):
+                f['fields'] = [
+                    dict(f, name='id', string=_("External ID")),
+                    dict(f, name='.id', string=_("Database ID")),
+                ]
+            elif field['type'] == 'one2many' and depth:
+                f['fields'] = self.get_fields(
+                    cr, uid, field['relation'], context=context, depth=depth-1)
+
+            fields.append(f)
+
+        return fields
+
+    def parse_preview(self, cr, uid, id, options, count=10, context=None):
+        """ Generates a preview of the uploaded files, and performs
+        fields-matching between the import's file data and the model's
+        columns.
+
+        :param id: identifier of the import
+        :param int count: number of preview lines to generate
+        :param dict options: format-specific options
+        :returns: (fields, matches, preview)
+        :rtype: (dict(str: dict(...)), dict(str, str), list(list(str)))
+        """
+        record = self.browse(cr, uid, id, context=context)
+        # recursive fields_get (cache based on res_model?)
+        fields = record.get_fields(record.res_model)
+        import pprint
+        pprint.pprint(fields)
+        # extract title row?
+        #    match title row to fields_ge
+        # Extract first $count rows
+        # return triplet
diff --git a/addons/base_import/tests/__init__.py b/addons/base_import/tests/__init__.py
new file mode 100644
index 00000000000..abef28c8ca1
--- /dev/null
+++ b/addons/base_import/tests/__init__.py
@@ -0,0 +1,3 @@
+from . import test_cases
+
+checks = [test_cases]
diff --git a/addons/base_import/tests/models.py b/addons/base_import/tests/models.py
new file mode 100644
index 00000000000..2eeea1543d8
--- /dev/null
+++ b/addons/base_import/tests/models.py
@@ -0,0 +1,92 @@
+from openerp.osv import orm, fields
+
+def name(n): return 'base_import.tests.models.%s' % n
+
+class char(orm.Model):
+    _name = name('char')
+
+    _columns = {
+        'value': fields.char('unknown', size=None)
+    }
+
+class char_required(orm.Model):
+    _name = name('char.required')
+
+    _columns = {
+        'value': fields.char('unknown', size=None, required=True)
+    }
+
+class char_readonly(orm.Model):
+    _name = name('char.readonly')
+
+    _columns = {
+        'value': fields.char('unknown', size=None, readonly=True)
+    }
+
+class char_states(orm.Model):
+    _name = name('char.states')
+
+    _columns = {
+        'value': fields.char('unknown', size=None, readonly=True, states={'draft': [('readonly', False)]})
+    }
+
+class char_noreadonly(orm.Model):
+    _name = name('char.noreadonly')
+
+    _columns = {
+        'value': fields.char('unknown', size=None, readonly=True, states={'draft': [('invisible', True)]})
+    }
+
+class char_stillreadonly(orm.Model):
+    _name = name('char.stillreadonly')
+
+    _columns = {
+        'value': fields.char('unknown', size=None, readonly=True, states={'draft': [('readonly', True)]})
+    }
+
+# TODO: complex field (m2m, o2m, m2o)
+class m2o(orm.Model):
+    _name = name('m2o')
+
+    _columns = {
+        'value': fields.many2one(name('m2o.related'))
+    }
+class m2o_related(orm.Model):
+    _name = name('m2o.related')
+
+    _columns = {
+        'value': fields.integer()
+    }
+    _defaults = {
+        'value': 42
+    }
+
+class m2o_required(orm.Model):
+    _name = name('m2o.required')
+
+    _columns = {
+        'value': fields.many2one(name('m2o.required.related'), required=True)
+    }
+class m2o_required_related(orm.Model):
+    _name = name('m2o.required.related')
+
+    _columns = {
+        'value': fields.integer()
+    }
+    _defaults = {
+        'value': 42
+    }
+
+class o2m(orm.Model):
+    _name = name('o2m')
+
+    _columns = {
+        'value': fields.one2many(name('o2m.child'), 'parent_id')
+    }
+class o2m_child(orm.Model):
+    _name = name('o2m.child')
+
+    _columns = {
+        'parent_id': fields.many2one(name('o2m')),
+        'value': fields.integer()
+    }
diff --git a/addons/base_import/tests/test_cases.py b/addons/base_import/tests/test_cases.py
new file mode 100644
index 00000000000..d415c348f30
--- /dev/null
+++ b/addons/base_import/tests/test_cases.py
@@ -0,0 +1,73 @@
+from openerp.tests.common import TransactionCase
+
+ID_FIELD = {'id': 'id', 'name': 'id', 'string': "External ID", 'required': False, 'fields': []}
+def make_field(name='value', string='unknown', required=False, fields=[]):
+    return [
+        ID_FIELD,
+        {'id': name, 'name': name, 'string': string, 'required': required, 'fields': fields},
+    ]
+
+class test_basic_fields(TransactionCase):
+    def get_fields(self, field):
+        return self.registry('base_import.import')\
+            .get_fields(self.cr, self.uid, 'base_import.tests.models.' + field)
+
+    def test_base(self):
+        """ A basic field is not required """
+        self.assertEqual(self.get_fields('char'), make_field())
+
+    def test_required(self):
+        """ Required fields should be flagged (so they can be fill-required) """
+        self.assertEqual(self.get_fields('char.required'), make_field(required=True))
+
+    def test_readonly(self):
+        """ Readonly fields should be filtered out"""
+        self.assertEqual(self.get_fields('char.readonly'), [ID_FIELD])
+
+    def test_readonly_states(self):
+        """ Readonly fields with states should not be filtered out"""
+        self.assertEqual(self.get_fields('char.states'), make_field())
+
+    def test_readonly_states_noreadonly(self):
+        """ Readonly fields with states having nothing to do with
+        readonly should still be filtered out"""
+        self.assertEqual(self.get_fields('char.noreadonly'), [ID_FIELD])
+
+    def test_readonly_states_stillreadonly(self):
+        """ Readonly fields with readonly states leaving them readonly
+        always... filtered out"""
+        self.assertEqual(self.get_fields('char.stillreadonly'), [ID_FIELD])
+
+    def test_m2o(self):
+        """ M2O fields should allow import of themselves (name_get),
+        their id and their xid"""
+        self.assertEqual(self.get_fields('m2o'), make_field(fields=[
+            {'id': 'value', 'name': 'id', 'string': 'External ID', 'required': False, 'fields': []},
+            {'id': 'value', 'name': '.id', 'string': 'Database ID', 'required': False, 'fields': []},
+        ]))
+    
+    def test_m2o_required(self):
+        """ If an m2o field is required, its three sub-fields are
+        required as well (the client has to handle that: requiredness
+        is id-based)
+        """
+        self.assertEqual(self.get_fields('m2o.required'), make_field(required=True, fields=[
+            {'id': 'value', 'name': 'id', 'string': 'External ID', 'required': True, 'fields': []},
+            {'id': 'value', 'name': '.id', 'string': 'Database ID', 'required': True, 'fields': []},
+        ]))
+
+class test_o2m(TransactionCase):
+    def get_fields(self, field):
+        return self.registry('base_import.import')\
+            .get_fields(self.cr, self.uid, 'base_import.tests.models.' + field)
+
+    def test_shallow(self):
+        self.assertEqual(self.get_fields('o2m'), make_field(fields=[
+            {'id': 'id', 'name': 'id', 'string': 'External ID', 'required': False, 'fields': []},
+            # FIXME: should reverse field be ignored?
+            {'id': 'parent_id', 'name': 'parent_id', 'string': 'unknown', 'required': False, 'fields': [
+                {'id': 'parent_id', 'name': 'id', 'string': 'External ID', 'required': False, 'fields': []},
+                {'id': 'parent_id', 'name': '.id', 'string': 'Database ID', 'required': False, 'fields': []},
+            ]},
+            {'id': 'value', 'name': 'value', 'string': 'unknown', 'required': False, 'fields': []},
+        ]))

From d68a21b0f2c3a0f4424f66d0e3fbd62c17d2e97a Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 13 Aug 2012 12:45:30 +0530
Subject: [PATCH 267/999] [IMP]l10n_in_hr_payroll:category name added in report

bzr revid: kbh@tinyerp.com-20120813071530-tsfqlsg08qkjs7s5
---
 .../report/report_hr_salary_employee_bymonth.rml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
index 9d1b4cb0e83..1f0a4b74896 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
@@ -114,7 +114,7 @@
   </stylesheet>
   <story>
     <para style="P1">Yearly Salary Details </para>
-    <para style="P5">From [[ formatLang(data['form']['start_date'], date=True) ]] To [[ formatLang(data['form']['end_date'], date=True) ]]</para>
+    <para style="P5">From [[ formatLang(data['form']['start_date'], date=True) ]] To [[ formatLang(data['form']['end_date'], date=True) ]] [[ (data['form']['category_id'][1]) ]] Category </para>
     <para style="P6">
       <font color="white"> </font>
     </para>

From 226e281b554b6298b10c7648c078741af1db57c9 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 13 Aug 2012 13:06:00 +0530
Subject: [PATCH 268/999] [IMP]l10n_in_hr_payroll:string added

bzr revid: kbh@tinyerp.com-20120813073600-g23vkk2h9sviuvr0
---
 .../report/report_hr_salary_employee_bymonth.rml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
index 1f0a4b74896..8293edfafcb 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
@@ -114,7 +114,7 @@
   </stylesheet>
   <story>
     <para style="P1">Yearly Salary Details </para>
-    <para style="P5">From [[ formatLang(data['form']['start_date'], date=True) ]] To [[ formatLang(data['form']['end_date'], date=True) ]] [[ (data['form']['category_id'][1]) ]] Category </para>
+    <para style="P5">From [[ formatLang(data['form']['start_date'], date=True) ]] To [[ formatLang(data['form']['end_date'], date=True) ]] of  [[ (data['form']['category_id'][1]) ]] Category </para>
     <para style="P6">
       <font color="white"> </font>
     </para>

From e63c4f84e936dbed94a19a659ddc5f47801366de Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 13 Aug 2012 14:13:17 +0530
Subject: [PATCH 269/999] [FIX]l10n_in_hr_payroll:underline on date and
 category

bzr revid: kbh@tinyerp.com-20120813084317-2eszak00jfmjukz5
---
 .../report/report_hr_salary_employee_bymonth.rml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
index 8293edfafcb..8f2a57d2018 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
@@ -114,7 +114,7 @@
   </stylesheet>
   <story>
     <para style="P1">Yearly Salary Details </para>
-    <para style="P5">From [[ formatLang(data['form']['start_date'], date=True) ]] To [[ formatLang(data['form']['end_date'], date=True) ]] of  [[ (data['form']['category_id'][1]) ]] Category </para>
+    <para style="P5">From <u>[[ formatLang(data['form']['start_date'], date=True) ]]</u> To <u>[[ formatLang(data['form']['end_date'], date=True) ]]</u> of <u>[[ (data['form']['category_id'][1]) ]]</u> Category</para>
     <para style="P6">
       <font color="white"> </font>
     </para>

From 5e0f7094105b8722f3d5b0007f46188be095d888 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Mon, 13 Aug 2012 11:10:47 +0200
Subject: [PATCH 270/999] [IMP] views: allow create/delete/edit attribte on
 form/tree/kanban views, automatically set the attributes from access rights.

bzr revid: vmt@openerp.com-20120813091047-vqjk3an52dfzbhqe
---
 openerp/addons/base/rng/view.rng | 8 ++++++++
 openerp/osv/orm.py               | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index c583040495b..c56892d7a07 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -172,6 +172,9 @@
     <rng:define name="form">
         <rng:element name="form">
             <rng:ref name="overload"/>
+            <rng:optional><rng:attribute name="create" /></rng:optional>
+            <rng:optional><rng:attribute name="delete" /></rng:optional>
+            <rng:optional><rng:attribute name="edit" /></rng:optional>
             <rng:optional><rng:attribute name="string"/></rng:optional>
             <rng:optional><rng:attribute name="type"/></rng:optional>
             <rng:optional><rng:attribute name="link"/></rng:optional>
@@ -220,6 +223,8 @@
                 <rng:attribute name="default_group_by" />
             </rng:optional>
             <rng:optional><rng:attribute name="create" /></rng:optional>
+            <rng:optional><rng:attribute name="delete" /></rng:optional>
+            <rng:optional><rng:attribute name="edit" /></rng:optional>
             <rng:optional><rng:attribute name="quick_create" /></rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field"/>
@@ -235,6 +240,9 @@
     <rng:define name="tree">
         <rng:element name="tree">
             <rng:ref name="overload"/>
+            <rng:optional><rng:attribute name="create" /></rng:optional>
+            <rng:optional><rng:attribute name="delete" /></rng:optional>
+            <rng:optional><rng:attribute name="edit" /></rng:optional>
             <rng:optional><rng:attribute name="string"/></rng:optional>
             <rng:optional><rng:attribute name="colors"/></rng:optional>
             <rng:optional><rng:attribute name="fonts"/></rng:optional>
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index d8861a20c26..b359c135d00 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1830,6 +1830,10 @@ class BaseModel(object):
             fields = self.fields_get(cr, user, None, context)
         fields_def = self.__view_look_dom(cr, user, node, view_id, False, fields, context=context)
         node = self._disable_workflow_buttons(cr, user, node)
+        if node.tag in ('kanban', 'tree', 'form'):
+            for a, b in (('create', 'check_create'), ('delete', 'check_unlink'), ('edit', 'check_write')):
+                if not node.get(a) and not getattr(self, b)(cr, user, raise_exception=False):
+                    node.set(a, 'false')
         arch = etree.tostring(node, encoding="utf-8").replace('\t', '')
         for k in fields.keys():
             if k not in fields_def:

From c590ca43b7e263ee0ebd9f2df958c4365e762a7c Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Mon, 13 Aug 2012 15:05:35 +0530
Subject: [PATCH 271/999] [FIX] l10n_in_hr_payrol: If bank account number not
 exist for employeereturn empty char instead of null

bzr revid: mra@tinyerp.com-20120813093535-eer0jjfye9kvhmo5
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 2fddafde6e6..da75c543f1f 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -279,7 +279,7 @@ class payroll_advice_line(osv.osv):
         if not employee_id:
             return {'value': res}
         employee = hr_obj.browse(cr, uid, [employee_id], context=context)[0]
-        res.update({'name': employee.bank_account_id.acc_number , 'ifsc_code': employee.bank_account_id.bank_bic})
+        res.update({'name': employee.bank_account_id.acc_number , 'ifsc_code': employee.bank_account_id.bank_bic or ''})
         return {'value': res}
 
     _name = 'hr.payroll.advice.line'

From 08460d4dcd7a11831da09d47c5480027cbd72ae9 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 13 Aug 2012 17:51:17 +0530
Subject: [PATCH 272/999] [IMP]implemented payslip batch yml

bzr revid: kbh@tinyerp.com-20120813122117-qlfgnep0z50ko7ql
---
 .../test/payment_advice_batch.yml             | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml b/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
index e69de29bb2d..49d4ae9a723 100644
--- a/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
+++ b/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
@@ -0,0 +1,52 @@
+-
+  In order to test Payslip Bacth I create New Payslip Batch
+-
+  I want to generate a payslip from Payslip run.
+-
+  !record {model: hr.payslip.run, id: hr_payslip_run_forAdvice}:
+    name: Payslip Batch for August
+-
+  I create record for generating the payslip for this Payslip run.
+-
+  !record {model: hr.payslip.employees, id: hr_payslip_employees}:
+    employee_ids:
+      - hr_payroll.hr_employee_bonamy0
+-
+  I generate the payslip by clicking on Generat button wizard.
+-
+  !python {model: hr.payslip.employees}: |
+     self.compute_sheet(cr, uid, [ref('hr_payslip_employees')], context={'active_id': ref('hr_payslip_run_forAdvice')})
+-
+  I check that the Payslip Batch is in "Draft"
+-
+  !assert {model: hr.payslip.run, id: hr_payslip_run_forAdvice}:
+    - state == 'draft'
+-
+  Now I close Payslip Batch
+-    
+  !python {model: hr.payslip.run}: |
+    self.close_payslip_run(cr, uid, [ref('hr_payslip_run_forAdvice')])
+-
+  I check that the Payslip Batch is "Close"
+-
+  !python {model: hr.payslip.run}: |
+    batch = self.browse(cr, uid, ref("hr_payslip_run_forAdvice"))
+    assert (batch.state == 'close')
+- 
+  I Create Advice from Payslip run
+- 
+  !record {model: hr.payroll.advice, id: hr_payroll_advice_fromBatch}:
+    batch_id: hr_payslip_run_forAdvice
+    company_id: base.main_company
+    date: '2012-08-31'
+    line_ids:
+      - bysal: 5700.0
+        company_id: base.main_company
+        employee_id: hr_payroll.hr_employee_bonamy0
+        name: '4656'
+    name: Advice of Payslip Batch for August
+-
+  I create advice from Payslip run by clicking on Create Advice button
+-
+    !python {model: hr.payslip.run}: |
+     self.create_advice(cr, uid, [ref('hr_payslip_run_forAdvice')])

From 45d5003dd6678c4ae115fef3a84d153d973c2b39 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 13 Aug 2012 15:42:19 +0200
Subject: [PATCH 273/999] [ADD] matching and parsing of CSV, preview production

bzr revid: xmo@openerp.com-20120813134219-ijo7d2kwn82qs4tm
---
 addons/base_import/models.py           | 128 +++++++++++++++++--
 addons/base_import/tests/models.py     |   9 ++
 addons/base_import/tests/test_cases.py | 166 +++++++++++++++++++++++++
 3 files changed, 292 insertions(+), 11 deletions(-)

diff --git a/addons/base_import/models.py b/addons/base_import/models.py
index a5e2678cd73..db1050636ff 100644
--- a/addons/base_import/models.py
+++ b/addons/base_import/models.py
@@ -1,5 +1,8 @@
+import base64
+import codecs
 import csv
 import itertools
+import logging
 
 try:
     from cStringIO import StringIO
@@ -10,6 +13,8 @@ from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
 FIELDS_RECURSION_LIMIT = 2
+ERROR_PREVIEW_BYTES = 200
+_logger = logging.getLogger(__name__)
 class ir_import(orm.TransientModel):
     _name = 'base_import.import'
 
@@ -103,8 +108,87 @@ class ir_import(orm.TransientModel):
 
             fields.append(f)
 
+        # TODO: cache on model?
         return fields
 
+    def _read_csv(self, record, options):
+        """ Returns a CSV-parsed iterator of all empty lines in the file
+
+        :throws csv.Error: if an error is detected during CSV parsing
+        :throws UnicodeDecodeError: if ``options.encoding`` is incorrect
+        """
+        csv_iterator = csv.reader(
+            StringIO(base64.b64decode(record.file)),
+            quotechar=options['quote'],
+            delimiter=options['separator'])
+        csv_nonempty = itertools.ifilter(None, csv_iterator)
+        # TODO: guess encoding?
+        encoding = options.get('encoding', 'utf-8')
+        return itertools.imap(
+            lambda row: [item.decode(encoding) for item in row],
+            csv_nonempty)
+
+    def _match_header(self, header, fields, options):
+        """ Attempts to match a given header to a field of the
+        imported model.
+
+        :param str header: header name from the CSV file
+        :param fields:
+        :param dict options:
+        :returns: an empty list if the header couldn't be matched, or
+                  all the fields to traverse
+        :rtype: list(Field)
+        """
+        for field in fields:
+            # FIXME: should match all translations & original
+            # TODO: use string distance (levenshtein? hamming?)
+            if header == field['name'] \
+              or header.lower() == field['string'].lower():
+                return [field]
+
+        if '/' not in header:
+            return []
+
+        # relational field path
+        traversal = []
+        subfields = fields
+        # Iteratively dive into fields tree
+        for section in header.split('/'):
+            # Strip section in case spaces are added around '/' for
+            # readability of paths
+            match = self._match_header(section.strip(), subfields, options)
+            # Any match failure, exit
+            if not match: return []
+            # prep subfields for next iteration within match[0]
+            field = match[0]
+            subfields = field['fields']
+            traversal.append(field)
+        return traversal
+
+    def _match_headers(self, rows, fields, options):
+        """ Attempts to match the imported model's fields to the
+        titles of the parsed CSV file, if the file is supposed to have
+        headers.
+
+        Will consume the first line of the ``rows`` iterator.
+
+        Returns either None (no title) or a dict mapping cell indices
+        to key paths in the ``fields`` tree
+
+        :param Iterator rows:
+        :param dict fields:
+        :param dict options:
+        :rtype: None | dict(int: list(str))
+        """
+        if not options.get('headers'):
+            return None
+
+        headers = next(rows)
+        return dict(
+            (index, [field['name'] for field in self._match_header(header, fields, options)] or None)
+            for index, header in enumerate(headers)
+        )
+
     def parse_preview(self, cr, uid, id, options, count=10, context=None):
         """ Generates a preview of the uploaded files, and performs
         fields-matching between the import's file data and the model's
@@ -112,16 +196,38 @@ class ir_import(orm.TransientModel):
 
         :param id: identifier of the import
         :param int count: number of preview lines to generate
-        :param dict options: format-specific options
-        :returns: (fields, matches, preview)
-        :rtype: (dict(str: dict(...)), dict(str, str), list(list(str)))
+        :param options: format-specific options.
+                        CSV: {encoding, quote, separator, headers}
+        :type options: {str, str, str, bool}
+        :returns: {fields, matches, preview} | {error, preview}
+        :rtype: {dict(str: dict(...)), dict(int, list(str)), list(list(str))} | {str, str}
         """
         record = self.browse(cr, uid, id, context=context)
-        # recursive fields_get (cache based on res_model?)
-        fields = record.get_fields(record.res_model)
-        import pprint
-        pprint.pprint(fields)
-        # extract title row?
-        #    match title row to fields_ge
-        # Extract first $count rows
-        # return triplet
+        fields = self.get_fields(cr, uid, record.res_model, context=context)
+
+        try:
+            rows = self._read_csv(record, options)
+
+            match = self._match_headers(rows, fields, options)
+            # Match should have consumed the first row (iif headers), get
+            # the ``count`` next rows for preview
+            preview = itertools.islice(rows, count)
+            return {
+                'fields': fields,
+                'matches': match,
+                'preview': list(preview),
+            }
+        except (TypeError, UnicodeDecodeError), e:
+            # Due to lazy generators, UnicodeDecodeError (for
+            # instance) may only be raised when serializing the
+            # preview to a list in the return.
+            _logger.debug("Error during CSV parsing preview", exc_info=True)
+            return {
+                'error': _("Failed to parse CSV file: %s") % e,
+                # iso-8859-1 ensures decoding will always succeed,
+                # even if it yields non-printable characters. This is
+                # in case of UnicodeDecodeError (or csv.Error
+                # compounded with UnicodeDecodeError)
+                'preview': base64.b64decode(record.file)[:ERROR_PREVIEW_BYTES]\
+                                 .decode('iso-8859-1'),
+            }
diff --git a/addons/base_import/tests/models.py b/addons/base_import/tests/models.py
index 2eeea1543d8..0720ae11eda 100644
--- a/addons/base_import/tests/models.py
+++ b/addons/base_import/tests/models.py
@@ -90,3 +90,12 @@ class o2m_child(orm.Model):
         'parent_id': fields.many2one(name('o2m')),
         'value': fields.integer()
     }
+
+class preview_model(orm.Model):
+    _name = name('preview')
+
+    _columns = {
+        'name': fields.char('Name', size=None),
+        'somevalue': fields.integer('Some Value', required=True),
+        'othervalue': fields.integer('Other Variable'),
+    }
diff --git a/addons/base_import/tests/test_cases.py b/addons/base_import/tests/test_cases.py
index d415c348f30..b10749bb585 100644
--- a/addons/base_import/tests/test_cases.py
+++ b/addons/base_import/tests/test_cases.py
@@ -1,5 +1,9 @@
+# -*- encoding: utf-8 -*-
+import unittest2
 from openerp.tests.common import TransactionCase
 
+from .. import models
+
 ID_FIELD = {'id': 'id', 'name': 'id', 'string': "External ID", 'required': False, 'fields': []}
 def make_field(name='value', string='unknown', required=False, fields=[]):
     return [
@@ -71,3 +75,165 @@ class test_o2m(TransactionCase):
             ]},
             {'id': 'value', 'name': 'value', 'string': 'unknown', 'required': False, 'fields': []},
         ]))
+
+class test_match_headers_single(TransactionCase):
+    def test_match_by_name(self):
+        match = self.registry('base_import.import')._match_header(
+            'f0', [{'name': 'f0'}], {})
+
+        self.assertEqual(match, [{'name': 'f0'}])
+
+    def test_match_by_string(self):
+        match = self.registry('base_import.import')._match_header(
+            'some field', [{'name': 'bob', 'string': "Some Field"}], {})
+
+        self.assertEqual(match, [{'name': 'bob', 'string': "Some Field"}])
+
+    def test_nomatch(self):
+        match = self.registry('base_import.import')._match_header(
+            'should not be', [{'name': 'bob', 'string': "wheee"}], {})
+
+        self.assertEqual(match, [])
+
+    def test_recursive_match(self):
+        f = {
+            'name': 'f0',
+            'string': "My Field",
+            'fields': [
+                {'name': 'f0', 'string': "Sub field 0", 'fields': []},
+                {'name': 'f1', 'string': "Sub field 2", 'fields': []},
+            ]
+        }
+        match = self.registry('base_import.import')._match_header(
+            'f0/f1', [f], {})
+
+        self.assertEqual(match, [f, f['fields'][1]])
+
+    def test_recursive_nomatch(self):
+        """ Match first level, fail to match second level
+        """
+        f = {
+            'name': 'f0',
+            'string': "My Field",
+            'fields': [
+                {'name': 'f0', 'string': "Sub field 0", 'fields': []},
+                {'name': 'f1', 'string': "Sub field 2", 'fields': []},
+            ]
+        }
+        match = self.registry('base_import.import')._match_header(
+            'f0/f2', [f], {})
+
+        self.assertEqual(match, [])
+
+class test_match_headers_multiple(TransactionCase):
+    def test_noheaders(self):
+        self.assertIsNone(
+            self.registry('base_import.import')._match_headers(
+                [], [], {}))
+    def test_nomatch(self):
+        self.assertEqual(
+            self.registry('base_import.import')._match_headers(
+                iter([
+                    ['foo', 'bar', 'baz', 'qux'],
+                    ['v1', 'v2', 'v3', 'v4'],
+                ]),
+                [],
+                {'headers': True}),
+            dict((index, None) for index in range(4)))
+
+    def test_mixed(self):
+        self.assertEqual(
+            self.registry('base_import.import')._match_headers(
+                iter(['foo bar baz qux/corge'.split()]),
+                [
+                    {'name': 'bar', 'string': 'Bar'},
+                    {'name': 'bob', 'string': 'Baz'},
+                    {'name': 'qux', 'string': 'Qux', 'fields': [
+                        {'name': 'corge', 'fields': []},
+                     ]}
+                ],
+                {'headers': True}),
+            {
+                0: None,
+                1: ['bar'],
+                2: ['bob'],
+                3: ['qux', 'corge'],
+            })
+
+import base64, csv
+class test_preview(TransactionCase):
+    def make_import(self):
+        Import = self.registry('base_import.import')
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'res.users',
+            'file': base64.b64encode(
+                u"로그인,언어\n".encode('euc_kr'),
+                "bob,1\n"),
+        })
+        return Import, id
+
+    def test_encoding(self):
+        Import, id = self.make_import()
+        result = Import.parse_preview(self.cr, self.uid, id, {
+                'quote': '"',
+                'separator': ',',
+        })
+        self.assertTrue('error' in result)
+
+    def test_csv_errors(self):
+        Import, id = self.make_import()
+
+        result = Import.parse_preview(self.cr, self.uid, id, {
+                'quote': 'foo',
+                'separator': ',',
+                'encoding': 'euc_kr',
+        })
+        self.assertTrue('error' in result)
+
+    def test_csv_errors(self):
+        Import, id = self.make_import()
+
+        result = Import.parse_preview(self.cr, self.uid, id, {
+                'quote': '"',
+                'separator': 'bob',
+                'encoding': 'euc_kr',
+        })
+        self.assertTrue('error' in result)
+
+    def test_success(self):
+        Import = self.registry('base_import.import')
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': base64.b64encode('name,Some Value,Counter\n'
+                    'foo,1,2\n'
+                    'bar,3,4\n'
+                    'qux,5,6\n')
+        })
+
+        result = Import.parse_preview(self.cr, self.uid, id, {
+            'quote': '"',
+            'separator': ',',
+            'headers': True,
+        })
+
+        p = {
+            'matches': {0: ['name'], 1: ['somevalue'], 2: None},
+            'fields': [
+                {'id': 'id', 'name': 'id', 'string': 'External ID', 'required':False, 'fields': []},
+                {'id': 'name', 'name': 'name', 'string': 'Name', 'required':False, 'fields': []},
+                {'id': 'somevalue', 'name': 'somevalue', 'string': 'Some Value', 'required':True, 'fields': []},
+                {'id': 'othervalue', 'name': 'othervalue', 'string': 'Other Variable', 'required':False, 'fields': []},
+            ],
+            'preview': [
+                ['foo', '1', '2'],
+                ['bar', '3', '4'],
+                ['qux', '5', '6'],
+            ]
+        }
+
+        self.assertEqual(result['matches'], p['matches'])
+        # Order depends on iteration order of fields_get
+        self.assertItemsEqual(result['fields'], p['fields'])
+        self.assertEqual(result['preview'], p['preview'])
+        # Ensure we only have the response fields we expect
+        self.assertItemsEqual(result.keys(), ['matches', 'fields', 'preview'])

From 138e9c273983d4739caa08c17c684f7811dc11aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 13 Aug 2012 16:13:21 +0200
Subject: [PATCH 274/999] [IMP] tools: image: added a sharpen filter when
 resizing images. Resized images quality is much better; but demo data are a
 bit 'aliased'.

bzr revid: tde@openerp.com-20120813141321-isaz930h3roov1ui
---
 openerp/tools/image.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/tools/image.py b/openerp/tools/image.py
index 1caafb23a18..8f018f22ab8 100644
--- a/openerp/tools/image.py
+++ b/openerp/tools/image.py
@@ -21,6 +21,7 @@
 
 import io
 from PIL import Image
+from PIL import ImageFilter
 import StringIO
 
 # ----------------------------------------
@@ -63,6 +64,7 @@ def image_resize_image(base64_source, size=(1024, 1024), encoding='base64', file
         return base64_source
     # create a thumbnail: will resize and keep ratios
     image.thumbnail(size, Image.ANTIALIAS)
+    image = image.filter(ImageFilter.SHARPEN)
     # create a transparent image for background
     background = Image.new('RGBA', size, (255, 255, 255, 0))
     # past the resized image on the background

From 87c4a3a3b7406cd8bba071846e230f48d7c03da8 Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Mon, 13 Aug 2012 19:04:29 +0200
Subject: [PATCH 275/999] initial note push

bzr revid: acl@openerp.com-20120813170429-91dibb1dpe32j6w2
---
 addons/crm_todo/crm_todo_view.xml        |   2 +-
 addons/note/__init__.py                  |  23 ++++
 addons/note/__openerp__.py               |  59 +++++++++
 addons/note/note.py                      | 134 +++++++++++++++++++
 addons/note/note_view.xml                | 158 +++++++++++++++++++++++
 addons/note/security/ir.model.access.csv |   3 +
 addons/note/security/note_security.xml   |  12 ++
 addons/note/static/src/css/note.css      |  58 +++++++++
 8 files changed, 448 insertions(+), 1 deletion(-)
 create mode 100644 addons/note/__init__.py
 create mode 100644 addons/note/__openerp__.py
 create mode 100644 addons/note/note.py
 create mode 100644 addons/note/note_view.xml
 create mode 100644 addons/note/security/ir.model.access.csv
 create mode 100644 addons/note/security/note_security.xml
 create mode 100644 addons/note/static/src/css/note.css

diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index c959f1722e6..47b0655ac99 100644
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -59,7 +59,7 @@
         parent="base.menu_sales"
         action="crm_todo_action"
         sequence="6"/>
-
+    
 
     </data>
 </openerp>
diff --git a/addons/note/__init__.py b/addons/note/__init__.py
new file mode 100644
index 00000000000..9bf064877b5
--- /dev/null
+++ b/addons/note/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 note
+
diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
new file mode 100644
index 00000000000..96938f56ef1
--- /dev/null
+++ b/addons/note/__openerp__.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Notes',
+    'version': '0.1',
+    'category': 'Tools',
+    'description': """
+This module allows users to create their own notes inside OpenERP
+==============================================================================
+
+With this module you can allow users to take notes inside OpenERP.
+These notes can be shared with OpenERP or external users.
+They also can be organized following user dependant categories. 
+Notes can be found in the 'Home' main menu, under 'Tool' submenu.
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://openerp.com',
+    'depends': ['base_tools','mail','pad'],
+    'init_xml': [],
+    'update_xml': [
+        'security/note_security.xml',
+        'security/ir.model.access.csv',
+        'note_view.xml',
+        #'note_workflow.xml',
+    ],
+    'demo_xml': [
+        #"note_data.xml"
+    ],
+    'test':[
+    ],
+    'css': [
+        'static/src/css/note.css',
+    ],
+    'installable': True,
+    'application': True,
+    'category': 'Tools',
+    'images': [],
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/note/note.py b/addons/note/note.py
new file mode 100644
index 00000000000..a9afad770c4
--- /dev/null
+++ b/addons/note/note.py
@@ -0,0 +1,134 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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
+from tools.translate import _
+
+#
+# Todo :
+
+
+#  ** fix editable when in form view ** not atm
+#  fix search
+#  fix design
+#  rights
+
+
+class note_stage(osv.Model):
+    """ Category of Note """
+
+    _name = "note.stage"
+    _description = "Note Stage"
+    _columns = {
+        'name': fields.char('Category Name', size=64, required=True),
+        'sequence': fields.integer('Sequence', help="Used to order the note stages"),
+        'user_id': fields.many2one('res.users', 'Owner', help="Owner of the note stage.", required=True, readonly=True),
+        'fold': fields.boolean('Folded'),
+
+    }
+    _sql_constraints = [
+    ]
+
+    _order = 'sequence asc'
+
+    _defaults = {
+        'fold': 0,
+        'user_id': lambda self, cr, uid, ctx: uid,
+        'sequence' : 1,
+    }
+
+    def __init__(self, pool, cr):
+        osv.Model.__init__(self,pool, cr)
+
+
+# class many2many_filter(fields.many2many)
+
+# grep many2many_mod dans le code
+
+
+
+class note_note(osv.Model):
+    """ Note """
+    _name = 'note.note'
+    _inherit = ['mail.thread','pad.common']
+    _pad_fields = ['note_pad']
+    _description = "Note"
+
+    def _get_note_first_line(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for note in self.browse(cr, uid, ids, context=context):
+            res[note.id] = note.note.split('\n')[0]
+        return res
+        
+    def _set_note_first_line(self, cr, uid, id, name, value, args, context=None):
+        #
+        # todo should set the pad first line (as title)
+        #
+        return self.write(cr, uid, [id], {'name': value}, context=context)
+    
+    _columns = {
+        'name': fields.function(_get_note_first_line,_fnct_inv=_set_note_first_line, string='Note Summary', type="text", store=True),
+        'note': fields.text('Pad Content'),
+        'note_pad': fields.char('Pad Url', size=250),
+        'sequence': fields.integer('Sequence'),
+        'stage_id': fields.many2one('note.stage', 'Stage'),
+        'active': fields.boolean('Active'),
+        'color': fields.integer('Color Index'),
+        #'follower_ids': fields.one2many('mail.subscription', 'res_id', 'Followers', domain=[('res_model','=', 'note.note')])
+        'follower_ids': fields.many2many('res.users', 'mail_subscription', 'res_id', 'user_id', 'Followers', join_filter="mail_subscription.res_model='note.note'")        
+    }
+
+    _sql_constraints = [
+    ]
+
+
+    def _get_default_stage_id(self,cr,uid,context=None):
+        id = self.pool.get('note.stage').search(cr,uid,[('sequence','=','1')])
+        return id[0]
+
+    _defaults = {
+        'active' : 1,
+        'stage_id' : _get_default_stage_id,
+        'note_pad': lambda self, cr, uid, context: self.pad_generate_url(cr, uid, context),
+    }
+
+    
+    _order = 'sequence asc'
+
+    
+
+    def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
+        access_rights_uid = access_rights_uid or uid
+        stage_obj = self.pool.get('note.stage')
+        
+        # only show stage groups not folded and owned by user
+        search_domain = [('fold', '=', False),('user_id', '=', uid)]
+        
+        stage_ids = stage_obj._search(cr, uid, search_domain, order=self._order, access_rights_uid=access_rights_uid, context=context)
+        result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
+        return result
+
+    _group_by_full = {
+        'stage_id' : _read_group_stage_ids,
+    }
+
+    def stage_set(self,cr,uid,ids,stage_id,context=None):
+        self.write(cr,uid,ids,{'stage_id': stage_id})
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
new file mode 100644
index 00000000000..9f8c91e9c62
--- /dev/null
+++ b/addons/note/note_view.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+
+    <!-- Note Stage Form View -->
+    <record model="ir.ui.view" id="view_note_stage_form">
+      <field name="name">note.stage.form</field>
+      <field name="model">note.stage</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="Stage of Notes" version="7.0">
+          <group>
+            <field name="name"/>
+          </group>
+        </form>
+      </field>
+    </record>
+
+
+
+    <!-- Note Stage Tree View -->
+    <record model="ir.ui.view" id="view_note_stage_tree">
+      <field name="name">note.stage.tree</field>
+      <field name="model">note.stage</field>
+      <field name="type">tree</field>
+      <field name="field_parent"></field>
+
+      <field name="arch" type="xml">
+        <tree string="Stages of notes" editable="top">
+	  <field name="sequence" invisible="1" />
+          <field name="name" />
+	  <field name="fold" />
+        </tree>
+      </field>
+    </record>
+
+    <!-- Note Stage Action -->
+    <record model="ir.actions.act_window" id="action_note_stage">
+      <field name="name">Stages</field>
+      <field name="res_model">note.stage</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree,form</field>
+      <field name="domain">[('user_id','=',uid)]</field>
+    </record>
+
+    <menuitem name="Notes" parent="base.menu_tools" id="menu_notes" sequence="20"/>
+
+    <menuitem name="Categories" parent="menu_notes"
+    	      id="menu_notes_stage" action="action_note_stage" sequence="2" />
+
+    <!-- New Note Kanban View -->
+    <record model="ir.ui.view" id="view_note_note_kanban">
+      <field name="name">note.note.kanban</field>
+      <field name="model">note.note</field>
+      <field name="type">kanban</field>
+      <field name="arch" type="xml">
+        <kanban default_group_by="stage_id" >
+	  <field name="color" />
+	  <field name="sequence" />
+	  <field name="name" />
+	  <field name="stage_id" />
+	  <field name="active" />
+	  <field name="note" />
+	  <field name="follower_ids" />
+	  <templates>
+	    <t t-name="kanban-box">
+	      <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+		<!-- dropdown menu -->
+		<div class="oe_dropdown_toggle oe_dropdown_kanban">
+		  <span class="oe_e">í</span>
+		  <ul class="oe_dropdown_menu">
+		    <li><a type="edit" >Edit...</a></li>
+                    <li><a type="delete">Delete</a></li>
+                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+		  </ul>
+		</div>
+
+		<!-- kanban note -->
+		<div class="oe_kanban_content">
+
+		  <!-- title -->
+		  <field name="name" />
+		  
+		</div>
+		
+		<div class="oe_kanban_project_avatars">
+                  <t t-foreach="record.follower_ids.raw_value" t-as="follower">
+                    <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
+                  </t>
+		</div>
+		
+	      </div>
+	      <div class="oe_clear"></div>
+	    </t>
+	  </templates>
+	</kanban>
+      </field>
+    </record>
+
+
+    
+    <!-- New Note Form View -->
+    <record model="ir.ui.view" id="view_note_note_form">
+      <field name="name">note.note.form</field>
+      <field name="model">note.note</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="Note" version="7.0">
+	  <header>
+	    <!-- todo: remove domain -->
+	    <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1" />
+	  </header>
+          <field name="note" widget="pad" />
+          <div class="oe_chatter">
+            <field name="message_ids" widget="mail_thread"/>
+          </div>
+        </form>
+      </field>
+    </record>
+
+    <!-- Search Note  -->
+    <record model="ir.ui.view" id="view_note_note_filter">
+      <field name="name">note.note.search</field>
+      <field name="model">note.note</field>
+      <field name="type">search</field>
+      <field name="arch" type="xml">
+        <search string="Notes">
+          <field name="note" string="Note"/>
+          <field name="stage_id"/>
+          <group expand="0" string="Group By...">
+            <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'create_uid'}"/>
+            <filter icon="terp-stock_symbol-selection" string="Stage" help="By Note Category" context="{'group_by':'stage_id'}"/>
+          </group>
+        </search>
+      </field>
+    </record>
+
+
+    <!-- New Note Tree View -->    
+    <record model="ir.ui.view" id="view_note_note_tree">
+      <field name="name">note.note.tree</field>
+      <field name="model">note.note</field>
+      <field name="type">tree</field>
+    </record>
+
+
+    <record model="ir.actions.act_window" id="action_note_note">
+      <field name="name">Notes</field>
+      <field name="res_model">note.note</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">kanban,tree,form</field>
+      <field name="search_view_id" ref="view_note_note_filter"/>
+    </record>
+    
+    <menuitem name="My notes" parent="menu_notes" id="menu_notes_note" action="action_note_note" sequence="1"/>
+
+  </data>
+</openerp>
diff --git a/addons/note/security/ir.model.access.csv b/addons/note/security/ir.model.access.csv
new file mode 100644
index 00000000000..fdd6030ca51
--- /dev/null
+++ b/addons/note/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_note_stage_user,note.stage user,model_note_stage,base.group_user,1,1,1,1
+access_note_note_user,note.note user,model_note_note,base.group_user,1,1,1,1
diff --git a/addons/note/security/note_security.xml b/addons/note/security/note_security.xml
new file mode 100644
index 00000000000..46eebee629c
--- /dev/null
+++ b/addons/note/security/note_security.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+      <record id="note_note_global" model="ir.rule">
+        <field name="name">My notes</field>
+        <field ref="model_note_note" name="model_id"/>
+        <field eval="1" name="global"/>
+        <field name="domain_force">[('follower_ids','=',user.id)]</field>
+      </record>
+</data>
+</openerp>
+
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
new file mode 100644
index 00000000000..a6b097ece88
--- /dev/null
+++ b/addons/note/static/src/css/note.css
@@ -0,0 +1,58 @@
+
+
+.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card {
+    text-decoration:none;
+    color:#000;
+    display:block;
+    padding:1em;
+    margin-right: 1em;
+    margin-bottom: 1em;
+    
+    -moz-box-shadow:5px 5px 7px rgba(33,33,33,1);
+    -webkit-box-shadow: 5px 5px 7px rgba(33,33,33,.7);
+    box-shadow: 5px 5px 7px rgba(33,33,33,.7);
+}
+
+
+.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card {
+    -webkit-transform: rotate(-3deg);
+    -o-transform: rotate(-3deg);
+    -moz-transform:rotate(-3deg);
+}
+
+.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups:nth-child(even) .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card {
+    -o-transform:rotate(1deg);
+    -webkit-transform:rotate(1deg);
+    -moz-transform:rotate(1deg);
+    position:relative;
+    top:3px;
+}
+
+.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups:nth-child(2n) .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card {
+    -o-transform:rotate(-2deg);
+    -webkit-transform:rotate(-2deg);
+    -moz-transform:rotate(-2deg);
+    position:relative;
+    top:-3px;
+}
+
+.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups:nth-child(2n) .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card {
+    -o-transform:rotate(2deg);
+    -webkit-transform:rotate(2deg);
+    -moz-transform:rotate(2deg);
+    position:relative;
+    top:-5px;
+}
+
+.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card:hover, 
+.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card:focus
+{
+    box-shadow:10px 10px 7px rgba(0,0,0,.7);
+    -moz-box-shadow:10px 10px 7px rgba(0,0,0,.7);
+    -webkit-box-shadow: 10px 10px 7px rgba(0,0,0,.7);
+    -webkit-transform: scale(1.25);
+    -moz-transform: scale(1.25);
+    -o-transform: scale(1.25);
+    position:relative;
+    z-index:5;
+}

From 8bdf79744bed43fda45c0e7ca00601ca65fce532 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 14 Aug 2012 11:08:47 +0530
Subject: [PATCH 276/999] [IMP]code added for checking advice in yml.

bzr revid: kbh@tinyerp.com-20120814053847-hrxby3r1s17l7uwr
---
 addons/l10n_in_hr_payroll/test/payment_advice_batch.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml b/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
index 49d4ae9a723..da2440a3826 100644
--- a/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
+++ b/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
@@ -50,3 +50,9 @@
 -
     !python {model: hr.payslip.run}: |
      self.create_advice(cr, uid, [ref('hr_payslip_run_forAdvice')])
+-
+  I check for Advice which made from Payslip run
+-
+  !python {model: hr.payroll.advice}: |
+    advice_ids = self.search(cr, uid, [('batch_id','=',ref('hr_payslip_run_forAdvice'))])
+    assert advice_ids,"Advice is not created from payslip Batch."

From de09433413d60fb8e40529a57dad1abac05c9011 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 14 Aug 2012 11:38:13 +0200
Subject: [PATCH 277/999] [ADD] feeding of import data into import_data

bzr revid: xmo@openerp.com-20120814093813-ql1uq1kb2766db0e
---
 addons/base_import/models.py           | 88 +++++++++++++++++++++++++-
 addons/base_import/tests/test_cases.py | 72 +++++++++++++++++++++
 2 files changed, 159 insertions(+), 1 deletion(-)

diff --git a/addons/base_import/models.py b/addons/base_import/models.py
index db1050636ff..754467ed1c2 100644
--- a/addons/base_import/models.py
+++ b/addons/base_import/models.py
@@ -3,6 +3,8 @@ import codecs
 import csv
 import itertools
 import logging
+import operator
+import random
 
 try:
     from cStringIO import StringIO
@@ -202,7 +204,7 @@ class ir_import(orm.TransientModel):
         :returns: {fields, matches, preview} | {error, preview}
         :rtype: {dict(str: dict(...)), dict(int, list(str)), list(list(str))} | {str, str}
         """
-        record = self.browse(cr, uid, id, context=context)
+        (record,) = self.browse(cr, uid, [id], context=context)
         fields = self.get_fields(cr, uid, record.res_model, context=context)
 
         try:
@@ -231,3 +233,87 @@ class ir_import(orm.TransientModel):
                 'preview': base64.b64decode(record.file)[:ERROR_PREVIEW_BYTES]\
                                  .decode('iso-8859-1'),
             }
+
+    def _convert_import_data(self, record, fields, options, context=None):
+        """ Extracts the input browse_record and fields list (with
+        ``False``-y placeholders for fields to *not* import) into a
+        format Model.import_data can use: a fields list without holes
+        and the precisely matching data matrix
+
+        :param browse_record record:
+        :param list(str|bool): fields
+        :returns: (data, fields)
+        :rtype: (list(list(str)), list(str))
+        """
+        # Get indices for non-empty fields
+        indices = [index for index, field in enumerate(fields) if field]
+        # If only one index, itemgetter will return an atom rather
+        # than a 1-tuple
+        if len(indices) == 1: mapper = lambda row: [row[indices[0]]]
+        else: mapper = operator.itemgetter(*indices)
+        # Get only list of actually imported fields
+        import_fields = filter(None, fields)
+
+        rows_to_import = self._read_csv(record, options)
+        if options.get('headers'):
+            rows_to_import = itertools.islice(
+                rows_to_import, 1, None)
+        data = [
+            row for row in itertools.imap(mapper, rows_to_import)
+            # don't try inserting completely empty rows (e.g. from
+            # filtering out o2m fields)
+            if any(row)
+        ]
+
+        return data, import_fields
+
+    def do(self, cr, uid, id, fields, options, dryrun=False, context=None):
+        """ Actual execution of the import
+
+        :param fields: import mapping: maps each column to a field,
+                       ``False`` for the columns to ignore
+        :type fields: list(str|bool)
+        :param dict options:
+        :param bool dryrun: performs all import operations (and
+                            validations) but rollbacks writes, allows
+                            getting as much errors as possible without
+                            the risk of clobbering the database.
+        :returns: A list of errors. If the list is empty the import
+                  executed fully and correctly. If the list is
+                  non-empty it contains dicts with 3 keys ``type`` the
+                  type of error (``error|warning``); ``message`` the
+                  error message associated with the error (a string)
+                  and ``record`` the data which failed to import (or
+                  ``false`` if that data isn't available or provided)
+        :rtype: list({type, message, record})
+        """
+        cr.execute('SAVEPOINT import')
+
+        (record,) = self.browse(cr, uid, [id], context=context)
+        data, import_fields = self._convert_import_data(
+            record, fields, options, context=context)
+
+        try:
+            (code, record, message, _wat) = self.pool[record.res_model].import_data(
+                cr, uid, import_fields, data, context=context)
+        except Exception, e:
+            # TODO: remove when exceptions stop being an "expected"
+            #       behavior of import_data on some invalid input.
+            code, record, message = -1, None, str(e)
+
+        if dryrun:
+            cr.execute('ROLLBACK TO SAVEPOINT import')
+        else:
+            cr.execute('RELEASE SAVEPOINT import')
+
+        if code != -1:
+            return []
+
+        # TODO: add key for error location?
+        # TODO: error not within normal preview, how to display? Re-preview
+        #       with higher count?
+        return [{
+            'type': 'error',
+            'message': message,
+            'record': record or False
+        }]
diff --git a/addons/base_import/tests/test_cases.py b/addons/base_import/tests/test_cases.py
index b10749bb585..7cd7cbc5d00 100644
--- a/addons/base_import/tests/test_cases.py
+++ b/addons/base_import/tests/test_cases.py
@@ -237,3 +237,75 @@ class test_preview(TransactionCase):
         self.assertEqual(result['preview'], p['preview'])
         # Ensure we only have the response fields we expect
         self.assertItemsEqual(result.keys(), ['matches', 'fields', 'preview'])
+
+class test_convert_import_data(TransactionCase):
+    """ Tests conversion of base_import.import input into data which
+    can be fed to Model.import_data
+    """
+    def test_all(self):
+        Import = self.registry('base_import.import')
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': base64.b64encode('name,Some Value,Counter\n'
+                    'foo,1,2\n'
+                    'bar,3,4\n'
+                    'qux,5,6\n')
+        })
+        record = Import.browse(self.cr, self.uid, id)
+        data, fields = Import._convert_import_data(
+            record, ['name', 'somevalue', 'othervalue'],
+            {'quote': '"', 'separator': ',', 'headers': True,})
+
+        self.assertItemsEqual(fields, ['name', 'somevalue', 'othervalue'])
+        self.assertItemsEqual(data, [
+            ('foo', '1', '2'),
+            ('bar', '3', '4'),
+            ('qux', '5', '6'),
+        ])
+
+    def test_filtered(self):
+        """ If ``False`` is provided as field mapping for a column,
+        that column should be removed from importable data
+        """
+        Import = self.registry('base_import.import')
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': base64.b64encode('name,Some Value,Counter\n'
+                    'foo,1,2\n'
+                    'bar,3,4\n'
+                    'qux,5,6\n')
+        })
+        record = Import.browse(self.cr, self.uid, id)
+        data, fields = Import._convert_import_data(
+            record, ['name', False, 'othervalue'],
+            {'quote': '"', 'separator': ',', 'headers': True,})
+
+        self.assertItemsEqual(fields, ['name', 'othervalue'])
+        self.assertItemsEqual(data, [
+            ('foo', '2'),
+            ('bar', '4'),
+            ('qux', '6'),
+        ])
+
+    def test_norow(self):
+        """ If a row is composed only of empty values (due to having
+        filtered out non-empty values from it), it should be removed
+        """
+        Import = self.registry('base_import.import')
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': base64.b64encode('name,Some Value,Counter\n'
+                    'foo,1,2\n'
+                    ',3,\n'
+                    ',5,6\n')
+        })
+        record = Import.browse(self.cr, self.uid, id)
+        data, fields = Import._convert_import_data(
+            record, ['name', False, 'othervalue'],
+            {'quote': '"', 'separator': ',', 'headers': True,})
+
+        self.assertItemsEqual(fields, ['name', 'othervalue'])
+        self.assertItemsEqual(data, [
+            ('foo', '2'),
+            ('', '6'),
+        ])

From 84ea769476468a46ee3ef19f388dff080b93b4ce Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 14 Aug 2012 14:07:37 +0200
Subject: [PATCH 278/999] [IMP] add information to _match_headers

bzr revid: xmo@openerp.com-20120814120737-0zuxqyjhnnx1aye3
---
 addons/base_import/models.py           | 22 +++++++-----
 addons/base_import/tests/test_cases.py | 48 ++++++++++++++------------
 2 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/addons/base_import/models.py b/addons/base_import/models.py
index 754467ed1c2..07a3439419d 100644
--- a/addons/base_import/models.py
+++ b/addons/base_import/models.py
@@ -24,6 +24,7 @@ class ir_import(orm.TransientModel):
         'res_model': fields.char('Model', size=64),
         'file': fields.binary('File'),
         'file_name': fields.char('File Name', size=None),
+        'file_mime': fields.char('File Type', size=None),
     }
 
     def get_fields(self, cr, uid, model, context=None,
@@ -174,19 +175,20 @@ class ir_import(orm.TransientModel):
 
         Will consume the first line of the ``rows`` iterator.
 
-        Returns either None (no title) or a dict mapping cell indices
+        Returns a pair of (None, None) if headers were not requested
+        or the list of headers and a dict mapping cell indices
         to key paths in the ``fields`` tree
 
         :param Iterator rows:
         :param dict fields:
         :param dict options:
-        :rtype: None | dict(int: list(str))
+        :rtype: (None, None) | (list(str), dict(int: list(str)))
         """
         if not options.get('headers'):
-            return None
+            return None, None
 
         headers = next(rows)
-        return dict(
+        return headers, dict(
             (index, [field['name'] for field in self._match_header(header, fields, options)] or None)
             for index, header in enumerate(headers)
         )
@@ -196,13 +198,16 @@ class ir_import(orm.TransientModel):
         fields-matching between the import's file data and the model's
         columns.
 
+        If the headers are not requested (not options.headers),
+        ``matches`` and ``headers`` are both ``False``.
+
         :param id: identifier of the import
         :param int count: number of preview lines to generate
         :param options: format-specific options.
                         CSV: {encoding, quote, separator, headers}
         :type options: {str, str, str, bool}
-        :returns: {fields, matches, preview} | {error, preview}
-        :rtype: {dict(str: dict(...)), dict(int, list(str)), list(list(str))} | {str, str}
+        :returns: {fields, matches, headers, preview} | {error, preview}
+        :rtype: {dict(str: dict(...)), dict(int, list(str)), list(str), list(list(str))} | {str, str}
         """
         (record,) = self.browse(cr, uid, [id], context=context)
         fields = self.get_fields(cr, uid, record.res_model, context=context)
@@ -210,13 +215,14 @@ class ir_import(orm.TransientModel):
         try:
             rows = self._read_csv(record, options)
 
-            match = self._match_headers(rows, fields, options)
+            headers, matches = self._match_headers(rows, fields, options)
             # Match should have consumed the first row (iif headers), get
             # the ``count`` next rows for preview
             preview = itertools.islice(rows, count)
             return {
                 'fields': fields,
-                'matches': match,
+                'matches': matches or False,
+                'headers': headers or False,
                 'preview': list(preview),
             }
         except (TypeError, UnicodeDecodeError), e:
diff --git a/addons/base_import/tests/test_cases.py b/addons/base_import/tests/test_cases.py
index 7cd7cbc5d00..00230f9a3c0 100644
--- a/addons/base_import/tests/test_cases.py
+++ b/addons/base_import/tests/test_cases.py
@@ -127,9 +127,11 @@ class test_match_headers_single(TransactionCase):
 
 class test_match_headers_multiple(TransactionCase):
     def test_noheaders(self):
-        self.assertIsNone(
+        self.assertEqual(
             self.registry('base_import.import')._match_headers(
-                [], [], {}))
+                [], [], {}),
+            (None, None)
+        )
     def test_nomatch(self):
         self.assertEqual(
             self.registry('base_import.import')._match_headers(
@@ -139,7 +141,11 @@ class test_match_headers_multiple(TransactionCase):
                 ]),
                 [],
                 {'headers': True}),
-            dict((index, None) for index in range(4)))
+            (
+                ['foo', 'bar', 'baz', 'qux'],
+                dict.fromkeys(range(4))
+            )
+        )
 
     def test_mixed(self):
         self.assertEqual(
@@ -153,12 +159,13 @@ class test_match_headers_multiple(TransactionCase):
                      ]}
                 ],
                 {'headers': True}),
-            {
+            (['foo', 'bar', 'baz', 'qux/corge'], {
                 0: None,
                 1: ['bar'],
                 2: ['bob'],
                 3: ['qux', 'corge'],
             })
+        )
 
 import base64, csv
 class test_preview(TransactionCase):
@@ -216,27 +223,22 @@ class test_preview(TransactionCase):
             'headers': True,
         })
 
-        p = {
-            'matches': {0: ['name'], 1: ['somevalue'], 2: None},
-            'fields': [
-                {'id': 'id', 'name': 'id', 'string': 'External ID', 'required':False, 'fields': []},
-                {'id': 'name', 'name': 'name', 'string': 'Name', 'required':False, 'fields': []},
-                {'id': 'somevalue', 'name': 'somevalue', 'string': 'Some Value', 'required':True, 'fields': []},
-                {'id': 'othervalue', 'name': 'othervalue', 'string': 'Other Variable', 'required':False, 'fields': []},
-            ],
-            'preview': [
-                ['foo', '1', '2'],
-                ['bar', '3', '4'],
-                ['qux', '5', '6'],
-            ]
-        }
-
-        self.assertEqual(result['matches'], p['matches'])
+        self.assertEqual(result['matches'], {0: ['name'], 1: ['somevalue'], 2: None})
+        self.assertEqual(result['headers'], ['name', 'Some Value', 'Counter'])
         # Order depends on iteration order of fields_get
-        self.assertItemsEqual(result['fields'], p['fields'])
-        self.assertEqual(result['preview'], p['preview'])
+        self.assertItemsEqual(result['fields'], [
+            {'id': 'id', 'name': 'id', 'string': 'External ID', 'required':False, 'fields': []},
+            {'id': 'name', 'name': 'name', 'string': 'Name', 'required':False, 'fields': []},
+            {'id': 'somevalue', 'name': 'somevalue', 'string': 'Some Value', 'required':True, 'fields': []},
+            {'id': 'othervalue', 'name': 'othervalue', 'string': 'Other Variable', 'required':False, 'fields': []},
+        ])
+        self.assertEqual(result['preview'], [
+            ['foo', '1', '2'],
+            ['bar', '3', '4'],
+            ['qux', '5', '6'],
+        ])
         # Ensure we only have the response fields we expect
-        self.assertItemsEqual(result.keys(), ['matches', 'fields', 'preview'])
+        self.assertItemsEqual(result.keys(), ['matches', 'headers', 'fields', 'preview'])
 
 class test_convert_import_data(TransactionCase):
     """ Tests conversion of base_import.import input into data which

From b8f93a7bc653d41bd519e7769573fe2ccab8ccbe Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 14 Aug 2012 14:16:10 +0200
Subject: [PATCH 279/999] [ADD] base import logic: implement creating an
 import, uploading a file and displaying the preview

bzr revid: xmo@openerp.com-20120814121610-j2rpg7u5zh4h93j1
---
 addons/base_import/__init__.py               |  1 +
 addons/base_import/__openerp__.py            |  2 +
 addons/base_import/controllers.py            | 24 ++++++
 addons/base_import/static/src/js/import.js   | 82 ++++++++++++++++++++
 addons/base_import/static/src/xml/import.xml | 25 ++++++
 5 files changed, 134 insertions(+)
 create mode 100644 addons/base_import/controllers.py
 create mode 100644 addons/base_import/static/src/js/import.js
 create mode 100644 addons/base_import/static/src/xml/import.xml

diff --git a/addons/base_import/__init__.py b/addons/base_import/__init__.py
index f0736de3bd1..ab0a528f1f1 100644
--- a/addons/base_import/__init__.py
+++ b/addons/base_import/__init__.py
@@ -1,2 +1,3 @@
+import controllers
 import models
 import tests.models
diff --git a/addons/base_import/__openerp__.py b/addons/base_import/__openerp__.py
index 7f117349ba9..230c514efc8 100644
--- a/addons/base_import/__openerp__.py
+++ b/addons/base_import/__openerp__.py
@@ -27,4 +27,6 @@ Re-implement openerp's file import system:
     'depends': ['base'],
     'installable': True,
     'auto_install': False, # set to true and allow uninstall?
+    'js': ['static/src/js/import.js'],
+    'qweb': ['static/src/xml/import.xml'],
 }
diff --git a/addons/base_import/controllers.py b/addons/base_import/controllers.py
new file mode 100644
index 00000000000..bc014cd8265
--- /dev/null
+++ b/addons/base_import/controllers.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+import base64
+import simplejson
+
+try:
+    import openerp.addons.web.common.http as openerpweb
+except ImportError:
+    import web.common.http as openerpweb
+
+class ImportController(openerpweb.Controller):
+    _cp_path = '/base_import'
+
+    @openerpweb.httprequest
+    def set_file(self, req, file, import_id, jsonp='callback'):
+        import_id = int(import_id)
+
+        written = req.session.model('base_import.import').write(import_id, {
+            'file': base64.b64encode(file.read()),
+            'file_name': file.filename,
+            'file_type': file.content_type,
+        }, req.session.eval_context(req.context))
+
+        return 'window.top.%s(%s)' % (
+            jsonp, simplejson.dumps({'result': written}))
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
new file mode 100644
index 00000000000..5bb81d23cbb
--- /dev/null
+++ b/addons/base_import/static/src/js/import.js
@@ -0,0 +1,82 @@
+openerp.base_import = function (instance) {
+    var QWeb = instance.web.qweb;
+    var _lt = instance.web._lt;
+
+    /**
+     * Safari does not deal well at all with raw JSON data being
+     * returned. As a result, we're going to cheat by using a
+     * pseudo-jsonp: instead of getting JSON data in the iframe, we're
+     * getting a ``script`` tag which consists of a function call and
+     * the returned data (the json dump).
+     *
+     * The function is an auto-generated name bound to ``window``,
+     * which calls back into the callback provided here.
+     *
+     * @param {Object} form the form element (DOM or jQuery) to use in the call
+     * @param {Object} attributes jquery.form attributes object
+     * @param {Function} callback function to call with the returned data
+     */
+    function jsonp(form, attributes, callback) {
+        attributes = attributes || {};
+        var options = {jsonp: _.uniqueId('import_callback_')};
+        window[options.jsonp] = function () {
+            delete window[options.jsonp];
+            callback.apply(null, arguments);
+        };
+        if ('data' in attributes) {
+            _.extend(attributes.data, options);
+        } else {
+            _.extend(attributes, {data: options});
+        }
+        _.extend(attributes, {
+            dataType: 'script',
+        });
+        $(form).ajaxSubmit(attributes);
+    }
+
+    instance.web.DataImport = instance.web.Dialog.extend({
+        template: 'ImportView',
+        dialog_title: _lt("Import Data"),
+        events: {
+            'change input.oe_import_file': 'file_update'
+        },
+        init: function (parent, dataset) {
+            this._super(parent, {});
+            this.res_model = parent.model;
+            // import object id
+            this.id = null;
+            this.Import = new instance.web.Model('base_import.import');
+        },
+        start: function () {
+            var self = this;
+            return this.Import.call('create', [{
+                'res_model': this.res_model
+            }]).then(function (id) {
+                self.id = id;
+                self.$('input[name=import_id]').val(id);
+            });
+        },
+
+        //- File change section
+        file_update: function (e) {
+            if (!this.$('input.oe_import_file').val()) { return; }
+
+            // TODO: hide preview before calling set_file
+            jsonp(this.$element, {
+                url: '/base_import/set_file'
+            }, this.proxy('file_updated'));
+        },
+        file_updated: function () {
+            // immediately trigger preview...
+            // TODO: test that write // succeeded?
+            this.Import.call('parse_preview', [this.id, {
+                quote: '"',
+                separator: ',',
+                headers: true,
+            }]).then(this.proxy('preview'));
+        },
+        preview: function (result) {
+            this.$('table').html(QWeb.render('ImportView.preview', result));
+        },
+    });
+};
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
new file mode 100644
index 00000000000..d2a3ec4f66d
--- /dev/null
+++ b/addons/base_import/static/src/xml/import.xml
@@ -0,0 +1,25 @@
+<templates>
+    <t t-name="ImportView">
+        <form action="" method="post" enctype="multipart/form-data">
+            <input type="hidden" name="session_id"
+                   t-att-value="widget.session.session_id"/>
+            <input type="hidden" name="import_id"/>
+            <label for="csvfile">CSV File:</label>
+            <input type="file" id="csvfile" name="file" class="oe_import_file"/>
+
+            <table class="oe_import_grid" width="100%">
+            </table>
+        </form>
+    </t>
+    <!-- TODO: column matcher? -->
+    <t t-name="ImportView.preview">
+        <tr t-if="headers" class="oe_import_grid-header">
+            <td t-foreach="headers" t-as="header" class="oe_import_grid-cell"
+                ><t t-esc="header"/></td>
+        </tr>
+        <tr t-foreach="preview" t-as="row" class="oe_import_grid-row">
+            <td t-foreach="row" t-as="cell" class="oe_import_grid-cell"
+                ><t t-esc="cell"/></td>
+        </tr>
+    </t>
+</templates>

From aec461651e2671dd6bb1caf7ee21430c861c109f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 14 Aug 2012 14:31:12 +0200
Subject: [PATCH 280/999] [FIX] NUL byte in a file leads csv.reader to raise
 csv.Error

bzr revid: xmo@openerp.com-20120814123112-p4iio7fl561ronln
---
 addons/base_import/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_import/models.py b/addons/base_import/models.py
index 07a3439419d..722a9bf848e 100644
--- a/addons/base_import/models.py
+++ b/addons/base_import/models.py
@@ -225,7 +225,7 @@ class ir_import(orm.TransientModel):
                 'headers': headers or False,
                 'preview': list(preview),
             }
-        except (TypeError, UnicodeDecodeError), e:
+        except (csv.Error, TypeError, UnicodeDecodeError), e:
             # Due to lazy generators, UnicodeDecodeError (for
             # instance) may only be raised when serializing the
             # preview to a list in the return.

From 323b979146d6e0ba428a3e15e98f112cf9f80d43 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 14 Aug 2012 14:48:35 +0200
Subject: [PATCH 281/999] [ADD] error reporting to user during preview

bzr revid: xmo@openerp.com-20120814124835-9nkqni98ie2eyt5r
---
 addons/base_import/__openerp__.py            |  1 +
 addons/base_import/models.py                 |  2 +-
 addons/base_import/static/src/js/import.js   | 12 ++++++++++--
 addons/base_import/static/src/xml/import.xml |  8 +++++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/addons/base_import/__openerp__.py b/addons/base_import/__openerp__.py
index 230c514efc8..ab97e237909 100644
--- a/addons/base_import/__openerp__.py
+++ b/addons/base_import/__openerp__.py
@@ -27,6 +27,7 @@ Re-implement openerp's file import system:
     'depends': ['base'],
     'installable': True,
     'auto_install': False, # set to true and allow uninstall?
+    'css': ['static/src/css/import.css'],
     'js': ['static/src/js/import.js'],
     'qweb': ['static/src/xml/import.xml'],
 }
diff --git a/addons/base_import/models.py b/addons/base_import/models.py
index 722a9bf848e..560a28f9067 100644
--- a/addons/base_import/models.py
+++ b/addons/base_import/models.py
@@ -231,7 +231,7 @@ class ir_import(orm.TransientModel):
             # preview to a list in the return.
             _logger.debug("Error during CSV parsing preview", exc_info=True)
             return {
-                'error': _("Failed to parse CSV file: %s") % e,
+                'error': str(e),
                 # iso-8859-1 ensures decoding will always succeed,
                 # even if it yields non-printable characters. This is
                 # in case of UnicodeDecodeError (or csv.Error
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 5bb81d23cbb..559d74734e8 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -61,7 +61,7 @@ openerp.base_import = function (instance) {
         file_update: function (e) {
             if (!this.$('input.oe_import_file').val()) { return; }
 
-            // TODO: hide preview before calling set_file
+            this.$element.removeClass('oe_import_preview oe_import_error');
             jsonp(this.$element, {
                 url: '/base_import/set_file'
             }, this.proxy('file_updated'));
@@ -76,7 +76,15 @@ openerp.base_import = function (instance) {
             }]).then(this.proxy('preview'));
         },
         preview: function (result) {
-            this.$('table').html(QWeb.render('ImportView.preview', result));
+            if (result.error) {
+                this.$element.addClass('oe_import_error');
+                this.$('.oe_import_error_report').html(
+                    QWeb.render('ImportView.error', result));
+            } else {
+                this.$element.addClass('oe_import_preview');
+                this.$('table').html(
+                    QWeb.render('ImportView.preview', result));
+            }
         },
     });
 };
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index d2a3ec4f66d..7cf04c55292 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -1,6 +1,6 @@
 <templates>
     <t t-name="ImportView">
-        <form action="" method="post" enctype="multipart/form-data">
+        <form action="" method="post" enctype="multipart/form-data" class="oe_import">
             <input type="hidden" name="session_id"
                    t-att-value="widget.session.session_id"/>
             <input type="hidden" name="import_id"/>
@@ -9,6 +9,7 @@
 
             <table class="oe_import_grid" width="100%">
             </table>
+            <div class="oe_import_error_report"></div>
         </form>
     </t>
     <!-- TODO: column matcher? -->
@@ -22,4 +23,9 @@
                 ><t t-esc="cell"/></td>
         </tr>
     </t>
+    <t t-name="ImportView.error">
+        <p>Import preview failed due to: <t t-esc="error"/></p>
+        <p>Here is the start of the file we could not import:</p>
+        <pre><t t-esc="preview"/></pre>
+    </t>
 </templates>

From 076fdb09940c57c385c3b3f7639bb893464afb69 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 14 Aug 2012 18:38:21 +0530
Subject: [PATCH 282/999] [IMP] views should show the button
 create/edit/delete/duplicate on the view tag create/edit/delete attributes

bzr revid: jam@tinyerp.com-20120814130821-ret2z62dsthle39p
---
 addons/web/static/src/js/view_form.js | 15 +++++++++++++--
 addons/web/static/src/js/view_list.js | 11 +++++++++--
 addons/web/static/src/xml/base.xml    | 18 ++++++++++++------
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index baf8c151b83..2e800191749 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -148,9 +148,17 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             if(this.fields_view.toolbar) {
                 this.sidebar.add_toolbar(this.fields_view.toolbar);
             }
+            if (self._is_action_enabled('delete')){
+                this.sidebar.add_items('other', [
+                    { label: _t('Delete'), callback: self.on_button_delete },
+                ]);
+            }
+            if (self._is_action_enabled('create')){
+                this.sidebar.add_items('other', [
+                    { label: _t('Duplicate'), callback: self.on_button_duplicate }
+                ]);
+            }
             this.sidebar.add_items('other', [
-                { label: _t('Delete'), callback: self.on_button_delete },
-                { label: _t('Duplicate'), callback: self.on_button_duplicate },
                 { label: _t('Set Default'), callback: function (item) { self.open_defaults_dialog(); } }
             ]);
         }
@@ -1042,6 +1050,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     open_translate_dialog: function(field) {
         return this._super(field);
     },
+    _is_action_enabled: function(action) {
+        return (_.has(this.fields_view.arch.attrs, action))?JSON.parse(this.fields_view.arch.attrs[action]):true;
+    }
 });
 
 /**
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 986b0e49faf..3d6ec27d065 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -353,9 +353,13 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
             this.sidebar.appendTo(this.options.$sidebar);
             this.sidebar.add_items('other', [
                 { label: _t("Import"), callback: this.on_sidebar_import },
-                { label: _t("Export"), callback: this.on_sidebar_export },
-                { label: _t('Delete'), callback: this.do_delete_selected }
+                { label: _t("Export"), callback: this.on_sidebar_export }
             ]);
+            if (self._is_action_enabled('delete')){
+                this.sidebar.add_items('other', [
+                    { label: _t('Delete'), callback: this.do_delete_selected }
+                ]);
+            }
             this.sidebar.add_toolbar(this.fields_view.toolbar);
             this.sidebar.$element.hide();
         }
@@ -831,6 +835,9 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         this.$element.prepend(
             $('<div class="oe_view_nocontent">').html(this.options.action.help)
         );
+    },
+    _is_action_enabled: function(action) {
+        return (_.has(this.fields_view.arch.attrs, action))?JSON.parse(this.fields_view.arch.attrs[action]):true;
     }
 });
 instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.ListView.List# */{
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 0eddd914f01..21d006e23ab 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -672,9 +672,11 @@
 </table>
 <div t-name="ListView.buttons" class="oe_list_buttons">
     <t t-if="!widget.no_leaf and widget.options.action_buttons !== false and widget.options.addable">
-        <button type="button" class="oe_button oe_list_add oe_highlight">
-            <t t-esc="widget.options.addable"/>
-        </button>
+        <t t-if="widget._is_action_enabled('create')">
+            <button type="button" class="oe_button oe_list_add oe_highlight">
+                <t t-esc="widget.options.addable"/>
+            </button>
+        </t>
         <span class="oe_alternative" t-if="widget.options.import_enabled">
             <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_list_button_import">Import</a>
         </span>
@@ -747,10 +749,14 @@
 <div t-name="FormView.buttons" class="oe_form_buttons">
     <t t-if="widget.options.action_buttons !== false">
         <span class="oe_form_buttons_view">
-            <div style="display: inline-block;"> <!-- required for the bounce effect on button -->
-              <button type="button" class="oe_button oe_form_button_edit">Edit</button>
-            </div>
+            <t t-if="widget._is_action_enabled('edit')">
+                <div style="display: inline-block;"> <!-- required for the bounce effect on button -->
+                  <button type="button" class="oe_button oe_form_button_edit">Edit</button>
+                </div>
+        </t>
+        <t t-if="widget._is_action_enabled('create')">
             <button type="button" class="oe_button oe_form_button_create">Create</button>
+        </t>
         </span>
         <span class="oe_form_buttons_edit">
             <button type="button" class="oe_button oe_form_button_save oe_highlight">Save</button> <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_form_button_cancel">Discard</a>

From 9c04845999c0c7176077781650332beb673e7a70 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 14 Aug 2012 19:02:42 +0530
Subject: [PATCH 283/999] [IMP] Addded the common view attrib check method for
 the access ui support

bzr revid: jam@tinyerp.com-20120814133242-y7ofa6oy59gj0uj4
---
 addons/web/static/src/js/view_form.js | 3 ---
 addons/web/static/src/js/view_list.js | 3 ---
 addons/web/static/src/js/views.js     | 8 ++++++++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 2e800191749..239460bbcb4 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1050,9 +1050,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     open_translate_dialog: function(field) {
         return this._super(field);
     },
-    _is_action_enabled: function(action) {
-        return (_.has(this.fields_view.arch.attrs, action))?JSON.parse(this.fields_view.arch.attrs[action]):true;
-    }
 });
 
 /**
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 3d6ec27d065..f420001669b 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -835,9 +835,6 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         this.$element.prepend(
             $('<div class="oe_view_nocontent">').html(this.options.action.help)
         );
-    },
-    _is_action_enabled: function(action) {
-        return (_.has(this.fields_view.arch.attrs, action))?JSON.parse(this.fields_view.arch.attrs[action]):true;
     }
 });
 instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.ListView.List# */{
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 7c9dfe1d543..0fdd49633b1 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1357,6 +1357,14 @@ instance.web.View = instance.web.Widget.extend({
      */
     reload: function () {
         return $.when();
+    },
+    _is_action_enabled: function(action) {
+    /**
+     * Takes action (e.g. create/edit/delete) and return the tag attribute from
+     * the view (e.g. <from string="" create="false" edit="false" delete="false">)
+     * will help to check access ui of the view.
+     */
+        return (_.has(this.fields_view.arch.attrs, action))?JSON.parse(this.fields_view.arch.attrs[action]):true;
     }
 });
 

From 8fa23a95186edd2f5bf6f223337d34f3a4e55e70 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 14 Aug 2012 16:14:56 +0200
Subject: [PATCH 284/999] [ADD] actual importing, no fields matching yet

also no error pinpointing because API does not allow for it currently

bzr revid: xmo@openerp.com-20120814141456-zh9kdbjy8wj1sxys
---
 addons/base_import/models.py                 | 29 ++++++++--
 addons/base_import/static/src/js/import.js   | 58 +++++++++++++++++---
 addons/base_import/static/src/xml/import.xml | 17 +++++-
 3 files changed, 89 insertions(+), 15 deletions(-)

diff --git a/addons/base_import/models.py b/addons/base_import/models.py
index 560a28f9067..a464649758d 100644
--- a/addons/base_import/models.py
+++ b/addons/base_import/models.py
@@ -11,6 +11,8 @@ try:
 except ImportError:
     from StringIO import StringIO
 
+import psycopg2
+
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
@@ -300,24 +302,39 @@ class ir_import(orm.TransientModel):
             record, fields, options, context=context)
 
         try:
+            _logger.info('importing %d rows...', len(data))
             (code, record, message, _wat) = self.pool[record.res_model].import_data(
                 cr, uid, import_fields, data, context=context)
+            _logger.info('done')
+
         except Exception, e:
+            _logger.exception("Import failed")
             # TODO: remove when exceptions stop being an "expected"
-            #       behavior of import_data on some invalid input.
+            #       behavior of import_data on some (most) invalid
+            #       input.
             code, record, message = -1, None, str(e)
 
-        if dryrun:
-            cr.execute('ROLLBACK TO SAVEPOINT import')
-        else:
-            cr.execute('RELEASE SAVEPOINT import')
+        # If transaction aborted, RELEASE SAVEPOINT is going to raise
+        # an InternalError (ROLLBACK should work, maybe). Ignore that.
+        # TODO: to handle multiple errors, create savepoint around
+        #       write and release it in case of write error (after
+        #       adding error to errors array) => can keep on trying to
+        #       import stuff, and rollback at the end if there is any
+        #       error in the results.
+        try:
+            if dryrun:
+                cr.execute('ROLLBACK TO SAVEPOINT import')
+            else:
+                cr.execute('RELEASE SAVEPOINT import')
+        except psycopg2.InternalError:
+            pass
 
         if code != -1:
             return []
 
         # TODO: add key for error location?
         # TODO: error not within normal preview, how to display? Re-preview
-        #       with higher count?
+        #       with higher ``count``?
         return [{
             'type': 'error',
             'message': message,
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 559d74734e8..037a9662b02 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -1,5 +1,6 @@
 openerp.base_import = function (instance) {
     var QWeb = instance.web.qweb;
+    var _t = instance.web._t;
     var _lt = instance.web._lt;
 
     /**
@@ -41,7 +42,14 @@ openerp.base_import = function (instance) {
             'change input.oe_import_file': 'file_update'
         },
         init: function (parent, dataset) {
-            this._super(parent, {});
+            var self = this;
+            this._super(parent, {
+                buttons: [
+                    {text: _t("Import File"), click: function () {
+                        self.do_import();
+                    }, 'class': 'oe_import_dialog_button'}
+                ]
+            });
             this.res_model = parent.model;
             // import object id
             this.id = null;
@@ -57,6 +65,15 @@ openerp.base_import = function (instance) {
             });
         },
 
+        import_options: function () {
+            return {
+                // TODO: customizable gangnam style
+                quote: '"',
+                separator: ',',
+                headers: true,
+            };
+        },
+
         //- File change section
         file_update: function (e) {
             if (!this.$('input.oe_import_file').val()) { return; }
@@ -69,22 +86,49 @@ openerp.base_import = function (instance) {
         file_updated: function () {
             // immediately trigger preview...
             // TODO: test that write // succeeded?
-            this.Import.call('parse_preview', [this.id, {
-                quote: '"',
-                separator: ',',
-                headers: true,
-            }]).then(this.proxy('preview'));
+            this.Import.call(
+                'parse_preview', [this.id, this.import_options()])
+                .then(this.proxy('preview'));
         },
         preview: function (result) {
             if (result.error) {
                 this.$element.addClass('oe_import_error');
                 this.$('.oe_import_error_report').html(
-                    QWeb.render('ImportView.error', result));
+                    QWeb.render('ImportView.preview.error', result));
             } else {
                 this.$element.addClass('oe_import_preview');
                 this.$('table').html(
                     QWeb.render('ImportView.preview', result));
             }
         },
+
+        //- import itself
+        do_import: function () {
+            var fields = this.$('.oe_import_fields input').map(function (index, el) {
+                return el.value || false;
+            }).get();
+            this.Import.call(
+                'do', [this.id, fields, this.import_options()], {
+                    // maybe could do a dryrun after successful
+                    // preview or something (note: don't go to
+                    // this.result if dryrun=true)
+                    dryrun: false
+                })
+                .then(this.proxy('result'));
+        },
+        result: function (errors) {
+            if (!errors.length) {
+                if (this.getParent().reload_content) {
+                    this.getParent().reload_content();
+                }
+                this.close();
+                return;
+            }
+            // import failed (or maybe just warnings, if we ever get
+            // warnings?)
+            this.$element.addClass('oe_import_error');
+            this.$('.oe_import_error_report').html(
+                QWeb.render('ImportView.error', {errors: errors}));
+        },
     });
 };
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index 7cf04c55292..483c9a4a3cb 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -7,9 +7,9 @@
             <label for="csvfile">CSV File:</label>
             <input type="file" id="csvfile" name="file" class="oe_import_file"/>
 
+            <div class="oe_import_error_report"></div>
             <table class="oe_import_grid" width="100%">
             </table>
-            <div class="oe_import_error_report"></div>
         </form>
     </t>
     <!-- TODO: column matcher? -->
@@ -18,14 +18,27 @@
             <td t-foreach="headers" t-as="header" class="oe_import_grid-cell"
                 ><t t-esc="header"/></td>
         </tr>
+        <tr class="oe_import_fields">
+            <!-- Iterate on first row to ensure we have all columns -->
+            <td t-foreach="preview[0]" t-as="column">
+                <input placeholder="Don't Import"/>
+            </td>
+        </tr>
         <tr t-foreach="preview" t-as="row" class="oe_import_grid-row">
             <td t-foreach="row" t-as="cell" class="oe_import_grid-cell"
                 ><t t-esc="cell"/></td>
         </tr>
     </t>
-    <t t-name="ImportView.error">
+    <t t-name="ImportView.preview.error">
         <p>Import preview failed due to: <t t-esc="error"/></p>
         <p>Here is the start of the file we could not import:</p>
         <pre><t t-esc="preview"/></pre>
     </t>
+    <ul t-name="ImportView.error">
+        <li t-foreach="errors" t-as="error" t-attf-class="oe_import_report_#{error.type}">
+            <!-- can also have error.record, but may be *huge* if
+                 e.g. has image fields -->
+            <t t-esc="error.message"/>
+        </li>
+    </ul>
 </templates>

From 876dc272424e78cf45db33dddd23ce994da1ba5e Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Tue, 14 Aug 2012 16:21:51 +0200
Subject: [PATCH 285/999] wip

bzr revid: acl@openerp.com-20120814142151-uwi6xkdamv623pos
---
 addons/note/__openerp__.py           |   3 +-
 addons/note/note.py                  |   2 +-
 addons/note/note_data.xml            | 224 +++++++++++++++++++++++++++
 addons/note/note_view.xml            |   4 +-
 addons/note/static/src/css/Makefile  |   3 +
 addons/note/static/src/css/note.css  |  79 +++++++---
 addons/note/static/src/css/note.sass | 137 ++++++++++++++++
 7 files changed, 427 insertions(+), 25 deletions(-)
 create mode 100644 addons/note/note_data.xml
 create mode 100644 addons/note/static/src/css/Makefile
 create mode 100644 addons/note/static/src/css/note.sass

diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index 96938f56ef1..c9200324bb7 100644
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -41,10 +41,9 @@ Notes can be found in the 'Home' main menu, under 'Tool' submenu.
         'security/note_security.xml',
         'security/ir.model.access.csv',
         'note_view.xml',
-        #'note_workflow.xml',
     ],
     'demo_xml': [
-        #"note_data.xml"
+        "note_data.xml"
     ],
     'test':[
     ],
diff --git a/addons/note/note.py b/addons/note/note.py
index a9afad770c4..89049bf6ec8 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -93,7 +93,7 @@ class note_note(osv.Model):
         'active': fields.boolean('Active'),
         'color': fields.integer('Color Index'),
         #'follower_ids': fields.one2many('mail.subscription', 'res_id', 'Followers', domain=[('res_model','=', 'note.note')])
-        'follower_ids': fields.many2many('res.users', 'mail_subscription', 'res_id', 'user_id', 'Followers', join_filter="mail_subscription.res_model='note.note'")        
+        #'follower_ids': fields.many2many('res.users', 'mail_subscription', 'res_id', 'user_id', 'Followers', join_filter="mail_subscription.res_model='note.note'")        
     }
 
     _sql_constraints = [
diff --git a/addons/note/note_data.xml b/addons/note/note_data.xml
new file mode 100644
index 00000000000..15226bd48b0
--- /dev/null
+++ b/addons/note/note_data.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+    <record model="note.stage" id="note_stage_today">
+      <field name="name">Today</field>
+      <field name="sequence">1</field>
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.stage" id="note_stage_tomorrow">
+      <field name="name">Tomorrow</field>
+      <field name="sequence">2</field>
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.stage" id="note_stage_week">
+      <field name="name">This week</field>
+      <field name="sequence">3</field>
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.stage" id="note_stage_month">
+      <field name="name">This month</field>
+      <field name="sequence">4</field>
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.note" id="note_1">
+      <field name="note"><![CDATA[Buying list
+	* coffee
+	* fruits
+	* ice cream
+	* towels
+	]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_today" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.note" id="note_2">
+      <field name="note"><![CDATA[Buying list
+	* more coffee
+	* tee
+	* sugar
+	* towels
+	]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_tomorrow" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.note" id="note_3">
+      <field name="note"><![CDATA[Idea to develop
+    * Phasellus vel eros lorem, vel tristique risus.
+    * Cras elementum risus ut massa bibendum ac sollicitudin quam feugiat.
+    * Phasellus ullamcorper mauris quis lectus volutpat non dignissim elit lacinia.
+     
+    Nulla vitae metus risus, nec placerat diam.
+    Proin quis nunc sodales dolor tempus eleifend.
+    Praesent iaculis libero ut orci egestas a dapibus libero ornare.
+     
+    * Proin at nisl sit amet ante feugiat euismod nec at orci.
+    * Nam aliquam massa id neque tincidunt eu pellentesque neque euismod.
+    * Proin eget mi sit amet erat tempus pellentesque.
+     
+    * Phasellus congue est lectus, vitae semper arcu.
+    * Suspendisse sodales tortor ut odio volutpat fringilla.
+    * Vestibulum mattis est quis risus dignissim sit amet faucibus nisl mattis.
+    * Pellentesque ullamcorper neque neque, vitae rhoncus massa.
+    
+    Ut id magna massa, quis scelerisque sapien.
+
+	]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_week" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+
+    <record model="note.note" id="note_4">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_month" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+
+    <record model="note.note" id="note_6">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_month" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.note" id="note_7">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_month" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.note" id="note_8">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_month" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.note" id="note_9">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_month" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.note" id="note_10">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_month" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.note" id="note_11">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_month" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.note" id="note_12">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_month" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.note" id="note_13">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_month" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.note" id="note_14">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_month" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.note" id="note_15">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_month" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+    <record model="note.note" id="note_16">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_month" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>
+
+
+
+    <record model="note.note" id="note_5">
+      <field name="note"><![CDATA[New computer specs
+      * Motherboard
+      according to processor
+      * Processor
+      need to decide 
+      * Graphic card
+      with great performance for games !
+      * Hard drive
+      big, for lot of internet backups
+      * Tower
+      silent, better when watching films
+      * Blueray drive ?
+      is it interesting yet ?
+      * Screen 
+      a big one, full of pixels, of course !
+      ]]>
+      </field>
+      <field name="note_pad"></field>      
+      <field name="stage_id" ref="note_stage_month" />
+      <field name="user_id" eval="ref('base.user_root')" />
+    </record>    
+  </data>
+</openerp>
+
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 9f8c91e9c62..ded45474f2f 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -84,9 +84,11 @@
 		</div>
 		
 		<div class="oe_kanban_project_avatars">
-                  <t t-foreach="record.follower_ids.raw_value" t-as="follower">
+                  <!-- 
+			<t t-foreach="record.follower_ids.raw_value" t-as="follower">
                     <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
                   </t>
+-->
 		</div>
 		
 	      </div>
diff --git a/addons/note/static/src/css/Makefile b/addons/note/static/src/css/Makefile
new file mode 100644
index 00000000000..d6019f4ed4a
--- /dev/null
+++ b/addons/note/static/src/css/Makefile
@@ -0,0 +1,3 @@
+note.css: note.sass
+	sass -t expanded note.sass note.css
+
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
index a6b097ece88..4b3c7e0e57d 100644
--- a/addons/note/static/src/css/note.css
+++ b/addons/note/static/src/css/note.css
@@ -1,6 +1,6 @@
 
 
-.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card {
+.openerp .oe_fold_column .oe_kanban_card {
     text-decoration:none;
     color:#000;
     display:block;
@@ -14,35 +14,72 @@
 }
 
 
-.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card {
+
+.oe_kanban_record .oe_kanban_card   {
+    -webkit-transform: rotate(-2deg);
+    -o-transform: rotate(-2deg);
+    -moz-transform:rotate(-2deg);
+}
+
+.oe_kanban_record:nth-of-type(even) .oe_kanban_card   {
+    -webkit-transform: rotate(-1deg);
+    -o-transform: rotate(-1deg);
+    -moz-transform:rotate(-1deg);
+}
+
+
+.oe_kanban_record:nth-of-type(3n) .oe_kanban_card   {
+    -webkit-transform: rotate(4deg);
+    -o-transform: rotate(4deg);
+    -moz-transform:rotate(4deg);
+}
+
+.oe_kanban_column:nth-of-type(even) .oe_kanban_record .oe_kanban_card   {
+    -webkit-transform: rotate(2deg);
+    -o-transform: rotate(2deg);
+    -moz-transform:rotate(2deg);
+}
+
+.oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(even) .oe_kanban_card   {
     -webkit-transform: rotate(-3deg);
     -o-transform: rotate(-3deg);
     -moz-transform:rotate(-3deg);
 }
 
-.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups:nth-child(even) .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card {
-    -o-transform:rotate(1deg);
-    -webkit-transform:rotate(1deg);
+.oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card   {
+    -webkit-transform: rotate(1deg);
+    -o-transform: rotate(1deg);
     -moz-transform:rotate(1deg);
-    position:relative;
-    top:3px;
 }
+/* .openerp .oe_fold_column:nth-child(even) .oe_kanban_card { */
+/*     -webkit-transform: rotate(-3deg); */
+/*     -o-transform: rotate(-3deg); */
+/*     -moz-transform:rotate(-3deg); */
+/* } */
 
-.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups:nth-child(2n) .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card {
-    -o-transform:rotate(-2deg);
-    -webkit-transform:rotate(-2deg);
-    -moz-transform:rotate(-2deg);
-    position:relative;
-    top:-3px;
-}
+/* .openerp  .oe_kanban_groups_records .oe_kanban_column .oe_fold_column:nth-child(even) .oe_kanban_card { */
+/*     -o-transform:rotate(1deg); */
+/*     -webkit-transform:rotate(1deg); */
+/*     -moz-transform:rotate(1deg); */
+/*     position:relative; */
+/*     top:3px; */
+/* } */
 
-.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups:nth-child(2n) .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card {
-    -o-transform:rotate(2deg);
-    -webkit-transform:rotate(2deg);
-    -moz-transform:rotate(2deg);
-    position:relative;
-    top:-5px;
-}
+/* .openerp  .oe_fold_column:nth-child(3n) .oe_kanban_card { */
+/*     -o-transform:rotate(-2deg); */
+/*     -webkit-transform:rotate(-2deg); */
+/*     -moz-transform:rotate(-2deg); */
+/*     position:relative; */
+/*     top:-3px; */
+/* } */
+
+/* .openerp.oe_fold_column:nth-child(5n) .oe_kanban_card { */
+/*     -o-transform:rotate(2deg); */
+/*     -webkit-transform:rotate(2deg); */
+/*     -moz-transform:rotate(2deg); */
+/*     position:relative; */
+/*     top:-5px; */
+/* } */
 
 .openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card:hover, 
 .openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card:focus
diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass
new file mode 100644
index 00000000000..cd04015dcbb
--- /dev/null
+++ b/addons/note/static/src/css/note.sass
@@ -0,0 +1,137 @@
+@charset "utf-8"
+
+// Variables {{{
+$section-title-color: #8786b7
+$tag-bg-light: #f0f0fa
+$tag-bg-dark: #8786b7
+$tag-border: #afafb6
+$tag-border-selected: #a6a6fe
+$hover-background: #f0f0fa
+$link-color: #8a89ba
+$sheet-max-width: 860px
+// }}}
+// Mixins {{{
+@font-face
+  font-family: 'mnmliconsRegular'
+  src: url('/web/static/src/font/mnmliconsv21-webfont.eot') format('eot')
+  src: url('/web/static/src/font/mnmliconsv21-webfont.woff') format('woff')
+  src: url('/web/static/src/font/mnmliconsv21-webfont.ttf') format('truetype')
+  src: url('/web/static/src/font/mnmliconsv21-webfont.svg') format('svg') active
+  font-weight: normal
+  font-style: normal
+
+@font-face
+  font-family: 'EntypoRegular'
+  src: url('/web/static/src/font/entypo-webfont.eot') format('eot')
+  src: url('/web/static/src/font/entypo-webfont.eot?#iefix') format('embedded-opentype')
+  src: url('/web/static/src/font/entypo-webfont.woff') format('woff')
+  src: url('/web/static/src/font/entypo-webfont.ttf') format('truetype')
+  src: url('/web/static/src/font/entypo-webfont.svg') format('svg') active
+  font-weight: normal
+  font-style: normal
+
+@mixin reset()
+  border: none
+  padding: 0
+  margin: 0
+  background: none
+  @include radius(none)
+  @include box-shadow(none)
+
+@mixin vertical-gradient($startColor: #555, $endColor: #333)
+  background-color: $startColor
+  background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */
+  background-image: -webkit-linear-gradient(top, $startColor, $endColor) /* Chrome 10+, Saf5.1+, iOS 5+ */
+  background-image:    -moz-linear-gradient(top, $startColor, $endColor) /* FF3.6 */
+  background-image:     -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */
+  background-image:      -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */
+  background-image:         linear-gradient(to bottom, $startColor, $endColor)
+
+@mixin radial-gradient($gradient)
+  background-position: center center
+  background-image: -webkit-radial-gradient(circle, $gradient)
+  background-image: -moz-radial-gradient($gradient)
+  background-image: -ms-radial-gradient($gradient)
+  background-image: radial-gradient($gradient)
+
+@mixin radius($radius: 5px)
+  -moz-border-radius: $radius
+  -webkit-border-radius: $radius
+  border-radius: $radius
+
+@mixin box-shadow($bsval: 0px 1px 4px #777)
+  -moz-box-shadow: $bsval
+  -webkit-box-shadow: $bsval
+  box-shadow: $bsval
+
+@mixin transition($transval: (border linear 0.2s, box-shadow linear 0.2s))
+  -webkit-transition: $transval
+  -moz-transition: $transval
+  -ms-transition: $transval
+  -o-transition: $transval
+  transition: $transval
+
+@mixin opacity($opacity: .5)
+  filter: alpha(opacity=$opacity * 100)
+  opacity: $opacity
+
+@mixin background-clip($clip: padding-box)
+  -webkit-background-clip: $clip
+  -moz-background-clip: $clip
+  background-clip: $clip
+
+@mixin box-sizing($type: content)
+  // type = border || content || padding
+  -webkit-box-sizing: #{$type}-box
+  -moz-box-sizing: #{$type}-box
+  -ms-box-sizing: #{$type}-box
+  box-sizing: #{$type}-box
+
+// Transforms the (readable) text of an inline element into an mmlicons icon,
+// allows for actual readable text in-code (and in readers?) with iconic looks
+@mixin text-to-icon($icon-name, $color: #404040)
+  font-size: 1px
+  letter-spacing: -1px
+  color: transparent
+  &:before
+    font: 21px "mnmliconsRegular"
+    content: $icon-name
+    color: $color
+        
+// }}}
+// CSS animation bounces {{{
+@-moz-keyframes bounce
+  0%
+    -moz-transform: scale(0)
+    opacity: 0
+  50%
+    -moz-transform: scale(1.3)
+    opacity: 0.4
+  75%
+    -moz-transform: scale(0.9)
+    opacity: 0.7
+  100%
+    -moz-transform: scale(1)
+    opacity: 1
+
+@-webkit-keyframes bounce
+  0%
+    -webkit-transform: scale(0)
+    opacity: 0
+  50%
+    -webkit-transform: scale(1.3)
+    opacity: 0.4
+  75%
+    -webkit-transform: scale(0.9)
+    opacity: 0.7
+  100%
+    -webkit-transform: scale(1)
+    opacity: 1
+// }}}
+
+
+.oe_kanban_color_2
+  background-color:red
+				  
+// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
+

From 34f9664377ae837a7080b88a24c87b6ed88f88d0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 14 Aug 2012 16:29:33 +0200
Subject: [PATCH 286/999] [FIX] no field selected for import by the user

bzr revid: xmo@openerp.com-20120814142933-myng67f2cily6vfg
---
 addons/base_import/models.py           | 14 +++++++++--
 addons/base_import/tests/test_cases.py | 32 ++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/addons/base_import/models.py b/addons/base_import/models.py
index a464649758d..2e44c686fd7 100644
--- a/addons/base_import/models.py
+++ b/addons/base_import/models.py
@@ -252,9 +252,12 @@ class ir_import(orm.TransientModel):
         :param list(str|bool): fields
         :returns: (data, fields)
         :rtype: (list(list(str)), list(str))
+        :raises ValueError: in case the import data could not be converted
         """
         # Get indices for non-empty fields
         indices = [index for index, field in enumerate(fields) if field]
+        if not indices:
+            raise ValueError(_("You must configure at least one field to import"))
         # If only one index, itemgetter will return an atom rather
         # than a 1-tuple
         if len(indices) == 1: mapper = lambda row: [row[indices[0]]]
@@ -298,8 +301,15 @@ class ir_import(orm.TransientModel):
         cr.execute('SAVEPOINT import')
 
         (record,) = self.browse(cr, uid, [id], context=context)
-        data, import_fields = self._convert_import_data(
-            record, fields, options, context=context)
+        try:
+            data, import_fields = self._convert_import_data(
+                record, fields, options, context=context)
+        except ValueError, e:
+            return [{
+                'type': 'error',
+                'message': str(e),
+                'record': False,
+            }]
 
         try:
             _logger.info('importing %d rows...', len(data))
diff --git a/addons/base_import/tests/test_cases.py b/addons/base_import/tests/test_cases.py
index 00230f9a3c0..e2b61c1928b 100644
--- a/addons/base_import/tests/test_cases.py
+++ b/addons/base_import/tests/test_cases.py
@@ -311,3 +311,35 @@ class test_convert_import_data(TransactionCase):
             ('foo', '2'),
             ('', '6'),
         ])
+
+    def test_nofield(self):
+        Import = self.registry('base_import.import')
+
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': base64.b64encode('name,Some Value,Counter\n'
+                    'foo,1,2\n')
+        })
+
+        record = Import.browse(self.cr, self.uid, id)
+        self.assertRaises(
+            ValueError,
+            Import._convert_import_data,
+            record, [],
+            {'quote': '"', 'separator': ',', 'headers': True,})
+
+    def test_falsefields(self):
+        Import = self.registry('base_import.import')
+
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': base64.b64encode('name,Some Value,Counter\n'
+                    'foo,1,2\n')
+        })
+
+        record = Import.browse(self.cr, self.uid, id)
+        self.assertRaises(
+            ValueError,
+            Import._convert_import_data,
+            record, [False, False, False],
+            {'quote': '"', 'separator': ',', 'headers': True,})

From 56666953b38e7ea2c6e8e8bc8391bd6da9b64276 Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Tue, 14 Aug 2012 17:18:00 +0200
Subject: [PATCH 287/999] Some fixes

bzr revid: acl@openerp.com-20120814151800-e0adyvny6v17c3qr
---
 addons/note/note.py                 | 15 +-------
 addons/note/note_view.xml           | 16 ++-------
 addons/note/static/src/css/note.css | 54 +++++++++++------------------
 3 files changed, 24 insertions(+), 61 deletions(-)

diff --git a/addons/note/note.py b/addons/note/note.py
index 89049bf6ec8..7d0ff170d79 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -22,16 +22,6 @@
 from openerp.osv import osv, fields
 from tools.translate import _
 
-#
-# Todo :
-
-
-#  ** fix editable when in form view ** not atm
-#  fix search
-#  fix design
-#  rights
-
-
 class note_stage(osv.Model):
     """ Category of Note """
 
@@ -55,9 +45,6 @@ class note_stage(osv.Model):
         'sequence' : 1,
     }
 
-    def __init__(self, pool, cr):
-        osv.Model.__init__(self,pool, cr)
-
 
 # class many2many_filter(fields.many2many)
 
@@ -93,7 +80,7 @@ class note_note(osv.Model):
         'active': fields.boolean('Active'),
         'color': fields.integer('Color Index'),
         #'follower_ids': fields.one2many('mail.subscription', 'res_id', 'Followers', domain=[('res_model','=', 'note.note')])
-        #'follower_ids': fields.many2many('res.users', 'mail_subscription', 'res_id', 'user_id', 'Followers', join_filter="mail_subscription.res_model='note.note'")        
+        'follower_ids': fields.many2many('res.users', 'mail_subscription', 'res_id', 'user_id', 'Followers', join_filter="mail_subscription.res_model='note.note'")        
     }
 
     _sql_constraints = [
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index ded45474f2f..39dca553c39 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -16,8 +16,6 @@
       </field>
     </record>
 
-
-
     <!-- Note Stage Tree View -->
     <record model="ir.ui.view" id="view_note_stage_tree">
       <field name="name">note.stage.tree</field>
@@ -77,18 +75,14 @@
 
 		<!-- kanban note -->
 		<div class="oe_kanban_content">
-
 		  <!-- title -->
 		  <field name="name" />
-		  
 		</div>
 		
 		<div class="oe_kanban_project_avatars">
-                  <!-- 
-			<t t-foreach="record.follower_ids.raw_value" t-as="follower">
+		  <t t-foreach="record.follower_ids.raw_value" t-as="follower">
                     <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
-                  </t>
--->
+		  </t>
 		</div>
 		
 	      </div>
@@ -99,8 +93,6 @@
       </field>
     </record>
 
-
-    
     <!-- New Note Form View -->
     <record model="ir.ui.view" id="view_note_note_form">
       <field name="name">note.note.form</field>
@@ -112,7 +104,7 @@
 	    <!-- todo: remove domain -->
 	    <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1" />
 	  </header>
-          <field name="note" widget="pad" />
+          <field name="note_pad" widget="pad" />
           <div class="oe_chatter">
             <field name="message_ids" widget="mail_thread"/>
           </div>
@@ -137,7 +129,6 @@
       </field>
     </record>
 
-
     <!-- New Note Tree View -->    
     <record model="ir.ui.view" id="view_note_note_tree">
       <field name="name">note.note.tree</field>
@@ -145,7 +136,6 @@
       <field name="type">tree</field>
     </record>
 
-
     <record model="ir.actions.act_window" id="action_note_note">
       <field name="name">Notes</field>
       <field name="res_model">note.note</field>
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
index 4b3c7e0e57d..39800834417 100644
--- a/addons/note/static/src/css/note.css
+++ b/addons/note/static/src/css/note.css
@@ -13,8 +13,6 @@
     box-shadow: 5px 5px 7px rgba(33,33,33,.7);
 }
 
-
-
 .oe_kanban_record .oe_kanban_card   {
     -webkit-transform: rotate(-2deg);
     -o-transform: rotate(-2deg);
@@ -22,12 +20,11 @@
 }
 
 .oe_kanban_record:nth-of-type(even) .oe_kanban_card   {
-    -webkit-transform: rotate(-1deg);
-    -o-transform: rotate(-1deg);
-    -moz-transform:rotate(-1deg);
+    -webkit-transform: rotate(1deg);
+    -o-transform: rotate(1deg);
+    -moz-transform:rotate(1deg);
 }
 
-
 .oe_kanban_record:nth-of-type(3n) .oe_kanban_card   {
     -webkit-transform: rotate(4deg);
     -o-transform: rotate(4deg);
@@ -51,38 +48,27 @@
     -o-transform: rotate(1deg);
     -moz-transform:rotate(1deg);
 }
-/* .openerp .oe_fold_column:nth-child(even) .oe_kanban_card { */
-/*     -webkit-transform: rotate(-3deg); */
-/*     -o-transform: rotate(-3deg); */
-/*     -moz-transform:rotate(-3deg); */
-/* } */
 
-/* .openerp  .oe_kanban_groups_records .oe_kanban_column .oe_fold_column:nth-child(even) .oe_kanban_card { */
-/*     -o-transform:rotate(1deg); */
-/*     -webkit-transform:rotate(1deg); */
-/*     -moz-transform:rotate(1deg); */
-/*     position:relative; */
-/*     top:3px; */
-/* } */
+.oe_kanban_column:nth-of-type(3n) .oe_kanban_record .oe_kanban_card   {
+    -webkit-transform: rotate(-2deg);
+    -o-transform: rotate(-2deg);
+    -moz-transform:rotate(-2deg);
+}
 
-/* .openerp  .oe_fold_column:nth-child(3n) .oe_kanban_card { */
-/*     -o-transform:rotate(-2deg); */
-/*     -webkit-transform:rotate(-2deg); */
-/*     -moz-transform:rotate(-2deg); */
-/*     position:relative; */
-/*     top:-3px; */
-/* } */
+.oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(even) .oe_kanban_card   {
+    -webkit-transform: rotate(1deg);
+    -o-transform: rotate(1deg);
+    -moz-transform:rotate(1deg);
+}
 
-/* .openerp.oe_fold_column:nth-child(5n) .oe_kanban_card { */
-/*     -o-transform:rotate(2deg); */
-/*     -webkit-transform:rotate(2deg); */
-/*     -moz-transform:rotate(2deg); */
-/*     position:relative; */
-/*     top:-5px; */
-/* } */
+.oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card   {
+    -webkit-transform: rotate(-1deg);
+    -o-transform: rotate(-1deg);
+    -moz-transform:rotate(-1deg);
+}
 
-.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card:hover, 
-.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card:focus
+.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card:hover, 
+.openerp  .oe_kanban_column .oe_fold_column .oe_kanban_card:focus
 {
     box-shadow:10px 10px 7px rgba(0,0,0,.7);
     -moz-box-shadow:10px 10px 7px rgba(0,0,0,.7);

From 531e077f1bcbbb4d3e45fe1985e6f246132b468e Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Tue, 14 Aug 2012 17:42:40 +0200
Subject: [PATCH 288/999] [FIX] some misc fixes

bzr revid: acl@openerp.com-20120814154240-on30lw5qfp66xj7q
---
 addons/note/note.py | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/addons/note/note.py b/addons/note/note.py
index 7d0ff170d79..05c5ea6eadf 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -32,8 +32,8 @@ class note_stage(osv.Model):
         'sequence': fields.integer('Sequence', help="Used to order the note stages"),
         'user_id': fields.many2one('res.users', 'Owner', help="Owner of the note stage.", required=True, readonly=True),
         'fold': fields.boolean('Folded'),
-
     }
+
     _sql_constraints = [
     ]
 
@@ -64,13 +64,13 @@ class note_note(osv.Model):
         for note in self.browse(cr, uid, ids, context=context):
             res[note.id] = note.note.split('\n')[0]
         return res
-        
+
     def _set_note_first_line(self, cr, uid, id, name, value, args, context=None):
         #
         # todo should set the pad first line (as title)
         #
         return self.write(cr, uid, [id], {'name': value}, context=context)
-    
+
     _columns = {
         'name': fields.function(_get_note_first_line,_fnct_inv=_set_note_first_line, string='Note Summary', type="text", store=True),
         'note': fields.text('Pad Content'),
@@ -79,8 +79,7 @@ class note_note(osv.Model):
         'stage_id': fields.many2one('note.stage', 'Stage'),
         'active': fields.boolean('Active'),
         'color': fields.integer('Color Index'),
-        #'follower_ids': fields.one2many('mail.subscription', 'res_id', 'Followers', domain=[('res_model','=', 'note.note')])
-        'follower_ids': fields.many2many('res.users', 'mail_subscription', 'res_id', 'user_id', 'Followers', join_filter="mail_subscription.res_model='note.note'")        
+        'follower_ids': fields.many2many('res.users', 'mail_subscription', 'res_id', 'user_id', 'Followers', join_filter="mail_subscription.res_model='note.note'")
     }
 
     _sql_constraints = [
@@ -97,18 +96,15 @@ class note_note(osv.Model):
         'note_pad': lambda self, cr, uid, context: self.pad_generate_url(cr, uid, context),
     }
 
-    
     _order = 'sequence asc'
 
-    
-
     def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
         access_rights_uid = access_rights_uid or uid
         stage_obj = self.pool.get('note.stage')
-        
+
         # only show stage groups not folded and owned by user
         search_domain = [('fold', '=', False),('user_id', '=', uid)]
-        
+
         stage_ids = stage_obj._search(cr, uid, search_domain, order=self._order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         return result

From 7f319f5a374842a2731e7fbacb468452be784c69 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 14 Aug 2012 19:23:22 +0200
Subject: [PATCH 289/999] [ADD] blahblahblahblah

also basic CSS effects

bzr revid: xmo@openerp.com-20120814172322-1hx09qqh90umjdcq
---
 addons/base_import/static/src/css/import.css | 27 ++++++++++++
 addons/base_import/static/src/js/import.js   | 27 +++++++++---
 addons/base_import/static/src/xml/import.xml | 46 +++++++++++++++++---
 3 files changed, 89 insertions(+), 11 deletions(-)
 create mode 100644 addons/base_import/static/src/css/import.css

diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css
new file mode 100644
index 00000000000..4bb1fdeaea0
--- /dev/null
+++ b/addons/base_import/static/src/css/import.css
@@ -0,0 +1,27 @@
+.oe_import dd,
+.oe_import .oe_import_grid,
+.oe_import .oe_import_error_report,
+.oe_import .oe_import_with_file,
+.oe_import .oe_import_noheaders {
+    display: none;
+}
+
+.oe_import.oe_import_preview .oe_import_grid {
+    display: table;
+}
+.oe_import.oe_import_error .oe_import_error_report,
+.oe_import.oe_import_with_file .oe_import_with_file,
+.oe_import.oe_import_noheaders .oe_import_noheaders {
+    display: block;
+}
+
+.oe_import .oe_import_error_report ul .oe_import_report_error {
+    background-color: #FFD9DB;
+}
+.oe_import .oe_import_error_report ul .oe_import_report_warning {
+    background-color: #FEFFD9;
+}
+
+.oe_import .oe_import_noheaders {
+    color: #888;
+}
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 037a9662b02..3a52ad548ec 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -39,7 +39,22 @@ openerp.base_import = function (instance) {
         template: 'ImportView',
         dialog_title: _lt("Import Data"),
         events: {
-            'change input.oe_import_file': 'file_update'
+            'change input.oe_import_file': 'file_update',
+            'click input.oe_import_has_header': function (e) {
+                this.$element.toggleClass(
+                    'oe_import_noheaders', !e.target.checked);
+                this.settings_updated();
+            },
+            'click a.oe_import_csv': function (e) {
+                e.preventDefault();
+            },
+            'click a.oe_import_export': function (e) {
+                e.preventDefault();
+            },
+            'click dt a': function (e) {
+                e.preventDefault();
+                $(e.target).parent().next().toggle();
+            }
         },
         init: function (parent, dataset) {
             var self = this;
@@ -70,21 +85,21 @@ openerp.base_import = function (instance) {
                 // TODO: customizable gangnam style
                 quote: '"',
                 separator: ',',
-                headers: true,
+                headers: this.$('input.oe_import_has_header').prop('checked'),
             };
         },
 
-        //- File change section
+        //- File & settings change section
         file_update: function (e) {
             if (!this.$('input.oe_import_file').val()) { return; }
 
             this.$element.removeClass('oe_import_preview oe_import_error');
             jsonp(this.$element, {
                 url: '/base_import/set_file'
-            }, this.proxy('file_updated'));
+            }, this.proxy('settings_updated'));
         },
-        file_updated: function () {
-            // immediately trigger preview...
+        settings_updated: function () {
+            this.$element.addClass('oe_import_with_file');
             // TODO: test that write // succeeded?
             this.Import.call(
                 'parse_preview', [this.id, this.import_options()])
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index 483c9a4a3cb..bb4f1d742d5 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -4,15 +4,51 @@
             <input type="hidden" name="session_id"
                    t-att-value="widget.session.session_id"/>
             <input type="hidden" name="import_id"/>
-            <label for="csvfile">CSV File:</label>
+            <h2>Upload your file</h2>
+            <p>Select the <a href="#" class="oe_import_csv">.CSV</a>
+            file to import. If you need a sample importable file, you
+            can use <a href="#" class="oe_import_export">the export
+            tool</a> to generate one.</p>
+            <label for="csvfile" autofocus="autofocus">CSV File:</label>
             <input type="file" id="csvfile" name="file" class="oe_import_file"/>
 
-            <div class="oe_import_error_report"></div>
-            <table class="oe_import_grid" width="100%">
-            </table>
+            <div class="oe_import_with_file">
+                <h2>Map your data to OpenERP</h2>
+                <input type="checkbox" class="oe_import_has_header"
+                       id="oe_import_has_header" checked="checked"/>
+                <label for="oe_import_has_header">The first row of the
+                file contains the label of the column</label>
+                <p class="oe_import_noheaders">If the file contains
+                the column names, OpenERP can try auto-detecting the
+                field corresponding to the column. This makes imports
+                simpler especially when the file has many columns.</p>
+
+                <div class="oe_import_error_report"></div>
+                <table class="oe_import_grid" width="100%"/>
+                <!-- TODO: other CSV options -->
+
+                <h2>Frequently Asked Questions</h2>
+                <dl>
+                    <dt><a href="#">Need to import data from an other application?</a></dt>
+                    <dd>
+                        <p>In order to re-create relationships between
+                        different records, you should use the unique
+                        identifier from the original application and
+                        map it to the <abbr title="External ID">ID</abbr>
+                        column in OpenERP. When you
+                        import an other record that links to the first
+                        one, use <abbr title="XXX/External ID">XXX/ID</abbr>
+                        to the original unique identifier.</p>
+                        <p>The <abbr title="External ID">ID</abbr>
+                        will also be used to update the original
+                        import if you need to re-import modified data
+                        later, it's thus good practice to specify it
+                        whenever possible</p>
+                    </dd>
+                </dl>
+            </div>
         </form>
     </t>
-    <!-- TODO: column matcher? -->
     <t t-name="ImportView.preview">
         <tr t-if="headers" class="oe_import_grid-header">
             <td t-foreach="headers" t-as="header" class="oe_import_grid-cell"

From c02116b41f9c500828c54725c11541ddcd1c5dfd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 14 Aug 2012 21:44:12 +0200
Subject: [PATCH 290/999] [IMP] cleaning of need action

bzr revid: fp@openerp.com-20120814194412-2bcujivyd45buikx
---
 openerp/addons/base/ir/ir.xml                 |  24 ---
 openerp/addons/base/ir/ir_needaction.py       | 182 +++---------------
 openerp/addons/base/ir/ir_ui_menu.py          |  18 +-
 .../addons/base/security/ir.model.access.csv  |   1 -
 openerp/osv/orm.py                            |  33 +---
 5 files changed, 36 insertions(+), 222 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index fac2946e204..c554a8896aa 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -556,30 +556,6 @@
 
         <menuitem action="ir_action_wizard" id="menu_ir_action_wizard" parent="base.next_id_6"/>
 
-        <!-- Needaction mechanism -->
-        <record model="ir.ui.view" id="view_ir_needaction_users_rel_tree">
-            <field name="name">ir.needaction_users_rel.tree</field>
-            <field name="model">ir.needaction_users_rel</field>
-            <field name="sequence">10</field>
-            <field name="arch" type="xml">
-                <tree string="Subscription">
-                    <field name="user_id"/>
-                    <field name="res_model"/>
-                    <field name="res_id"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="action_view_needaction_users_rel" model="ir.actions.act_window">
-            <field name="name">Need action relationships</field>
-            <field name="res_model">ir.needaction_users_rel</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem id="menu_needaction_users_rel" name="Need actions" parent="base.menu_users" sequence="20" action="action_view_needaction_users_rel" groups="base.group_no_one"/>
-
-
         <!-- View -->
         <record id="view_view_form" model="ir.ui.view">
             <field name="name">ir.ui.view</field>
diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 0f28c33ded9..95fc6d81b09 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -19,180 +19,48 @@
 #
 ##############################################################################
 
-import openerp.pooler as pooler
-from operator import itemgetter
 from osv import osv, fields
-from tools.translate import _
-
-class ir_needaction_users_rel(osv.Model):
-    ''' ir_needaction_users_rel holds data related to the needaction 
-    mechanism inside OpenERP. A row in this model is characterized 
-    by:
-    - res_model: model of the record requiring an action
-    - res_id: ID of the record requiring an action
-    - user_id: foreign key to the res.users table, to the user that has to
-      perform the action
-    This model can be seen as a many2many, linking (res_model, res_id) to users
-    (those whose attention is required on the record). '''
-    
-    _name = 'ir.needaction_users_rel'
-    _description = 'Needaction relationship table'
-    _rec_name = 'id'
-    _order = 'id desc'
-    _columns = {
-        'res_model': fields.char('Related Document Model', size=128,
-                        select=1, required=True),
-        'res_id': fields.integer('Related Document ID',
-                        select=1, required=True),
-        'user_id': fields.many2one('res.users', string='Related User',
-                        ondelete='cascade', select=1, required=True),
-    }
-    
-    def _get_users(self, cr, uid, res_ids, res_model, context=None):
-        """Given res_ids of res_model, get user_ids present in table"""
-        rel_ids = self.search(cr, uid, [('res_model', '=', res_model), ('res_id', 'in', res_ids)], context=context)
-        return list(set(map(itemgetter('user_id'), self.read(cr, uid, rel_ids, ['user_id'], context=context))))
-    
-    def create_users(self, cr, uid, res_ids, res_model, user_ids, context=None):
-        """Given res_ids of res_model, add user_ids to the relationship table"""
-        for res_id in res_ids:
-            for user_id in user_ids:
-                self.create(cr, uid, {'res_model': res_model, 'res_id': res_id, 'user_id': user_id}, context=context)
-        return True
-    
-    def unlink_users(self, cr, uid, res_ids, res_model, context=None):
-        """Given res_ids of res_model, delete all entries in the relationship table"""
-        to_del_ids = self.search(cr, uid, [('res_model', '=', res_model), ('res_id', 'in', res_ids)], context=context)
-        return self.unlink(cr, uid, to_del_ids, context=context)
-    
-    def update_users(self, cr, uid, res_ids, res_model, user_ids, context=None):
-        """Given res_ids of res_model, update their entries in the relationship table to user_ids"""
-        # read current records
-        cur_users = self._get_users(cr, uid, res_ids, res_model, context=context)
-        if len(cur_users) == len(user_ids) and all(cur_user in user_ids for cur_user in cur_users):
-            return True
-        # unlink old records
-        self.unlink_users(cr, uid, res_ids, res_model, context=context)
-        # link new records
-        self.create_users(cr, uid, res_ids, res_model, user_ids, context=context)
-        return True
-
 
 class ir_needaction_mixin(osv.Model):
     '''Mixin class for objects using the need action feature.
-    
-    Need action feature can be used by objects having to be able to 
-    signal that an action is required on a particular record. If in 
-    the business logic an action must be performed by somebody, for 
-    instance validation by a manager, this mechanism allows to set a 
+
+    Need action feature can be used by objects having to be able to
+    signal that an action is required on a particular record. If in
+    the business logic an action must be performed by somebody, for
+    instance validation by a manager, this mechanism allows to set a
     list of users asked to perform an action.
-    
-    This class wraps a class (ir.ir_needaction_users_rel) that 
-    behaves like a many2many field. This class handles the low-level 
-    considerations of updating relationships. Every change made on 
-    the record calls a method that updates the relationships.
-    
-    Objects using the 'need_action' feature should override the 
-    ``get_needaction_user_ids`` method. This methods returns a 
-    dictionary whose keys are record ids, and values a list of user 
-    ids, like in a many2many relationship. Therefore by defining 
-    only one method, you can specify if an action is required by 
-    defining the users that have to do it, in every possible 
-    situation.
-    
-    This class also offers several global services: 
-    - ``needaction_get_record_ids``: for the current model and uid, get
-    all record ids that ask this user to perform an action. This 
-    mechanism is used for instance to display the number of pending 
-    actions in menus, such as Leads (12)
+
+    Objects using the 'need_action' feature should override the
+    ``needaction_domain_get`` method. This methods returns a
+    domain to filter records requiring an action for a specific user.
+
+    This class also offers several global services:
     - ``needaction_get_action_count``: as ``needaction_get_record_ids``
-    but returns only the number of action, not the ids (performs a 
+    but returns only the number of action, not the ids (performs a
     search with count=True)
+    '''
 
-    The ``ir_needaction_mixin`` class adds a calculated field 
-    ``needaction_pending``. This function field allows to state 
-    whether a given record has a needaction for the current user. 
-    This is usefull if you want to customize views according to the 
-    needaction feature. For example, you may want to set records in 
-    bold in a list view if the current user has an action to perform 
-    on the record. '''
-    
     _name = 'ir.needaction_mixin'
-    _description = 'Need action mixin'
-    
-    def get_needaction_pending(self, cr, uid, ids, name, arg, context=None):
-        res = {}
-        needaction_user_ids = self.get_needaction_user_ids(cr, uid, ids, context=context)
-        for id in ids:
-            res[id] = uid in needaction_user_ids[id]
-        return res
+    _description = 'Need Action Mixin'
+    _needaction = True
 
-    def search_needaction_pending(self, cr, uid, self_again, field_name, criterion, context=None):
-        ids = self.needaction_get_record_ids(
-            cr, uid, uid, limit=1024, context=context)
-        return [('id', 'in', ids)]
-    
-    _columns = {
-        'needaction_pending': fields.function(
-            get_needaction_pending, type='boolean',
-            fnct_search=search_needaction_pending,
-            string='Need action pending',
-            help="If True, this field states that users have to perform an " \
-                 "action This field comes from the ir.needaction_mixin class."),
-    }
-    
     #------------------------------------------------------
     # Addon API
     #------------------------------------------------------
-    
-    def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        """ Returns the user_ids that have to perform an action
-            :return: dict { record_id: [user_ids], }
+
+    def _needaction_domain_get(self, cr, uid, context=None):
+        """ Returns the domain to filter records that require an action
+            :return: domain or False is no need action
         """
-        return dict((id,list()) for id in ids)
-    
-    def create(self, cr, uid, values, context=None):
-        rel_obj = self.pool.get('ir.needaction_users_rel')
-        # perform create
-        obj_id = super(ir_needaction_mixin, self).create(cr, uid, values, context=context)
-        # link user_ids
-        needaction_user_ids = self.get_needaction_user_ids(cr, uid, [obj_id], context=context)
-        rel_obj.create_users(cr, uid, [obj_id], self._name, needaction_user_ids[obj_id], context=context)
-        return obj_id
-    
-    def write(self, cr, uid, ids, values, context=None):
-        rel_obj = self.pool.get('ir.needaction_users_rel')
-        # perform write
-        write_res = super(ir_needaction_mixin, self).write(cr, uid, ids, values, context=context)
-        # get and update user_ids
-        needaction_user_ids = self.get_needaction_user_ids(cr, uid, ids, context=context)
-        for id in ids:
-            rel_obj.update_users(cr, uid, [id], self._name, needaction_user_ids[id], context=context)
-        return write_res
-    
-    def unlink(self, cr, uid, ids, context=None):
-        # unlink user_ids
-        rel_obj = self.pool.get('ir.needaction_users_rel')
-        rel_obj.unlink_users(cr, uid, ids, self._name, context=context)
-        # perform unlink
-        return super(ir_needaction_mixin, self).unlink(cr, uid, ids, context=context)
-    
+        return False
+
     #------------------------------------------------------
     # "Need action" API
     #------------------------------------------------------
-    
-    def needaction_get_record_ids(self, cr, uid, user_id, limit=80, context=None):
-        """Given the current model and a user_id
-           return the record ids that require the user to perform an
-           action"""
-        rel_obj = self.pool.get('ir.needaction_users_rel')
-        rel_ids = rel_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, context=context)
-        return map(itemgetter('res_id'), rel_obj.read(cr, uid, rel_ids, ['res_id'], context=context))
-    
-    def needaction_get_action_count(self, cr, uid, user_id, limit=80, context=None):
+
+    def _needaction_count(self, cr, uid, domain=[], context=None):
         """Given the current model and a user_id
            get the number of actions it has to perform"""
-        rel_obj = self.pool.get('ir.needaction_users_rel')
-        return rel_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, count=True, context=context)
+        dom = self._needaction_domain_get(cr, uid, context=context)
+        return self.search(cr, uid, domain+dom, context=context, count=True)
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index 77c0c4d738a..1bb517c570f 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -255,23 +255,23 @@ class ir_ui_menu(osv.osv):
 
         return res
 
-    def _get_needaction_info(self, cr, uid, id, domain=[], context={}):
-        return [False, 0]
-
     def _get_needaction(self, cr, uid, ids, field_names, args, context=None):
         if context is None:
             context = {}
         res = {}
         for menu in self.browse(cr, uid, ids, context=context):
+            res[menu.id]['needaction_enabled'] = False
+            res[menu.id]['needaction_counter'] = False
             res[menu.id] = {}
             if menu.action and menu.action.type == 'ir.actions.act_window' and menu.action.res_model:
-                menu_needaction_res = self.pool.get(menu.action.res_model)._get_needaction_info(cr, uid, uid, domain=menu.action.domain, context=context)
-            else:
-                menu_needaction_res = [False, 0]
-            res[menu.id]['needaction_enabled'] = menu_needaction_res[0]
-            res[menu.id]['needaction_counter'] = menu_needaction_res[1]
+                obj = self.pool.get(menu.action.res_model)
+                if obj._needaction_active:
+                    res[menu.id]['needaction_enabled'] = obj._needaction_active
+                    # check domain and context: should we evaluate the domain ?
+                    # and add context of the action ?
+                    res[menu.id]['needaction_counter'] = obj._needaction_count(cr, uid, menu.action.domain, context=context)
         return res
-        
+
     _columns = {
         'name': fields.char('Menu', size=64, required=True, translate=True),
         'sequence': fields.integer('Sequence'),
diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index d49aa18db8c..b0218e977bc 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -118,6 +118,5 @@
 "access_ir_config_parameter","ir_config_parameter","model_ir_config_parameter",,1,0,0,0
 "access_ir_mail_server_all","ir_mail_server","model_ir_mail_server",,1,0,0,0
 "access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0
-"access_ir_needaction_users_rel","ir_needaction_users_rel","model_ir_needaction_users_rel",,1,1,1,1
 "access_ir_needaction_mixin","ir_needaction_mixin","model_ir_needaction_mixin",,1,1,1,1
 
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 7c8085ea8ed..368a37f455a 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -666,6 +666,7 @@ class BaseModel(object):
     _order = 'id'
     _sequence = None
     _description = None
+    _needaction = False
 
     # dict of {field:method}, with method returning the name_get of records
     # to include in the _read_group, if grouped on this field
@@ -4960,37 +4961,7 @@ class BaseModel(object):
     # backwards compatibility
     get_xml_id = get_external_id
     _get_xml_ids = _get_external_ids
-    
-    def _get_needaction_info(self, cr, uid, user_id, limit=None, order=None, domain=False, context=None):
-        """Base method for needaction mechanism
-           - see ir.needaction for actual implementation
-           - if the model uses the need action mechanism
-             (hasattr(model_obj, 'needaction_get_record_ids')):
-              - get the record ids on which the user has actions to perform
-              - evaluate the menu domain
-              - compose a new domain: menu domain, limited to ids of
-                records requesting an action
-              - count the number of records maching that domain, that
-                is the number of actions the user has to perform
-           - this method returns default values
-           :param: model_name: the name of the model (ex: hr.holidays)
-           :param: user_id: the id of user
-           :return: [uses_needaction=True/False, needaction_uid_ctr=%d]
-        """
-        if hasattr(self, 'needaction_get_record_ids'):
-            # Arbitrary limit, but still much lower thant infinity, to avoid
-            # getting too much data.
-            ids = self.needaction_get_record_ids(cr, uid, user_id, limit=8192, context=context)
-            if not ids:
-                return [True, 0]
-            if domain:
-                new_domain = eval(domain, locals_dict={'uid': user_id}) + [('id', 'in', ids)]
-            else:
-                new_domain = [('id', 'in', ids)]
-            return [True, self.search(cr, uid, new_domain, limit=limit, order=order, count=True, context=context)]
-        else:
-            return [False, 0]
-            
+
     # Transience
     def is_transient(self):
         """ Return whether the model is transient.

From 560e9e7fd259c4da0285d3730ec72c1f462b755a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 14 Aug 2012 21:58:40 +0200
Subject: [PATCH 291/999] [IMP] put needaction_pending again, new
 implementation

bzr revid: fp@openerp.com-20120814195840-yaha9r3qvj8o13zr
---
 openerp/addons/base/ir/ir_needaction.py | 27 +++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 95fc6d81b09..5552b42052e 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -38,12 +38,39 @@ class ir_needaction_mixin(osv.Model):
     - ``needaction_get_action_count``: as ``needaction_get_record_ids``
     but returns only the number of action, not the ids (performs a
     search with count=True)
+
+    The ``ir_needaction_mixin`` class adds a calculated field
+    ``needaction_pending``. This function field allows to state
+    whether a given record has a needaction for the current user.
+    This is usefull if you want to customize views according to the
+    needaction feature. For example, you may want to set records in
+    bold in a list view if the current user has an action to perform
+    on the record.
     '''
 
     _name = 'ir.needaction_mixin'
     _description = 'Need Action Mixin'
     _needaction = True
 
+   def get_needaction_pending(self, cr, uid, ids, name, arg, context=None):
+       dom = self._needaction_domain_get(cr, uid, context=context)
+       result = dict.fromkeys(ids, False)
+       ids2 = self.search(cr, uid, [('id','in',ids)+dom], context=context)
+       for idna in ids2:
+           result[idna] = True
+       return result
+
+    def search_needaction_pending(self, cr, uid, field, field_name, criterion, context=None):
+        return self._needaction_domain_get(cr, uid, context=context)
+
+    _columns = {
+        'needaction_pending': fields.function(
+            get_needaction_pending, type='boolean',
+            fnct_search=search_needaction_pending,
+            string='Need an Action',
+            help="Do the current user requires to perform an action."),
+    }
+
     #------------------------------------------------------
     # Addon API
     #------------------------------------------------------

From 8b61ed737c1e5da85dc75091246cab89ca6b85b0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 15 Aug 2012 12:29:19 +0200
Subject: [PATCH 292/999] [IMP] need action new implementation

bzr revid: fp@openerp.com-20120815102919-w3iuspeoz5fmz97u
---
 addons/base_calendar/crm_meeting.py |  4 ++++
 addons/crm/crm_phonecall.py         |  2 +-
 addons/hr_holidays/hr_holidays.py   | 28 +++++++++++++---------------
 addons/purchase/purchase.py         |  8 ++------
 addons/sale/sale.py                 |  8 ++------
 5 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index cb96ff2a4d0..a66449a8b5d 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -70,6 +70,10 @@ class crm_meeting(base_state, osv.Model):
     # OpenChatter
     # ----------------------------------------
 
+    # shows events of the day for this user
+    def needaction_domain_get(self, cr, uid, domain=[], context={}):
+        return [('date','<=',time.strftime('%Y-%M-%D 23:59:59')), ('date_deadline','>=', time.strftime('%Y-%M-%D 00:00:00')), ('user_id','=',uid)]
+
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
         return 'Meeting'
 
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 8ffa8dd591e..7a544da5dc1 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -32,7 +32,7 @@ class crm_phonecall(base_state, osv.osv):
     _name = "crm.phonecall"
     _description = "Phonecall"
     _order = "id desc"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread']
     _columns = {
         # base_state required fields
         'date_action_last': fields.datetime('Last Action', readonly=1),
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 7eedfa54ce5..0134fc79fdd 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -347,24 +347,22 @@ class hr_holidays(osv.osv):
                     if leaves_rest < record.number_of_days_temp:
                         raise osv.except_osv(_('Warning!'), _('There are not enough %s allocated for employee %s; please create an allocation request for this leave type.') % (record.holiday_status_id.name, record.employee_id.name))
         return True
-    
+
     # -----------------------------
     # OpenChatter and notifications
     # -----------------------------
-    
-    def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        result = super(hr_holidays, self).get_needaction_user_ids(cr, uid, ids, context=context)
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.state == 'confirm' and obj.employee_id.parent_id:
-                result[obj.id] = [obj.employee_id.parent_id.user_id.id]
-            elif obj.state == 'validate1':
-                # get group_hr_manager: everyone will be warned of second validation
-                res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_hr_manager') or False
-                obj_id = res and res[1] or False
-                if obj_id:
-                    hr_manager_group = self.pool.get('res.groups').read(cr, uid, [obj_id], ['users'], context=context)[0]
-                    result[obj.id] = hr_manager_group['users']
-        return result
+
+    def needaction_domain_get(self, cr, uid, ids, context=None):
+        # to be tested, otherwise convert into employee_id in ...
+        emp_obj = self.pool.get('hr.employee')
+        empids = emp_obj.search(cr, uid, [('parent_id.user_id','=',uid)], context=context)
+        dom = [
+            '&', ('state','=','confirm'),('employee_id', 'in', empids)
+        ]
+        # if this user is a hr.manager, he should do second validations
+        if self.pool.get('res.users').has_group(cr, uid, 'base.group_hr_manager'):
+            dom = ['|'] + dom + [ ('state','=','validate1') ]
+        return dom
 
     def message_get_subscribers(self, cr, uid, ids, context=None):
         """ Override to add employee and its manager. """
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index b02e959301f..705f55f5d5c 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -732,12 +732,8 @@ class purchase_order(osv.osv):
     # OpenChatter methods and notifications
     # --------------------------------------
 
-    def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        result = super(purchase_order, self).get_needaction_user_ids(cr, uid, ids, context=context)
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.state == 'approved':
-                result[obj.id].append(obj.validator.id)
-        return result
+    def needaction_domain_get(self, cr, uid, ids, context=None):
+        return [('state','=','draft')]
 
     def create_send_note(self, cr, uid, ids, context=None):
         return self.message_append_note(cr, uid, ids, body=_("Request for quotation <b>created</b>."), context=context)
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 722b22ba602..2a9aa08d3ca 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1022,12 +1022,8 @@ class sale_order(osv.osv):
     # OpenChatter methods and notifications
     # ------------------------------------------------
 
-    def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        result = super(sale_order, self).get_needaction_user_ids(cr, uid, ids, context=context)
-        for obj in self.browse(cr, uid, ids, context=context):
-            if (obj.state == 'manual' or obj.state == 'progress'):
-                result[obj.id].append(obj.user_id.id)
-        return result
+    def needaction_domain_get(self, cr, uid, ids, context=None):
+        return [('state', '=', 'draft'), ('user_id','=',uid)]
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):

From eb0669850d6f07d19db12291fe78a40eb3ca8e4e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 15 Aug 2012 15:36:43 +0200
Subject: [PATCH 293/999] [IMP] removed needaction_pending, some cleaning in
 messages mail

bzr revid: fp@openerp.com-20120815133643-loyzmyp6azs5lr47
---
 addons/base_calendar/crm_meeting_view.xml     |  25 +-
 addons/crm/crm_lead_view.xml                  |  16 +-
 addons/crm/crm_phonecall_view.xml             |   8 +-
 addons/event/event_view.xml                   |  12 +-
 addons/hr_holidays/hr_holidays_view.xml       |  10 +-
 addons/hr_recruitment/hr_recruitment_view.xml |   6 +-
 addons/mail/mail_message.py                   |  90 ++---
 addons/mail/mail_subscription.py              |  40 ++
 addons/mail/mail_thread.py                    | 342 ++++++------------
 addons/mail/res_users.py                      |   3 +-
 addons/mrp/mrp_view.xml                       |   4 +-
 addons/project/project_view.xml               |  14 +-
 addons/project_issue/project_issue_view.xml   |  10 +-
 addons/purchase/purchase_view.xml             |   6 +-
 .../purchase_requisition_view.xml             |   4 +-
 addons/sale/sale_view.xml                     |   6 +-
 16 files changed, 246 insertions(+), 350 deletions(-)

diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index c6826786379..b57d7dcb2c7 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -170,7 +170,7 @@
                     <page string="Invitation Detail">
                         <button string="Invite People"
                             name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                            icon="terp-partner" type="action"
+                            type="action"
                             attrs="{'readonly': [('state', '=', 'done')]}"
                             context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
                         <field name="attendee_ids" widget="one2many" mode="tree">
@@ -183,17 +183,16 @@
                                 <button name="do_tentative"
                                     states="needs-action,declined,accepted"
                                     string="Uncertain" type="object"
-                                    icon="terp-crm" />
+                                    />
                                 <button name="do_accept" string="Accept"
                                     states="needs-action,tentative,declined"
-                                    type="object" icon="gtk-apply" />
+                                    type="object" />
                                 <button name="do_decline" string="Decline"
                                     states="needs-action,tentative,accepted"
-                                    type="object" icon="gtk-cancel" />
+                                    type="object" />
                                 <button
                                     name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
                                     string="Delegate" type="action"
-                                    icon="gtk-sort-descending"
                                     states="needs-action,tentative,declined,accepted"
                                     context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                             </tree>
@@ -201,16 +200,16 @@
                                 <header>
                                     <button name="do_tentative" type="object"
                                         states="needs-action,declined,accepted"
-                                        string="Uncertain" icon="terp-crm" />
+                                        string="Uncertain" />
                                     <button name="do_accept" type="object"
                                         states="needs-action,tentative,declined"
-                                        string="Accept" icon="gtk-apply" />
+                                        string="Accept" />
                                     <button name="do_decline" type="object"
                                         states="needs-action,tentative,accepted"
-                                        string="Decline" icon="gtk-cancel" />
+                                        string="Decline" />
                                     <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" type="action"
                                         states="needs-action,tentative,declined,accepted"
-                                        string="Delegate" icon="gtk-sort-descending"
+                                        string="Delegate" 
                                         context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
                                 </header>
@@ -244,14 +243,14 @@
         <field name="name">CRM - Meetings Tree</field>
         <field name="model">crm.meeting</field>
         <field name="arch" type="xml">
-            <tree string="Meetings" fonts="bold:needaction_pending==True"
+            <tree string="Meetings" fonts="bold:message_state==True"
                 colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="name" string="Subject" />
                 <field name="user_id"/>
                 <field name="date"/>
                 <field name="state"/>
                 <field name="duration" />
-                <field name="needaction_pending" invisible="1"/>
+                <field name="message_state" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -288,9 +287,9 @@
         <field name="arch" type="xml">
             <search string="Search Meetings">
                 <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
-                <filter string="Inbox" help="Unread messages" icon="terp-mail-message-new" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                <filter string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
                 <separator/>
-                <filter string="My Meetings" help="My Meetings" icon="terp-personal" domain="[('user_id','=',uid)]"/>
+                <filter string="My Meetings" help="My Meetings" domain="[('user_id','=',uid)]"/>
                 <field name="user_id"/>
                 <field name="partner_ids"/>
             </search>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index dd7743bc26b..9b187ed4417 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -245,7 +245,7 @@
             <field name="name">Leads</field>
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
-                <tree string="Leads" fonts="bold:needaction_pending==True" colors="grey:state in ('cancel', 'done')">
+                <tree string="Leads" fonts="bold:message_state==True" colors="grey:state in ('cancel', 'done')">
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name"/>
@@ -261,7 +261,7 @@
                     <field name="referred" invisible="1"/>
                     <field name="channel_id" invisible="1"/>
                     <field name="subjects" invisible="1"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -294,7 +294,7 @@
                     <field name="user_id"/>
                     <field name="partner_address_email"/>
                     <field name="message_summary"/>
-                    <field name="needaction_pending"/>
+                    <field name="message_state"/>
                     <templates>
                         <t t-name="lead_details">
                             <ul class="oe_kanban_tooltip">
@@ -340,7 +340,7 @@
                                         <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
-                                        <t t-if="record.needaction_pending.raw_value"><span class="oe_kanban_mail_new">New</span></t>
+                                        <t t-if="record.message_state.raw_value"><span class="oe_kanban_mail_new">New</span></t>
                                         <t t-raw="record.message_summary.raw_value"/>
                                     </div>
                                 </div>
@@ -363,7 +363,7 @@
                     <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
                     <field name="subjects"/>
                     <field name="create_date"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Open" name="open" domain="[('state','=','open')]"/>
@@ -542,7 +542,7 @@
             <field name="name">Opportunities Tree</field>
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
-                <tree string="Opportunities" fonts="bold:needaction_pending==True" colors="gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
+                <tree string="Opportunities" fonts="bold:message_state==True" colors="gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name" string="Opportunity"/>
@@ -560,7 +560,7 @@
                     <field name="user_id"/>
                     <field name="priority" invisible="1"/>
                     <field name="state" groups="base.group_no_one"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -575,7 +575,7 @@
                     <field name="name" string="Opportunity / Customer"
                         filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]" />
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Open" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 9081ea15637..1639d075f3e 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -66,8 +66,7 @@
         <field name="name">CRM - Phone Calls Tree</field>
         <field name="model">crm.phonecall</field>
         <field name="arch" type="xml">
-            <tree fonts="bold:needaction_pending==True" colors="gray:state in ('cancel','done');blue:state in ('pending',)" string="Phone Calls">
-                <field name="needaction_pending" invisible="1"/>
+            <tree colors="gray:state in ('cancel','done');blue:state in ('pending',)" string="Phone Calls">
                 <field name="date"/>
                 <field name="name"/>
                 <field name="partner_id"/>
@@ -76,7 +75,6 @@
                 <field name="categ_id" invisible="1"/>
                 <field name="create_date" invisible="1"/>
                 <field name="opportunity_id" invisible="1"/>
-                <field name="needaction_pending" invisible="1"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="open,pending"
@@ -165,7 +163,7 @@
         <field name="name">CRM - Logged Phone Calls Tree</field>
         <field name="model">crm.phonecall</field>
         <field name="arch" type="xml">
-            <tree string="Phone Calls" fonts="bold:needaction_pending==True" editable="top">
+            <tree string="Phone Calls" editable="top">
                 <field name="date"/>
                 <field name="name"/>
                 <field name="partner_id"
@@ -179,7 +177,6 @@
                 <field name="state" invisible="1"/>
                 <field name="create_date" invisible="1"/>
                 <field name="opportunity_id" invisible="1"/>
-                <field name="needaction_pending" invisible="1"/>
                 <button string="Schedule Other Call"
                     icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
@@ -218,7 +215,6 @@
             <search string="Search Phonecalls">
                <field name="name" string="Phonecalls"/>
                <field name="date"/>
-               <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                <separator/>
                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
                <separator/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 289316110e6..c550d36016c 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -207,7 +207,7 @@
             <field name="name">event.event.tree</field>
             <field name="model">event.event</field>
             <field name="arch" type="xml">
-                <tree string="Events" fonts="bold:needaction_pending==True" colors="red:(register_min and register_min&gt;register_current) or (register_max and register_max&lt;register_current);grey:state=='cancel'">
+                <tree string="Events" fonts="bold:message_state==True" colors="red:(register_min and register_min&gt;register_current) or (register_max and register_max&lt;register_current);grey:state=='cancel'">
                     <field name="name" string="Name"/>
                     <field name="type"/>
                     <field name="date_begin"/>
@@ -218,7 +218,7 @@
                     <field name="main_speaker_id" groups="base.extended"/>
                     <field name="user_id"/>
                     <field name="state"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -325,7 +325,7 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <field name="name" string="Events"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
@@ -420,7 +420,7 @@
             <field name="name">event.registration.tree</field>
             <field name="model">event.registration</field>
             <field name="arch" type="xml">
-                <tree string="Registration" fonts="bold:needaction_pending==True">
+                <tree string="Registration" fonts="bold:message_state==True">
                     <field name="create_date"/>
                     <field name="partner_id"/>
                     <field name="name"/>
@@ -430,7 +430,7 @@
                     <field name="user_id"/>
                     <field name="origin"/>
                     <field name="state"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -514,7 +514,7 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <field name="name" string="Participant" filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 0030a2b0187..40cdda25529 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -44,7 +44,6 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                     <field name="date_from"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
                     <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/>
@@ -192,8 +191,7 @@
             <field name="name">hr.holidays.allocation.tree</field>
             <field name="model">hr.holidays</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="red:state == 'refuse';blue:state == 'draft';black:state in ('confirm','validate','validate1')" string="Allocation Requests">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree colors="red:state == 'refuse';blue:state == 'draft';black:state in ('confirm','validate','validate1')" string="Allocation Requests">
                     <field name="employee_id"/>
                     <field name="holiday_type"/>
                     <field name="category_id"/>
@@ -241,8 +239,7 @@
             <field name="model">hr.holidays</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leaves Summary">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leaves Summary">
                     <field name="employee_id"/>
                     <field name="category_id" invisible="1"/>
                     <field name="department_id" invisible="1"/>
@@ -264,8 +261,7 @@
             <field name="name">hr.holidays.tree</field>
             <field name="model">hr.holidays</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leave Requests">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leave Requests">
                     <field name="employee_id"/>
                     <field name="holiday_type" string="Mode" groups="base.group_hr_user"/>
                     <field name="name"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 8a6296cd230..507874a6fda 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -76,8 +76,8 @@
         <field name="name">Applicants</field>
         <field name="model">hr.applicant</field>
         <field name="arch" type="xml">
-            <tree string="Applicants" fonts="bold:needaction_pending==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
-                <field name="needaction_pending" invisible="1"/>
+            <tree string="Applicants" fonts="bold:message_state==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
+                <field name="message_state" invisible="1"/>
                 <field name="create_date" groups="base.group_no_one"/>
                 <field name="name" string="Subject"/>
                 <field name="partner_name"/>
@@ -204,7 +204,7 @@
         <field name="arch" type="xml">
             <search string="Search Jobs">
                 <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
-                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
                 <separator/>
                 <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
                 <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 52a931c9d20..ee137b635ce 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -19,6 +19,8 @@
 #
 ##############################################################################
 
+# FP Note: can we remove some dependencies ? Use lint
+
 import ast
 import base64
 import dateutil.parser
@@ -56,6 +58,9 @@ def mail_tools_to_email(text):
 def to_email(text):
     return mail_tools_to_email(text)
 
+# FP Note: I propose to merge mail.message and mail.message.common
+# there is a conflict for the field parent_id
+# I don't understand the usage of mail.message.common
 class mail_message_common(osv.TransientModel):
     """ Common abstract class for holding the main attributes of a 
         message object. It could be reused as parent model for any
@@ -65,25 +70,6 @@ class mail_message_common(osv.TransientModel):
         model holds the basics of a message. For example, a wizard for writing
         emails should inherit from this class and not from mail.message."""
 
-    def get_body(self, cr, uid, ids, name, arg, context=None):
-        """ get correct body version: body_html for html messages, and
-            body_text for plain text messages
-        """
-        result = dict.fromkeys(ids, '')
-        for message in self.browse(cr, uid, ids, context=context):
-            if message.content_subtype == 'html':
-                result[message.id] = message.body_html
-            else:
-                result[message.id] = message.body_text
-        return result
-    
-    def search_body(self, cr, uid, obj, name, args, context=None):
-        # will receive:
-        #   - obj: mail.message object
-        #   - name: 'body'
-        #   - args: [('body', 'ilike', 'blah')]
-        return ['|', '&', ('content_subtype', '=', 'html'), ('body_html', args[0][1], args[0][2]), ('body_text', args[0][1], args[0][2])]
-    
     def get_record_name(self, cr, uid, ids, name, arg, context=None):
         result = dict.fromkeys(ids, '')
         for message in self.browse(cr, uid, ids, context=context):
@@ -99,43 +85,41 @@ class mail_message_common(osv.TransientModel):
             if message.subject:
                 name = '%s: ' % (message.subject)
             if message.body_text:
-                name = '%s%s ' % (name, message.body_text[0:20])
-            if message.date:
-                name = '%s(%s)' % (name, message.date)
+                name = name + message.body_text[0:20]
             res.append((message.id, name))
         return res
 
     _name = 'mail.message.common'
     _rec_name = 'subject'
     _columns = {
-        'subject': fields.char('Subject', size=512),
         'model': fields.char('Related Document Model', size=128, select=1),
         'res_id': fields.integer('Related Document ID', select=1),
         'record_name': fields.function(get_record_name, type='string',
             string='Message Record Name',
             help="Name get of the related document."),
+
+        'subject': fields.char('Subject', size=128),
         'date': fields.datetime('Date'),
+
+        # FP Note: I propose to remove these fields and put email in attachment as an option
         'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences.'),
-        'email_to': fields.char('To', size=256, help='Message recipients'),
+        'email_to': fields.text('To', help='Message recipients'),
         'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
         'email_bcc': fields.char('Bcc', size=256, help='Blind carbon copy message recipients'),
         'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
         'headers': fields.text('Message Headers', readonly=1,
             help="Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"),
-        'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
         'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
         'content_subtype': fields.char('Message content subtype', size=32,
             oldname="subtype", readonly=1,
             help="Type of message, usually 'html' or 'plain', used to select "\
                   "plain-text or rich-text contents accordingly"),
-        'body_text': fields.text('Text Contents', help="Plain-text version of the message"),
         'body_html': fields.html('Rich-text Contents', help="Rich-text/HTML version of the message"),
-        'body': fields.function(get_body, fnct_search = search_body, type='text',
-            string='Message Content', store=True,
-            help="Content of the message. This content equals the body_text field "\
-                 "for plain-test messages, and body_html for rich-text/HTML "\
-                 "messages. This allows having one field if we want to access "\
-                 "the content matching the message content_subtype."),
+        # END FP Note
+
+        'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
+        'body': fields.text('Text Contents', help="Plain-text version of the message", required=True),
+
         'parent_id': fields.many2one('mail.message.common', 'Parent Message',
             select=True, ondelete='set null',
             help="Parent message, used for displaying as threads with hierarchy"),
@@ -158,6 +142,7 @@ class mail_message(osv.Model):
     _description = 'Mail Message (email, comment, notification)'
     _order = 'date desc'
 
+    # FP Note: can we remove these two methods ?
     def open_document(self, cr, uid, ids, context=None):
         """ Open the message related document. Note that only the document of
             ids[0] will be opened.
@@ -196,7 +181,8 @@ class mail_message(osv.Model):
                 'nodestroy': True
                 })
         return action_data
-    
+    # END FP Note
+
     _columns = {
         'type': fields.selection([
                         ('email', 'email'),
@@ -205,14 +191,17 @@ class mail_message(osv.Model):
                         ], 'Type',
             help="Message type: email for email message, notification for system "\
                   "message, comment for other messages such as user replies"),
+        # FP Note: ro be removed
         'partner_id': fields.many2one('res.partner', 'Related partner',
             help="Deprecated field. Use partner_ids instead."),
+        # END FP Note
+
         'partner_ids': fields.many2many('res.partner',
             'mail_message_destination_partner_rel',
             'message_id', 'partner_id', 'Destination partners',
             help="When sending emails through the social network composition wizard"\
                  "you may choose to send a copy of the mail to partners."),
-        'user_id': fields.many2one('res.users', 'Related User', readonly=1),
+        'user_id': fields.many2one('res.users', 'Author', readonly=1),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
         'state': fields.selection([
@@ -224,8 +213,12 @@ class mail_message(osv.Model):
                         ], 'Status', readonly=True),
         'auto_delete': fields.boolean('Auto Delete',
             help="Permanently delete this email after sending it, to save space"),
+
+        # FP Note: to be removed, in attachment if needed
         'original': fields.binary('Original', readonly=1,
             help="Original version of the message, as it was sent on the network"),
+        # End FP Note
+
         'parent_id': fields.many2one('mail.message', 'Parent Message',
             select=True, ondelete='set null',
             help="Parent message, used for displaying as threads with hierarchy"),
@@ -246,7 +239,7 @@ class mail_message(osv.Model):
         if not cr.fetchone():
             cr.execute("""CREATE INDEX mail_message_model_res_id_idx ON mail_message (model, res_id)""")
 
-    def check(self, cr, uid, ids, mode, context=None, values=None):
+    def check(self, cr, uid, ids, mode, context=None):
         """Restricts the access to a mail.message, according to referred model
         """
         if not ids:
@@ -259,9 +252,6 @@ class mail_message(osv.Model):
             if not (rmod and rid):
                 continue
             res_ids.setdefault(rmod,set()).add(rid)
-        if values:
-            if 'res_model' in values and 'res_id' in values:
-                res_ids.setdefault(values['res_model'],set()).add(values['res_id'])
 
         ima_obj = self.pool.get('ir.model.access')
         for model, mids in res_ids.items():
@@ -272,8 +262,21 @@ class mail_message(osv.Model):
             self.pool.get(model).check_access_rule(cr, uid, mids, mode, context=context)
     
     def create(self, cr, uid, values, context=None):
-        self.check(cr, uid, [], mode='create', context=context, values=values)
-        return super(mail_message, self).create(cr, uid, values, context)
+        newid = super(mail_message, self).create(cr, uid, values, context)
+        self.check(cr, uid, [newid], mode='create', context=context)
+
+        # notify all followers
+        if values.get('model') and values.get('res_id'):
+            notification_obj = self.pool.get('mail.notification')
+            modobj = self.pool.get(values.get('model'))
+            follower_notify = []
+            for follower in modobj.follower_ids:
+                if follower.id <> uid:
+                    follower_notify.append(follower.id)
+
+            self.pool.get('mail.notification').notify(cr, uid, follower_notify, newid, context=context)
+
+        return newid
 
     def read(self, cr, uid, ids, fields_to_read=None, context=None, load='_classic_read'):
         self.check(cr, uid, ids, 'read', context=context)
@@ -288,13 +291,16 @@ class mail_message(osv.Model):
         return super(mail_message,self).copy(cr, uid, id, default=default, context=context)
     
     def write(self, cr, uid, ids, vals, context=None):
-        self.check(cr, uid, ids, 'write', context=context, values=vals)
-        return super(mail_message, self).write(cr, uid, ids, vals, context)
+        result = super(mail_message, self).write(cr, uid, ids, vals, context)
+        self.check(cr, uid, ids, 'write', context=context)
+        return result
 
     def unlink(self, cr, uid, ids, context=None):
         self.check(cr, uid, ids, 'unlink', context=context)
         return super(mail_message, self).unlink(cr, uid, ids, context)
 
+    # FP Note: do we need this method ?
+    # We should just ask to create the message before scheduling it
     def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, type='email',
                              email_cc=None, email_bcc=None, reply_to=False, partner_ids=None, attachments=None,
                              message_id=False, references=False, res_id=False, content_subtype='plain',
diff --git a/addons/mail/mail_subscription.py b/addons/mail/mail_subscription.py
index fc82af879a9..bd46db16cce 100644
--- a/addons/mail/mail_subscription.py
+++ b/addons/mail/mail_subscription.py
@@ -65,3 +65,43 @@ class mail_notification(osv.osv):
     _defaults = {
         'read': False,
     }
+    # Create notification in the wall of each user
+    # Send by email the notification depending on the user preferences
+    def notify(self, cr, uid, user_ids, msg_id, context=context):
+        user_obj = self.pool.get('res.users')
+        msg_obj = self.pool.get('mail.message')
+        msg = msg_obj.browse(cr, uid, msg_id, context=context)
+
+        towrite = {
+            'email_to': msg.email_to,
+            'subject': msg.subject
+        }
+        for user in user_obj.browse(cr, uid, user_ids, context=context):
+            notification_obj.create(cr, uid, {
+                'user_id': user.id,
+                'message_id': msg_id
+            }, context=context)
+            if user.notification_email_pref=='none' or not user.user_email:
+                continue
+
+            if user.notification_email_pref=='comment' and msg.type in ('email','comment'):
+                continue
+
+            if not msg.email_from:
+                current_user = res_users_obj.browse(cr, uid, uid, context=context)
+                towrite['email_from'] = current_user.user_email
+
+            towrite['state'] = 'outgoing'
+            if not towrite.get('email_to', False):
+                towrite['email_to'] = email_to
+            else:
+                if email_to not in towrite['email_to']:
+                    towrite['email_to'] = towrite['email_to'] + ', ' + email_to
+
+            if towrite.get('subject', False):
+                towrite['subject'] = msg.name_get(cr, uid, [msg.id], context=context)[0][1]
+        if towrite.get('state', False):
+            msg_obj.write(cr, uid, [msg.id], towrite, context=context)
+        return True
+
+
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index d03dd8252d7..d6e33497d98 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -68,41 +68,52 @@ class mail_thread(osv.Model):
     '''
     _name = 'mail.thread'
     _description = 'Email Thread'
+    # TODO: may be we should make it _inherit ir.needaction
 
-    def _get_message_ids(self, cr, uid, ids, name, args, context=None):
+    def _get_message_data(self, cr, uid, ids, name, args, context=None):
         res = {}
         for id in ids:
-            message_ids = self.message_search(cr, uid, [id], context=context)
-            subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context)
             res[id] = {
-                'message_ids': message_ids,
-                'message_summary': "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)),
+                'message_state': False,
+                'message_Summary': ''
             }
+        nobj = self.pool.get('mail.notification')
+        notifs = nobj.search(cr, uid, [
+            ('user_id','=',uid),
+            ('message_id.res_id','in', ids),
+            ('message_id.model','=', self._name),
+            ('read','=',False)
+        ], context=context)
+        for notif in nobj.browse(cr, uid, nids, context=context):
+            res[notif.message_id.id]['message_state'] = True
+
+        for thread in self.browse(cr, uid, ids, context=context):
+            message_ids = thread.message_ids
+            subscriber_ids = thread.message_follower_ids
+            res[id]['message_summary'] = "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)),
         return res
 
-    def _search_message_ids(self, cr, uid, obj, name, args, context=None):
-        msg_obj = self.pool.get('mail.message')
-        msg_ids = msg_obj.search(cr, uid, ['&', ('res_id', 'in', args[0][2]), ('model', '=', self._name)], context=context)
-        return [('id', 'in', msg_ids)]
+    # FP Note: todo
+    def _search_state(self, tobj, cr, uid, obj=None, name=None, domain=None, context=None):
+        return [('id','in',[])]
 
     _columns = {
-        'message_ids': fields.function(_get_message_ids,
-			fnct_search=_search_message_ids,
-            type='one2many', obj='mail.message', _fields_id = 'res_id',
-            string='Temp messages', multi="_get_message_ids",
-            help="Functional field holding messages related to the current document."),
-        'message_state': fields.boolean('Read',
-            help="When checked, new messages require your attention."),
-        'message_summary': fields.function(_get_message_ids, method=True,
-            type='text', string='Summary', multi="_get_message_ids",
+        'message_follower_ids': fields.one2many('mail.subscription', 'res_id',
+            domain=lambda self: [('res_model','=',self._name)],
+            string='Followers')
+        'message_ids': fields.one2many('mail.message', 'res_id',
+            domain=lambda self: [('model','=',self._name)],
+            string='Related Messages', 
+            help="All messages related to the current document."),
+        'message_state': fields.function(_get_message_data, fnct_search=_search_state, 'Message Read',
+            help="When checked, new messages require your attention.",
+            multi="_get_message_data"),
+        'message_summary': fields.function(_get_message_data, method=True,
+            type='text', string='Summary', multi="_get_message_data",
             help="Holds the Chatter summary (number of messages, ...). "\
                  "This summary is directly in html format in order to "\
                  "be inserted in kanban views."),
     }
-    
-    _defaults = {
-        'message_state': True,
-    }
 
     #------------------------------------------------------
     # Automatic subscription when creating/reading
@@ -111,19 +122,9 @@ class mail_thread(osv.Model):
     def create(self, cr, uid, vals, context=None):
         """Automatically subscribe the creator """
         thread_id = super(mail_thread, self).create(cr, uid, vals, context=context)
-        if thread_id:
-            self.message_subscribe(cr, uid, [thread_id], [uid], context=context)
+        self.message_subscribe(cr, uid, [thread_id], [uid], context=context)
         return thread_id
 
-    def write(self, cr, uid, ids, vals, context=None):
-        """Automatically subscribe the writer"""
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        write_res = super(mail_thread, self).write(cr, uid, ids, vals, context=context);
-        if write_res:
-            self.message_subscribe(cr, uid, ids, [uid], context=context)
-        return write_res;
-
     def unlink(self, cr, uid, ids, context=None):
         """Override unlink, to automatically delete
            - subscriptions
@@ -140,7 +141,6 @@ class mail_thread(osv.Model):
         # delete messages and notifications
         msg_to_del_ids = msg_obj.search(cr, uid, [('model', '=', self._name), ('res_id', 'in', ids)], context=context)
         msg_obj.unlink(cr, uid, msg_to_del_ids, context=context)
-
         return super(mail_thread, self).unlink(cr, uid, ids, context=context)
 
     #------------------------------------------------------
@@ -153,73 +153,17 @@ class mail_thread(osv.Model):
            - automatically subscribe the message writer
            - push the message to subscribed users
         """
-        if context is None:
-            context = {}
-        
+        context = context or {}
         message_obj = self.pool.get('mail.message')
-        notification_obj = self.pool.get('mail.notification')
-        
-        # automatically subscribe the writer of the message
-        if vals.get('user_id'):
-            self.message_subscribe(cr, uid, [thread_id], [vals['user_id']], context=context)
-        
-        # create message
+        vals['model'] = self._name
+        vals['res_id'] = thread_id
         msg_id = message_obj.create(cr, uid, vals, context=context)
-        
-        # Set as unread if writer is not the document responsible
-        self.message_create_set_unread(cr, uid, [thread_id], context=context)
-        
-        # special: if install mode, do not push demo data
-        if context.get('install_mode', False):
-            return msg_id
-        
-        # get users that will get a notification pushed
-        user_to_push_ids = self.message_get_user_ids_to_notify(cr, uid, [thread_id], vals, context=context)
-        for id in user_to_push_ids:
-            notification_obj.create(cr, uid, {'user_id': id, 'message_id': msg_id}, context=context)
-        
-        # create the email to send
-        self.message_create_notify_by_email(cr, uid, vals, user_to_push_ids, context=context)
-        
         return msg_id
-    
-    def message_get_user_ids_to_notify(self, cr, uid, thread_ids, new_msg_vals, context=None):
-        # get body
-        body = new_msg_vals.get('body_html', '') if new_msg_vals.get('content_subtype') == 'html' else new_msg_vals.get('body_text', '')
-        
-        # get subscribers
-        notif_user_ids = self.message_get_subscribers(cr, uid, thread_ids, context=context)
-        
-        # add users requested via parsing message (@login)
-        notif_user_ids += self.message_parse_users(cr, uid, body, context=context)
-        
-        # add users requested to perform an action (need_action mechanism)
-        if hasattr(self, 'get_needaction_user_ids') and self._columns.get('user_id'):
-            user_ids_dict = self.get_needaction_user_ids(cr, uid, thread_ids, context=context)
-            for id, user_ids in user_ids_dict.iteritems():
-                notif_user_ids += user_ids
-        
-        # add users notified of the parent messages (because: if parent message contains @login, login must receive the replies)
-        if new_msg_vals.get('parent_id'):
-            notif_obj = self.pool.get('mail.notification')
-            parent_notif_ids = notif_obj.search(cr, uid, [('message_id', '=', new_msg_vals.get('parent_id'))], context=context)
-            parent_notifs = notif_obj.read(cr, uid, parent_notif_ids, context=context)
-            notif_user_ids += [parent_notif['user_id'][0] for parent_notif in parent_notifs]
 
-        # remove duplicate entries
-        notif_user_ids = list(set(notif_user_ids))
-        return notif_user_ids
-
-    def message_parse_users(self, cr, uid, string, context=None):
-        """Parse message content
-           - if find @login -(^|\s)@((\w|@|\.)*)-: returns the related ids
-             this supports login that are emails (such as @raoul@grobedon.net)
-        """
-        regex = re.compile('(^|\s)@((\w|@|\.)*)')
-        login_lst = [item[1] for item in regex.findall(string)]
-        if not login_lst: return []
-        user_ids = self.pool.get('res.users').search(cr, uid, [('login', 'in', login_lst)], context=context)
-        return user_ids
+    def _needaction_domain_get(self, cr, uid, context={}):
+        if self._needaction:
+            return [('message_state','=',True)]
+        return []
 
     #------------------------------------------------------
     # Generic message api
@@ -241,15 +185,15 @@ class mail_thread(osv.Model):
                         headers=None, message_id=False, references=None,
                         attachments=None, original=None, context=None):
         """ Creates a new mail.message through message_create. The new message
-            is attached to the current mail.thread, containing all the details 
-            passed as parameters. All attachments will be attached to the 
+            is attached to the current mail.thread, containing all the details
+            passed as parameters. All attachments will be attached to the
             thread record as well as to the actual message.
-           
+
             This method calls message_create that will handle management of
             subscription and notifications, and effectively create the message.
-           
+
             If ``email_from`` is not set or ``type`` not set as 'email',
-            a note message is created (comment or system notification), 
+            a note message is created (comment or system notification),
             without the usual envelope attributes (sender, recipients, etc.).
 
             :param threads: list of thread ids, or list of browse_records
@@ -454,11 +398,11 @@ class mail_thread(osv.Model):
         """
         return ['&', ('res_id', 'in', ids), ('model', '=', self._name)]
 
-    def message_search(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
+    def message_search(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None,
                         limit=100, offset=0, domain=None, count=False, context=None):
         """ OpenChatter feature: return thread messages ids according to the
             search domain given by ``message_search_get_domain``.
-            
+
             It is possible to add in the search the parent of messages by
             setting the fetch_ancestors flag to True. In that case, using
             the parent_id relationship, the method returns the id list according
@@ -466,19 +410,19 @@ class mail_thread(osv.Model):
             that will add to the list the ancestors ids. The search is limited
             to parent messages having an id in ancestor_ids or having
             parent_id set to False.
-            
+
             If ``count==True``, the number of ids is returned instead of the
-            id list. The count is done by hand instead of passing it as an 
+            id list. The count is done by hand instead of passing it as an
             argument to the search call because we might want to perform
             a research including parent messages until some ancestor_ids.
-            
-            :param fetch_ancestors: performs an ascended search; will add 
+
+            :param fetch_ancestors: performs an ascended search; will add
                                     to fetched msgs all their parents until
                                     ancestor_ids
             :param ancestor_ids: used when fetching ancestors
             :param domain: domain to add to the search; especially child_of
                            is interesting when dealing with threaded display.
-                           Note that the added domain is anded with the 
+                           Note that the added domain is anded with the
                            default domain.
             :param limit, offset, count, context: as usual
         """
@@ -488,10 +432,10 @@ class mail_thread(osv.Model):
         message_obj = self.pool.get('mail.message')
         message_res = message_obj.search(cr, uid, search_domain, limit=limit, offset=offset, count=count, context=context)
         if not count and fetch_ancestors:
-            message_res += self._message_search_ancestor_ids(cr, uid, ids, message_res, ancestor_ids, context=context) 
+            message_res += self._message_search_ancestor_ids(cr, uid, ids, message_res, ancestor_ids, context=context)
         return message_res
 
-    def message_read(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
+    def message_read(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None,
                         limit=100, offset=0, domain=None, context=None):
         """ OpenChatter feature: read the messages related to some threads.
             This method is used mainly the Chatter widget, to directly have
@@ -508,18 +452,18 @@ class mail_thread(osv.Model):
 
         ids = map_id_to_name.keys()
         names = self.pool.get('ir.attachment').name_get(cr, uid, ids, context=context)
-        
+
         # convert the list of tuples into a dictionnary
-        for name in names: 
+        for name in names:
             map_id_to_name[name[0]] = name[1]
-        
+
         # give corresponding ids and names to each message
         for msg in messages:
             msg["attachments"] = []
-            
+
             for attach_id in msg["attachment_ids"]:
                 msg["attachments"].append({'id': attach_id, 'name': map_id_to_name[attach_id]})
-        
+
         # Set the threads as read
         self.message_check_and_set_read(cr, uid, ids, context=context)
         # Sort and return the messages
@@ -530,7 +474,7 @@ class mail_thread(osv.Model):
                             limit=100, offset=0, msg_search_domain=[], context=None):
         """ OpenChatter: wall: get the pushed notifications and used them
             to fetch messages to display on the wall.
-            
+
             :param fetch_ancestors: performs an ascended search; will add
                                     to fetched msgs all their parents until
                                     ancestor_ids
@@ -577,11 +521,11 @@ class mail_thread(osv.Model):
         Multiple values may be returned, if a message had multiple
         recipients matching existing mail.aliases, for example.
 
-        The following heuristics are used, in this order: 
+        The following heuristics are used, in this order:
              1. If the message replies to an existing thread_id, and
                 properly contains the thread model in the 'In-Reply-To'
                 header, use this model/thread_id pair, and ignore
-                custom_value (not needed as no creation will take place) 
+                custom_value (not needed as no creation will take place)
              2. Look for a mail.alias entry matching the message
                 recipient, and use the corresponding model, thread_id,
                 custom_values and user_id.
@@ -617,7 +561,7 @@ class mail_thread(osv.Model):
                 _logger.debug('Routing mail with Message-Id %s: direct reply to model: %s, thread_id: %s, custom_values: %s, uid: %s',
                               message_id, model, thread_id, custom_values, uid)
                 return [(model, thread_id, custom_values, uid)]
-        
+
         # 2. Look for a matching mail.alias entry
         # Delivered-To is a safe bet in most modern MTAs, but we have to fallback on To + Cc values
         # for all the odd MTAs out there, as there is no standard header for the envelope's `rcpt_to` value.
@@ -640,7 +584,7 @@ class mail_thread(osv.Model):
                                    eval(alias.alias_defaults), user_id))
                 _logger.debug('Routing mail with Message-Id %s: direct alias match: %r', message_id, routes)
                 return routes
-        
+
         # 3. Fallback to the provided parameters, if they work
         model_pool = self.pool.get(model)
         if not thread_id:
@@ -664,8 +608,8 @@ class mail_thread(osv.Model):
                         thread_id=None, context=None):
         """Process an incoming RFC2822 email message, relying on
            ``mail.message.parse()`` for the parsing operation,
-           and ``message_route()`` to figure out the target model. 
-           
+           and ``message_route()`` to figure out the target model.
+
            Once the target model is known, its ``message_new`` method
            is called with the new message (if the thread record did not exist)
             or its ``message_update`` method (if it did). Finally,
@@ -706,10 +650,10 @@ class mail_thread(osv.Model):
                                     thread_id, custom_values,
                                     context=context)
         msg = self.pool.get('mail.message').parse_message(msg_txt, save_original=save_original, context=context)
-        msg['state'] = 'received'     
+        msg['state'] = 'received'
         if strip_attachments and 'attachments' in msg:
             del msg['attachments']
-        for model, thread_id, custom_values, user_id in routes:   
+        for model, thread_id, custom_values, user_id in routes:
             if self._name != model:
                 context.update({'thread_model': model})
             model_pool = self.pool.get(model)
@@ -720,7 +664,7 @@ class mail_thread(osv.Model):
                 model_pool.message_update(cr, user_id, [thread_id], msg, context=context)
             else:
                 thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
-    
+
             # Forward the email to other followers
             self.message_forward(cr, uid, model, [thread_id], msg_txt, context=context)
             model_pool.message_mark_as_unread(cr, uid, [thread_id], context=context)
@@ -903,17 +847,8 @@ class mail_thread(osv.Model):
     # Subscription mechanism
     #------------------------------------------------------
 
-    def message_get_subscribers(self, cr, uid, ids, context=None):
-        """ Returns the current document followers. Basically this method
-            checks in mail.subscription for entries with matching res_model,
-            res_id.
-            This method can be overriden to add implicit subscribers, such
-            as project managers, by adding their user_id to the list of
-            ids returned by this method.
-        """
-        subscr_obj = self.pool.get('mail.subscription')
-        subscr_ids = subscr_obj.search(cr, uid, ['&', ('res_model', '=', self._name), ('res_id', 'in', ids)], context=context)
-        return [sub['user_id'][0] for sub in subscr_obj.read(cr, uid, subscr_ids, ['user_id'], context=context)]
+    # FP Note: replaced by message_follower_ids
+    # def message_get_subscribers(self, cr, uid, ids, context=None):
 
     def message_read_subscribers(self, cr, uid, ids, fields=['id', 'name', 'image_small'], context=None):
         """ Returns the current document followers as a read result. Used
@@ -926,7 +861,7 @@ class mail_thread(osv.Model):
     def message_is_subscriber(self, cr, uid, ids, user_id = None, context=None):
         """ Check if uid or user_id (if set) is a subscriber to the current
             document.
-            
+
             :param user_id: if set, check is done on user_id; if not set
                             check is done on uid
         """
@@ -937,7 +872,7 @@ class mail_thread(osv.Model):
 
     def message_subscribe(self, cr, uid, ids, user_ids = None, context=None):
         """ Subscribe the user (or user_ids) to the current document.
-            
+
             :param user_ids: a list of user_ids; if not set, subscribe
                              uid instead
         """
@@ -953,7 +888,7 @@ class mail_thread(osv.Model):
 
     def message_unsubscribe(self, cr, uid, ids, user_ids = None, context=None):
         """ Unsubscribe the user (or user_ids) from the current document.
-            
+
             :param user_ids: a list of user_ids; if not set, subscribe
                              uid instead
         """
@@ -972,85 +907,6 @@ class mail_thread(osv.Model):
     # Notification API
     #------------------------------------------------------
 
-    def message_create_notify_by_email(self, cr, uid, new_msg_values, user_to_notify_ids, context=None):
-        """ When creating a new message and pushing notifications, emails
-            must be send if users have chosen to receive notifications
-            by email via the notification_email_pref field.
-            
-            ``notification_email_pref`` can have 3 values :
-            - all: receive all notification by email (for example for shared
-              users)
-            - to_me: messages send directly to me (@login, messages on res.users)
-            - never: never receive notifications
-            Note that an user should never receive notifications for messages
-            he has created.
-            
-            :param new_msg_values: dictionary of message values, those that
-                                   are given to the create method
-            :param user_to_notify_ids: list of user_ids, user that will
-                                       receive a notification on their Wall
-        """
-        message_obj = self.pool.get('mail.message')
-        res_users_obj = self.pool.get('res.users')
-        body = new_msg_values.get('body_html', '') if new_msg_values.get('content_subtype') == 'html' else new_msg_values.get('body_text', '')
-        
-        # remove message writer
-        if user_to_notify_ids.count(new_msg_values.get('user_id')) > 0:
-            user_to_notify_ids.remove(new_msg_values.get('user_id'))
-        
-        # get user_ids directly asked
-        user_to_push_from_parse_ids = self.message_parse_users(cr, uid, body, context=context)
-        
-        # try to find an email_to
-        email_to = ''
-        for user in res_users_obj.browse(cr, uid, user_to_notify_ids, context=context):
-            if not user.notification_email_pref == 'all' and \
-                not (user.notification_email_pref == 'to_me' and user.id in user_to_push_from_parse_ids):
-                continue
-            if not user.user_email:
-                continue
-            email_to = '%s, %s' % (email_to, user.user_email)
-            email_to = email_to.lstrip(', ')
-        
-        # did not find any email address: not necessary to create an email
-        if not email_to:
-            return
-        
-        # try to find an email_from
-        current_user = res_users_obj.browse(cr, uid, [uid], context=context)[0]
-        email_from = new_msg_values.get('email_from')
-        if not email_from:
-            email_from = current_user.user_email
-        
-        # get email content, create it (with mail_message.create)
-        email_values = self.message_create_notify_get_email_dict(cr, uid, new_msg_values, email_from, email_to, context)
-        email_id = message_obj.create(cr, uid, email_values, context=context)
-        return email_id
-    
-    def message_create_notify_get_email_dict(self, cr, uid, new_msg_values, email_from, email_to, context=None):
-        values = dict(new_msg_values)
-        
-        body_html = new_msg_values.get('body_html', '')
-        if body_html:
-            body_html += '\n\n----------\nThis email was send automatically by OpenERP, because you have subscribed to a document.'
-        body_text = new_msg_values.get('body_text', '')
-        if body_text:
-            body_text += '\n\n----------\nThis email was send automatically by OpenERP, because you have subscribed to a document.'
-        values.update({
-            'type': 'email',
-            'state': 'outgoing',
-            'email_from': email_from,
-            'email_to': email_to,
-            'subject': 'New message',
-            'content_subtype': new_msg_values.get('content_subtype', 'plain'),
-            'body_html': body_html,
-            'body_text': body_text,
-            'auto_delete': True,
-            'res_model': '',
-            'res_id': False,
-        })
-        return values
-
     def message_remove_pushed_notifications(self, cr, uid, ids, msg_ids, remove_childs=True, context=None):
         notif_obj = self.pool.get('mail.notification')
         msg_obj = self.pool.get('mail.message')
@@ -1065,33 +921,37 @@ class mail_thread(osv.Model):
     # Thread_state
     #------------------------------------------------------
 
-    def message_create_set_unread(self, cr, uid, ids, context=None):
-        """ When creating a new message, set as unread if uid is not the
-            object responsible. """
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.message_state and self._columns.get('user_id') and (not obj.user_id or obj.user_id.id != uid):
-                self.message_mark_as_unread(cr, uid, [obj.id], context=context)
+    # FP Note: should be removed ?
+    # def message_check_and_set_unread(self, cr, uid, ids, context=None):
+    #    """ Set unread if uid is the object responsible or if the object has
+    #        no responsible. """
+    #    for obj in self.browse(cr, uid, ids, context=context):
+    #        if obj.message_state and self._columns.get('user_id') and (not obj.user_id or obj.user_id.id == uid):
+    #            self.message_mark_as_unread(cr, uid, [obj.id], context=context)
 
-    def message_check_and_set_unread(self, cr, uid, ids, context=None):
-        """ Set unread if uid is the object responsible or if the object has
-            no responsible. """
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.message_state and self._columns.get('user_id') and (not obj.user_id or obj.user_id.id == uid):
-                self.message_mark_as_unread(cr, uid, [obj.id], context=context)
+    # FP Note: should be removed ?
+    # def message_check_and_set_read(self, cr, uid, ids, context=None):
+    #    """ Set read if uid is the object responsible. """
+    #    for obj in self.browse(cr, uid, ids, context=context):
+    #        if not obj.message_state and self._columns.get('user_id') and obj.user_id and obj.user_id.id == uid:
+    #            self.message_mark_as_read(cr, uid, [obj.id], context=context)
 
-    def message_mark_as_unread(self, cr, uid, ids, context=None):
-        """ Set as unread. """
-        return self.write(cr, uid, ids, {'message_state': False}, context=context)
-
-    def message_check_and_set_read(self, cr, uid, ids, context=None):
-        """ Set read if uid is the object responsible. """
-        for obj in self.browse(cr, uid, ids, context=context):
-            if not obj.message_state and self._columns.get('user_id') and obj.user_id and obj.user_id.id == uid:
-                self.message_mark_as_read(cr, uid, [obj.id], context=context)
-    
+    # FP Note: this should be a invert function on message_state field
     def message_mark_as_read(self, cr, uid, ids, context=None):
         """ Set as read. """
         return self.write(cr, uid, ids, {'message_state': True}, context=context)
 
+    def message_mark_as_unread(self, cr, uid, ids, context=None):
+        """ Set as unread. """
+        notobj = self.pool.get('mail.notification')
+        cr.execute('''
+            update mail_notification set 
+                read=true
+            where
+                message_id in (select id from mail_message where res_id in %s and model=%s)
+                user_id = %s
+        ''', (ids, self._name, uid)
+        return True
+    # END FP note
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index a2ca7207aa4..e11e736270b 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -41,8 +41,7 @@ class res_users(osv.osv):
     _columns = {
         'notification_email_pref': fields.selection([
             ('all', 'All feeds'),
-            ('comments', 'Only comments'),
-            ('to_me', 'Only when sent directly to me'),
+            ('comment', 'Comments and emails'),
             ('none', 'Never')
             ], 'Receive Feeds by Email', required=True,
             help="Choose in which case you want to receive an email when you "\
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 6de9a9a0bbc..f0eb7b57298 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -574,8 +574,8 @@
             <field name="name">mrp.production.tree</field>
             <field name="model">mrp.production</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="blue:state in ('draft','confirmed');red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date;gray:state in ('done','cancel') " string="Manufacturing Orders">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree fonts="bold:message_state==True" colors="blue:state in ('draft','confirmed');red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date;gray:state in ('done','cancel') " string="Manufacturing Orders">
+                    <field name="message_state" invisible="1"/>
                     <field name="name"/>
                     <field name="date_planned"/>
                     <field name="product_id"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7d78a040b7e..28106828c9a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -159,7 +159,7 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                     <field name="complete_name" string="Project Name"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
                     <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
@@ -184,9 +184,9 @@
             <field name="model">project.project</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="red:date and (date&lt;current_date) and (state == 'open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
+                <tree fonts="bold:message_state==True" colors="red:date and (date&lt;current_date) and (state == 'open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
                     <field name="sequence" invisible="1"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_state" invisible="1"/>
                     <field name="date" invisible="1"/>
                     <field name="name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
@@ -504,7 +504,7 @@
                     <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline"/>
                     <field name="message_summary"/>
-                    <field name="needaction_pending"/>
+                    <field name="message_state"/>
                     <field name="categ_ids"/>
                     <templates>
                     <t t-name="kanban-box">
@@ -569,8 +569,8 @@
             <field name="model">project.task</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree fonts="bold:message_state==True" colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
+                    <field name="message_state" invisible="1"/>
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent" invisible="context.get('user_invisible', False)"/>
@@ -630,7 +630,7 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <field name="name" string="Tasks"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
                     <separator/>
                     <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
                     <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 08a2ae0b1d0..88dfe38e195 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -169,8 +169,8 @@
             <field name="name">Project Issue Tracker Tree</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree string="Issue Tracker Tree" fonts="bold:needaction_pending==True" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree string="Issue Tracker Tree" fonts="bold:message_state==True" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                    <field name="message_state" invisible="1"/>
                     <field name="id"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name"/>
@@ -195,7 +195,7 @@
                 <search string="Issue Tracker Search">
                     <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                     <field name="id"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
                     <separator/>
                     <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
                     <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
@@ -309,9 +309,9 @@
             <field name="name">Project Issue- Feature Tracker Tree</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree string="Feature Tracker Tree" fonts="bold:needaction_pending==True" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                <tree string="Feature Tracker Tree" fonts="bold:message_state==True" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                     <field name="id"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_state" invisible="1"/>
                     <field name="name" string="Feature description"/>
                     <field name="partner_id"/>
                     <field name="priority" string="Priority"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 6730e32913e..80398de01ba 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -298,7 +298,7 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                     <field name="name" string="Reference"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
                     <separator/>
                     <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
                     <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
@@ -323,8 +323,8 @@
             <field name="name">purchase.order.tree</field>
             <field name="model">purchase.order</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree fonts="bold:message_state==True" colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
+                    <field name="message_state" invisible="1"/>
                     <field name="name" string="Reference"/>
                     <field name="date_order" />
                     <field name="partner_id"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 0a442c3f9aa..2f07e65f6d5 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -111,8 +111,8 @@
         <field name="name">purchase.requisition.tree</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <tree fonts="bold:needaction_pending==True" colors="grey:state == 'cancel';red:date_end and date_end&lt;current_date;black:date_end&gt;current_date;" string="Purchase Requisition">
-                <field name="needaction_pending" invisible="1"/>
+            <tree fonts="bold:message_state==True" colors="grey:state == 'cancel';red:date_end and date_end&lt;current_date;black:date_end&gt;current_date;" string="Purchase Requisition">
+                <field name="message_state" invisible="1"/>
                 <field name="name"/>
                 <field name="date_start"/>
                 <field name="user_id"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a4a049fdbc5..c3ddda260d4 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -133,8 +133,8 @@
             <field name="model">sale.order</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <tree string="Sales Orders" fonts="bold:needaction_pending==True" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree string="Sales Orders" fonts="bold:message_state==True" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
+                    <field name="message_state" invisible="1"/>
                     <field name="name"/>
                     <field name="date_order"/>
                     <field name="partner_id"/>
@@ -362,7 +362,7 @@
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
                     <separator/>
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
                     <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>

From 1353759beca8ada3d739f9c57117255c9909e25d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 15 Aug 2012 15:37:10 +0200
Subject: [PATCH 294/999] [IMP] dynamic domains on O2M, remove
 needaction_pending

bzr revid: fp@openerp.com-20120815133710-138x0d52qqcd8ex2
---
 openerp/addons/base/ir/ir_needaction.py | 30 ++-----------------------
 openerp/addons/base/ir/ir_ui_menu.py    |  5 +++--
 openerp/osv/fields.py                   | 15 ++++++++++---
 3 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 5552b42052e..9112d60c1f4 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -38,39 +38,11 @@ class ir_needaction_mixin(osv.Model):
     - ``needaction_get_action_count``: as ``needaction_get_record_ids``
     but returns only the number of action, not the ids (performs a
     search with count=True)
-
-    The ``ir_needaction_mixin`` class adds a calculated field
-    ``needaction_pending``. This function field allows to state
-    whether a given record has a needaction for the current user.
-    This is usefull if you want to customize views according to the
-    needaction feature. For example, you may want to set records in
-    bold in a list view if the current user has an action to perform
-    on the record.
     '''
 
     _name = 'ir.needaction_mixin'
-    _description = 'Need Action Mixin'
     _needaction = True
 
-   def get_needaction_pending(self, cr, uid, ids, name, arg, context=None):
-       dom = self._needaction_domain_get(cr, uid, context=context)
-       result = dict.fromkeys(ids, False)
-       ids2 = self.search(cr, uid, [('id','in',ids)+dom], context=context)
-       for idna in ids2:
-           result[idna] = True
-       return result
-
-    def search_needaction_pending(self, cr, uid, field, field_name, criterion, context=None):
-        return self._needaction_domain_get(cr, uid, context=context)
-
-    _columns = {
-        'needaction_pending': fields.function(
-            get_needaction_pending, type='boolean',
-            fnct_search=search_needaction_pending,
-            string='Need an Action',
-            help="Do the current user requires to perform an action."),
-    }
-
     #------------------------------------------------------
     # Addon API
     #------------------------------------------------------
@@ -89,5 +61,7 @@ class ir_needaction_mixin(osv.Model):
         """Given the current model and a user_id
            get the number of actions it has to perform"""
         dom = self._needaction_domain_get(cr, uid, context=context)
+        if dom is False:
+            return 0
         return self.search(cr, uid, domain+dom, context=context, count=True)
 
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index 1bb517c570f..f5e4ee2ba05 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -260,13 +260,14 @@ class ir_ui_menu(osv.osv):
             context = {}
         res = {}
         for menu in self.browse(cr, uid, ids, context=context):
+            res[menu.id] = {}
             res[menu.id]['needaction_enabled'] = False
             res[menu.id]['needaction_counter'] = False
             res[menu.id] = {}
             if menu.action and menu.action.type == 'ir.actions.act_window' and menu.action.res_model:
                 obj = self.pool.get(menu.action.res_model)
-                if obj._needaction_active:
-                    res[menu.id]['needaction_enabled'] = obj._needaction_active
+                if obj._needaction:
+                    res[menu.id]['needaction_enabled'] = obj._needaction
                     # check domain and context: should we evaluate the domain ?
                     # and add context of the action ?
                     res[menu.id]['needaction_counter'] = obj._needaction_count(cr, uid, menu.action.domain, context=context)
diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index d6a5f4f63d8..fd23c246a16 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -514,7 +514,10 @@ class one2many(_column):
         for id in ids:
             res[id] = []
 
-        ids2 = obj.pool.get(self._obj).search(cr, user, self._domain + [(self._fields_id, 'in', ids)], limit=self._limit, context=context)
+        dom = self._domain
+        if isinstance(self._domain, type(lambda: None)):
+            dom = self._domain(obj)
+        ids2 = obj.pool.get(self._obj).search(cr, user, dom + [(self._fields_id, 'in', ids)], limit=self._limit, context=context)
         for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
             if r[self._fields_id] in res:
                 res[r[self._fields_id]].append(r['id'])
@@ -556,7 +559,10 @@ class one2many(_column):
                 reverse_rel = obj._all_columns.get(self._fields_id)
                 assert reverse_rel, 'Trying to unlink the content of a o2m but the pointed model does not have a m2o'
                 # if the o2m has a static domain we must respect it when unlinking
-                extra_domain = self._domain if isinstance(getattr(self, '_domain', None), list) else [] 
+                dom = self._domain
+                if isinstance(self._domain, type(lambda: None)):
+                    dom = self._domain(obj)
+                extra_domain = dom or []
                 ids_to_unlink = obj.search(cr, user, [(self._fields_id,'=',id)] + extra_domain, context=context)
                 # If the model has cascade deletion, we delete the rows because it is the intended behavior,
                 # otherwise we only nullify the reverse foreign key column.
@@ -574,7 +580,10 @@ class one2many(_column):
         return result
 
     def search(self, cr, obj, args, name, value, offset=0, limit=None, uid=None, operator='like', context=None):
-        return obj.pool.get(self._obj).name_search(cr, uid, value, self._domain, operator, context=context,limit=limit)
+        dom = self._domain
+        if isinstance(self._domain, type(lambda: None)):
+            dom = self._domain(obj)
+        return obj.pool.get(self._obj).name_search(cr, uid, value, dom, operator, context=context,limit=limit)
 
     
     @classmethod

From af93ab52908c765b482f5cbc125633701257a7aa Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 15 Aug 2012 19:08:22 +0200
Subject: [PATCH 295/999] [IMP] factorisation of objects

bzr revid: fp@openerp.com-20120815170822-udsmc9geqmm6jae8
---
 addons/mail/__init__.py         |   2 +-
 addons/mail/ir_needaction.py    |  46 ----
 addons/mail/mail_group.py       |  58 +----
 addons/mail/mail_group_view.xml |  11 +-
 addons/mail/mail_mail.py        | 268 ++++++++++++++++++++++
 addons/mail/mail_message.py     | 392 +++++---------------------------
 addons/mail/mail_thread.py      |  15 ++
 7 files changed, 356 insertions(+), 436 deletions(-)
 delete mode 100644 addons/mail/ir_needaction.py
 create mode 100644 addons/mail/mail_mail.py

diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index b19aad1afe3..9c1f0d70f6f 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -21,10 +21,10 @@
 
 import mail_alias
 import mail_message
+import mail_mail
 import mail_thread
 import mail_group
 import mail_subscription
-import ir_needaction
 import res_users
 import res_partner
 import report
diff --git a/addons/mail/ir_needaction.py b/addons/mail/ir_needaction.py
deleted file mode 100644
index 8193ac4f385..00000000000
--- a/addons/mail/ir_needaction.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2012-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 osv import osv
-
-class ir_needaction_mixin(osv.Model):
-    """ Update of ir.needaction_mixin class
-        - override the get_needaction_user_ids method to define the default
-          mail gateway need_action: when the object is unread, the object
-          responsible has an action to perform.
-    """
-    _name = 'ir.needaction_mixin'
-    _inherit = ['ir.needaction_mixin']
-    
-    def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        """ Returns the user_ids that have to perform an action. It the
-            document mail state is unread (False), return object.user_id.id
-            as need_action uid.
-            :return: dict { record_id: [user_ids], }
-        """
-        result = super(ir_needaction_mixin, self).get_needaction_user_ids(cr, uid, ids, context=context)
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.message_state == False and obj.user_id:
-                result[obj.id].append(obj.user_id.id)
-        return result
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 61bd21439a1..e93306aed02 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -34,13 +34,8 @@ class mail_group(osv.osv):
     subscription/follow mechanism of OpenSocial. A mail group has nothing
     in common with res.users.group.
     Additional information on fields:
-        - ``member_ids``: user member of the groups are calculated with
-          ``message_get_subscribers`` method from mail.thread
-        - ``member_count``: calculated with member_ids
-        - ``is_subscriber``: calculated with member_ids
-        
     """
-    
+
     _description = 'Discussion group'
     _name = 'mail.group'
     _inherit = ['mail.thread']
@@ -51,42 +46,15 @@ class mail_group(osv.osv):
         for obj in self.browse(cr, uid, ids, context=context):
             result[obj.id] = tools.image_get_resized_images(obj.image)
         return result
-    
+
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
-    
-    def get_member_ids(self, cr, uid, ids, field_names, args, context=None):
-        if context is None:
-            context = {}
-        result = dict.fromkeys(ids)
-        for id in ids:
-            result[id] = {}
-            result[id]['member_ids'] = self.message_get_subscribers(cr, uid, [id], context=context)
-            result[id]['member_count'] = len(result[id]['member_ids'])
-            result[id]['is_subscriber'] = uid in result[id]['member_ids']
-        return result
-    
-    def search_member_ids(self, cr, uid, obj, name, args, context=None):
-        if context is None:
-            context = {}
-        sub_obj = self.pool.get('mail.subscription')
-        sub_ids = sub_obj.search(cr, uid, ['&', ('res_model', '=', obj._name), ('user_id', '=', args[0][2])], context=context)
-        subs = sub_obj.read(cr, uid, sub_ids, context=context)
-        return [('id', 'in', map(itemgetter('res_id'), subs))]
-    
-    def get_last_month_msg_nbr(self, cr, uid, ids, name, args, context=None):
-        result = {}
-        for id in ids:
-            lower_date = (DT.datetime.now() - DT.timedelta(days=30)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
-            result[id] = self.message_search(cr, uid, [id], limit=None, domain=[('date', '>=', lower_date)], count=True, context=context)
-        return result
-    
+
     def _get_default_image(self, cr, uid, context=None):
         image_path = openerp.modules.get_module_resource('mail', 'static/src/img', 'groupdefault.png')
         return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
-    
+
     _columns = {
-        #'name': fields.char('Group Name', size=64, required=True),
         'description': fields.text('Description'),
         'menu_id': fields.many2one('ir.ui.menu', string='Related Menu', required=True, ondelete="cascade"),
         'responsible_id': fields.many2one('res.users', string='Responsible',
@@ -121,17 +89,7 @@ class mail_group(osv.osv):
             help="Small-sized photo of the group. It is automatically "\
                  "resized as a 50x50px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
-        'member_ids': fields.function(get_member_ids, fnct_search=search_member_ids,
-            type='many2many', relation='res.users', string='Group members', multi='get_member_ids',
-            deprecated='This field will be deleted in a few hours or days, so please do not use it.'),
-        'member_count': fields.function(get_member_ids, type='integer',
-            string='Member count', multi='get_member_ids',
-            deprecated='This field will be deleted in a few hours or days, so please do not use it.'),
-        'is_subscriber': fields.function(get_member_ids, type='boolean',
-            string='Joined', multi='get_member_ids'),
-        'last_month_msg_nbr': fields.function(get_last_month_msg_nbr, type='integer',
-            string='Messages count for last month'),
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", 
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade",
                                     help="The email address associated with this group. New emails received will automatically "
                                          "create new topics."),
     }
@@ -150,7 +108,7 @@ class mail_group(osv.osv):
         'responsible_id': (lambda s, cr, uid, ctx: uid),
         'image': _get_default_image,
         'parent_id': _get_menu_parent,
-        'alias_domain': False, # always hide alias during creation 
+        'alias_domain': False, # always hide alias during creation
     }
 
     def _subscribe_user_with_group_m2m_command(self, cr, uid, ids, group_ids_command, context=None):
@@ -169,7 +127,7 @@ class mail_group(osv.osv):
         mail_alias = self.pool.get('mail.alias')
         if not vals.get('alias_id'):
             vals.pop('alias_name', None) # prevent errors during copy()
-            alias_id = mail_alias.create_unique_alias(cr, uid, 
+            alias_id = mail_alias.create_unique_alias(cr, uid,
                           # Using '+' allows using subaddressing for those who don't
                           # have a catchall domain setup.
                           {'alias_name': "group+"+vals['name']},
@@ -194,7 +152,7 @@ class mail_group(osv.osv):
             self.write(cr, uid, [mail_group_id], {'action': 'ir.actions.client,'+str(newref), 'mail_group_id': mail_group_id}, context=context)
 
         mail_alias.write(cr, uid, [vals['alias_id']], {"alias_force_thread_id": mail_group_id}, context)
-       
+
         if vals.get('group_ids'):
             self._subscribe_user_with_group_m2m_command(cr, uid, [mail_group_id], vals.get('group_ids'), context=context)
 
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 7df68bf399e..dac5333024c 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -21,18 +21,17 @@
                             </div>
                         </t>
                         <t t-name="kanban-box">
-                            <div t-attf-class="{record.is_subscriber.raw_value} oe_group_vignette">
+                            <div t-attf-class="{record.message_is_subscriber.raw_value} oe_group_vignette">
                                 <div class="oe_group_image">
                                     <a type="edit"><img t-att-src="kanban_image('mail.group', 'image_medium', record.id.value)" class="oe_group_photo" tooltip="kanban-description"/></a>
                                 </div>
                                 <div class="oe_group_details">
                                     <h4><a type="edit"><field name="name"/></a></h4>
-                                    <span style="display: none;"><field name="is_subscriber"/></span>
+                                    <span style="display: none;"><field name="message_is_subscriber"/></span>
                                     <ul>
-                                        <li><field name="member_count"/> members</li>
-                                        <li t-if="! record.is_subscriber.raw_value"><a name="action_group_join" string="Join" type="object" class="oe_group_join">Not following</a></li>
-                                        <li t-if="record.is_subscriber.raw_value"><a name="action_group_leave" string="Join" type="object" class="oe_group_leave">Following</a></li>
-                                        <li><field name="last_month_msg_nbr"/> messages last month</li>
+                                        <li><t t-raw="record.message_summary.raw_value"/></li>
+                                        <li t-if="! record.message_is_subscriber.raw_value"><a name="action_group_join" string="Join" type="object" class="oe_group_join">Not following</a></li>
+                                        <li t-if="record.message_is_subscriber.raw_value"><a name="action_group_leave" string="Join" type="object" class="oe_group_leave">Following</a></li>
                                     </ul>
                                 </div>
                             </div>
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
new file mode 100644
index 00000000000..b960745ec68
--- /dev/null
+++ b/addons/mail/mail_mail.py
@@ -0,0 +1,268 @@
+
+class mail_mail(osv.Model):
+    """
+    Model holding RFC2822 email messages to send. This model also provides
+    facilities to queue and send new email messages. 
+    """
+
+    _name = 'mail.mail'
+    _description = 'Outgoing Mails'
+    _inherits = {'mail.message': 'message_id'}
+    _columns = {
+        'message_id': fields.many2one('mail.message', 'Message', required=True),
+        # why do we need this on the mail, why not on the company?
+        'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
+        'state': fields.selection([
+                        ('outgoing', 'Outgoing'),
+                        ('sent', 'Sent'),
+                        ('received', 'Received'),
+                        ('exception', 'Delivery Failed'),
+                        ('cancel', 'Cancelled'),
+                        ], 'Status', readonly=True),
+        'auto_delete': fields.boolean('Auto Delete',
+            help="Permanently delete this email after sending it, to save space"),
+
+        # FP Note: to be removed, in attachment if needed
+        'original': fields.binary('Original', readonly=1,
+            help="Original version of the message, as it was sent on the network"),
+        # End FP Note
+
+        # FP Note: I propose to remove these fields and put email in attachment as an option
+        'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences.'),
+        'email_to': fields.text('To', help='Message recipients'),
+        'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
+        'email_bcc': fields.char('Bcc', size=256, help='Blind carbon copy message recipients'),
+        'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
+        'content_subtype': fields.char('Message content subtype', size=32,
+            oldname="subtype", readonly=1,
+            help="Type of message, usually 'html' or 'plain', used to select "\
+                  "plain-text or rich-text contents accordingly"),
+        'body_html': fields.html('Rich-text Contents', help="Rich-text/HTML version of the message"),
+
+    }
+
+    _defaults = {
+        'state': 'received',
+        'content_subtype': 'plain',
+    }
+
+    # FP Note: do we need this method ?
+    # We should just ask to create the message before scheduling it
+    def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, type='email',
+                             email_cc=None, email_bcc=None, reply_to=False, partner_ids=None, attachments=None,
+                             message_id=False, references=False, res_id=False, content_subtype='plain',
+                             headers=None, mail_server_id=False, auto_delete=False, context=None):
+        """ Schedule sending a new email message, to be sent the next time the
+            mail scheduler runs, or the next time :meth:`process_email_queue` is
+            called explicitly.
+
+            :param string email_from: sender email address
+            :param list email_to: list of recipient addresses (to be joined with commas) 
+            :param string subject: email subject (no pre-encoding/quoting necessary)
+            :param string body: email body, according to the ``content_subtype`` 
+                (by default, plaintext). If html content_subtype is used, the
+                message will be automatically converted to plaintext and wrapped
+                in multipart/alternative.
+            :param list email_cc: optional list of string values for CC header
+                (to be joined with commas)
+            :param list email_bcc: optional list of string values for BCC header
+                (to be joined with commas)
+            :param string model: optional model name of the document this mail
+                is related to (this will also be used to generate a tracking id,
+                used to match any response related to the same document)
+            :param int res_id: optional resource identifier this mail is related
+                to (this will also be used to generate a tracking id, used to
+                match any response related to the same document)
+            :param string reply_to: optional value of Reply-To header
+            :param partner_ids: destination partner_ids
+            :param string content_subtype: optional mime content_subtype for
+                the text body (usually 'plain' or 'html'), must match the format
+                of the ``body`` parameter. Default is 'plain', making the content
+                part of the mail "text/plain".
+            :param dict attachments: map of filename to filecontents, where
+                filecontents is a string containing the bytes of the attachment
+            :param dict headers: optional map of headers to set on the outgoing
+                mail (may override the other headers, including Subject,
+                Reply-To, Message-Id, etc.)
+            :param int mail_server_id: optional id of the preferred outgoing
+                mail server for this mail
+            :param bool auto_delete: optional flag to turn on auto-deletion of
+                the message after it has been successfully sent (default to False)
+        """
+        if context is None:
+            context = {}
+        if attachments is None:
+            attachments = {}
+        if partner_ids is None:
+            partner_ids = []
+        attachment_obj = self.pool.get('ir.attachment')
+        for param in (email_to, email_cc, email_bcc):
+            if param and not isinstance(param, list):
+                param = [param]
+        msg_vals = {
+                'subject': subject,
+                'date': fields.datetime.now(),
+                'user_id': uid,
+                'model': model,
+                'res_id': res_id,
+                'type': type,
+                'body_text': body if content_subtype != 'html' else False,
+                'body_html': body if content_subtype == 'html' else False,
+                'email_from': email_from,
+                'email_to': email_to and ','.join(email_to) or '',
+                'email_cc': email_cc and ','.join(email_cc) or '',
+                'email_bcc': email_bcc and ','.join(email_bcc) or '',
+                'partner_ids': partner_ids,
+                'reply_to': reply_to,
+                'message_id': message_id,
+                'references': references,
+                'content_subtype': content_subtype,
+                'headers': headers, # serialize the dict on the fly
+                'mail_server_id': mail_server_id,
+                'state': 'outgoing',
+                'auto_delete': auto_delete
+            }
+        email_msg_id = self.create(cr, uid, msg_vals, context)
+        attachment_ids = []
+        for fname, fcontent in attachments.iteritems():
+            attachment_data = {
+                    'name': fname,
+                    'datas_fname': fname,
+                    'datas': fcontent and fcontent.encode('base64'),
+                    'res_model': self._name,
+                    'res_id': email_msg_id,
+            }
+            if context.has_key('default_type'):
+                del context['default_type']
+            attachment_ids.append(attachment_obj.create(cr, uid, attachment_data, context))
+        if attachment_ids:
+            self.write(cr, uid, email_msg_id, { 'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
+        return email_msg_id
+
+    def mark_outgoing(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state':'outgoing'}, context=context)
+
+    def cancel(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state':'cancel'}, context=context)
+
+    def process_email_queue(self, cr, uid, ids=None, context=None):
+        """Send immediately queued messages, committing after each
+           message is sent - this is not transactional and should
+           not be called during another transaction!
+
+           :param list ids: optional list of emails ids to send. If passed
+                            no search is performed, and these ids are used
+                            instead.
+           :param dict context: if a 'filters' key is present in context,
+                                this value will be used as an additional
+                                filter to further restrict the outgoing
+                                messages to send (by default all 'outgoing'
+                                messages are sent).
+        """
+        if context is None:
+            context = {}
+        if not ids:
+            filters = ['&', ('state', '=', 'outgoing'), ('type', '=', 'email')]
+            if 'filters' in context:
+                filters.extend(context['filters'])
+            ids = self.search(cr, uid, filters, context=context)
+        res = None
+        try:
+            # Force auto-commit - this is meant to be called by
+            # the scheduler, and we can't allow rolling back the status
+            # of previously sent emails!
+            res = self.send(cr, uid, ids, auto_commit=True, context=context)
+        except Exception:
+            _logger.exception("Failed processing mail queue")
+        return res
+
+    def _postprocess_sent_message(self, cr, uid, message, context=None):
+        """Perform any post-processing necessary after sending ``message``
+        successfully, including deleting it completely along with its
+        attachment if the ``auto_delete`` flag of the message was set.
+        Overridden by subclasses for extra post-processing behaviors. 
+
+        :param browse_record message: the message that was just sent
+        :return: True
+        """
+        if message.auto_delete:
+            self.pool.get('ir.attachment').unlink(cr, uid,
+                [x.id for x in message.attachment_ids
+                    if x.res_model == self._name and x.res_id == message.id],
+                context=context)
+            message.unlink()
+        return True
+
+    def send(self, cr, uid, ids, auto_commit=False, context=None):
+        """Sends the selected emails immediately, ignoring their current
+           state (mails that have already been sent should not be passed
+           unless they should actually be re-sent).
+           Emails successfully delivered are marked as 'sent', and those
+           that fail to be deliver are marked as 'exception', and the
+           corresponding error message is output in the server logs.
+
+           :param bool auto_commit: whether to force a commit of the message
+                                    status after sending each message (meant
+                                    only for processing by the scheduler),
+                                    should never be True during normal
+                                    transactions (default: False)
+           :return: True
+        """
+        ir_mail_server = self.pool.get('ir.mail_server')
+        self.write(cr, uid, ids, {'state': 'outgoing'}, context=context)
+        for message in self.browse(cr, uid, ids, context=context):
+            try:
+                attachments = []
+                for attach in message.attachment_ids:
+                    attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
+
+                body = message.body_html if message.content_subtype == 'html' else message.body_text
+                body_alternative = None
+                content_subtype_alternative = None
+                if message.content_subtype == 'html' and message.body_text:
+                    # we have a plain text alternative prepared, pass it to 
+                    # build_message instead of letting it build one
+                    body_alternative = message.body_text
+                    content_subtype_alternative = 'plain'
+
+                # handle destination_partners
+                partner_ids_email_to = ''
+                for partner in message.partner_ids:
+                    partner_ids_email_to += '%s ' % (partner.email or '')
+                message_email_to = '%s %s' % (partner_ids_email_to, message.email_to or '')
+
+                # build an RFC2822 email.message.Message object and send it
+                # without queuing
+                msg = ir_mail_server.build_email(
+                    email_from=message.email_from,
+                    email_to=mail_tools_to_email(message_email_to),
+                    subject=message.subject,
+                    body=body,
+                    body_alternative=body_alternative,
+                    email_cc=mail_tools_to_email(message.email_cc),
+                    email_bcc=mail_tools_to_email(message.email_bcc),
+                    reply_to=message.reply_to,
+                    attachments=attachments, message_id=message.message_id,
+                    references = message.references,
+                    object_id=message.res_id and ('%s-%s' % (message.res_id,message.model)),
+                    subtype=message.content_subtype,
+                    subtype_alternative=content_subtype_alternative,
+                    headers=message.headers and ast.literal_eval(message.headers))
+                res = ir_mail_server.send_email(cr, uid, msg,
+                                                mail_server_id=message.mail_server_id.id,
+                                                context=context)
+                if res:
+                    message.write({'state':'sent', 'message_id': res, 'email_to': message_email_to})
+                else:
+                    message.write({'state':'exception', 'email_to': message_email_to})
+                message.refresh()
+                if message.state == 'sent':
+                    self._postprocess_sent_message(cr, uid, message, context=context)
+            except Exception:
+                _logger.exception('failed sending mail.message %s', message.id)
+                message.write({'state':'exception'})
+
+            if auto_commit == True:
+                cr.commit()
+        return True
+
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index ee137b635ce..227a9b81f5b 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -54,93 +54,15 @@ def mail_tools_to_email(text):
     if not text: return []
     return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
 
-# TODO: remove that after cleaning
-def to_email(text):
-    return mail_tools_to_email(text)
-
-# FP Note: I propose to merge mail.message and mail.message.common
-# there is a conflict for the field parent_id
-# I don't understand the usage of mail.message.common
-class mail_message_common(osv.TransientModel):
-    """ Common abstract class for holding the main attributes of a 
-        message object. It could be reused as parent model for any
-        database model or wizard screen that needs to hold a kind of
-        message.
-        All internal logic should be in another model while this
-        model holds the basics of a message. For example, a wizard for writing
-        emails should inherit from this class and not from mail.message."""
-
-    def get_record_name(self, cr, uid, ids, name, arg, context=None):
-        result = dict.fromkeys(ids, '')
-        for message in self.browse(cr, uid, ids, context=context):
-            if not message.model or not message.res_id:
-                continue
-            result[message.id] = self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1]
-        return result
-
-    def name_get(self, cr, uid, ids, context=None):
-        res = []
-        for message in self.browse(cr, uid, ids, context=context):
-            name = ''
-            if message.subject:
-                name = '%s: ' % (message.subject)
-            if message.body_text:
-                name = name + message.body_text[0:20]
-            res.append((message.id, name))
-        return res
-
-    _name = 'mail.message.common'
-    _rec_name = 'subject'
-    _columns = {
-        'model': fields.char('Related Document Model', size=128, select=1),
-        'res_id': fields.integer('Related Document ID', select=1),
-        'record_name': fields.function(get_record_name, type='string',
-            string='Message Record Name',
-            help="Name get of the related document."),
-
-        'subject': fields.char('Subject', size=128),
-        'date': fields.datetime('Date'),
-
-        # FP Note: I propose to remove these fields and put email in attachment as an option
-        'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences.'),
-        'email_to': fields.text('To', help='Message recipients'),
-        'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
-        'email_bcc': fields.char('Bcc', size=256, help='Blind carbon copy message recipients'),
-        'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
-        'headers': fields.text('Message Headers', readonly=1,
-            help="Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"),
-        'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
-        'content_subtype': fields.char('Message content subtype', size=32,
-            oldname="subtype", readonly=1,
-            help="Type of message, usually 'html' or 'plain', used to select "\
-                  "plain-text or rich-text contents accordingly"),
-        'body_html': fields.html('Rich-text Contents', help="Rich-text/HTML version of the message"),
-        # END FP Note
-
-        'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
-        'body': fields.text('Text Contents', help="Plain-text version of the message", required=True),
-
-        'parent_id': fields.many2one('mail.message.common', 'Parent Message',
-            select=True, ondelete='set null',
-            help="Parent message, used for displaying as threads with hierarchy"),
-    }
-
-    _defaults = {
-        'content_subtype': 'plain',
-        'date': (lambda *a: fields.datetime.now()),
-    }
-
 class mail_message(osv.Model):
     """Model holding messages: system notification (replacing res.log
-       notifications), comments (for OpenChatter feature) and
-       RFC2822 email messages. This model also provides facilities to
-       parse, queue and send new email messages. Type of messages
-       are differentiated using the 'type' column. """
+    notifications), comments (for OpenChatter feature). This model also
+    provides facilities to parse new email messages. Type of messages are
+    differentiated using the 'type' column. """
 
     _name = 'mail.message'
-    _inherit = 'mail.message.common'
-    _description = 'Mail Message (email, comment, notification)'
-    _order = 'date desc'
+    _description = 'Message'
+    _order = 'id desc'
 
     # FP Note: can we remove these two methods ?
     def open_document(self, cr, uid, ids, context=None):
@@ -183,7 +105,28 @@ class mail_message(osv.Model):
         return action_data
     # END FP Note
 
+    def get_record_name(self, cr, uid, ids, name, arg, context=None):
+        result = dict.fromkeys(ids, '')
+        for message in self.browse(cr, uid, ids, context=context):
+            if not message.model or not message.res_id:
+                continue
+            result[message.id] = self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1]
+        return result
+
+    def name_get(self, cr, uid, ids, context=None):
+        res = []
+        for message in self.browse(cr, uid, ids, context=context):
+            name = ''
+            if message.subject:
+                name = '%s: ' % (message.subject)
+            if message.body_text:
+                name = name + message.body_text[0:20]
+            res.append((message.id, name))
+        return res
+
+
     _columns = {
+        # should we keep a distinction between email and comment ?
         'type': fields.selection([
                         ('email', 'email'),
                         ('comment', 'Comment'),
@@ -191,49 +134,55 @@ class mail_message(osv.Model):
                         ], 'Type',
             help="Message type: email for email message, notification for system "\
                   "message, comment for other messages such as user replies"),
-        # FP Note: ro be removed
-        'partner_id': fields.many2one('res.partner', 'Related partner',
-            help="Deprecated field. Use partner_ids instead."),
-        # END FP Note
 
+        # partner_id should be renamed into author_id
+        'author_id': fields.many2one('res.partner', 'Author', required=True),
+
+        # this is redundant with notifications ?
         'partner_ids': fields.many2many('res.partner',
             'mail_message_destination_partner_rel',
             'message_id', 'partner_id', 'Destination partners',
             help="When sending emails through the social network composition wizard"\
                  "you may choose to send a copy of the mail to partners."),
-        'user_id': fields.many2one('res.users', 'Author', readonly=1),
-        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
-        'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
-        'state': fields.selection([
-                        ('outgoing', 'Outgoing'),
-                        ('sent', 'Sent'),
-                        ('received', 'Received'),
-                        ('exception', 'Delivery Failed'),
-                        ('cancel', 'Cancelled'),
-                        ], 'Status', readonly=True),
-        'auto_delete': fields.boolean('Auto Delete',
-            help="Permanently delete this email after sending it, to save space"),
 
-        # FP Note: to be removed, in attachment if needed
-        'original': fields.binary('Original', readonly=1,
-            help="Original version of the message, as it was sent on the network"),
-        # End FP Note
+        # 'user_id': fields.many2one('res.users', 'Author', readonly=1),
+
+        # why don't we attach the file to the message using res_id, res_model of the attachment ?
+        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
 
         'parent_id': fields.many2one('mail.message', 'Parent Message',
             select=True, ondelete='set null',
             help="Parent message, used for displaying as threads with hierarchy"),
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
+
+
+        'model': fields.char('Related Document Model', size=128, select=1),
+        'res_id': fields.integer('Related Document ID', select=1),
+        'record_name': fields.function(get_record_name, type='string',
+            string='Message Record Name',
+            help="Name get of the related document."),
+
+        'subject': fields.char('Subject', size=128),
+        'date': fields.datetime('Date'),
+
+        # FP Note: do we need this ?
+        'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
+
+        # END FP Note
+
+        'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
+        'body': fields.text('Content', help="Content of Message", required=True),
+
     }
-        
     _defaults = {
         'type': 'email',
-        'state': 'received',
+        'date': (lambda *a: fields.datetime.now()),
     }
-    
+
     #------------------------------------------------------
     # Email api
     #------------------------------------------------------
-    
+
     def init(self, cr):
         cr.execute("""SELECT indexname FROM pg_indexes WHERE indexname = 'mail_message_model_res_id_idx'""")
         if not cr.fetchone():
@@ -260,7 +209,7 @@ class mail_message(osv.Model):
             mids = self.pool.get(model).exists(cr, uid, mids)
             ima_obj.check(cr, uid, model, mode)
             self.pool.get(model).check_access_rule(cr, uid, mids, mode, context=context)
-    
+
     def create(self, cr, uid, values, context=None):
         newid = super(mail_message, self).create(cr, uid, values, context)
         self.check(cr, uid, [newid], mode='create', context=context)
@@ -273,9 +222,7 @@ class mail_message(osv.Model):
             for follower in modobj.follower_ids:
                 if follower.id <> uid:
                     follower_notify.append(follower.id)
-
             self.pool.get('mail.notification').notify(cr, uid, follower_notify, newid, context=context)
-
         return newid
 
     def read(self, cr, uid, ids, fields_to_read=None, context=None, load='_classic_read'):
@@ -289,7 +236,7 @@ class mail_message(osv.Model):
         self.check(cr, uid, [id], 'read', context=context)
         default.update(message_id=False, original=False, headers=False)
         return super(mail_message,self).copy(cr, uid, id, default=default, context=context)
-    
+
     def write(self, cr, uid, ids, vals, context=None):
         result = super(mail_message, self).write(cr, uid, ids, vals, context)
         self.check(cr, uid, ids, 'write', context=context)
@@ -299,136 +246,7 @@ class mail_message(osv.Model):
         self.check(cr, uid, ids, 'unlink', context=context)
         return super(mail_message, self).unlink(cr, uid, ids, context)
 
-    # FP Note: do we need this method ?
-    # We should just ask to create the message before scheduling it
-    def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, type='email',
-                             email_cc=None, email_bcc=None, reply_to=False, partner_ids=None, attachments=None,
-                             message_id=False, references=False, res_id=False, content_subtype='plain',
-                             headers=None, mail_server_id=False, auto_delete=False, context=None):
-        """ Schedule sending a new email message, to be sent the next time the
-            mail scheduler runs, or the next time :meth:`process_email_queue` is
-            called explicitly.
-
-            :param string email_from: sender email address
-            :param list email_to: list of recipient addresses (to be joined with commas) 
-            :param string subject: email subject (no pre-encoding/quoting necessary)
-            :param string body: email body, according to the ``content_subtype`` 
-                (by default, plaintext). If html content_subtype is used, the
-                message will be automatically converted to plaintext and wrapped
-                in multipart/alternative.
-            :param list email_cc: optional list of string values for CC header
-                (to be joined with commas)
-            :param list email_bcc: optional list of string values for BCC header
-                (to be joined with commas)
-            :param string model: optional model name of the document this mail
-                is related to (this will also be used to generate a tracking id,
-                used to match any response related to the same document)
-            :param int res_id: optional resource identifier this mail is related
-                to (this will also be used to generate a tracking id, used to
-                match any response related to the same document)
-            :param string reply_to: optional value of Reply-To header
-            :param partner_ids: destination partner_ids
-            :param string content_subtype: optional mime content_subtype for
-                the text body (usually 'plain' or 'html'), must match the format
-                of the ``body`` parameter. Default is 'plain', making the content
-                part of the mail "text/plain".
-            :param dict attachments: map of filename to filecontents, where
-                filecontents is a string containing the bytes of the attachment
-            :param dict headers: optional map of headers to set on the outgoing
-                mail (may override the other headers, including Subject,
-                Reply-To, Message-Id, etc.)
-            :param int mail_server_id: optional id of the preferred outgoing
-                mail server for this mail
-            :param bool auto_delete: optional flag to turn on auto-deletion of
-                the message after it has been successfully sent (default to False)
-        """
-        if context is None:
-            context = {}
-        if attachments is None:
-            attachments = {}
-        if partner_ids is None:
-            partner_ids = []
-        attachment_obj = self.pool.get('ir.attachment')
-        for param in (email_to, email_cc, email_bcc):
-            if param and not isinstance(param, list):
-                param = [param]
-        msg_vals = {
-                'subject': subject,
-                'date': fields.datetime.now(),
-                'user_id': uid,
-                'model': model,
-                'res_id': res_id,
-                'type': type,
-                'body_text': body if content_subtype != 'html' else False,
-                'body_html': body if content_subtype == 'html' else False,
-                'email_from': email_from,
-                'email_to': email_to and ','.join(email_to) or '',
-                'email_cc': email_cc and ','.join(email_cc) or '',
-                'email_bcc': email_bcc and ','.join(email_bcc) or '',
-                'partner_ids': partner_ids,
-                'reply_to': reply_to,
-                'message_id': message_id,
-                'references': references,
-                'content_subtype': content_subtype,
-                'headers': headers, # serialize the dict on the fly
-                'mail_server_id': mail_server_id,
-                'state': 'outgoing',
-                'auto_delete': auto_delete
-            }
-        email_msg_id = self.create(cr, uid, msg_vals, context)
-        attachment_ids = []
-        for fname, fcontent in attachments.iteritems():
-            attachment_data = {
-                    'name': fname,
-                    'datas_fname': fname,
-                    'datas': fcontent and fcontent.encode('base64'),
-                    'res_model': self._name,
-                    'res_id': email_msg_id,
-            }
-            if context.has_key('default_type'):
-                del context['default_type']
-            attachment_ids.append(attachment_obj.create(cr, uid, attachment_data, context))
-        if attachment_ids:
-            self.write(cr, uid, email_msg_id, { 'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
-        return email_msg_id
-
-    def mark_outgoing(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'outgoing'}, context=context)
-
-    def cancel(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'cancel'}, context=context)
-
-    def process_email_queue(self, cr, uid, ids=None, context=None):
-        """Send immediately queued messages, committing after each
-           message is sent - this is not transactional and should
-           not be called during another transaction!
-
-           :param list ids: optional list of emails ids to send. If passed
-                            no search is performed, and these ids are used
-                            instead.
-           :param dict context: if a 'filters' key is present in context,
-                                this value will be used as an additional
-                                filter to further restrict the outgoing
-                                messages to send (by default all 'outgoing'
-                                messages are sent).
-        """
-        if context is None:
-            context = {}
-        if not ids:
-            filters = ['&', ('state', '=', 'outgoing'), ('type', '=', 'email')]
-            if 'filters' in context:
-                filters.extend(context['filters'])
-            ids = self.search(cr, uid, filters, context=context)
-        res = None
-        try:
-            # Force auto-commit - this is meant to be called by
-            # the scheduler, and we can't allow rolling back the status
-            # of previously sent emails!
-            res = self.send(cr, uid, ids, auto_commit=True, context=context)
-        except Exception:
-            _logger.exception("Failed processing mail queue")
-        return res
-
+    # FP Note: to be simplified, mail.message fields only, not mail.mail
     def parse_message(self, message, save_original=False, context=None):
         """Parses a string or email.message.Message representing an
            RFC-2822 email, and returns a generic dict holding the
@@ -585,96 +403,4 @@ class mail_message(osv.Model):
         msg['sub_type'] = msg['content_subtype'] or 'plain'
         return msg
 
-    def _postprocess_sent_message(self, cr, uid, message, context=None):
-        """Perform any post-processing necessary after sending ``message``
-        successfully, including deleting it completely along with its
-        attachment if the ``auto_delete`` flag of the message was set.
-        Overridden by subclasses for extra post-processing behaviors. 
 
-        :param browse_record message: the message that was just sent
-        :return: True
-        """
-        if message.auto_delete:
-            self.pool.get('ir.attachment').unlink(cr, uid,
-                [x.id for x in message.attachment_ids
-                    if x.res_model == self._name and x.res_id == message.id],
-                context=context)
-            message.unlink()
-        return True
-
-    def send(self, cr, uid, ids, auto_commit=False, context=None):
-        """Sends the selected emails immediately, ignoring their current
-           state (mails that have already been sent should not be passed
-           unless they should actually be re-sent).
-           Emails successfully delivered are marked as 'sent', and those
-           that fail to be deliver are marked as 'exception', and the
-           corresponding error message is output in the server logs.
-
-           :param bool auto_commit: whether to force a commit of the message
-                                    status after sending each message (meant
-                                    only for processing by the scheduler),
-                                    should never be True during normal
-                                    transactions (default: False)
-           :return: True
-        """
-        ir_mail_server = self.pool.get('ir.mail_server')
-        self.write(cr, uid, ids, {'state': 'outgoing'}, context=context)
-        for message in self.browse(cr, uid, ids, context=context):
-            try:
-                attachments = []
-                for attach in message.attachment_ids:
-                    attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
-
-                body = message.body_html if message.content_subtype == 'html' else message.body_text
-                body_alternative = None
-                content_subtype_alternative = None
-                if message.content_subtype == 'html' and message.body_text:
-                    # we have a plain text alternative prepared, pass it to 
-                    # build_message instead of letting it build one
-                    body_alternative = message.body_text
-                    content_subtype_alternative = 'plain'
-
-                # handle destination_partners
-                partner_ids_email_to = ''
-                for partner in message.partner_ids:
-                    partner_ids_email_to += '%s ' % (partner.email or '')
-                message_email_to = '%s %s' % (partner_ids_email_to, message.email_to or '')
-
-                # build an RFC2822 email.message.Message object and send it
-                # without queuing
-                msg = ir_mail_server.build_email(
-                    email_from=message.email_from,
-                    email_to=mail_tools_to_email(message_email_to),
-                    subject=message.subject,
-                    body=body,
-                    body_alternative=body_alternative,
-                    email_cc=mail_tools_to_email(message.email_cc),
-                    email_bcc=mail_tools_to_email(message.email_bcc),
-                    reply_to=message.reply_to,
-                    attachments=attachments, message_id=message.message_id,
-                    references = message.references,
-                    object_id=message.res_id and ('%s-%s' % (message.res_id,message.model)),
-                    subtype=message.content_subtype,
-                    subtype_alternative=content_subtype_alternative,
-                    headers=message.headers and ast.literal_eval(message.headers))
-                res = ir_mail_server.send_email(cr, uid, msg,
-                                                mail_server_id=message.mail_server_id.id,
-                                                context=context)
-                if res:
-                    message.write({'state':'sent', 'message_id': res, 'email_to': message_email_to})
-                else:
-                    message.write({'state':'exception', 'email_to': message_email_to})
-                message.refresh()
-                if message.state == 'sent':
-                    self._postprocess_sent_message(cr, uid, message, context=context)
-            except Exception:
-                _logger.exception('failed sending mail.message %s', message.id)
-                message.write({'state':'exception'})
-
-            if auto_commit == True:
-                cr.commit()
-        return True
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index d6e33497d98..d3f80c08513 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -70,6 +70,19 @@ class mail_thread(osv.Model):
     _description = 'Email Thread'
     # TODO: may be we should make it _inherit ir.needaction
 
+    def _get_is_subscriber(self, cr, uid, ids, name, args, context=None):
+        subobj = self.pool.get('mail.subscription')
+        subids = subobj.search(cr, uid, [
+            ('res_model','=',self._name),
+            ('res_id', 'in', ids),
+            ('user_id','=',uid)], context=context)
+        result = dict.fromkeys(ids, False)
+        for sub in subobj.browse(cr, uid, subids, context=context):
+            result[res_id] = True
+        return result
+
+
+
     def _get_message_data(self, cr, uid, ids, name, args, context=None):
         res = {}
         for id in ids:
@@ -98,6 +111,8 @@ class mail_thread(osv.Model):
         return [('id','in',[])]
 
     _columns = {
+        'message_is_subscriber': fields.function(_get_is_subscriber,
+            type='boolean', string='Is a Follower'),
         'message_follower_ids': fields.one2many('mail.subscription', 'res_id',
             domain=lambda self: [('res_model','=',self._name)],
             string='Followers')

From 677024e09940a83fed23d7ef24e67206d060331f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 15 Aug 2012 20:44:03 +0200
Subject: [PATCH 296/999] [IMP] refactoring email

bzr revid: fp@openerp.com-20120815184403-dtpep7ypwbc6hm5w
---
 addons/mail/mail_group.py                     | 13 ++--
 addons/mail/mail_group_menu.py                |  3 +-
 addons/mail/mail_group_view.xml               |  5 --
 addons/mail/mail_mail.py                      | 51 +++++++--------
 addons/mail/mail_message.py                   | 62 +++----------------
 addons/mail/mail_message_view.xml             |  6 --
 addons/mail/mail_subscription.py              | 22 +++----
 addons/mail/mail_thread.py                    | 48 +++-----------
 addons/mail/res_partner.py                    |  9 +++
 addons/mail/res_users.py                      |  9 +--
 addons/mail/wizard/mail_compose_message.py    |  9 ++-
 .../mail/wizard/mail_compose_message_view.xml |  1 -
 12 files changed, 70 insertions(+), 168 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index e93306aed02..b93a7f814a1 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -35,10 +35,9 @@ class mail_group(osv.osv):
     in common with res.users.group.
     Additional information on fields:
     """
-
     _description = 'Discussion group'
     _name = 'mail.group'
-    _inherit = ['mail.thread']
+    _inherit = ['mail.thread','ir.needaction']
     _inherits = {'mail.alias': 'alias_id', 'ir.ui.menu': 'menu_id'}
 
     def _get_image(self, cr, uid, ids, name, args, context=None):
@@ -57,9 +56,6 @@ class mail_group(osv.osv):
     _columns = {
         'description': fields.text('Description'),
         'menu_id': fields.many2one('ir.ui.menu', string='Related Menu', required=True, ondelete="cascade"),
-        'responsible_id': fields.many2one('res.users', string='Responsible',
-            ondelete='set null', required=True, select=1,
-            help="Responsible of the group that has all rights on the record."),
         'public': fields.selection([('public','Public'),('private','Private'),('groups','Selected Group Only')], 'Privacy', required=True,
             help='This group is visible by non members. \
             Invisible groups can add members through the invite button.'),
@@ -105,7 +101,6 @@ class mail_group(osv.osv):
     _defaults = {
         'public': 'groups',
         'group_public_id': _get_default_employee_group,
-        'responsible_id': (lambda s, cr, uid, ctx: uid),
         'image': _get_default_image,
         'parent_id': _get_menu_parent,
         'alias_domain': False, # always hide alias during creation
@@ -116,12 +111,12 @@ class mail_group(osv.osv):
         user_group_ids = [command[1] for command in group_ids_command if command[0] == 4]
         user_group_ids += [id for command in group_ids_command if command[0] == 6 for id in command[2]]
         # retrieve the user member of those groups
-        user_ids = []
+        partner_ids = []
         res_groups_obj = self.pool.get('res.groups')
         for group in res_groups_obj.browse(cr, uid, user_group_ids, context=context):
-            user_ids += [user.id for user in group.users]
+            partner_ids += [user.partner_id.id for user in group.users]
         # subscribe the users
-        return self.message_subscribe(cr, uid, ids, user_ids, context=context)
+        return self.message_subscribe(cr, uid, ids, partner_ids, context=context)
 
     def create(self, cr, uid, vals, context=None):
         mail_alias = self.pool.get('mail.alias')
diff --git a/addons/mail/mail_group_menu.py b/addons/mail/mail_group_menu.py
index 38756f69928..a966118dba8 100644
--- a/addons/mail/mail_group_menu.py
+++ b/addons/mail/mail_group_menu.py
@@ -31,11 +31,12 @@ class ir_ui_menu(osv.osv):
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         ids = super(ir_ui_menu, self).search(cr, uid, args, offset=0, limit=None, order=order, context=context, count=False)
 
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         subs = self.pool.get('mail.subscription')
         for menu in self.browse(cr, uid, ids, context=context):
             if menu.mail_group_id:
                 sub_ids = subs.search(cr, uid, [
-                    ('user_id','=',uid),('res_model','=','mail.group'),
+                    ('partner_id','=',partner_id),('res_model','=','mail.group'),
                     ('res_id','=',menu.mail_group_id.id)
                     ], context=context)
                 if not sub_ids:
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index dac5333024c..8f1430fbc56 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -75,9 +75,6 @@
                                     />
                                 <field name="group_ids" widget="many2many_tags" class="oe_inline"/>
                             </group>
-                            <group class="oe_edit_only">
-                                <field name="responsible_id" class="oe_inline"/>
-                            </group>
                         </group>
                     </sheet>
                     <div class="oe_chatter">
@@ -96,7 +93,6 @@
             <field name="arch" type="xml">
                 <tree string="Groups">
                     <field name="name" string="Group Name"/>
-                    <field name="responsible_id"/>
                 </tree>
             </field>
         </record>
@@ -109,7 +105,6 @@
             <field name="arch" type="xml">
                 <search string="Search Groups">
                     <field name="name" string="Group"/>
-                    <field name="responsible_id"/>
                 </search>
             </field>
         </record>
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index b960745ec68..b129597c3e8 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -1,4 +1,15 @@
 
+import ast
+import base64
+import email
+import logging
+import re
+import time
+import datetime
+
+from osv import osv
+from osv import fields
+
 class mail_mail(osv.Model):
     """
     Model holding RFC2822 email messages to send. This model also provides
@@ -9,8 +20,7 @@ class mail_mail(osv.Model):
     _description = 'Outgoing Mails'
     _inherits = {'mail.message': 'message_id'}
     _columns = {
-        'message_id': fields.many2one('mail.message', 'Message', required=True),
-        # why do we need this on the mail, why not on the company?
+        'message_id': fields.many2one('mail.message', 'Message', required=True, ondelete='cascade'),
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
         'state': fields.selection([
                         ('outgoing', 'Outgoing'),
@@ -22,34 +32,24 @@ class mail_mail(osv.Model):
         'auto_delete': fields.boolean('Auto Delete',
             help="Permanently delete this email after sending it, to save space"),
 
-        # FP Note: to be removed, in attachment if needed
-        'original': fields.binary('Original', readonly=1,
-            help="Original version of the message, as it was sent on the network"),
-        # End FP Note
-
-        # FP Note: I propose to remove these fields and put email in attachment as an option
         'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences.'),
         'email_to': fields.text('To', help='Message recipients'),
         'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
-        'email_bcc': fields.char('Bcc', size=256, help='Blind carbon copy message recipients'),
         'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
         'content_subtype': fields.char('Message content subtype', size=32,
             oldname="subtype", readonly=1,
             help="Type of message, usually 'html' or 'plain', used to select "\
                   "plain-text or rich-text contents accordingly"),
         'body_html': fields.html('Rich-text Contents', help="Rich-text/HTML version of the message"),
-
     }
 
     _defaults = {
-        'state': 'received',
+        'state': 'outgoing',
         'content_subtype': 'plain',
     }
 
-    # FP Note: do we need this method ?
-    # We should just ask to create the message before scheduling it
     def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, type='email',
-                             email_cc=None, email_bcc=None, reply_to=False, partner_ids=None, attachments=None,
+                             email_cc=None, reply_to=False, partner_ids=None, attachments=None,
                              message_id=False, references=False, res_id=False, content_subtype='plain',
                              headers=None, mail_server_id=False, auto_delete=False, context=None):
         """ Schedule sending a new email message, to be sent the next time the
@@ -65,8 +65,6 @@ class mail_mail(osv.Model):
                 in multipart/alternative.
             :param list email_cc: optional list of string values for CC header
                 (to be joined with commas)
-            :param list email_bcc: optional list of string values for BCC header
-                (to be joined with commas)
             :param string model: optional model name of the document this mail
                 is related to (this will also be used to generate a tracking id,
                 used to match any response related to the same document)
@@ -96,7 +94,7 @@ class mail_mail(osv.Model):
         if partner_ids is None:
             partner_ids = []
         attachment_obj = self.pool.get('ir.attachment')
-        for param in (email_to, email_cc, email_bcc):
+        for param in (email_to, email_cc):
             if param and not isinstance(param, list):
                 param = [param]
         msg_vals = {
@@ -111,7 +109,6 @@ class mail_mail(osv.Model):
                 'email_from': email_from,
                 'email_to': email_to and ','.join(email_to) or '',
                 'email_cc': email_cc and ','.join(email_cc) or '',
-                'email_bcc': email_bcc and ','.join(email_bcc) or '',
                 'partner_ids': partner_ids,
                 'reply_to': reply_to,
                 'message_id': message_id,
@@ -123,20 +120,18 @@ class mail_mail(osv.Model):
                 'auto_delete': auto_delete
             }
         email_msg_id = self.create(cr, uid, msg_vals, context)
-        attachment_ids = []
+        msg = self.browse(cr, uid, email_msg_id, context)
         for fname, fcontent in attachments.iteritems():
             attachment_data = {
                     'name': fname,
                     'datas_fname': fname,
                     'datas': fcontent and fcontent.encode('base64'),
-                    'res_model': self._name,
-                    'res_id': email_msg_id,
+                    'res_model': 'mail.message',
+                    'res_id': msg.message_id.id,
             }
-            if context.has_key('default_type'):
-                del context['default_type']
-            attachment_ids.append(attachment_obj.create(cr, uid, attachment_data, context))
-        if attachment_ids:
-            self.write(cr, uid, email_msg_id, { 'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
+            # FP Note: what's this ???
+            # if context.has_key('default_type'):
+            #     del context['default_type']
         return email_msg_id
 
     def mark_outgoing(self, cr, uid, ids, context=None):
@@ -187,8 +182,7 @@ class mail_mail(osv.Model):
         """
         if message.auto_delete:
             self.pool.get('ir.attachment').unlink(cr, uid,
-                [x.id for x in message.attachment_ids
-                    if x.res_model == self._name and x.res_id == message.id],
+                [x.id for x in message.attachment_ids],
                 context=context)
             message.unlink()
         return True
@@ -240,7 +234,6 @@ class mail_mail(osv.Model):
                     body=body,
                     body_alternative=body_alternative,
                     email_cc=mail_tools_to_email(message.email_cc),
-                    email_bcc=mail_tools_to_email(message.email_bcc),
                     reply_to=message.reply_to,
                     attachments=attachments, message_id=message.message_id,
                     references = message.references,
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 227a9b81f5b..1262cbb9fc7 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -21,7 +21,6 @@
 
 # FP Note: can we remove some dependencies ? Use lint
 
-import ast
 import base64
 import dateutil.parser
 import email
@@ -32,12 +31,10 @@ import datetime
 from email.header import decode_header
 from email.message import Message
 
-from openerp import SUPERUSER_ID
 from osv import osv
 from osv import fields
 import pytz
 from tools import DEFAULT_SERVER_DATETIME_FORMAT
-from tools.translate import _
 import tools
 
 _logger = logging.getLogger(__name__)
@@ -64,47 +61,6 @@ class mail_message(osv.Model):
     _description = 'Message'
     _order = 'id desc'
 
-    # FP Note: can we remove these two methods ?
-    def open_document(self, cr, uid, ids, context=None):
-        """ Open the message related document. Note that only the document of
-            ids[0] will be opened.
-            TODO: how to determine the action to use ?
-        """
-        action_data = False
-        if not ids:
-            return action_data
-        msg = self.browse(cr, uid, ids[0], context=context)
-        ir_act_window = self.pool.get('ir.actions.act_window')
-        action_ids = ir_act_window.search(cr, uid, [('res_model', '=', msg.model)], context=context)
-        if action_ids:
-            action_data = ir_act_window.read(cr, uid, action_ids[0], context=context)
-            action_data.update({
-                    'domain' : "[('id', '=', %d)]" % (msg.res_id),
-                    'nodestroy': True,
-                    'context': {}
-                    })
-        return action_data
-
-    def open_attachment(self, cr, uid, ids, context=None):
-        """ Open the message related attachments.
-            TODO: how to determine the action to use ?
-        """
-        action_data = False
-        if not ids:
-            return action_data
-        action_pool = self.pool.get('ir.actions.act_window')
-        messages = self.browse(cr, uid, ids, context=context)
-        att_ids = [x.id for message in messages for x in message.attachment_ids]
-        action_ids = action_pool.search(cr, uid, [('res_model', '=', 'ir.attachment')], context=context)
-        if action_ids:
-            action_data = action_pool.read(cr, uid, action_ids[0], context=context)
-            action_data.update({
-                'domain': [('id', 'in', att_ids)],
-                'nodestroy': True
-                })
-        return action_data
-    # END FP Note
-
     def get_record_name(self, cr, uid, ids, name, arg, context=None):
         result = dict.fromkeys(ids, '')
         for message in self.browse(cr, uid, ids, context=context):
@@ -135,20 +91,18 @@ class mail_message(osv.Model):
             help="Message type: email for email message, notification for system "\
                   "message, comment for other messages such as user replies"),
 
-        # partner_id should be renamed into author_id
+        # partner_id should be renamed into author_id, user_id removed
         'author_id': fields.many2one('res.partner', 'Author', required=True),
 
-        # this is redundant with notifications ?
+        # this is redundant with notifications ? Yes
         'partner_ids': fields.many2many('res.partner',
             'mail_message_destination_partner_rel',
             'message_id', 'partner_id', 'Destination partners',
             help="When sending emails through the social network composition wizard"\
                  "you may choose to send a copy of the mail to partners."),
 
-        # 'user_id': fields.many2one('res.users', 'Author', readonly=1),
-
-        # why don't we attach the file to the message using res_id, res_model of the attachment ?
-        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
+        'attachment_ids': fields.one2many('ir.attachment', 'res_id', 'Attachments'
+            domain=[('res_model','=','mail.message')]),
 
         'parent_id': fields.many2one('mail.message', 'Parent Message',
             select=True, ondelete='set null',
@@ -189,7 +143,11 @@ class mail_message(osv.Model):
             cr.execute("""CREATE INDEX mail_message_model_res_id_idx ON mail_message (model, res_id)""")
 
     def check(self, cr, uid, ids, mode, context=None):
-        """Restricts the access to a mail.message, according to referred model
+        """
+        You can access a message if:
+          - you received it (a notification exists) or
+          - you can read the related document (res_model, res_id)
+        If a message is not attached to a document, normal access rights apply.
         """
         if not ids:
             return
@@ -234,7 +192,7 @@ class mail_message(osv.Model):
         if default is None:
             default = {}
         self.check(cr, uid, [id], 'read', context=context)
-        default.update(message_id=False, original=False, headers=False)
+        default.update(message_id=False, headers=False)
         return super(mail_message,self).copy(cr, uid, id, default=default, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 0aa5261d7e7..c50e53c8e75 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -123,7 +123,6 @@
                                         <field name="email_from"/>
                                         <field name="email_to"/>
                                         <field name="email_cc"/>
-                                        <field name="email_bcc"/>
                                         <field name="reply_to"/>
                                     </group>
                                     <group>
@@ -148,11 +147,8 @@
                                         <field name="content_subtype"/>
                                         <field name="state" colspan="2"/>
                                         <field name="mail_server_id"/>
-                                        <field name="original"/>
                                         <field name="model"/>
                                         <field name="res_id"/>
-                                        <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"
-                                            attrs="{'invisible':['|', ('model', '=', ''), ('res_id', '=', False)]}"/>
                                     </group>
                                     <group>
                                         <field name="message_id"/>
@@ -187,8 +183,6 @@
                     <button name="send" string="Send Now" type="object" icon="gtk-media-play" states='outgoing'/>
                     <button name="mark_outgoing" string="Retry" type="object" icon="gtk-redo" states='exception,cancel'/>
                     <button name="cancel" string="Cancel" type="object" icon="terp-gtk-stop" states='outgoing'/>
-                    <button name="open_document" string="Open Related Document" type="object" icon="gtk-jump-to"/>
-                    <button name="open_attachment" string="Open Attachments" type="object" icon="gtk-jump-to"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/mail/mail_subscription.py b/addons/mail/mail_subscription.py
index bd46db16cce..a8786a16e3e 100644
--- a/addons/mail/mail_subscription.py
+++ b/addons/mail/mail_subscription.py
@@ -55,36 +55,35 @@ class mail_notification(osv.osv):
     _order = 'message_id desc'
     _description = 'Mail notification'
     _columns = {
-        'user_id': fields.many2one('res.users', string='User',
+        'partner_id': fields.many2one('res.partner', string='Contact',
                         ondelete='cascade', required=True, select=1),
         'message_id': fields.many2one('mail.message', string='Message',
                         ondelete='cascade', required=True, select=1),
-        'read': fields.boolean('Read', help="Not used currently",),
-        # TODO: add a timestamp ? or use message date ?
+        'read': fields.boolean('Read'),
     }
     _defaults = {
         'read': False,
     }
     # Create notification in the wall of each user
     # Send by email the notification depending on the user preferences
-    def notify(self, cr, uid, user_ids, msg_id, context=context):
-        user_obj = self.pool.get('res.users')
+    def notify(self, cr, uid, partner_ids, msg_id, context=context):
+        partner_obj = self.pool.get('res.partner')
         msg_obj = self.pool.get('mail.message')
         msg = msg_obj.browse(cr, uid, msg_id, context=context)
 
         towrite = {
-            'email_to': msg.email_to,
+            'email_to': '',
             'subject': msg.subject
         }
-        for user in user_obj.browse(cr, uid, user_ids, context=context):
+        for partner in partner_obj.browse(cr, uid, partner_ids, context=context):
             notification_obj.create(cr, uid, {
-                'user_id': user.id,
+                'partner_id': user.id,
                 'message_id': msg_id
             }, context=context)
-            if user.notification_email_pref=='none' or not user.user_email:
+            if partner.notification_email_pref=='none' or not partner.user_email:
                 continue
 
-            if user.notification_email_pref=='comment' and msg.type in ('email','comment'):
+            if partner.notification_email_pref=='comment' and msg.type in ('email','comment'):
                 continue
 
             if not msg.email_from:
@@ -101,7 +100,8 @@ class mail_notification(osv.osv):
             if towrite.get('subject', False):
                 towrite['subject'] = msg.name_get(cr, uid, [msg.id], context=context)[0][1]
         if towrite.get('state', False):
-            msg_obj.write(cr, uid, [msg.id], towrite, context=context)
+            towrite['message_id'] = msg.id
+            self.pool.get('mail.mail').create(cr, uid, towrite, context=context)
         return True
 
 
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index d3f80c08513..7080dcd3b78 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -196,9 +196,9 @@ class mail_thread(osv.Model):
                         type='email', email_date=None, parent_id=False,
                         content_subtype='plain', state=None,
                         partner_ids=None, email_from=False, email_to=False,
-                        email_cc=None, email_bcc=None, reply_to=None,
+                        email_cc=None, reply_to=None,
                         headers=None, message_id=False, references=None,
-                        attachments=None, original=None, context=None):
+                        attachments=None, context=None):
         """ Creates a new mail.message through message_create. The new message
             is attached to the current mail.thread, containing all the details
             passed as parameters. All attachments will be attached to the
@@ -235,16 +235,12 @@ class mail_thread(osv.Model):
             :param email_to: Email-To / Recipient address
             :param email_cc: Comma-Separated list of Carbon Copy Emails To
                 addresses if any
-            :param email_bcc: Comma-Separated list of Blind Carbon Copy Emails To
-                addresses if any
             :param reply_to: reply_to header
             :param headers: mail headers to store
             :param message_id: optional email identifier
             :param references: optional email references
             :param dict attachments: map of attachment filenames to binary
                 contents, if any.
-            :param str original: optional full source of the RFC2822 email, for
-                reference
             :param dict context: if a ``thread_model`` value is present in the
                 context, its value will be used to determine the model of the
                 thread to update (instead of the current model).
@@ -278,8 +274,6 @@ class mail_thread(osv.Model):
                     'datas': base64.b64encode(str(fcontent)),
                     'datas_fname': fname,
                     'description': _('Mail attachment'),
-                    'res_model': thread._name,
-                    'res_id': thread.id,
                 }
                 to_attach.append(ir_attachment.create(cr, uid, data_attach, context=context))
             # find related partner: partner_id column in thread object, or self is res.partner model
@@ -310,7 +304,7 @@ class mail_thread(osv.Model):
             }
 
             if email_from or type == 'email':
-                for param in (email_to, email_cc, email_bcc):
+                for param in (email_to, email_cc):
                     if isinstance(param, list):
                         param = ", ".join(param)
                 data.update({
@@ -318,11 +312,10 @@ class mail_thread(osv.Model):
                     'email_from': email_from or \
                         thread._model._columns.get('user_id') and thread.user_id and thread.user_id.user_email,
                     'email_cc': email_cc,
-                    'email_bcc': email_bcc,
                     'references': references,
                     'headers': headers,
                     'reply_to': reply_to,
-                    'original': original, })
+                    })
 
             new_msg_ids.append(self.message_create(cr, uid, thread.id, data, context=context))
         return new_msg_ids
@@ -355,7 +348,6 @@ class mail_thread(osv.Model):
                             email_from = msg_dict.get('from', msg_dict.get('email_from')),
                             email_to = msg_dict.get('to', msg_dict.get('email_to')),
                             email_cc = msg_dict.get('cc', msg_dict.get('email_cc')),
-                            email_bcc = msg_dict.get('bcc', msg_dict.get('email_bcc')),
                             reply_to = msg_dict.get('reply', msg_dict.get('reply_to')),
                             email_date = msg_dict.get('date'),
                             message_id = msg_dict.get('message-id', msg_dict.get('message_id')),
@@ -363,7 +355,6 @@ class mail_thread(osv.Model):
                                       or msg_dict.get('in-reply-to'),
                             attachments = msg_dict.get('attachments'),
                             headers = msg_dict.get('headers'),
-                            original = msg_dict.get('original'),
                             context = context)
 
     #------------------------------------------------------
@@ -480,7 +471,7 @@ class mail_thread(osv.Model):
                 msg["attachments"].append({'id': attach_id, 'name': map_id_to_name[attach_id]})
 
         # Set the threads as read
-        self.message_check_and_set_read(cr, uid, ids, context=context)
+        self.message_mark_as_read(cr, uid, ids, context=context)
         # Sort and return the messages
         messages = sorted(messages, key=lambda d: (-d['id']))
         return messages
@@ -680,9 +671,6 @@ class mail_thread(osv.Model):
             else:
                 thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
 
-            # Forward the email to other followers
-            self.message_forward(cr, uid, model, [thread_id], msg_txt, context=context)
-            model_pool.message_mark_as_unread(cr, uid, [thread_id], context=context)
         return True
 
     def message_new(self, cr, uid, msg_dict, custom_values=None, context=None):
@@ -885,9 +873,8 @@ class mail_thread(osv.Model):
             return True
         return False
 
-    def message_subscribe(self, cr, uid, ids, user_ids = None, context=None):
-        """ Subscribe the user (or user_ids) to the current document.
-
+    def message_subscribe(self, cr, uid, ids, partner_ids=None, context=None):
+        """
             :param user_ids: a list of user_ids; if not set, subscribe
                              uid instead
         """
@@ -936,28 +923,9 @@ class mail_thread(osv.Model):
     # Thread_state
     #------------------------------------------------------
 
-    # FP Note: should be removed ?
-    # def message_check_and_set_unread(self, cr, uid, ids, context=None):
-    #    """ Set unread if uid is the object responsible or if the object has
-    #        no responsible. """
-    #    for obj in self.browse(cr, uid, ids, context=context):
-    #        if obj.message_state and self._columns.get('user_id') and (not obj.user_id or obj.user_id.id == uid):
-    #            self.message_mark_as_unread(cr, uid, [obj.id], context=context)
-
-    # FP Note: should be removed ?
-    # def message_check_and_set_read(self, cr, uid, ids, context=None):
-    #    """ Set read if uid is the object responsible. """
-    #    for obj in self.browse(cr, uid, ids, context=context):
-    #        if not obj.message_state and self._columns.get('user_id') and obj.user_id and obj.user_id.id == uid:
-    #            self.message_mark_as_read(cr, uid, [obj.id], context=context)
-
     # FP Note: this should be a invert function on message_state field
     def message_mark_as_read(self, cr, uid, ids, context=None):
         """ Set as read. """
-        return self.write(cr, uid, ids, {'message_state': True}, context=context)
-
-    def message_mark_as_unread(self, cr, uid, ids, context=None):
-        """ Set as unread. """
         notobj = self.pool.get('mail.notification')
         cr.execute('''
             update mail_notification set 
@@ -967,6 +935,4 @@ class mail_thread(osv.Model):
                 user_id = %s
         ''', (ids, self._name, uid)
         return True
-    # END FP note
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 3dc1f91d857..7ffb07ee632 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -35,5 +35,14 @@ class res_partner_mail(osv.osv):
         if self._name == 'res.partner': # to avoid models inheriting from res.partner
             search_domain = ['|'] + initial_domain + ['|', ('partner_id', 'in', ids), ('partner_ids', 'in', ids)]
         return search_domain
+    _columns = {
+        'notification_email_pref': fields.selection([
+            ('all', 'All feeds'),
+            ('comment', 'Comments and emails'),
+            ('none', 'Never')
+            ], 'Receive Feeds by Email', required=True,
+            help="Choose in which case you want to receive an email when you "\
+                  "receive new feeds."),
+    }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index e11e736270b..07e9c557228 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -35,17 +35,10 @@ class res_users(osv.osv):
         - add a welcome message
     """
     _name = 'res.users'
-    _inherit = ['res.users', 'mail.thread']
+    _inherit = ['res.users']
     _inherits = {'mail.alias': 'alias_id'}
     
     _columns = {
-        'notification_email_pref': fields.selection([
-            ('all', 'All feeds'),
-            ('comment', 'Comments and emails'),
-            ('none', 'Never')
-            ], 'Receive Feeds by Email', required=True,
-            help="Choose in which case you want to receive an email when you "\
-                  "receive new feeds."),
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True, 
                                     help="Email address internally associated with this user. Incoming emails will appear "
                                          "in the user's notifications."),
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index d26511464f8..ba081575c06 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -294,7 +294,6 @@ class mail_compose_message(osv.TransientModel):
                     email_from = self.render_template(cr, uid, mail_wiz.email_from, active_model, active_id)
                     email_to = self.render_template(cr, uid, mail_wiz.email_to, active_model, active_id)
                     email_cc = self.render_template(cr, uid, mail_wiz.email_cc, active_model, active_id)
-                    email_bcc = self.render_template(cr, uid, mail_wiz.email_bcc, active_model, active_id)
                     reply_to = self.render_template(cr, uid, mail_wiz.reply_to, active_model, active_id)
 
                     # in mass-mailing mode we only schedule the mail for sending, it will be 
@@ -302,11 +301,11 @@ class mail_compose_message(osv.TransientModel):
                     if mail_thread_enabled:
                         active_model_pool.message_append(cr, uid, [active_id], rendered_subject, rendered_body_text, rendered_body_html,
                             type=type, content_subtype=content_subtype, state=state, partner_ids=partner_ids,
-                            email_from=email_from, email_to=email_to, email_cc=email_cc, email_bcc=email_bcc,
+                            email_from=email_from, email_to=email_to, email_cc=email_cc, 
                             reply_to=reply_to, references=references, attachments=attachment, headers=headers, context=context)
                     else:
                         mail_message_obj.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body_text,
-                            model=mail_wiz.model, email_cc=to_email(email_cc), email_bcc=to_email(email_bcc), reply_to=reply_to,
+                            model=mail_wiz.model, email_cc=to_email(email_cc), reply_to=reply_to,
                             attachments=attachment, references=references, res_id=active_id, partner_ids=partner_ids,
                             content_subtype=mail_wiz.content_subtype, headers=headers, context=context)
             else:
@@ -314,11 +313,11 @@ class mail_compose_message(osv.TransientModel):
                 if mail_thread_enabled:
                     msg_ids = active_model_pool.message_append(cr, uid, active_ids, subject, mail_wiz.body_text, mail_wiz.body_html,
                         type=type, content_subtype=content_subtype, state=state, partner_ids=partner_ids,
-                        email_from=mail_wiz.email_from, email_to=mail_wiz.email_to, email_cc=mail_wiz.email_cc, email_bcc=mail_wiz.email_bcc,
+                        email_from=mail_wiz.email_from, email_to=mail_wiz.email_to, email_cc=mail_wiz.email_cc, 
                         reply_to=mail_wiz.reply_to, references=references, attachments=attachment, headers=headers, context=context)
                 else:
                     msg_ids = [mail_message_obj.schedule_with_attach(cr, uid, mail_wiz.email_from, to_email(mail_wiz.email_to), subject, mail_wiz.body_text,
-                        type=type, model=mail_wiz.model, email_cc=to_email(mail_wiz.email_cc), email_bcc=to_email(mail_wiz.email_bcc), reply_to=mail_wiz.reply_to,
+                        type=type, model=mail_wiz.model, email_cc=to_email(mail_wiz.email_cc), reply_to=mail_wiz.reply_to,
                         attachments=attachment, references=references, res_id=int(mail_wiz.res_id), partner_ids=partner_ids,
                         content_subtype=mail_wiz.content_subtype, headers=headers, context=context)]
                 # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 73fb03cdc28..c2d7420fe14 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -13,7 +13,6 @@
                         <field name="email_from" required="1"/>
                         <field name="email_to" required="1"/>
                         <field name="email_cc"/>
-                        <field name="email_bcc"/>
                         <field name="reply_to"/>
                         <field name="subject" widget="char" size="512"/>
                         <field name="references"/>

From a4f9b6ca0971aa5aca6fa30342e6acb950f42c3b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 15 Aug 2012 20:53:13 +0200
Subject: [PATCH 297/999] [IMP] cleaning of messages and mails

bzr revid: fp@openerp.com-20120815185313-8ky091md69wofbx5
---
 addons/mail/mail_thread.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 7080dcd3b78..3b475127c87 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -879,7 +879,6 @@ class mail_thread(osv.Model):
                              uid instead
         """
         subscription_obj = self.pool.get('mail.subscription')
-        to_subscribe_uids = [uid] if user_ids is None else user_ids
         create_ids = []
         for id in ids:
             already_subscribed_user_ids = self.message_get_subscribers(cr, uid, [id], context=context)

From e9fb0161f5de136ee6e2f85ed77b8191523d4ae3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 15 Aug 2012 21:34:06 +0200
Subject: [PATCH 298/999] [IMP] wip

bzr revid: fp@openerp.com-20120815193406-7dw3zwbz0sg1cjwa
---
 addons/mail/mail_mail.py         | 15 ++++++++-------
 addons/mail/mail_message.py      |  4 +---
 addons/mail/mail_subscription.py |  9 ++++-----
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index b129597c3e8..1112bf8d76a 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -23,12 +23,12 @@ class mail_mail(osv.Model):
         'message_id': fields.many2one('mail.message', 'Message', required=True, ondelete='cascade'),
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
         'state': fields.selection([
-                        ('outgoing', 'Outgoing'),
-                        ('sent', 'Sent'),
-                        ('received', 'Received'),
-                        ('exception', 'Delivery Failed'),
-                        ('cancel', 'Cancelled'),
-                        ], 'Status', readonly=True),
+            ('outgoing', 'Outgoing'),
+            ('sent', 'Sent'),
+            ('received', 'Received'),
+            ('exception', 'Delivery Failed'),
+            ('cancel', 'Cancelled'),
+        ], 'Status', readonly=True),
         'auto_delete': fields.boolean('Auto Delete',
             help="Permanently delete this email after sending it, to save space"),
 
@@ -97,10 +97,11 @@ class mail_mail(osv.Model):
         for param in (email_to, email_cc):
             if param and not isinstance(param, list):
                 param = [param]
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         msg_vals = {
                 'subject': subject,
                 'date': fields.datetime.now(),
-                'user_id': uid,
+                'author_id': partner_id,
                 'model': model,
                 'res_id': res_id,
                 'type': type,
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 5994f971deb..e9d6768c370 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -94,9 +94,7 @@ class mail_message(osv.Model):
             help="Message type: email for email message, notification for system "\
                   "message, comment for other messages such as user replies"),
 
-        # partner_id should be renamed into author_id, user_id removed
         'author_id': fields.many2one('res.partner', 'Author', required=True),
-
         # this is redundant with notifications ? Yes
         'partner_ids': fields.many2many('res.partner',
             'mail_message_res_partner_rel',
@@ -179,7 +177,7 @@ class mail_message(osv.Model):
             notification_obj = self.pool.get('mail.notification')
             modobj = self.pool.get(values.get('model'))
             follower_notify = []
-            for follower in modobj.follower_ids:
+            for follower in modobj.message_follower_ids:
                 if follower.id <> uid:
                     follower_notify.append(follower.id)
             self.pool.get('mail.notification').notify(cr, uid, follower_notify, newid, context=context)
diff --git a/addons/mail/mail_subscription.py b/addons/mail/mail_subscription.py
index a8786a16e3e..47df6f14cf7 100644
--- a/addons/mail/mail_subscription.py
+++ b/addons/mail/mail_subscription.py
@@ -28,7 +28,6 @@ class mail_subscription(osv.osv):
     A subscription is characterized by:
         :param: res_model: model of the followed objects
         :param: res_id: ID of resource (may be 0 for every objects)
-        :param: user_id: user_id of the follower
     """
     _name = 'mail.subscription'
     _rec_name = 'id'
@@ -40,7 +39,7 @@ class mail_subscription(osv.osv):
                         help='Model of the followed resource'),
         'res_id': fields.integer('Related Document ID', select=1,
                         help='Id of the followed resource'),
-        'user_id': fields.many2one('res.users', string='Related User',
+        'partner_id': fields.many2one('res.partner', string='Related User',
                         ondelete='cascade', required=True, select=1),
     }
 
@@ -77,10 +76,10 @@ class mail_notification(osv.osv):
         }
         for partner in partner_obj.browse(cr, uid, partner_ids, context=context):
             notification_obj.create(cr, uid, {
-                'partner_id': user.id,
+                'partner_id': partner.id,
                 'message_id': msg_id
             }, context=context)
-            if partner.notification_email_pref=='none' or not partner.user_email:
+            if partner.notification_email_pref=='none' or not partner.email:
                 continue
 
             if partner.notification_email_pref=='comment' and msg.type in ('email','comment'):
@@ -88,7 +87,7 @@ class mail_notification(osv.osv):
 
             if not msg.email_from:
                 current_user = res_users_obj.browse(cr, uid, uid, context=context)
-                towrite['email_from'] = current_user.user_email
+                towrite['email_from'] = current_user.email
 
             towrite['state'] = 'outgoing'
             if not towrite.get('email_to', False):

From 883d07d87c51234fe9d73c8344cd5f4642726b1b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 15 Aug 2012 22:01:26 +0200
Subject: [PATCH 299/999] [IMP] access rights on messages

bzr revid: fp@openerp.com-20120815200126-22kzvupbhy6bt3cg
---
 addons/mail/mail_message.py | 45 +++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index e9d6768c370..c6e901d98e7 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -95,20 +95,18 @@ class mail_message(osv.Model):
                   "message, comment for other messages such as user replies"),
 
         'author_id': fields.many2one('res.partner', 'Author', required=True),
-        # this is redundant with notifications ? Yes
         'partner_ids': fields.many2many('res.partner',
-            'mail_message_res_partner_rel',
-            'message_id', 'partner_id', 'Destination partners',
-            help="When sending emails through the social network composition wizard"\
-                 "you may choose to send a copy of the mail to partners."),
-        'attachment_ids': fields.one2many('ir.attachment', 'res_id', 'Attachments'
-            domain=[('res_model','=','mail.message')]),
+            'mail_notification', 'message_id', 'partner_id', 
+            'Recipients'),
+
+        'attachment_ids': fields.one2many('ir.attachment', 'res_id',
+            'Attachments' domain=[('res_model','=','mail.message')]),
 
         'parent_id': fields.many2one('mail.message', 'Parent Message',
             select=True, ondelete='set null',
-            help="Parent message, used for displaying as threads with hierarchy"),
-        'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
+            help="Initial thread message."),
 
+        'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
 
         'model': fields.char('Related Document Model', size=128, select=1),
         'res_id': fields.integer('Related Document ID', select=1),
@@ -119,14 +117,10 @@ class mail_message(osv.Model):
         'subject': fields.char('Subject', size=128),
         'date': fields.datetime('Date'),
 
-        # FP Note: do we need this ?
         'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
-
-        # END FP Note
-
         'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
-        'body': fields.text('Content', help="Content of Message", required=True),
 
+        'body': fields.text('Content', required=True),
     }
     _defaults = {
         'type': 'email',
@@ -144,16 +138,31 @@ class mail_message(osv.Model):
 
     def check(self, cr, uid, ids, mode, context=None):
         """
-        You can access a message if:
+        You can read/write a message if:
           - you received it (a notification exists) or
           - you can read the related document (res_model, res_id)
-        If a message is not attached to a document, normal access rights apply.
+        If a message is not attached to a document, normal access rights on
+        the mail.message object apply.
         """
         if not ids:
             return
-        res_ids = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
+
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+
+        # check messages for which you have a notification
+        not_obj = self.pool.get('mail.notification')
+        not_ids = not_obj.search(cr, uid, [
+            ('partner_id', '=', partner_id),
+            ('message_id', 'in', ids),
+        ], context=context)
+        notifications = {}
+        for notification in not_obj.browse(cr, uid, not_ids, context=context):
+            ids.remove(notification.message_id.id)
+
+        # check messages according to related documents
+        res_ids = {}
         cr.execute('SELECT DISTINCT model, res_id FROM mail_message WHERE id = ANY (%s)', (ids,))
         for rmod, rid in cr.fetchall():
             if not (rmod and rid):
@@ -162,8 +171,6 @@ class mail_message(osv.Model):
 
         ima_obj = self.pool.get('ir.model.access')
         for model, mids in res_ids.items():
-            # ignore mail messages that are not attached to a resource anymore when checking access rights
-            # (resource was deleted but message was not)
             mids = self.pool.get(model).exists(cr, uid, mids)
             ima_obj.check(cr, uid, model, mode)
             self.pool.get(model).check_access_rule(cr, uid, mids, mode, context=context)

From 629e216efde675a191eff83eeddeeea32cbd88e5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 15 Aug 2012 22:02:46 +0200
Subject: [PATCH 300/999] [IMP] comment

bzr revid: fp@openerp.com-20120815200246-bns99yzzstl074t1
---
 addons/mail/mail_subscription.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/mail/mail_subscription.py b/addons/mail/mail_subscription.py
index 47df6f14cf7..f5ca21f0fa1 100644
--- a/addons/mail/mail_subscription.py
+++ b/addons/mail/mail_subscription.py
@@ -63,6 +63,12 @@ class mail_notification(osv.osv):
     _defaults = {
         'read': False,
     }
+
+    # FP Note: todo: check that we can not create a notification for
+    # a message we can not read.
+    # def create(self, ...)
+
+
     # Create notification in the wall of each user
     # Send by email the notification depending on the user preferences
     def notify(self, cr, uid, partner_ids, msg_id, context=context):

From cf464eb2733efc5a872451c08208410a45bd1b79 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 16 Aug 2012 10:03:10 +0530
Subject: [PATCH 301/999] [FIX] kanban : Keep is_action_enable consistant as
 per previous commit

bzr revid: jam@tinyerp.com-20120816043310-b0sbicnv73jgzhti
---
 addons/web_kanban/static/src/js/kanban.js       | 6 +++---
 addons/web_kanban/static/src/xml/web_kanban.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 6c70ecfb8ec..155f03b8aae 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -68,11 +68,11 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
             return JSON.parse(this.fields_view.arch.attrs.quick_create);
         return !! this.group_by;
     },
-    _is_create_enabled: function() {
+    _is_action_enabled: function(action) {
         if (! this.options.creatable)
             return false;
-        if (this.fields_view.arch.attrs.create !== undefined)
-            return JSON.parse(this.fields_view.arch.attrs.create);
+        if (_.has(this.fields_view.arch.attrs, action))
+            return JSON.parse(this.fields_view.arch.attrs[action]);
         return true;
     },
     add_qweb_template: function() {
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 4bcc9a709a3..7aba4d6ee87 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -14,7 +14,7 @@
 </t>
 <div t-name="KanbanView.buttons" class="oe_kanban_buttons">
     <t t-if="widget.options.action_buttons !== false">
-        <t t-if="widget._is_create_enabled()">
+        <t t-if="widget._is_action_enabled('create')">
             <button type="button" class="oe_kanban_button_new oe_highlight">
                 <t t-esc="widget.options.create_text || _t('Create')"/>
             </button>

From fc4ec216ae4186e83962c2e29246f88c0639bb55 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 16 Aug 2012 11:15:12 +0530
Subject: [PATCH 302/999] [IMP] l10n_in_hr_payroll: Employee form view for join
 date

bzr revid: mra@tinyerp.com-20120816054512-93cpurza3ykzfvtk
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index c6aa9edc29c..81491fd8937 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -33,7 +33,7 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
             <data>
-                 <xpath expr="//field[@name='job_id']" position="after">
+                 <xpath expr="//field[@name='active']" position="before">
                     <field name="join_date"/>
                     <field name="number_of_year"/>
                  </xpath>

From 1b58af40cc5affbdde948ed323ba4d3e626c9d6d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 16 Aug 2012 09:26:42 +0200
Subject: [PATCH 303/999] [IMP] subscriber --> follower

bzr revid: fp@tinyerp.com-20120816072642-614ukk9q5zvrdp6i
---
 addons/mail/mail_thread.py                  | 24 ++++++++++-----------
 addons/mail/static/src/js/mail_followers.js | 20 ++++++++---------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 7d233345315..689bbc2f27f 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -121,7 +121,7 @@ class mail_thread(osv.Model):
     _description = 'Email Thread'
     # TODO: may be we should make it _inherit ir.needaction
 
-    def _get_is_subscriber(self, cr, uid, ids, name, args, context=None):
+    def _get_is_follower(self, cr, uid, ids, name, args, context=None):
         subobj = self.pool.get('mail.subscription')
         subids = subobj.search(cr, uid, [
             ('res_model','=',self._name),
@@ -153,8 +153,8 @@ class mail_thread(osv.Model):
 
         for thread in self.browse(cr, uid, ids, context=context):
             message_ids = thread.message_ids
-            subscriber_ids = thread.message_follower_ids
-            res[id]['message_summary'] = "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)),
+            follower_ids = thread.message_follower_ids
+            res[id]['message_summary'] = "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(follower_ids)),
         return res
 
     # FP Note: todo
@@ -229,7 +229,7 @@ class mail_thread(osv.Model):
 
     def message_get_automatic_followers(self, cr, uid, id, record_vals, add_uid=True, fetch_missing=False, context=None):
         """ Return the command for the many2many follower_ids field to manage
-            subscribers. Behavior :
+            followers. Behavior :
             - get the monitored fields (ex: ['user_id', 'responsible_id']); those
               fields should be relationships to res.users (#TODO: res.partner)
             - if this field is in the record_vals: it means it has been modified
@@ -237,7 +237,7 @@ class mail_thread(osv.Model):
             - if this fields is not in record_vals, but fetch_missing paramter
               is set to True: fetch the value in the record (use: at creation
               for default values, not present in record_vals)
-            - if add_uid: add the current user (for example: writer is subscriber)
+            - if add_uid: add the current user (for example: writer is follower)
             - generate the command and return it
             This method has to be used on 1 id, because otherwise it would imply
             to track which user.id is used for which record.id.
@@ -965,25 +965,25 @@ class mail_thread(osv.Model):
     #------------------------------------------------------
 
     # FP Note: replaced by message_follower_ids
-    # def message_get_subscribers(self, cr, uid, ids, context=None):
+    # def message_get_followers(self, cr, uid, ids, context=None):
 
-    def message_read_subscribers(self, cr, uid, ids, fields=['id', 'name', 'image_small'], context=None):
+    def message_read_followers(self, cr, uid, ids, fields=['id', 'name', 'image_small'], context=None):
         """ Returns the current document followers as a read result. Used
             mainly for Chatter having only one method to call to have
             details about users.
         """
-        user_ids = self.message_get_subscribers(cr, uid, ids, context=context)
+        user_ids = self.message_get_followers(cr, uid, ids, context=context)
         return self.pool.get('res.users').read(cr, uid, user_ids, fields=fields, context=context)
 
-    def message_is_subscriber(self, cr, uid, ids, user_id = None, context=None):
-        """ Check if uid or user_id (if set) is a subscriber to the current
+    def message_is_follower(self, cr, uid, ids, user_id = None, context=None):
+        """ Check if uid or user_id (if set) is a follower to the current
             document.
 
             :param user_id: if set, check is done on user_id; if not set
                             check is done on uid
         """
         sub_user_id = uid if user_id is None else user_id
-        if sub_user_id in self.message_get_subscribers(cr, uid, ids, context=context):
+        if sub_user_id in self.message_get_followers(cr, uid, ids, context=context):
             return True
         return False
 
@@ -1002,7 +1002,7 @@ class mail_thread(osv.Model):
         subscription_obj = self.pool.get('mail.subscription')
         create_ids = []
         for id in ids:
-            already_subscribed_user_ids = self.message_get_subscribers(cr, uid, [id], context=context)
+            already_subscribed_user_ids = self.message_get_followers(cr, uid, [id], context=context)
             for user_id in to_subscribe_uids:
                 if user_id in already_subscribed_user_ids: continue
                 create_ids.append(subscription_obj.create(cr, uid, {'res_model': self._name, 'res_id': id, 'user_id': user_id}, context=context))
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 0e920f73041..87d68a228a9 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -76,27 +76,27 @@ openerp_mail_followers = function(session, mail) {
                 this.$element.find('div.oe_mail_recthread_aside').hide();
                 return;
             }
-            return this.fetch_subscribers(value_);
+            return this.fetch_followers(value_);
         },
 
-        fetch_subscribers: function (value_) {
-            return this.ds_follow.call('read', [value_ || this.get_value(), ['name', this.params.image]]).then(this.proxy('display_subscribers'));
+        fetch_followers: function (value_) {
+            return this.ds_follow.call('read', [value_ || this.get_value(), ['name', this.params.image]]).then(this.proxy('display_followers'));
         },
 
         /**
          * Display the followers.
-         * TODO: replace the is_subscriber check by fields read */
-        display_subscribers: function (records) {
+         * TODO: replace the is_follower check by fields read */
+        display_followers: function (records) {
             var self = this;
-            this.is_subscriber = false;
+            this.is_follower = false;
             var user_list = this.$element.find('ul.oe_mail_followers_display').empty();
             this.$element.find('div.oe_mail_recthread_followers h4').html(this.params.title + ' (' + records.length + ')');
             _(records).each(function (record) {
-                if (record.id == self.session.uid) { self.is_subscriber = true; }
+                if (record.id == self.session.uid) { self.is_follower = true; }
                 record.avatar_url = mail.ChatterUtils.get_image(self.session.prefix, self.session.session_id, 'res.users', 'image_small', record.id);
                 $(session.web.qweb.render('mail.followers.partner', {'record': record})).appendTo(user_list);
             });
-            if (this.is_subscriber) {
+            if (this.is_follower) {
                 this.$element.find('button.oe_mail_button_follow').hide();
                 this.$element.find('button.oe_mail_button_unfollow').show(); }
             else {
@@ -113,8 +113,8 @@ openerp_mail_followers = function(session, mail) {
         },
 
         do_toggle_followers: function () {
-            this.params.see_subscribers = ! this.params.see_subscribers;
-            if (this.params.see_subscribers) { this.$element.find('button.oe_mail_button_followers').html('Hide followers'); }
+            this.params.see_followers = ! this.params.see_followers;
+            if (this.params.see_followers) { this.$element.find('button.oe_mail_button_followers').html('Hide followers'); }
             else { this.$element.find('button.oe_mail_button_followers').html('Show followers'); }
             this.$element.find('div.oe_mail_recthread_followers').toggle();
         },

From e283ea49e3aa8c8d2b0437bd45fb19edb466ba05 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 16 Aug 2012 14:18:21 +0530
Subject: [PATCH 304/999] [FIX] l10n_in_hr_payroll: If bank account number not
 available

bzr revid: mra@tinyerp.com-20120816084821-la394tds5ysfgpys
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index da75c543f1f..8f3bbca4b11 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -253,7 +253,7 @@ class hr_payslip_run(osv.osv):
                 slip_ids.append(slip_id.id)
 
             for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
-                if not slip.employee_id.bank_account_id and not slip.employee_id.bank_account_id.acc_number:
+                if not slip.employee_id.bank_account_id or not slip.employee_id.bank_account_id.acc_number:
                     raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
                 line_ids = payslip_line_pool.search(cr, uid, [('slip_id', '=', slip.id), ('code', '=', 'NET')], context=context)
                 if line_ids:

From a2b7f82a81513d39e43b8e48c0c06903d14aef2e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 16 Aug 2012 11:02:43 +0200
Subject: [PATCH 305/999] [IMP] no auto_follow, we will use auto-compose
 instead on some actions

bzr revid: fp@tinyerp.com-20120816090243-nzu6ounygswiceqi
---
 addons/crm/crm_lead.py                  |  5 --
 addons/hr_holidays/hr_holidays.py       |  6 ---
 addons/hr_recruitment/hr_recruitment.py |  5 --
 addons/mail/__init__.py                 |  1 -
 addons/mail/mail_followers.py           | 18 +++----
 addons/mail/mail_group.py               | 16 +-----
 addons/mail/mail_group_view.xml         |  4 +-
 addons/mail/mail_mail.py                |  1 +
 addons/mail/mail_thread.py              | 72 -------------------------
 addons/mrp/mrp.py                       |  5 --
 addons/project/project.py               |  5 --
 addons/project_issue/project_issue.py   |  5 --
 addons/purchase/purchase.py             |  5 --
 13 files changed, 12 insertions(+), 136 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 146417a7abb..9fd81712b92 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -859,11 +859,6 @@ class crm_lead(base_stage, osv.osv):
     # OpenChatter methods and notifications
     # ----------------------------------------
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' to the monitored fields """
-        res = super(crm_lead, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id']
-
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('crm.case.stage').name_get(cr, uid, [stage_id], context=context)[0][1]
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index e888f9b5c3b..47ca1246240 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -364,12 +364,6 @@ class hr_holidays(osv.osv):
             dom = ['|'] + dom + [ ('state','=','validate1') ]
         return dom
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' and 'manager' to the monitored fields """
-        res = super(hr_holidays, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        # TODO: add manager
-        return res + ['user_id']
-        
     def create_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             self.message_append_note(cr, uid, ids, _('System notification'),
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 0ace2574d65..3d0b704b36d 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -461,11 +461,6 @@ class hr_applicant(base_stage, osv.Model):
     # OpenChatter methods and notifications
     # -------------------------------------------------------
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' to the monitored fields """
-        res = super(hr_applicant, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id']
-
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         if not stage_id: return True
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index 49ee9e18995..cba9cfe1fe7 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -25,7 +25,6 @@ import mail_mail
 import mail_followers
 import mail_thread
 import mail_group
-import ir_needaction
 import res_partner
 import res_users
 import report
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 24ab4a56b4d..0073ee81e41 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -24,7 +24,7 @@ from osv import fields
 
 class mail_followers(osv.Model):
     """ mail_followers holds the data related to the follow mechanism inside
-    OpenERP. Users can choose to follow documents (records) of any kind that
+    OpenERP. Partners can choose to follow documents (records) of any kind that
     inherits from mail.thread. Following documents allow to receive
     notifications for new messages.
     A subscription is characterized by:
@@ -32,28 +32,26 @@ class mail_followers(osv.Model):
         :param: res_id: ID of resource (may be 0 for every objects)
     """
     _name = 'mail.followers'
-    _rec_name = 'id'
+    _rec_name = 'partner_id'
     _log_access = False
-    _order = 'res_model asc'
-    _description = 'Mail Document Followers'
+    _description = 'Document Followers'
     _columns = {
         'res_model': fields.char('Related Document Model', size=128,
                         required=True, select=1,
                         help='Model of the followed resource'),
         'res_id': fields.integer('Related Document ID', select=1,
                         help='Id of the followed resource'),
-        'partner_id': fields.many2one('res.partner', string='Related User',
+        'partner_id': fields.many2one('res.partner', string='Related Partner',
                         ondelete='cascade', required=True, select=1),
     }
 
 class mail_notification(osv.Model):
-    """ mail_notification is a relational table modeling messages pushed to users.
+    """ mail_notification is a relational table modeling messages pushed to partners.
     """
     _name = 'mail.notification'
-    _rec_name = 'id'
+    _rec_name = 'partner_id'
     _log_access = False
-    _order = 'message_id desc'
-    _description = 'Mail notification'
+    _description = 'Notifications'
     _columns = {
         'partner_id': fields.many2one('res.partner', string='Contact',
                         ondelete='cascade', required=True, select=1),
@@ -103,9 +101,9 @@ class mail_notification(osv.Model):
                 if email_to not in towrite['email_to']:
                     towrite['email_to'] = towrite['email_to'] + ', ' + email_to
 
+        if towrite.get('state', False):
             if towrite.get('subject', False):
                 towrite['subject'] = msg.name_get(cr, uid, [msg.id], context=context)[0][1]
-        if towrite.get('state', False):
             towrite['message_id'] = msg.id
             self.pool.get('mail.mail').create(cr, uid, towrite, context=context)
         return True
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 6db6308d040..7de74db27c3 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -67,7 +67,7 @@ class mail_group(osv.Model):
         'image': fields.binary("Photo",
             help="This field holds the image used as photo for the "\
                  "user. The image is base64 encoded, and PIL-supported. "\
-                 "It is limited to a 12024x1024 px image."),
+                 "It is limited to a 1024x1024 px image."),
         'image_medium': fields.function(_get_image, fnct_inv=_set_image,
             string="Medium-sized photo", type="binary", multi="_get_image",
             store = {
@@ -165,17 +165,3 @@ class mail_group(osv.Model):
             self._subscribe_user_with_group_m2m_command(cr, uid, ids, vals.get('group_ids'), context=context)
         return super(mail_group, self).write(cr, uid, ids, vals, context=context)
 
-    def action_group_join(self, cr, uid, ids, context=None):
-        return self.message_subscribe(cr, uid, ids, context=context)
-
-    def action_group_leave(self, cr, uid, ids, context=None):
-        return self.message_unsubscribe(cr, uid, ids, context=context)
-
-    # ----------------------------------------
-    # OpenChatter methods and notifications
-    # ----------------------------------------
-
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'responsible_id' to the monitored fields """
-        res = super(mail_group, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['responsible_id']
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 1dac0ab9408..b1d7971e2ac 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -31,8 +31,8 @@
                                     <h4><a type="edit"><field name="name"/></a></h4>
                                     <ul>
                                         <li><t t-raw="record.message_summary.raw_value"/></li>
-                                        <li t-if="! record.message_is_follower.raw_value"><a name="action_group_join" string="Join" type="object" class="oe_group_join">Not following</a></li>
-                                        <li t-if="record.message_is_follower.raw_value"><a name="action_group_leave" string="Join" type="object" class="oe_group_leave">Following</a></li>
+                                        <li t-if="! record.message_is_follower.raw_value"><a name="message_subscribe" string="Join" type="object" class="oe_group_join">Not following</a></li>
+                                        <li t-if="record.message_is_follower.raw_value"><a name="message_unsubscribe" string="Join" type="object" class="oe_group_leave">Following</a></li>
                                     </ul>
                                 </div>
                             </div>
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 1112bf8d76a..4599209c305 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -22,6 +22,7 @@ class mail_mail(osv.Model):
     _columns = {
         'message_id': fields.many2one('mail.message', 'Message', required=True, ondelete='cascade'),
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
+        'subject': fields.char('Subject', size=128),
         'state': fields.selection([
             ('outgoing', 'Outgoing'),
             ('sent', 'Sent'),
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 689bbc2f27f..a86eaec2896 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -194,27 +194,6 @@ class mail_thread(osv.Model):
         self.message_subscribe(cr, uid, [thread_id], [uid], context=context)
         return thread_id
 
-    # FP Note: not sure we need this?
-    #def write(self, cr, uid, ids, vals, context=None):
-    #    """ Override of write to subscribe :
-    #        - the writer
-    #        - followers given by the monitored fields
-    #    """
-    #    if isinstance(ids, (int, long)):
-    #        ids = [ids]
-    #    for id in ids:
-    #        # copy original vals because we are going to modify it
-    #        specific_vals = dict(vals)
-    #        # we modify followers: do not subscribe the uid
-    #        if specific_vals.get('message_follower_ids'):
-    #            followers_command = self.message_get_automatic_followers(cr, uid, id, specific_vals, add_uid=False, context=context)
-    #            specific_vals['message_follower_ids'] += followers_command
-    #        else:
-    #            followers_command = self.message_get_automatic_followers(cr, uid, id, specific_vals, context=context)
-    #            specific_vals['message_follower_ids'] = followers_command
-    #        write_res = super(mail_thread, self).write(cr, uid, ids, specific_vals, context=context)
-    #    return True
-
     def unlink(self, cr, uid, ids, context=None):
         """Override unlink, to automatically delete messages
            that are linked with res_model and res_id, not through
@@ -227,51 +206,6 @@ class mail_thread(osv.Model):
         msg_obj.unlink(cr, uid, msg_to_del_ids, context=context)
         return super(mail_thread, self).unlink(cr, uid, ids, context=context)
 
-    def message_get_automatic_followers(self, cr, uid, id, record_vals, add_uid=True, fetch_missing=False, context=None):
-        """ Return the command for the many2many follower_ids field to manage
-            followers. Behavior :
-            - get the monitored fields (ex: ['user_id', 'responsible_id']); those
-              fields should be relationships to res.users (#TODO: res.partner)
-            - if this field is in the record_vals: it means it has been modified
-              thus add its value to the followers
-            - if this fields is not in record_vals, but fetch_missing paramter
-              is set to True: fetch the value in the record (use: at creation
-              for default values, not present in record_vals)
-            - if add_uid: add the current user (for example: writer is follower)
-            - generate the command and return it
-            This method has to be used on 1 id, because otherwise it would imply
-            to track which user.id is used for which record.id.
-
-            :param record_vals: values given to the create method of the new
-                record, or values updated in a write.
-            :param monitored_fields: a list of fields that are monitored. Those
-                fields must be many2one fields to the res.users model.
-            :param fetch_missing: is set to True, the method will read the
-                record to find values that are not present in record_vals.
-
-            #TODO : UPDATE WHEN MERGING TO PARTNERS
-        """
-        # get monitored fields
-        monitored_fields = self.message_get_monitored_follower_fields(cr, uid, [id], context=context)
-        modified_fields = [field for field in monitored_fields if field in record_vals.iterkeys()]
-        other_fields = [field for field in monitored_fields if field not in record_vals.iterkeys()] if fetch_missing else []
-        # for each monitored field: if in record_vals, it has been modified/added
-        follower_ids = []
-        for field in modified_fields:
-            # do not add 'False'
-            if record_vals.get(fields):
-                follower_ids.append(record_vals.get(field))
-        # for other fields: read in record if fetch_missing (otherwise list is void)
-        for field in other_fields:
-            record = self.browse(cr, uid, id, context=context)
-            value = getattr(record, field)
-            if value:
-                follower_ids.append(value)
-        # add uid if asked and not already present
-        if add_uid and uid not in follower_ids:
-            follower_ids.append(uid)
-        return self.message_subscribe_get_command(cr, uid, follower_ids, context=context)
-
     #------------------------------------------------------
     # mail.message wrappers and tools
     #------------------------------------------------------
@@ -987,12 +921,6 @@ class mail_thread(osv.Model):
             return True
         return False
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Returns a list of fields containing a res.user.id. Those fields
-            will be checked to automatically subscribe those users.
-        """
-        return []
-
     def message_subscribe(self, cr, uid, ids, partner_ids=None, context=None):
         """
             :param user_ids: a list of user_ids; if not set, subscribe
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 7b8442b4c46..16c66655b3c 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1046,11 +1046,6 @@ class mrp_production(osv.osv):
     # OpenChatter methods and notifications
     # ---------------------------------------------------
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' to the monitored fields """
-        res = super(mrp_production, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id']
-
     def create_send_note(self, cr, uid, ids, context=None):
         self.message_append_note(cr, uid, ids, body=_("Manufacturing order has been <b>created</b>."), context=context)
         return True
diff --git a/addons/project/project.py b/addons/project/project.py
index 1a8f8c8bfe5..caea3c6f23b 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -514,11 +514,6 @@ def Project():
     # OpenChatter methods and notifications
     # ------------------------------------------------
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' to the monitored fields """
-        res = super(project, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id']
-
     def create(self, cr, uid, vals, context=None):
         if context is None: context = {}
         # Prevent double project creation when 'use_tasks' is checked!
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 5c440976b5c..a8a1e617ecb 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -499,11 +499,6 @@ class project_issue(base_stage, osv.osv):
     # OpenChatter methods and notifications
     # -------------------------------------------------------
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' to the monitored fields """
-        res = super(project_issue, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id']
-
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('project.task.type').name_get(cr, uid, [stage_id], context=context)[0][1]
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 1d904383718..350d40526ab 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -734,11 +734,6 @@ class purchase_order(osv.osv):
     def needaction_domain_get(self, cr, uid, ids, context=None):
         return [('state','=','draft')]
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'validator' to the monitored fields """
-        res = super(purchase_order, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['validator']
-
     def create_send_note(self, cr, uid, ids, context=None):
         return self.message_append_note(cr, uid, ids, body=_("Request for quotation <b>created</b>."), context=context)
 

From d38148abba9548d768564cedaddcdcf6aee3217d Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 16 Aug 2012 14:50:10 +0530
Subject: [PATCH 306/999] [FIX] l10n_in_hr_payroll: YAML Fix

bzr revid: mra@tinyerp.com-20120816092010-vq3eqe8prjufd0rc
---
 addons/l10n_in_hr_payroll/test/payment_advice_batch.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml b/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
index 7750695860f..8193161478b 100644
--- a/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
+++ b/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
@@ -10,7 +10,7 @@
 -
   !record {model: hr.payslip.employees, id: hr_payslip_employees}:
     employee_ids:
-      - hr_payroll.hr_employee_bonamy0
+      - hr.employee_qdp
 -
   I generate the payslip by clicking on Generat button wizard.
 -

From c7c1cb1037b755a52b8c00a200bc51cc6b29a644 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 16 Aug 2012 11:26:16 +0200
Subject: [PATCH 307/999] [IMP] renaming message_state to message_unread

bzr revid: fp@tinyerp.com-20120816092616-jnoj0d18rw1ifqth
---
 addons/base_calendar/crm_meeting_view.xml     |  6 +-
 addons/crm/crm_lead_view.xml                  | 16 ++---
 addons/event/event_view.xml                   | 12 ++--
 addons/hr_recruitment/hr_recruitment_view.xml |  6 +-
 addons/mail/doc/mail_state.rst                |  8 +--
 addons/mail/mail_group.py                     |  2 +
 addons/mail/mail_mail.py                      |  8 +--
 addons/mail/mail_message.py                   | 10 +--
 addons/mail/mail_thread.py                    | 65 ++-----------------
 addons/mrp/mrp_view.xml                       |  4 +-
 addons/project/project_view.xml               | 14 ++--
 addons/project_issue/project_issue_view.xml   | 10 +--
 addons/purchase/purchase_view.xml             |  6 +-
 .../purchase_requisition_view.xml             |  4 +-
 addons/sale/sale_view.xml                     |  6 +-
 15 files changed, 59 insertions(+), 118 deletions(-)

diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 9776d66b839..3dffcd61520 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -244,14 +244,14 @@
         <field name="name">CRM - Meetings Tree</field>
         <field name="model">crm.meeting</field>
         <field name="arch" type="xml">
-            <tree string="Meetings" fonts="bold:message_state==True"
+            <tree string="Meetings" fonts="bold:message_unread==True"
                 colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="name" string="Subject" />
                 <field name="user_id"/>
                 <field name="date"/>
                 <field name="state"/>
                 <field name="duration" />
-                <field name="message_state" invisible="1"/>
+                <field name="message_unread" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -288,7 +288,7 @@
         <field name="arch" type="xml">
             <search string="Search Meetings">
                 <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
-                <filter string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
+                <filter string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <separator/>
                 <filter string="My Meetings" help="My Meetings" domain="[('user_id','=',uid)]"/>
                 <field name="user_id"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index e47e0cafcad..4109bca5b17 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -246,7 +246,7 @@
             <field name="name">Leads</field>
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
-                <tree string="Leads" fonts="bold:message_state==True" colors="grey:state in ('cancel', 'done')">
+                <tree string="Leads" fonts="bold:message_unread==True" colors="grey:state in ('cancel', 'done')">
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name"/>
@@ -262,7 +262,7 @@
                     <field name="referred" invisible="1"/>
                     <field name="channel_id" invisible="1"/>
                     <field name="subjects" invisible="1"/>
-                    <field name="message_state" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -295,7 +295,7 @@
                     <field name="user_id"/>
                     <field name="partner_address_email"/>
                     <field name="message_summary"/>
-                    <field name="message_state"/>
+                    <field name="message_unread"/>
                     <templates>
                         <t t-name="lead_details">
                             <ul class="oe_kanban_tooltip">
@@ -341,7 +341,7 @@
                                         <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
-                                        <t t-if="record.message_state.raw_value"><span class="oe_kanban_mail_new">New</span></t>
+                                        <t t-if="record.message_unread.raw_value"><span class="oe_kanban_mail_new">New</span></t>
                                         <t t-raw="record.message_summary.raw_value"/>
                                     </div>
                                 </div>
@@ -364,7 +364,7 @@
                     <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
                     <field name="subjects"/>
                     <field name="create_date"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Open" name="open" domain="[('state','=','open')]"/>
@@ -544,7 +544,7 @@
             <field name="name">Opportunities Tree</field>
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
-                <tree string="Opportunities" fonts="bold:message_state==True" colors="gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
+                <tree string="Opportunities" fonts="bold:message_unread==True" colors="gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name" string="Opportunity"/>
@@ -562,7 +562,7 @@
                     <field name="user_id"/>
                     <field name="priority" invisible="1"/>
                     <field name="state" groups="base.group_no_one"/>
-                    <field name="message_state" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -577,7 +577,7 @@
                     <field name="name" string="Opportunity / Customer"
                         filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]" />
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Open" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index bfed55b17cf..29e3afb04b4 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -208,7 +208,7 @@
             <field name="name">event.event.tree</field>
             <field name="model">event.event</field>
             <field name="arch" type="xml">
-                <tree string="Events" fonts="bold:message_state==True" colors="red:(register_min and register_min&gt;register_current) or (register_max and register_max&lt;register_current);grey:state=='cancel'">
+                <tree string="Events" fonts="bold:message_unread==True" colors="red:(register_min and register_min&gt;register_current) or (register_max and register_max&lt;register_current);grey:state=='cancel'">
                     <field name="name" string="Name"/>
                     <field name="type"/>
                     <field name="date_begin"/>
@@ -219,7 +219,7 @@
                     <field name="main_speaker_id" groups="base.extended"/>
                     <field name="user_id"/>
                     <field name="state"/>
-                    <field name="message_state" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -326,7 +326,7 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <field name="name" string="Events"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
@@ -421,7 +421,7 @@
             <field name="name">event.registration.tree</field>
             <field name="model">event.registration</field>
             <field name="arch" type="xml">
-                <tree string="Registration" fonts="bold:message_state==True">
+                <tree string="Registration" fonts="bold:message_unread==True">
                     <field name="create_date"/>
                     <field name="partner_id"/>
                     <field name="name"/>
@@ -431,7 +431,7 @@
                     <field name="user_id"/>
                     <field name="origin"/>
                     <field name="state"/>
-                    <field name="message_state" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -516,7 +516,7 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <field name="name" string="Participant" filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 548b4f93ead..59d4993bca3 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -76,8 +76,8 @@
         <field name="name">Applicants</field>
         <field name="model">hr.applicant</field>
         <field name="arch" type="xml">
-            <tree string="Applicants" fonts="bold:message_state==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
-                <field name="message_state" invisible="1"/>
+            <tree string="Applicants" fonts="bold:message_unread==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
+                <field name="message_unread" invisible="1"/>
                 <field name="create_date" groups="base.group_no_one"/>
                 <field name="name" string="Subject"/>
                 <field name="partner_name"/>
@@ -205,7 +205,7 @@
         <field name="arch" type="xml">
             <search string="Search Jobs">
                 <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
-                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
+                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <separator/>
                 <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
                 <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
diff --git a/addons/mail/doc/mail_state.rst b/addons/mail/doc/mail_state.rst
index 527a31ba835..fc2772bf094 100644
--- a/addons/mail/doc/mail_state.rst
+++ b/addons/mail/doc/mail_state.rst
@@ -1,15 +1,15 @@
 .. _mail_state:
 
-message_state
+message_unread
 =============
 
-``message_state`` is a boolean field that states whether the document
+``message_unread`` is a boolean field that states whether the document
 has unread messages. In previous versions, some documents were going
 back to ``pending`` state when receiving an email through the mail
 gateway. Now the state related to messages differs from the state or
 stage of the document itself.
 
-message_state and need action mechanism
+message_unread and need action mechanism
 +++++++++++++++++++++++++++++++++++++++
 
 The ``mail`` module introduces a default behavior for the need_action
@@ -23,6 +23,6 @@ mechanism [REF].
     """
     result = super(ir_needaction_mixin, self).get_needaction_user_ids(cr, uid, ids, context=context)
     for obj in self.browse(cr, uid, ids, context=context):
-      if obj.message_state == False and obj.user_id:
+      if obj.message_unread == False and obj.user_id:
         result[obj.id].append(obj.user_id.id)
     return result
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 7de74db27c3..0ff6c3f798d 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -105,6 +105,8 @@ class mail_group(osv.Model):
         'alias_domain': False, # always hide alias during creation
     }
 
+    # FP Note: code to be improved. Check we have a code for res.users
+    # when we give them a new group.
     def _subscribe_user_with_group_m2m_command(self, cr, uid, ids, group_ids_command, context=None):
         # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
         user_group_ids = [command[1] for command in group_ids_command if command[0] == 4]
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 4599209c305..8d53793341b 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -18,9 +18,9 @@ class mail_mail(osv.Model):
 
     _name = 'mail.mail'
     _description = 'Outgoing Mails'
-    _inherits = {'mail.message': 'message_id'}
+    _inherits = {'mail.message': 'mail_message_id'}
     _columns = {
-        'message_id': fields.many2one('mail.message', 'Message', required=True, ondelete='cascade'),
+        'mail_message_id': fields.many2one('mail.message', 'Message', required=True, ondelete='cascade'),
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
         'subject': fields.char('Subject', size=128),
         'state': fields.selection([
@@ -32,7 +32,7 @@ class mail_mail(osv.Model):
         ], 'Status', readonly=True),
         'auto_delete': fields.boolean('Auto Delete',
             help="Permanently delete this email after sending it, to save space"),
-
+        'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
         'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences.'),
         'email_to': fields.text('To', help='Message recipients'),
         'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
@@ -129,7 +129,7 @@ class mail_mail(osv.Model):
                     'datas_fname': fname,
                     'datas': fcontent and fcontent.encode('base64'),
                     'res_model': 'mail.message',
-                    'res_id': msg.message_id.id,
+                    'res_id': msg.mail_message_id.id,
             }
             # FP Note: what's this ???
             # if context.has_key('default_type'):
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index c6e901d98e7..3a942bf53a7 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -83,7 +83,6 @@ class mail_message(osv.Model):
             res.append((message.id, name))
         return res
 
-
     _columns = {
         # should we keep a distinction between email and comment ?
         'type': fields.selection([
@@ -105,26 +104,20 @@ class mail_message(osv.Model):
         'parent_id': fields.many2one('mail.message', 'Parent Message',
             select=True, ondelete='set null',
             help="Initial thread message."),
-
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
-
         'model': fields.char('Related Document Model', size=128, select=1),
         'res_id': fields.integer('Related Document ID', select=1),
         'record_name': fields.function(get_record_name, type='string',
             string='Message Record Name',
             help="Name get of the related document."),
-
         'subject': fields.char('Subject', size=128),
         'date': fields.datetime('Date'),
-
-        'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
         'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
-
         'body': fields.text('Content', required=True),
     }
     _defaults = {
         'type': 'email',
-        'date': (lambda *a: fields.datetime.now()),
+        'date': lambda *a: fields.datetime.now(),
     }
 
     #------------------------------------------------------
@@ -211,6 +204,7 @@ class mail_message(osv.Model):
         self.check(cr, uid, ids, 'unlink', context=context)
         return super(mail_message, self).unlink(cr, uid, ids, context)
 
+    # FP Note: to review
     def parse_message(self, message, save_original=False, context=None):
         """Parses a string or email.message.Message representing an
            RFC-2822 email, and returns a generic dict holding the
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index a86eaec2896..7cdaa70f5de 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -39,59 +39,6 @@ _logger = logging.getLogger(__name__)
 def decode_header(message, header, separator=' '):
     return separator.join(map(decode,message.get_all(header, [])))
 
-class many2many_reference(fields.many2many):
-    """ many2many_reference is an override of fields.many2many. It manages
-        many2many-like table where one id is given by two fields, res_model
-        and res_id.
-    """
-    
-    def _get_query_and_where_params(self, cr, model, ids, values, where_params):
-        """ Add in where:
-            - mail_followers.res_model = 'crm.lead'
-        """
-        query = 'SELECT %(rel)s.%(id2)s, %(rel)s.%(id1)s \
-                    FROM %(rel)s, %(from_c)s \
-                    WHERE %(rel)s.%(id1)s IN %%s \
-                    AND %(rel)s.%(id2)s = %(tbl)s.id \
-                    AND %(rel)s.res_model = %%s \
-                    %(where_c)s  \
-                    %(order_by)s \
-                    %(limit)s \
-                    OFFSET %(offset)d' \
-                % values
-        where_params = [model._name] + where_params
-        return query, where_params
-
-    def set(self, cr, model, id, name, values, user=None, context=None):
-        """ Override to add the res_model field in queries. """
-        if not values: return
-        rel, id1, id2 = self._sql_names(model)
-        obj = model.pool.get(self._obj)
-        for act in values:
-            if not (isinstance(act, list) or isinstance(act, tuple)) or not act:
-                continue
-            if act[0] == 0:
-                idnew = obj.create(cr, user, act[2], context=context)
-                cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+',res_model) VALUES (%s,%s,%s)', (id, idnew, model._name))
-            elif act[0] == 3:
-                cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND res_model=%s', (id, act[1], model._name))
-            elif act[0] == 4:
-                # following queries are in the same transaction - so should be relatively safe
-                cr.execute('SELECT 1 FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND res_model=%s', (id, act[1], model._name))
-                if not cr.fetchone():
-                    cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+',res_model) VALUES (%s,%s,%s)', (id, act[1], model._name))
-            elif act[0] == 6:
-                d1, d2,tables = obj.pool.get('ir.rule').domain_get(cr, user, obj._name, context=context)
-                if d1:
-                    d1 = ' and ' + ' and '.join(d1)
-                else:
-                    d1 = ''
-                cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND res_model=%s AND '+id2+' IN (SELECT '+rel+'.'+id2+' FROM '+rel+', '+','.join(tables)+' WHERE '+rel+'.'+id1+'=%s AND '+rel+'.'+id2+' = '+obj._table+'.id '+ d1 +')', [id, model._name, id]+d2)
-                for act_nbr in act[2]:
-                    cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+',res_model) VALUES (%s,%s,%s)', (id, act_nbr, model._name))
-            else:
-                return super(many2many_reference, self).set(cr, model, id, name, values, user, context)
-
 class mail_thread(osv.Model):
     '''Mixin model, meant to be inherited by any model that needs to
        act as a discussion topic on which messages can be attached.
@@ -132,13 +79,11 @@ class mail_thread(osv.Model):
             result[res_id] = True
         return result
 
-
-
     def _get_message_data(self, cr, uid, ids, name, args, context=None):
         res = {}
         for id in ids:
             res[id] = {
-                'message_state': False,
+                'message_unread': False,
                 'message_Summary': ''
             }
         nobj = self.pool.get('mail.notification')
@@ -149,7 +94,7 @@ class mail_thread(osv.Model):
             ('read','=',False)
         ], context=context)
         for notif in nobj.browse(cr, uid, nids, context=context):
-            res[notif.message_id.id]['message_state'] = True
+            res[notif.message_id.id]['message_unread'] = True
 
         for thread in self.browse(cr, uid, ids, context=context):
             message_ids = thread.message_ids
@@ -171,7 +116,7 @@ class mail_thread(osv.Model):
             domain=lambda self: [('model','=',self._name)],
             string='Related Messages', 
             help="All messages related to the current document."),
-        'message_state': fields.function(_get_message_data, fnct_search=_search_state, 'Message Read',
+        'message_unread': fields.function(_get_message_data, fnct_search=_search_state, 'Message Read',
             help="When checked, new messages require your attention.",
             multi="_get_message_data"),
         'message_summary': fields.function(_get_message_data, method=True,
@@ -225,7 +170,7 @@ class mail_thread(osv.Model):
 
     def _needaction_domain_get(self, cr, uid, context={}):
         if self._needaction:
-            return [('message_state','=',True)]
+            return [('message_unread','=',True)]
         return []
 
     #------------------------------------------------------
@@ -969,7 +914,7 @@ class mail_thread(osv.Model):
     # Thread_state
     #------------------------------------------------------
 
-    # FP Note: this should be a invert function on message_state field
+    # FP Note: this should be a invert function on message_unread field
     def message_mark_as_read(self, cr, uid, ids, context=None):
         """ Set as read. """
         notobj = self.pool.get('mail.notification')
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 02cf1f19149..1a63a3dab14 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -574,8 +574,8 @@
             <field name="name">mrp.production.tree</field>
             <field name="model">mrp.production</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:message_state==True" colors="blue:state in ('draft','confirmed');red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date;gray:state in ('done','cancel') " string="Manufacturing Orders">
-                    <field name="message_state" invisible="1"/>
+                <tree fonts="bold:message_unread==True" colors="blue:state in ('draft','confirmed');red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date;gray:state in ('done','cancel') " string="Manufacturing Orders">
+                    <field name="message_unread" invisible="1"/>
                     <field name="name"/>
                     <field name="date_planned"/>
                     <field name="product_id"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 395a3c63219..3a1d21324f3 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -160,7 +160,7 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                     <field name="complete_name" string="Project Name"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
                     <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
@@ -185,9 +185,9 @@
             <field name="model">project.project</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:message_state==True" colors="red:date and (date&lt;current_date) and (state == 'open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
+                <tree fonts="bold:message_unread==True" colors="red:date and (date&lt;current_date) and (state == 'open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
                     <field name="sequence" invisible="1"/>
-                    <field name="message_state" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                     <field name="date" invisible="1"/>
                     <field name="name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
@@ -506,7 +506,7 @@
                     <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline"/>
                     <field name="message_summary"/>
-                    <field name="message_state"/>
+                    <field name="message_unread"/>
                     <field name="categ_ids"/>
                     <templates>
                     <t t-name="kanban-box">
@@ -571,8 +571,8 @@
             <field name="model">project.task</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree fonts="bold:message_state==True" colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
-                    <field name="message_state" invisible="1"/>
+                <tree fonts="bold:message_unread==True" colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
+                    <field name="message_unread" invisible="1"/>
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent" invisible="context.get('user_invisible', False)"/>
@@ -632,7 +632,7 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <field name="name" string="Tasks"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
                     <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 6dc5ed946f1..be732c8c9a6 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -170,8 +170,8 @@
             <field name="name">Project Issue Tracker Tree</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree string="Issue Tracker Tree" fonts="bold:message_state==True" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
-                    <field name="message_state" invisible="1"/>
+                <tree string="Issue Tracker Tree" fonts="bold:message_unread==True" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                    <field name="message_unread" invisible="1"/>
                     <field name="id"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name"/>
@@ -196,7 +196,7 @@
                 <search string="Issue Tracker Search">
                     <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                     <field name="id"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
                     <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
@@ -310,9 +310,9 @@
             <field name="name">Project Issue- Feature Tracker Tree</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree string="Feature Tracker Tree" fonts="bold:message_state==True" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                <tree string="Feature Tracker Tree" fonts="bold:message_unread==True" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                     <field name="id"/>
-                    <field name="message_state" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                     <field name="name" string="Feature description"/>
                     <field name="partner_id"/>
                     <field name="priority" string="Priority"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 0cdc8d2d206..158ef53f559 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -298,7 +298,7 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                     <field name="name" string="Reference"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
                     <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
@@ -323,8 +323,8 @@
             <field name="name">purchase.order.tree</field>
             <field name="model">purchase.order</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:message_state==True" colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
-                    <field name="message_state" invisible="1"/>
+                <tree fonts="bold:message_unread==True" colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
+                    <field name="message_unread" invisible="1"/>
                     <field name="name" string="Reference"/>
                     <field name="date_order" />
                     <field name="partner_id"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 2e9f4104342..34fc8dcb540 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -112,8 +112,8 @@
         <field name="name">purchase.requisition.tree</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <tree fonts="bold:message_state==True" colors="grey:state == 'cancel';red:date_end and date_end&lt;current_date;black:date_end&gt;current_date;" string="Purchase Requisition">
-                <field name="message_state" invisible="1"/>
+            <tree fonts="bold:message_unread==True" colors="grey:state == 'cancel';red:date_end and date_end&lt;current_date;black:date_end&gt;current_date;" string="Purchase Requisition">
+                <field name="message_unread" invisible="1"/>
                 <field name="name"/>
                 <field name="date_start"/>
                 <field name="user_id"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 07abe9c4318..1e7e3fc1581 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -133,8 +133,8 @@
             <field name="model">sale.order</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <tree string="Sales Orders" fonts="bold:message_state==True" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
-                    <field name="message_state" invisible="1"/>
+                <tree string="Sales Orders" fonts="bold:message_unread==True" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
+                    <field name="message_unread" invisible="1"/>
                     <field name="name"/>
                     <field name="date_order"/>
                     <field name="partner_id"/>
@@ -363,7 +363,7 @@
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_state" domain="[('message_state','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
                     <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>

From a1182d97ed749ddf175d1c6f9f88ca3dc8ebdb1b Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Thu, 16 Aug 2012 15:11:23 +0530
Subject: [PATCH 308/999] [IMP]Remove or

bzr revid: tch@tinyerp.com-20120816094123-f1yiealw1p59j95n
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 1728bfb584b..96adbd42d2e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -678,7 +678,7 @@
             </button>
         </t>
         <span class="oe_alternative" t-if="widget.options.import_enabled">
-            <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_list_button_import">Import</a>
+            <span class="oe_fade"></span> <a href="#" class="oe_bold oe_list_button_import">Import</a>
         </span>
     </t>
 </div>

From 0364cffb0fd6d0476509d1a851ee3d6ba795a267 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 16 Aug 2012 15:45:47 +0530
Subject: [PATCH 309/999] [FIX] l10n_in_hr_payroll: YAML Fix

bzr revid: mra@tinyerp.com-20120816101547-tahjdcbuocg3727f
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 8f3bbca4b11..16cb12493c6 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -204,7 +204,7 @@ class payroll_advice(osv.osv):
         if company_id:
             company = self.pool.get('res.company').browse(cr, uid, [company_id], context=context)[0]
             if company.partner_id.bank_ids:
-                res.update({'bank': company.partner_id.bank_ids[0].bank.name})
+                res.update({'bank_id': company.partner_id.bank_ids[0].bank.id})
         return {
             'value':res
         }

From 73827c55259f81223f9629f8f1925042043dabce Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 16 Aug 2012 12:18:48 +0200
Subject: [PATCH 310/999] [IMP] mail cleaning

bzr revid: fp@tinyerp.com-20120816101848-0l3wyu98zjmtkfks
---
 addons/mail/mail_group.py   | 25 ++++++---------
 addons/mail/mail_mail.py    |  1 +
 addons/mail/mail_message.py |  2 --
 addons/mail/mail_thread.py  | 58 ++++++++++++++++++++--------------
 addons/mail/res_partner.py  | 13 ++------
 addons/mail/res_users.py    | 62 ++++++++++++++++++-------------------
 6 files changed, 80 insertions(+), 81 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 0ff6c3f798d..2c8b9450439 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -107,17 +107,12 @@ class mail_group(osv.Model):
 
     # FP Note: code to be improved. Check we have a code for res.users
     # when we give them a new group.
-    def _subscribe_user_with_group_m2m_command(self, cr, uid, ids, group_ids_command, context=None):
-        # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
-        user_group_ids = [command[1] for command in group_ids_command if command[0] == 4]
-        user_group_ids += [id for command in group_ids_command if command[0] == 6 for id in command[2]]
-        # retrieve the user member of those groups
-        partner_ids = []
-        res_groups_obj = self.pool.get('res.groups')
-        for group in res_groups_obj.browse(cr, uid, user_group_ids, context=context):
-            partner_ids += [user.partner_id.id for user in group.users]
-        # subscribe the users
-        return self.message_subscribe(cr, uid, ids, partner_ids, context=context)
+    def _subscribe_users(self, cr, uid, ids, context=None):
+        for mail_group in self.browse(cr, uid, ids, context=context):
+            partner_ids = []
+            for group in mail_group.group_ids:
+                partner_ids += [user.partner_id.id for user in group.users]
+            self.message_subscribe(cr, uid, ids, partner_ids, context=context)
 
     def create(self, cr, uid, vals, context=None):
         mail_alias = self.pool.get('mail.alias')
@@ -150,8 +145,7 @@ class mail_group(osv.Model):
         mail_alias.write(cr, uid, [vals['alias_id']], {"alias_force_thread_id": mail_group_id}, context)
 
         if vals.get('group_ids'):
-            self._subscribe_user_with_group_m2m_command(cr, uid, [mail_group_id], vals.get('group_ids'), context=context)
-
+            self._subscribe_users(cr, uid, [mail_group_id], context=context)
         return mail_group_id
 
     def unlink(self, cr, uid, ids, context=None):
@@ -163,7 +157,8 @@ class mail_group(osv.Model):
         return res
 
     def write(self, cr, uid, ids, vals, context=None):
+        result = super(mail_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('group_ids'):
-            self._subscribe_user_with_group_m2m_command(cr, uid, ids, vals.get('group_ids'), context=context)
-        return super(mail_group, self).write(cr, uid, ids, vals, context=context)
+            self._subscribe_users(cr, uid, ids, vals.get('group_ids'), context=context)
+        return result
 
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 8d53793341b..9aae5f9a8b7 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -49,6 +49,7 @@ class mail_mail(osv.Model):
         'content_subtype': 'plain',
     }
 
+    # FP Note: should we use a dict instead ?
     def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, type='email',
                              email_cc=None, reply_to=False, partner_ids=None, attachments=None,
                              message_id=False, references=False, res_id=False, content_subtype='plain',
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 3a942bf53a7..43628f217f1 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -360,5 +360,3 @@ class mail_message(osv.Model):
         msg['body'] = msg['body_text']
         msg['sub_type'] = msg['content_subtype'] or 'plain'
         return msg
-
-
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 7cdaa70f5de..74a69ac88e5 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -103,8 +103,8 @@ class mail_thread(osv.Model):
         return res
 
     # FP Note: todo
-    def _search_state(self, tobj, cr, uid, obj=None, name=None, domain=None, context=None):
-        return [('id','in',[])]
+    def _search_unread(self, tobj, cr, uid, obj=None, name=None, domain=None, context=None):
+        return []
 
     _columns = {
         'message_is_follower': fields.function(_get_is_follower,
@@ -116,7 +116,7 @@ class mail_thread(osv.Model):
             domain=lambda self: [('model','=',self._name)],
             string='Related Messages', 
             help="All messages related to the current document."),
-        'message_unread': fields.function(_get_message_data, fnct_search=_search_state, 'Message Read',
+        'message_unread': fields.function(_get_message_data, fnct_search=_search_unread, 'Has Unread Messages',
             help="When checked, new messages require your attention.",
             multi="_get_message_data"),
         'message_summary': fields.function(_get_message_data, method=True,
@@ -131,12 +131,10 @@ class mail_thread(osv.Model):
     #------------------------------------------------------
 
     def create(self, cr, uid, vals, context=None):
-        """ Override of create to subscribe :
-            - the writer
-            - followers given by the monitored fields
+        """ Override of create to subscribe the current user
         """
         thread_id = super(mail_thread, self).create(cr, uid, vals, context=context)
-        self.message_subscribe(cr, uid, [thread_id], [uid], context=context)
+        self.message_subscribe_users(cr, uid, [thread_id], [uid], context=context)
         return thread_id
 
     def unlink(self, cr, uid, ids, context=None):
@@ -155,6 +153,8 @@ class mail_thread(osv.Model):
     # mail.message wrappers and tools
     #------------------------------------------------------
 
+    # FP Note: should we support attachment ? Also, this method must be on
+    # the mail.message object, not on the thread.
     def message_create(self, cr, uid, thread_id, vals, context=None):
         """ OpenChatter: wrapper of mail.message create method
            - creates the mail.message
@@ -177,14 +177,7 @@ class mail_thread(osv.Model):
     # Generic message api
     #------------------------------------------------------
 
-    def message_capable_models(self, cr, uid, context=None):
-        ret_dict = {}
-        for model_name in self.pool.obj_list():
-            model = self.pool.get(model_name)
-            if 'mail.thread' in getattr(model, '_inherit', []):
-                ret_dict[model_name] = model._description
-        return ret_dict
-
+    # I propose to remove this. Everyone should use message_create instead.
     def message_append(self, cr, uid, threads, subject, body_text=None, body_html=None,
                         type='email', email_date=None, parent_id=False,
                         content_subtype='plain', state=None,
@@ -313,6 +306,7 @@ class mail_thread(osv.Model):
             new_msg_ids.append(self.message_create(cr, uid, thread.id, data, context=context))
         return new_msg_ids
 
+    # to be removed completly
     def message_append_dict(self, cr, uid, ids, msg_dict, context=None):
         """Creates a new mail.message attached to the given threads (``ids``),
            with the contents of ``msg_dict``, by calling ``message_append``
@@ -866,19 +860,37 @@ class mail_thread(osv.Model):
             return True
         return False
 
-    def message_subscribe(self, cr, uid, ids, partner_ids=None, context=None):
+    def message_subscribe_users(self, cr, uid, ids, user_ids=None, context=None):
+        if not user_ids: user_ids = [uid]
+        partners = {}
+        for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context):
+            partners[user.partner_id.id] = True
+        return self.message_subscribe(cr, uid, ids, partners.keys(), context=context)
+
+    def message_subscribe(self, cr, uid, ids, partner_ids, context=None):
         """
-            :param user_ids: a list of user_ids; if not set, subscribe
+            :param partner_ids: a list of user_ids; if not set, subscribe
                              uid instead
             :param return: new value of followers, for Chatter
         """
-        subscription_obj = self.pool.get('mail.subscription')
+        obj = self.pool.get('mail.followers')
+        objids = obj.search(cr, uid, [
+            ('res_id', 'in', ids),
+            ('res_model', '=', self._name),
+            ('partner_id', 'in', partner_ids),
+            ], context=context)
+        followers = {}
+        for follow in obj.browse(cr, uid, objids, context=context)
+            followers.setdefault(follow.partner_id.id, {})[follow.res_id] = True
         create_ids = []
-        for id in ids:
-            already_subscribed_user_ids = self.message_get_followers(cr, uid, [id], context=context)
-            for user_id in to_subscribe_uids:
-                if user_id in already_subscribed_user_ids: continue
-                create_ids.append(subscription_obj.create(cr, uid, {'res_model': self._name, 'res_id': id, 'user_id': user_id}, context=context))
+        for res_id in ids:
+            for partner_id in partner_ids:
+                if followers.get(partner_id, {}).get(res_id, False):
+                    continue
+                create_ids.append(obj.create(cr, uid, {
+                    'res_model': self._name,
+                    'res_id': res_id, 'partner_id': partner_id
+                }, context=context))
         return create_ids
 
     def message_unsubscribe(self, cr, uid, ids, user_ids = None, context=None):
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 062c557b325..c6ec7712fe1 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -31,18 +31,11 @@ class res_partner_mail(osv.Model):
             The purpose is to add messages directly sent to the partner. It also
             adds messages pushed to the related user, if any, using @login.
         """
-        initial_domain = super(res_partner_mail, self).message_search_get_domain(cr, uid, ids, context=context)
-        # to avoid models inheriting from res.partner
         if self._name != 'res.partner':
-            return initial_domain
+            return super(res_partner_mail, self).message_search_get_domain(cr, uid, ids, context=context)
         # add message linked to the partner
-        search_domain = ['|'] + initial_domain + ['|', ('partner_id', 'in', ids), ('partner_ids', 'in', ids)]
-        # if partner is linked to a user: find @login
-        res_users_obj = self.pool.get('res.users')
-        user_ids = res_users_obj.search(cr, uid, [('partner_id', 'in', ids)], context=context)
-        for user in res_users_obj.browse(cr, uid, user_ids, context=context):
-            search_domain = ['|'] + search_domain + ['|', ('body_text', 'like', '@%s' % (user.login)), ('body_html', 'like', '@%s' % (user.login))]
-        return search_domain
+        return [('partner_ids', 'in', ids)]
+
     _columns = {
         'notification_email_pref': fields.selection([
             ('all', 'All feeds'),
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index e57b046622e..1a39ed64bd9 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -98,17 +98,16 @@ class res_users(osv.Model):
         alias_id = mail_alias.create_unique_alias(cr, uid, {'alias_name': data['login']}, model_name=self._name, context=context)
         data['alias_id'] = alias_id
         data.pop('alias_name', None) # prevent errors during copy()
+
         # create user that follows its related partner
-        user_id = super(res_users, self).create(cr, uid, data, context=context)
-        user = self.browse(cr, uid, user_id, context=context)
-        self.pool.get('res.partner').message_subscribe(cr, uid, [user.partner_id.id], [user_id], context=context)
+        self.pool.get('res.partner').message_subscribe_users(cr, uid, [user_id], [user_id], context=context)
         # alias
         mail_alias.write(cr, SUPERUSER_ID, [alias_id], {"alias_force_thread_id": user_id}, context)
         # create a welcome message
-        self.create_welcome_message(cr, uid, user, context=context)
+        self._create_welcome_message(cr, uid, user, context=context)
         return user_id
 
-    def create_welcome_message(self, cr, uid, user, context=None):
+    def _create_welcome_message(self, cr, uid, user, context=None):
         company_name = user.company_id.name if user.company_id else _('the company')
         subject = '''%s has joined %s.''' % (user.name, company_name)
         body = '''Welcome to OpenERP !''' 
@@ -135,35 +134,35 @@ class res_users(osv.Model):
     # that should help cleaning those wrappers
     # --------------------------------------------------
 
-    def message_append(self, cr, uid, threads, subject, body_text=None, body_html=None,
-                        type='email', email_date=None, parent_id=False,
-                        content_subtype='plain', state=None,
-                        partner_ids=None, email_from=False, email_to=False,
-                        email_cc=None, email_bcc=None, reply_to=None,
-                        headers=None, message_id=False, references=None,
-                        attachments=None, original=None, context=None):
-        for user in self.browse(cr, uid, threads, context=context):
-            user.partner_id.message_append(subject, body_text, body_html, type, email_date, parent_id,
-                content_subtype, state, partner_ids, email_from, email_to, email_cc, email_bcc, reply_to,
-                headers, message_id, references, attachments, original)
+    #def message_append(self, cr, uid, threads, subject, body_text=None, body_html=None,
+    #                    type='email', email_date=None, parent_id=False,
+    #                    content_subtype='plain', state=None,
+    #                    partner_ids=None, email_from=False, email_to=False,
+    #                    email_cc=None, email_bcc=None, reply_to=None,
+    #                    headers=None, message_id=False, references=None,
+    #                    attachments=None, original=None, context=None):
+    #    for user in self.browse(cr, uid, threads, context=context):
+    #        user.partner_id.message_append(subject, body_text, body_html, type, email_date, parent_id,
+    #            content_subtype, state, partner_ids, email_from, email_to, email_cc, email_bcc, reply_to,
+    #            headers, message_id, references, attachments, original)
 
-    def message_read(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
-                        limit=100, offset=0, domain=None, context=None):
-        for user in self.browse(cr, uid, ids, context=context):
-            return user.partner_id.message_read(fetch_ancestors, ancestor_ids, limit, offset, domain)
+    #def message_read(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
+    #                    limit=100, offset=0, domain=None, context=None):
+    #    for user in self.browse(cr, uid, ids, context=context):
+    #        return user.partner_id.message_read(fetch_ancestors, ancestor_ids, limit, offset, domain)
 
-    def message_search(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
-                        limit=100, offset=0, domain=None, count=False, context=None):
-        for user in self.browse(cr, uid, ids, context=context):
-            return user.partner_id.message_search(fetch_ancestors, ancestor_ids, limit, offset, domain, count)
+    #def message_search(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
+    #                    limit=100, offset=0, domain=None, count=False, context=None):
+    #    for user in self.browse(cr, uid, ids, context=context):
+    #        return user.partner_id.message_search(fetch_ancestors, ancestor_ids, limit, offset, domain, count)
 
-    def message_subscribe(self, cr, uid, ids, user_ids = None, context=None):
-        for user in self.browse(cr, uid, ids, context=context):
-            return user.partner_id.message_subscribe(user_ids)
+    #def message_subscribe(self, cr, uid, ids, user_ids = None, context=None):
+    #    for user in self.browse(cr, uid, ids, context=context):
+    #        return user.partner_id.message_subscribe(user_ids)
 
-    def message_unsubscribe(self, cr, uid, ids, user_ids = None, context=None):
-        for user in self.browse(cr, uid, ids, context=context):
-            return user.partner_id.message_unsubscribe(user_ids)
+    #def message_unsubscribe(self, cr, uid, ids, user_ids = None, context=None):
+    #    for user in self.browse(cr, uid, ids, context=context):
+    #        return user.partner_id.message_unsubscribe(user_ids)
 
 
 class res_users_mail_group(osv.Model):
@@ -175,6 +174,7 @@ class res_users_mail_group(osv.Model):
     _name = 'res.users'
     _inherit = ['res.users']
 
+    # FP Note: to improve
     def write(self, cr, uid, ids, vals, context=None):
         write_res = super(res_users_mail_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('groups_id'):
@@ -195,6 +195,7 @@ class res_groups_mail_group(osv.Model):
     _name = 'res.groups'
     _inherit = 'res.groups'
 
+    # FP Note: to improve
     def write(self, cr, uid, ids, vals, context=None):
         if vals.get('users'):
             # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
@@ -205,4 +206,3 @@ class res_groups_mail_group(osv.Model):
             mail_group_obj.message_subscribe(cr, uid, mail_group_ids, user_ids, context=context)
         return super(res_groups_mail_group, self).write(cr, uid, ids, vals, context=context)
 
-# vim:et:

From 4c9205ff4aa8590ec49cc9131e312c6158a8819c Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 16 Aug 2012 15:57:58 +0530
Subject: [PATCH 311/999] [IMP] Kanan quick create action should also repect
 the create tag on view

bzr revid: jam@tinyerp.com-20120816102758-2swimfa9dxu3uotv
---
 addons/web_kanban/static/src/js/kanban.js       | 7 ++++++-
 addons/web_kanban/static/src/xml/web_kanban.xml | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 155f03b8aae..27b3184977c 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -514,7 +514,12 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
                 self.view.dataset.ids.push(id);
                 self.do_add_records(records, true);
             });
-    }
+    },
+    _is_action_enabled: function(action) {
+        if (_.has(this.fields_view.arch.attrs, action))
+            return JSON.parse(this.fields_view.arch.attrs[action]);
+        return true;
+    }    
 });
 
 instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 7aba4d6ee87..7e316a2b47e 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -25,7 +25,7 @@
     <td class="oe_kanban_group_header">
         <t t-if="widget.view.group_by">
             <div class="oe_kanban_header">
-                <t t-if="widget.view._is_quick_create_enabled()">
+                <t t-if="widget.view._is_quick_create_enabled() and widget.view._is_action_enabled('create')">
                     <div class="oe_kanban_add oe_e">]</div>
                 </t>
                 <div class="oe_fold_column">

From b6f53ed079b374aa8742d7cd7c95721326a5fa7c Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 16 Aug 2012 16:12:15 +0530
Subject: [PATCH 312/999] [FIX] hr_payroll_account: Small fix if journal id not
 present in read

bzr revid: mra@tinyerp.com-20120816104215-o6sznbu05q84syhh
---
 .../wizard/hr_payroll_payslips_by_employees.py               | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py b/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
index a00ff97ef6b..7e3f4bbbe2b 100644
--- a/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
+++ b/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
@@ -31,8 +31,9 @@ class hr_payslip_employees(osv.osv_memory):
             context = {}
         if context and context.get('active_id', False):
             run_data = run_pool.read(cr, uid, context['active_id'], ['journal_id'])
-        journal_id =  run_data.get('journal_id', False)[0]
-        context.update({'journal_id': journal_id})
+        journal_id =  run_data.get('journal_id', False)
+        journal_id = journal_id and journal_id[0] or False
+        if journal_id: context.update({'journal_id': journal_id})
         return super(hr_payslip_employees, self).compute_sheet(cr, uid, ids, context=context)
 
 hr_payslip_employees()

From d42261907c2bb2f2e3c690b2d88720e6b7ecc838 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 16 Aug 2012 16:32:43 +0530
Subject: [PATCH 313/999] [FIX] Gantt View Create button Shouls repect the view
 create teg

bzr revid: jam@tinyerp.com-20120816110243-blbjzmb2xdemoupg
---
 addons/web_gantt/static/src/js/gantt.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
index 202fb2aecc6..05488fcdca9 100644
--- a/addons/web_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -183,12 +183,14 @@ instance.web_gantt.GanttView = instance.web.View.extend({
                 self.on_task_display(task_info.internal_task);
             }
         });
-        
-        // insertion of create button
-        var td = $($("table td", self.$element)[0]);
-        var rendered = QWeb.render("GanttView-create-button");
-        $(rendered).prependTo(td);
-        $(".oe_gantt_button_create", this.$element).click(this.on_task_create);
+
+        // insertion of create button if gantt has crate false do not render create button     
+        if (this._is_action_enabled('create')){
+            var td = $($("table td", self.$element)[0]);
+            var rendered = QWeb.render("GanttView-create-button");
+            $(rendered).prependTo(td);
+            $(".oe_gantt_button_create", this.$element).click(this.on_task_create);
+        }
     },
     on_task_changed: function(task_obj) {
         var self = this;

From 9ec6f82e382984c9e0fc415090d8c5c56892b6c4 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Thu, 16 Aug 2012 16:59:20 +0530
Subject: [PATCH 314/999] [IMP]Remove or

bzr revid: tch@tinyerp.com-20120816112920-i4gnwzn7z7n3v0gs
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 96adbd42d2e..614c2a91d79 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -678,7 +678,7 @@
             </button>
         </t>
         <span class="oe_alternative" t-if="widget.options.import_enabled">
-            <span class="oe_fade"></span> <a href="#" class="oe_bold oe_list_button_import">Import</a>
+            <span class="oe_fade" t-if="widget._is_action_enabled('create')">or</span> <a href="#" class="oe_bold oe_list_button_import">Import</a>
         </span>
     </t>
 </div>

From cfa66e42f8e99609aaddd09a612884a4c373c1fe Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 16 Aug 2012 18:06:17 +0530
Subject: [PATCH 315/999] [IMP] hr_expense: improve code as per suggestion

bzr revid: cha@tinyerp.com-20120816123617-afade73y5wqune2r
---
 addons/hr_expense/hr_expense.py | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 3683eff9f1d..fca62261814 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -254,12 +254,8 @@ class hr_expense_line(osv.osv):
         return res
 
     def _get_uom_id(self, cr, uid, context=None):
-        try:
-            proxy = self.pool.get('ir.model.data')
-            result = proxy.get_object_reference(cr, uid, 'product', 'product_uom_unit')
-            return result[1]
-        except Exception, ex:
-            return False
+        result = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product', 'product_uom_unit')
+        return result and result[1] or False
 
     _columns = {
         'name': fields.char('Expense Note', size=128, required=True),
@@ -294,14 +290,15 @@ class hr_expense_line(osv.osv):
 
     def onchange_uom(self, cr, uid, ids, product_id, uom_id, context=None):
         res = {'value':{}}
-        if uom_id:
-            if product_id:
-                product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-                uom = self.pool.get('product.uom').browse(cr, uid, uom_id, context=context)
-                if uom.category_id.id != product.uom_id.category_id.id:
-                    res['warning'] = {'title': _('Warning'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure')}
-                    uom_id = product.uom_id.id
-            res['value'].update({'uom_id': uom_id})
+        if not uom_id:
+            return res
+        if product_id:
+            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            uom = self.pool.get('product.uom').browse(cr, uid, uom_id, context=context)
+            if uom.category_id.id != product.uom_id.category_id.id:
+                res['warning'] = {'title': _('Warning'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure')}
+                uom_id = product.uom_id.id
+        res['value'].update({'uom_id': uom_id})
         return res
 
 hr_expense_line()

From 298119b0d339ad77c6a67dda394384c6e30b8547 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 16 Aug 2012 18:14:07 +0530
Subject: [PATCH 316/999] [FIX]error of journal_id fixed and bank record added
 in yml

bzr revid: kbh@tinyerp.com-20120816124407-z0i24fk26k0jltlk
---
 .../hr_payroll_account/hr_payroll_account.py  | 11 +++++++
 .../test/payment_advice_batch.yml             | 30 +++++++++++++++++--
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 71621874066..4dbd31c6550 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -218,6 +218,17 @@ class hr_payslip_run(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Expense Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True),
     }
 
+    def _get_default_journal(self, cr, uid, context=None):
+        model_data = self.pool.get('ir.model.data')
+        res = model_data.search(cr, uid, [('name', '=', 'expenses_journal')])
+        if res:
+            return model_data.browse(cr, uid, res[0]).res_id
+        return False
+
+    _defaults = {
+        'journal_id': _get_default_journal,
+    }
+
 hr_payslip_run()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml b/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
index 8193161478b..e470d81753f 100644
--- a/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
+++ b/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
@@ -1,5 +1,29 @@
 -
   In order to test Payment Advice creation from Payslip Bacth I create New Payslip Batch
+-
+  I Create a bank record
+-
+  !record {model: res.partner.bank, id: res_partner_bank_0}:
+    acc_number: '23457685'
+    partner_id: base.res_partner_21
+    sequence: 0.0
+    name: Fortis
+    state: bank
+    bank: base.res_bank_1
+-
+  I create a new employee “Edwin”
+-
+  !record {model: hr.employee, id: hr_employee_edwin0}:
+    address_home_id: base.res_partner_address_2
+    address_id: base.res_partner_address_9
+    birthday: '1984-05-01'
+    children: 0.0
+    country_id: base.in
+    department_id: hr.dep_rd
+    gender: male
+    name: Edwin
+    bank_account_id: res_partner_bank_0
+    vehicle_distance: 0.0
 -
   I want to generate a payslip from Payslip Batch.
 -
@@ -10,9 +34,9 @@
 -
   !record {model: hr.payslip.employees, id: hr_payslip_employees}:
     employee_ids:
-      - hr.employee_qdp
+      - hr_employee_edwin0
 -
-  I generate the payslip by clicking on Generat button wizard.
+  I generate the payslip by clicking on Generate button wizard.
 -
   !python {model: hr.payslip.employees}: |
      self.compute_sheet(cr, uid, [ref('hr_payslip_employees')], context={'active_id': ref('hr_payslip_run_forAdvice')})
@@ -33,7 +57,7 @@
     batch = self.browse(cr, uid, ref("hr_payslip_run_forAdvice"))
     assert (batch.state == 'close')
 - 
-  I Create Advice from Payslip Batch using Create Advice button
+  I create Advice from Payslip Batch using Create Advice button
 -
     !python {model: hr.payslip.run}: |
      self.create_advice(cr, uid, [ref('hr_payslip_run_forAdvice')])

From 9aca3bac8bcff422f1f7354f97cf43f1efbbd6e9 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 16 Aug 2012 18:27:06 +0530
Subject: [PATCH 317/999] [REF/IMP] refectorec the varibale names and added the
 gantt view, added create ndoe button diable condition

bzr revid: jam@tinyerp.com-20120816125706-h92owusp47t6chl1
---
 openerp/addons/base/rng/view.rng |  4 ++++
 openerp/osv/orm.py               | 12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index c56892d7a07..b82c96fdb60 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -184,6 +184,7 @@
 
     <rng:define name="diagram">
         <rng:element name="diagram">
+            <rng:optional><rng:attribute name="create" /></rng:optional>
             <rng:optional><rng:attribute name="string"/></rng:optional>
             <rng:ref name="node"/>
             <rng:ref name="arrow"/>
@@ -381,6 +382,9 @@
                  <rng:value>5years</rng:value>
               </rng:choice></rng:attribute>
             </rng:optional>
+            <rng:optional><rng:attribute name="create"/></rng:optional>
+            <rng:optional><rng:attribute name="delete"/></rng:optional>
+            <rng:optional><rng:attribute name="edit"/></rng:optional>
             <rng:optional><rng:attribute name="color"/></rng:optional>
             <rng:optional><rng:attribute name="date_delay"/></rng:optional>
             <rng:optional><rng:attribute name="day_length"/></rng:optional>
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 0a8a05e7706..ea9f1c094e3 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1824,6 +1824,10 @@ class BaseModel(object):
             if node.getchildren()[0].tag == 'node':
                 node_fields = self.pool.get(node.getchildren()[0].get('object')).fields_get(cr, user, None, context)
                 fields.update(node_fields)
+                if not node.get("create"):
+                    fn = getattr(self.pool.get(node.getchildren()[1].get('object')), 'check_create')
+                    if not fn(cr, user, raise_exception=False):
+                        node.set("create", 'false')
             if node.getchildren()[1].tag == 'arrow':
                 arrow_fields = self.pool.get(node.getchildren()[1].get('object')).fields_get(cr, user, None, context)
                 fields.update(arrow_fields)
@@ -1831,10 +1835,10 @@ class BaseModel(object):
             fields = self.fields_get(cr, user, None, context)
         fields_def = self.__view_look_dom(cr, user, node, view_id, False, fields, context=context)
         node = self._disable_workflow_buttons(cr, user, node)
-        if node.tag in ('kanban', 'tree', 'form'):
-            for a, b in (('create', 'check_create'), ('delete', 'check_unlink'), ('edit', 'check_write')):
-                if not node.get(a) and not getattr(self, b)(cr, user, raise_exception=False):
-                    node.set(a, 'false')
+        if node.tag in ('kanban', 'tree', 'form', 'gantt'):
+            for action, fn in (('create', 'check_create'), ('delete', 'check_unlink'), ('edit', 'check_write')):
+                if not node.get(action) and not getattr(self, fn)(cr, user, raise_exception=False):
+                    node.set(action, 'false')
         arch = etree.tostring(node, encoding="utf-8").replace('\t', '')
         for k in fields.keys():
             if k not in fields_def:

From 41964c4b9d9b53358b3fc01700bd2306f13916c6 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 16 Aug 2012 18:30:12 +0530
Subject: [PATCH 318/999] [IMP] View Button Constrains: Diagrem view add node
 button, kanban record slidebar widget mnethod support

bzr revid: jam@tinyerp.com-20120816130012-ibtv0ipbbnpznqb1
---
 addons/web_diagram/static/src/js/diagram.js        | 2 +-
 addons/web_diagram/static/src/xml/base_diagram.xml | 8 +++++---
 addons/web_kanban/static/src/js/kanban.js          | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index f06e757f7f1..02216052c69 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -44,7 +44,7 @@ instance.web.DiagramView = instance.web.View.extend({
         this.node = this.nodes.attrs.object,
         this.connector = this.connectors.attrs.object;
 
-        this.$element.html(QWeb.render("DiagramView", this));
+        this.$element.html(QWeb.render("DiagramView",  {'widget':self}));
         this.$element.addClass(this.fields_view.arch.attrs['class']);
 
         this.$element.find('div.oe_diagram_pager button[data-pager-action]').click(function() {
diff --git a/addons/web_diagram/static/src/xml/base_diagram.xml b/addons/web_diagram/static/src/xml/base_diagram.xml
index 96e32f59648..f883f949457 100644
--- a/addons/web_diagram/static/src/xml/base_diagram.xml
+++ b/addons/web_diagram/static/src/xml/base_diagram.xml
@@ -2,9 +2,11 @@
 <t t-name="DiagramView">
     <div class="oe_diagram_header" t-att-id="element_id + '_header'">
         <h3 class="oe_diagram_title"/>
-        <div class="oe_diagram_buttons">
-            <button type="button" id="new_node" class="oe_button oe_diagram_button_new">New Node</button>
-        </div>
+            <t t-if="widget._is_action_enabled('create')">
+                <div class="oe_diagram_buttons">
+                        <button type="button" id="new_node" class="oe_button oe_diagram_button_new">New Node</button>
+                </div>
+            </t>
         <div class="oe_diagram_pager">
             <t t-call="ViewPager">
                 <span class="oe_pager_index">0</span> / <span class="oe_pager_count">0</span>
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 27b3184977c..84a0a76ba0d 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -785,6 +785,9 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
     },
     kanban_compute_domain: function(domain) {
         return instance.web.form.compute_domain(domain, this.values);
+    },
+    _is_action_enabled: function(action) {
+        return (_.has(this.fields_view.arch.attrs, action))?JSON.parse(this.fields_view.arch.attrs[action]):true;
     }
 });
 

From b478264bded10e59ef4ff83997fe03757dcd9d75 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 16 Aug 2012 19:11:49 +0530
Subject: [PATCH 319/999] [IMP] hr_expense: made change in condition

bzr revid: cha@tinyerp.com-20120816134149-wjumyv73z72sh6w5
---
 addons/hr_expense/hr_expense.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index fca62261814..44ecef2ebba 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -290,15 +290,14 @@ class hr_expense_line(osv.osv):
 
     def onchange_uom(self, cr, uid, ids, product_id, uom_id, context=None):
         res = {'value':{}}
-        if not uom_id:
+        if not uom_id or not product_id:
             return res
-        if product_id:
-            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            uom = self.pool.get('product.uom').browse(cr, uid, uom_id, context=context)
-            if uom.category_id.id != product.uom_id.category_id.id:
-                res['warning'] = {'title': _('Warning'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure')}
-                uom_id = product.uom_id.id
-        res['value'].update({'uom_id': uom_id})
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        uom = self.pool.get('product.uom').browse(cr, uid, uom_id, context=context)
+        if uom.category_id.id != product.uom_id.category_id.id:
+            res['warning'] = {'title': _('Warning'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure')}
+            uom_id = product.uom_id.id
+            res['value'].update({'uom_id': uom_id})
         return res
 
 hr_expense_line()

From 282f2535bc59742ff7ab5bac9a321c4bdf1eb5c7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 16 Aug 2012 17:48:23 +0200
Subject: [PATCH 320/999] [IMP] mail cleaning

bzr revid: fp@tinyerp.com-20120816154823-84cnif2cw99vn0qu
---
 addons/crm/crm_lead.py                        |   1 -
 .../process/communication_with_customer.yml   |   6 -
 addons/crm/wizard/crm_lead_to_partner.py      |   4 -
 addons/crm_claim/crm_claim.py                 |   1 -
 addons/crm_helpdesk/crm_helpdesk.py           |   1 -
 addons/hr_recruitment/hr_recruitment.py       |   1 -
 addons/mail/mail_mail.py                      |   3 +-
 addons/mail/mail_message.py                   | 159 +------------
 addons/mail/mail_thread.py                    | 221 +++++++++++++++---
 addons/mail/res_users.py                      |   4 +-
 addons/project_issue/project_issue.py         |   1 -
 addons/project_mailgate/project_mailgate.py   |   1 -
 12 files changed, 196 insertions(+), 207 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 9fd81712b92..daecdf86ef4 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -827,7 +827,6 @@ class crm_lead(base_stage, osv.osv):
         })
         if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
             custom_values['priority'] = msg.get('priority')
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from', False), context=context))
         return super(crm_lead, self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
index 1653be10763..c958889bdc1 100644
--- a/addons/crm/test/process/communication_with_customer.yml
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -34,12 +34,6 @@
   !python {model: crm.lead}: |
     lead_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     self.convert_partner(cr, uid, lead_ids, context=context)
--
-  Now, I search customer in regular customer list.
--
-  !python {model: crm.lead}: |
-    partner_ids = self.message_partner_by_email(cr, uid, 'Mr. John Right <info@customer.com>')
-    assert partner_ids.get('partner_id'), "Customer is not found in regular customer list."
 -
   I convert one phonecall request as a customer and put into regular customer list. 
 -
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 98f114b4088..430ec3c1543 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -56,10 +56,6 @@ class crm_lead2partner(osv.osv_memory):
         if not len(lead_ids):
             return False
         this = lead.browse(cr, uid, lead_ids[0], context=context)
-        # Find partner address matches the email_from of the lead
-        res = lead.message_partner_by_email(cr, uid, this.email_from, context=context)
-        partner_id = res.get('partner_id', False)      
-        # Find partner name that matches the name of the lead
         if not partner_id and this.partner_name:
             partner_ids = partner.search(cr, uid, [('name', '=', this.partner_name)], context=context)
             if partner_ids and len(partner_ids):
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index ec6252bcdca..73d5af68b52 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -200,7 +200,6 @@ class crm_claim(base_stage, osv.osv):
         })
         if msg.get('priority'):
             custom_values['priority'] = msg.get('priority')
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from'), context=context))
         return super(crm_claim,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 4b0cb2e3ffa..bb3b0891479 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -110,7 +110,6 @@ class crm_helpdesk(base_state, osv.osv):
             'email_cc': msg.get('cc'),
             'user_id': False,
         })
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from'), context=context))
         return super(crm_helpdesk,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 3d0b704b36d..721b5a8dc6d 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -339,7 +339,6 @@ class hr_applicant(base_stage, osv.Model):
         })
         if msg.get('priority'):
             custom_values['priority'] = msg.get('priority')
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from', False), context=context))
         return super(hr_applicant,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 9aae5f9a8b7..0380e9084a3 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -37,11 +37,12 @@ class mail_mail(osv.Model):
         'email_to': fields.text('To', help='Message recipients'),
         'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
         'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
+
         'content_subtype': fields.char('Message content subtype', size=32,
             oldname="subtype", readonly=1,
             help="Type of message, usually 'html' or 'plain', used to select "\
                   "plain-text or rich-text contents accordingly"),
-        'body_html': fields.html('Rich-text Contents', help="Rich-text/HTML version of the message"),
+        'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML version of the message"),
     }
 
     _defaults = {
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 43628f217f1..2fe65600389 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -105,15 +105,17 @@ class mail_message(osv.Model):
             select=True, ondelete='set null',
             help="Initial thread message."),
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
+
         'model': fields.char('Related Document Model', size=128, select=1),
         'res_id': fields.integer('Related Document ID', select=1),
         'record_name': fields.function(get_record_name, type='string',
             string='Message Record Name',
             help="Name get of the related document."),
+
         'subject': fields.char('Subject', size=128),
         'date': fields.datetime('Date'),
         'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
-        'body': fields.text('Content', required=True),
+        'body': fields.html('Content', required=True),
     }
     _defaults = {
         'type': 'email',
@@ -204,159 +206,4 @@ class mail_message(osv.Model):
         self.check(cr, uid, ids, 'unlink', context=context)
         return super(mail_message, self).unlink(cr, uid, ids, context)
 
-    # FP Note: to review
-    def parse_message(self, message, save_original=False, context=None):
-        """Parses a string or email.message.Message representing an
-           RFC-2822 email, and returns a generic dict holding the
-           message details.
 
-           :param message: the message to parse
-           :type message: email.message.Message | string | unicode
-           :param bool save_original: whether the returned dict
-               should include an ``original`` entry with the base64
-               encoded source of the message.
-           :rtype: dict
-           :return: A dict with the following structure, where each
-                    field may not be present if missing in original
-                    message::
-
-                    { 'message-id': msg_id,
-                      'subject': subject,
-                      'from': from,
-                      'to': to,
-                      'cc': cc,
-                      'headers' : { 'X-Mailer': mailer,
-                                    #.. all X- headers...
-                                  },
-                      'content_subtype': msg_mime_subtype,
-                      'body_text': plaintext_body
-                      'body_html': html_body,
-                      'attachments': [('file1', 'bytes'),
-                                       ('file2', 'bytes') }
-                       # ...
-                       'original': source_of_email,
-                    }
-        """
-        msg_txt = message
-        if isinstance(message, str):
-            msg_txt = email.message_from_string(message)
-
-        # Warning: message_from_string doesn't always work correctly on unicode,
-        # we must use utf-8 strings here :-(
-        if isinstance(message, unicode):
-            message = message.encode('utf-8')
-            msg_txt = email.message_from_string(message)
-
-        message_id = msg_txt.get('message-id', False)
-        msg = {}
-
-        if save_original:
-            # save original, we need to be able to read the original email sometimes
-            msg['original'] = message.as_string() if isinstance(message, Message) \
-                                                  else message
-            msg['original'] = base64.b64encode(msg['original']) # binary fields are b64
-
-        if not message_id:
-            # Very unusual situation, be we should be fault-tolerant here
-            message_id = time.time()
-            msg_txt['message-id'] = message_id
-            _logger.info('Parsing Message without message-id, generating a random one: %s', message_id)
-
-        msg_fields = msg_txt.keys()
-        msg['id'] = message_id
-        msg['message-id'] = message_id
-
-        if 'Subject' in msg_fields:
-            msg['subject'] = decode(msg_txt.get('Subject'))
-
-        if 'Content-Type' in msg_fields:
-            msg['content-type'] = msg_txt.get('Content-Type')
-
-        if 'From' in msg_fields:
-            msg['from'] = decode(msg_txt.get('From') or msg_txt.get_unixfrom())
-
-        if 'To' in msg_fields:
-            msg['to'] = decode(msg_txt.get('To'))
-
-        if 'Delivered-To' in msg_fields:
-            msg['to'] = decode(msg_txt.get('Delivered-To'))
-
-        if 'CC' in msg_fields:
-            msg['cc'] = decode(msg_txt.get('CC'))
-
-        if 'Cc' in msg_fields:
-            msg['cc'] = decode(msg_txt.get('Cc'))
-
-        if 'Reply-To' in msg_fields:
-            msg['reply'] = decode(msg_txt.get('Reply-To'))
-
-        if 'Date' in msg_fields:
-            date_hdr = decode(msg_txt.get('Date'))
-            # convert from email timezone to server timezone
-            date_server_datetime = dateutil.parser.parse(date_hdr).astimezone(pytz.timezone(tools.get_server_timezone()))
-            date_server_datetime_str = date_server_datetime.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
-            msg['date'] = date_server_datetime_str
-
-        if 'Content-Transfer-Encoding' in msg_fields:
-            msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
-
-        if 'References' in msg_fields:
-            msg['references'] = msg_txt.get('References')
-
-        if 'In-Reply-To' in msg_fields:
-            msg['in-reply-to'] = msg_txt.get('In-Reply-To')
-
-        msg['headers'] = {}
-        msg['content_subtype'] = 'plain'
-        for item in msg_txt.items():
-            if item[0].startswith('X-'):
-                msg['headers'].update({item[0]: item[1]})
-        if not msg_txt.is_multipart() or 'text/plain' in msg.get('content-type', ''):
-            encoding = msg_txt.get_content_charset()
-            body = msg_txt.get_payload(decode=True)
-            if 'text/html' in msg.get('content-type', ''):
-                msg['body_html'] =  body
-                msg['content_subtype'] = 'html'
-                if body:
-                    body = tools.html2plaintext(body)
-            msg['body_text'] = tools.ustr(body, encoding)
-
-        attachments = []
-        if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''):
-            body = ""
-            if 'multipart/alternative' in msg.get('content-type', ''):
-                msg['content_subtype'] = 'alternative'
-            else:
-                msg['content_subtype'] = 'mixed'
-            for part in msg_txt.walk():
-                if part.get_content_maintype() == 'multipart':
-                    continue
-
-                encoding = part.get_content_charset()
-                filename = part.get_filename()
-                if part.get_content_maintype()=='text':
-                    content = part.get_payload(decode=True)
-                    if filename:
-                        attachments.append((filename, content))
-                    content = tools.ustr(content, encoding)
-                    if part.get_content_subtype() == 'html':
-                        msg['body_html'] = content
-                        msg['content_subtype'] = 'html' # html version prevails
-                        body = tools.ustr(tools.html2plaintext(content))
-                        body = body.replace('&#13;', '')
-                    elif part.get_content_subtype() == 'plain':
-                        body = content
-                elif part.get_content_maintype() in ('application', 'image'):
-                    if filename :
-                        attachments.append((filename,part.get_payload(decode=True)))
-                    else:
-                        res = part.get_payload(decode=True)
-                        body += tools.ustr(res, encoding)
-
-            msg['body_text'] = body
-        msg['attachments'] = attachments
-
-        # for backwards compatibility:
-        msg['body'] = msg['body_text']
-        msg['sub_type'] = msg['content_subtype'] or 'plain'
-        return msg
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 74a69ac88e5..394ef32ca1e 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -29,7 +29,7 @@ from email.utils import parsedate
 from email.message import Message
 
 from osv import osv, fields
-from mail_message import decode, to_email
+from mail_message import decode, mail_tools_to_email
 import tools
 from tools.translate import _
 from tools.safe_eval import safe_eval as eval
@@ -497,8 +497,16 @@ class mail_thread(osv.Model):
         msgs = msg_obj.read(cr, uid, msg_ids, context=context)
         return msgs
 
+    def _message_find_partners(self, cr, uid, message, headers=['From'], context=None):
+        s = ', '.join([decode(message.get(h)) for h in headers)
+        mails = mail_tools_to_email(s)
+        result = []
+        for m in mails:
+            result += self.pool.get('res.partner').search(cr, uid, [('email','ilike',m)], context=context)
+        return result
+
     def _message_find_user_id(self, cr, uid, message, context=None):
-        from_local_part = to_email(decode(message.get('From')))[0]
+        from_local_part = mail_tools_to_email(decode(message.get('From')))[0]
         user_ids = self.pool.get('res.users').search(cr, uid, [('login', '=', from_local_part)], context=context)
         return user_ids[0] if user_ids else uid
 
@@ -595,7 +603,6 @@ class mail_thread(osv.Model):
                       message_id, model, thread_id, custom_values, uid)
         return [(model, thread_id, custom_values, uid)]
 
-
     def message_process(self, cr, uid, model, message, custom_values=None,
                         save_original=False, strip_attachments=False,
                         thread_id=None, context=None):
@@ -753,8 +760,8 @@ class mail_thread(osv.Model):
                 followers = model_pool.message_thread_followers(cr, uid, [res.id])[res.id]
             else:
                 followers = self.message_thread_followers(cr, uid, [res.id])[res.id]
-            message_followers_emails = to_email(','.join(filter(None, followers)))
-            message_recipients = to_email(','.join(filter(None,
+            message_followers_emails = mail_tools_to_email(','.join(filter(None, followers)))
+            message_recipients = mail_tools_to_email(','.join(filter(None,
                                                                        [decode(msg['from']),
                                                                         decode(msg['to']),
                                                                         decode(msg['cc'])])))
@@ -765,7 +772,7 @@ class mail_thread(osv.Model):
                     del msg['reply-to']
                     msg['reply-to'] = res.section_id.reply_to
 
-                smtp_from, = to_email(msg['from'])
+                smtp_from, = mail_tools_to_email(msg['from'])
                 msg['from'] = smtp_from
                 msg['to'] =  ", ".join(forward_to)
                 msg['message-id'] = tools.generate_tracking_message_id(res.id)
@@ -777,37 +784,187 @@ class mail_thread(osv.Model):
                     smtp_server_obj.send_email(cr, uid, msg)
         return True
 
-    def message_partner_by_email(self, cr, uid, email, context=None):
-        """Attempts to return the id of a partner address matching
-           the given ``email``, and the corresponding partner id.
-           Can be used by classes using the ``mail.thread`` mixin
-           to lookup the partner and use it in their implementation
-           of ``message_new`` to link the new record with a
-           corresponding partner.
-           The keys used in the returned dict are meant to map
-           to usual names for relationships towards a partner
-           and one of its addresses.
+    def parse_message(self, message, save_original=False, context=None):
+        """Parses a string or email.message.Message representing an
+           RFC-2822 email, and returns a generic dict holding the
+           message details.
 
-           :param email: email address for which a partner
-                         should be searched for.
+           :param message: the message to parse
+           :type message: email.message.Message | string | unicode
+           :param bool save_original: whether the returned dict
+               should include an ``original`` entry with the base64
+               encoded source of the message.
            :rtype: dict
-           :return: a map of the following form::
+           :return: A dict with the following structure, where each
+                    field may not be present if missing in original
+                    message::
 
-                      { 'partner_address_id': id or False,
-                        'partner_id': pid or False }
+                    { 'message-id': msg_id,
+                      'subject': subject,
+                      'from': from,          --> author_id
+                      'to': to,              --> partner_ids
+                      'cc': cc,              --> partner_ids
+                      'headers' : { 'X-Mailer': mailer,  --> to remove
+                                    #.. all X- headers...
+                                  },
+                      'content_subtype': msg_mime_subtype,  --> to remove
+                      'body_text': plaintext_body           --> keep body
+                      'body_html': html_body,               --> to remove
+                      'attachments': [('file1', 'bytes'),
+                                       ('file2', 'bytes') }
+                       # ...
+                       'original': source_of_email,         --> attachment document
+                    }
         """
-        partner_pool = self.pool.get('res.partner')
-        res = {'partner_id': False}
-        if email:
-            email = to_email(email)[0]
-            contact_ids = partner_pool.search(cr, uid, [('email', '=', email)])
-            if contact_ids:
-                contact = partner_pool.browse(cr, uid, contact_ids[0])
-                res['partner_id'] = contact.id
-        return res
+        msg_txt = message
+        attachments = []
+        if isinstance(message, str):
+            msg_txt = email.message_from_string(message)
 
-    # for backwards-compatibility with old scripts
-    process_email = message_process
+        # Warning: message_from_string doesn't always work correctly on unicode,
+        # we must use utf-8 strings here :-(
+        if isinstance(message, unicode):
+            message = message.encode('utf-8')
+            msg_txt = email.message_from_string(message)
+
+        message_id = msg_txt.get('message-id', False)
+        msg = {}
+
+        if save_original:
+            msg_original = message.as_string() if isinstance(message, Message) \
+                                                  else message
+            attachments.append((0, 0, {
+                'name':'email.msg',
+                'datas': base64.b64encode(msg_original),
+                'datas_fname': 'email.msg',
+                'res_model': 'mail.message',
+                'description': _('original email'),
+            })
+
+        if not message_id:
+            # Very unusual situation, be we should be fault-tolerant here
+            message_id = time.time()
+            msg_txt['message-id'] = message_id
+            _logger.info('Parsing Message without message-id, generating a random one: %s', message_id)
+
+        msg_fields = msg_txt.keys()
+
+        msg['message_id'] = message_id
+
+        if 'Subject' in msg_fields:
+            msg['subject'] = decode(msg_txt.get('Subject'))
+
+        #if 'Content-Type' in msg_fields:
+        #    msg['content-type'] = msg_txt.get('Content-Type')
+
+        # find author_id
+
+        if 'From' in msg_fields:
+            author_ids = self._message_find_partners(cr, uid, msg_text, ['From'], context=context)
+            #decode(msg_txt.get('From') or msg_txt.get_unixfrom()) )
+            if author_ids:
+                msg['author_id'] = author_ids[0]
+
+        partner_ids = self._message_find_partners(cr, uid, msg_text, ['From','To','Delivered-To','CC','Cc'], context=context)
+        msg['partner_ids'] = partner_ids
+
+        #if 'To' in msg_fields:
+        #    msg['to'] = decode(msg_txt.get('To'))
+
+        #if 'Delivered-To' in msg_fields:
+        #    msg['to'] = decode(msg_txt.get('Delivered-To'))
+
+        #if 'CC' in msg_fields:
+        #    msg['cc'] = decode(msg_txt.get('CC'))
+
+        #if 'Cc' in msg_fields:
+        #    msg['cc'] = decode(msg_txt.get('Cc'))
+
+        #if 'Reply-To' in msg_fields:
+        #    msg['reply'] = decode(msg_txt.get('Reply-To'))
+
+        # FP Note: I propose to store the current datetime rather than the email date
+        #if 'Date' in msg_fields:
+        #    date_hdr = decode(msg_txt.get('Date'))
+        #    # convert from email timezone to server timezone
+        #    date_server_datetime = dateutil.parser.parse(date_hdr).astimezone(pytz.timezone(tools.get_server_timezone()))
+        #    date_server_datetime_str = date_server_datetime.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        #    msg['date'] = date_server_datetime_str
+
+        #if 'Content-Transfer-Encoding' in msg_fields:
+        #    msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
+
+        #if 'References' in msg_fields:
+        #    msg['references'] = msg_txt.get('References')
+
+        # FP Note: todo - find parent_id
+        if 'In-Reply-To' in msg_fields:
+            pass
+
+        #msg['headers'] = {}
+        #msg['content_subtype'] = 'plain'
+        #for item in msg_txt.items():
+        #    if item[0].startswith('X-'):
+        #        msg['headers'].update({item[0]: item[1]})
+        if not msg_txt.is_multipart() or 'text/plain' in msg.get('content-type', ''):
+            encoding = msg_txt.get_content_charset()
+            body = msg_txt.get_payload(decode=True)
+            if 'text/html' in msg.get('content-type', ''):
+                msg['body'] =  body
+        #        msg['content_subtype'] = 'html'
+        #        if body:
+        #            body = tools.html2plaintext(body)
+        #    msg['body_text'] = tools.ustr(body, encoding)
+
+        if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''):
+            body = ""
+            if 'multipart/alternative' in msg.get('content-type', ''):
+                msg['content_subtype'] = 'alternative'
+            else:
+                msg['content_subtype'] = 'mixed'
+            for part in msg_txt.walk():
+                if part.get_content_maintype() == 'multipart':
+                    continue
+
+                encoding = part.get_content_charset()
+                filename = part.get_filename()
+                if part.get_content_maintype()=='text':
+                    content = part.get_payload(decode=True)
+                    if filename:
+                        attachments.append((0, 0, {
+                            'name': filename,
+                            'datas': base64.b64encode(msg_original),
+                            'datas_fname': filename,
+                            'res_model': 'mail.message',
+                            'description': _('email attachment'),
+                        }))
+                    content = tools.ustr(content, encoding)
+                    if part.get_content_subtype() == 'html':
+                        msg['body'] = content
+                        # msg['content_subtype'] = 'html' # html version prevails
+                        # body = tools.ustr(tools.html2plaintext(content))
+                        # body = body.replace('&#13;', '')
+                    elif part.get_content_subtype() == 'plain':
+                        msg['body'] = content
+                elif part.get_content_maintype() in ('application', 'image'):
+                    if filename:
+                        attachments.append((0, 0, {
+                            'name': filename,
+                            'datas': part.get_payload(decode=True),
+                            'datas_fname': filename,
+                            'res_model': 'mail.message',
+                            'description': _('email attachment'),
+                        }))
+                    else:
+                        res = part.get_payload(decode=True)
+                        msg['body'] += tools.ustr(res, encoding)
+
+        msg['attachments'] = attachments
+
+        # for backwards compatibility:
+        # msg['body'] = msg['body_text']
+        # msg['sub_type'] = msg['content_subtype'] or 'plain'
+        return msg
 
     #------------------------------------------------------
     # Note specific
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 1a39ed64bd9..5a8c1b0412e 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -183,7 +183,7 @@ class res_users_mail_group(osv.Model):
             user_group_ids += [id for command in vals['groups_id'] if command[0] == 6 for id in command[2]]
             mail_group_obj = self.pool.get('mail.group')
             mail_group_ids = mail_group_obj.search(cr, uid, [('group_ids', 'in', user_group_ids)], context=context)
-            mail_group_obj.message_subscribe(cr, uid, mail_group_ids, ids, context=context)
+            mail_group_obj.message_subscribe_users(cr, uid, mail_group_ids, ids, context=context)
         return write_res
 
 class res_groups_mail_group(osv.Model):
@@ -203,6 +203,6 @@ class res_groups_mail_group(osv.Model):
             user_ids += [id for command in vals['users'] if command[0] == 6 for id in command[2]]
             mail_group_obj = self.pool.get('mail.group')
             mail_group_ids = mail_group_obj.search(cr, uid, [('group_ids', 'in', ids)], context=context)
-            mail_group_obj.message_subscribe(cr, uid, mail_group_ids, user_ids, context=context)
+            mail_group_obj.message_subscribe_users(cr, uid, mail_group_ids, user_ids, context=context)
         return super(res_groups_mail_group, self).write(cr, uid, ids, vals, context=context)
 
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index a8a1e617ecb..db9d02bfd1e 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -461,7 +461,6 @@ class project_issue(base_stage, osv.osv):
         })
         if  msg.get('priority'):
             custom_values['priority'] =  msg.get('priority')
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from'), context=context))
 
         res_id = super(project_issue, self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
         # self.convert_to_bug(cr, uid, [res_id], context=context)
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
index ba3cd702760..cf2bc120fbf 100644
--- a/addons/project_mailgate/project_mailgate.py
+++ b/addons/project_mailgate/project_mailgate.py
@@ -38,7 +38,6 @@ class project_tasks(osv.osv):
             'planned_hours': 0.0,
             'subject': msg.get('subject'),
         })
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from', False), context=context))
         return super(project_tasks,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):

From b9bdf2c29a048116304f18a95eb2e8c912f3100a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 16 Aug 2012 18:42:39 +0200
Subject: [PATCH 321/999] [IMP] tools.email_split

bzr revid: fp@tinyerp.com-20120816164239-yl1vzp83w6z5xi5i
---
 openerp/tools/misc.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index e90fadf0492..7f2dade30d8 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -1113,6 +1113,12 @@ class unquote(str):
     def __repr__(self):
         return self
 
+def emails_split(text):
+    """Return a list of the email addresses found in ``text``"""
+    if not text: return []
+    return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
+
+
 class UnquoteEvalContext(defaultdict):
     """Defaultdict-based evaluation context that returns 
        an ``unquote`` string for any missing name used during

From 960e4ba5412ae0646667803b4b97de9a2e10039a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 16 Aug 2012 18:43:11 +0200
Subject: [PATCH 322/999] [IMP] email cleaning

bzr revid: fp@tinyerp.com-20120816164311-o7r05mewrvjoldsg
---
 addons/base_action_rule/base_action_rule.py |  7 ++----
 addons/crm/crm_lead.py                      |  3 +--
 addons/mail/mail_followers.py               |  5 ++--
 addons/mail/mail_mail.py                    |  4 +--
 addons/mail/mail_message.py                 |  7 +-----
 addons/mail/mail_thread.py                  | 27 +++++++++++----------
 addons/mail/res_partner.py                  |  2 +-
 addons/mail/wizard/mail_compose_message.py  | 16 +++++++-----
 8 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index b6eacda63c0..8c115baed23 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -438,11 +438,8 @@ the rule to mark CC(mail to any other person defined in actions)."),
         if len(emails) and action.act_mail_body:
             emails = list(set(emails))
             email_from = safe_eval(action.act_email_from, {}, locals_for_emails)
-
-            def to_email(text):
-                return re.findall(r'([^ ,<@]+@[^> ,]+)', text or '')
-            emails = to_email(','.join(filter(None, emails)))
-            email_froms = to_email(email_from)
+            emails = tools.email_split(','.join(filter(None, emails)))
+            email_froms = tools.email_split(email_from)
             if email_froms:
                 self.email_send(cr, uid, obj, emails, action.act_mail_body, emailfrom=email_froms[0])
         return True
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index daecdf86ef4..3569480ba9c 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -23,7 +23,6 @@ import binascii
 from base_status.base_stage import base_stage
 import crm
 from datetime import datetime
-from mail.mail_message import to_email
 from osv import fields, osv
 import time
 import tools
@@ -629,7 +628,7 @@ class crm_lead(base_stage, osv.osv):
             'parent_id': parent_id,
             'phone': lead.phone,
             'mobile': lead.mobile,
-            'email': lead.email_from and to_email(lead.email_from)[0],
+            'email': lead.email_from and tools.email_split(lead.email_from)[0],
             'fax': lead.fax,
             'title': lead.title and lead.title.id or False,
             'function': lead.function,
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 0073ee81e41..dcace5c0344 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -70,7 +70,8 @@ class mail_notification(osv.Model):
 
     # Create notification in the wall of each user
     # Send by email the notification depending on the user preferences
-    def notify(self, cr, uid, partner_ids, msg_id, context=context):
+    def notify(self, cr, uid, partner_ids, msg_id, context=None):
+        context = context or {}
         partner_obj = self.pool.get('res.partner')
         msg_obj = self.pool.get('mail.message')
         msg = msg_obj.browse(cr, uid, msg_id, context=context)
@@ -101,7 +102,7 @@ class mail_notification(osv.Model):
                 if email_to not in towrite['email_to']:
                     towrite['email_to'] = towrite['email_to'] + ', ' + email_to
 
-        if towrite.get('state', False):
+        if towrite.get('state', False) and not context.get('noemail', False):
             if towrite.get('subject', False):
                 towrite['subject'] = msg.name_get(cr, uid, [msg.id], context=context)[0][1]
             towrite['message_id'] = msg.id
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 0380e9084a3..13e0638c299 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -233,11 +233,11 @@ class mail_mail(osv.Model):
                 # without queuing
                 msg = ir_mail_server.build_email(
                     email_from=message.email_from,
-                    email_to=mail_tools_to_email(message_email_to),
+                    email_to=tools.email_split(message_email_to),
                     subject=message.subject,
                     body=body,
                     body_alternative=body_alternative,
-                    email_cc=mail_tools_to_email(message.email_cc),
+                    email_cc=tools.email_split(message.email_cc),
                     reply_to=message.reply_to,
                     attachments=attachments, message_id=message.message_id,
                     references = message.references,
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 2fe65600389..846ba739843 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -46,11 +46,6 @@ def decode(text):
         text = decode_header(text.replace('\r', ''))
         return ''.join([tools.ustr(x[0], x[1]) for x in text])
 
-def mail_tools_to_email(text):
-    """Return a list of the email addresses found in ``text``"""
-    if not text: return []
-    return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
-
 class mail_message(osv.Model):
     """Model holding messages: system notification (replacing res.log
     notifications), comments (for OpenChatter feature). This model also
@@ -99,7 +94,7 @@ class mail_message(osv.Model):
             'Recipients'),
 
         'attachment_ids': fields.one2many('ir.attachment', 'res_id',
-            'Attachments' domain=[('res_model','=','mail.message')]),
+            'Attachments', domain=[('res_model','=','mail.message')]),
 
         'parent_id': fields.many2one('mail.message', 'Parent Message',
             select=True, ondelete='set null',
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 394ef32ca1e..ab6ad324125 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -29,7 +29,7 @@ from email.utils import parsedate
 from email.message import Message
 
 from osv import osv, fields
-from mail_message import decode, mail_tools_to_email
+from mail_message import decode
 import tools
 from tools.translate import _
 from tools.safe_eval import safe_eval as eval
@@ -111,12 +111,13 @@ class mail_thread(osv.Model):
             type='boolean', string='Is a Follower'),
         'message_follower_ids': fields.one2many('mail.subscription', 'res_id',
             domain=lambda self: [('res_model','=',self._name)],
-            string='Followers')
+            string='Followers'),
         'message_ids': fields.one2many('mail.message', 'res_id',
             domain=lambda self: [('model','=',self._name)],
             string='Related Messages', 
             help="All messages related to the current document."),
-        'message_unread': fields.function(_get_message_data, fnct_search=_search_unread, 'Has Unread Messages',
+        'message_unread': fields.function(_get_message_data, fnct_search=_search_unread, 
+            string='Has Unread Messages',
             help="When checked, new messages require your attention.",
             multi="_get_message_data"),
         'message_summary': fields.function(_get_message_data, method=True,
@@ -498,15 +499,15 @@ class mail_thread(osv.Model):
         return msgs
 
     def _message_find_partners(self, cr, uid, message, headers=['From'], context=None):
-        s = ', '.join([decode(message.get(h)) for h in headers)
-        mails = mail_tools_to_email(s)
+        s = ', '.join([decode(message.get(h)) for h in headers])
+        mails = tools.email_split(s)
         result = []
         for m in mails:
             result += self.pool.get('res.partner').search(cr, uid, [('email','ilike',m)], context=context)
         return result
 
     def _message_find_user_id(self, cr, uid, message, context=None):
-        from_local_part = mail_tools_to_email(decode(message.get('From')))[0]
+        from_local_part = tools.email_split(decode(message.get('From')))[0]
         user_ids = self.pool.get('res.users').search(cr, uid, [('login', '=', from_local_part)], context=context)
         return user_ids[0] if user_ids else uid
 
@@ -571,7 +572,7 @@ class mail_thread(osv.Model):
                        decode_header(message, 'Cc'),
                        decode_header(message, 'Resent-To'),
                        decode_header(message, 'Resent-Cc')])
-        local_parts = [e.split('@')[0] for e in to_email(rcpt_tos)]
+        local_parts = [e.split('@')[0] for e in tools.email_split(rcpt_tos)]
         if local_parts:
             mail_alias = self.pool.get('mail.alias')
             alias_ids = mail_alias.search(cr, uid, [('alias_name', 'in', local_parts)])
@@ -760,8 +761,8 @@ class mail_thread(osv.Model):
                 followers = model_pool.message_thread_followers(cr, uid, [res.id])[res.id]
             else:
                 followers = self.message_thread_followers(cr, uid, [res.id])[res.id]
-            message_followers_emails = mail_tools_to_email(','.join(filter(None, followers)))
-            message_recipients = mail_tools_to_email(','.join(filter(None,
+            message_followers_emails = tools.email_split(','.join(filter(None, followers)))
+            message_recipients = tools.email_split(','.join(filter(None,
                                                                        [decode(msg['from']),
                                                                         decode(msg['to']),
                                                                         decode(msg['cc'])])))
@@ -772,7 +773,7 @@ class mail_thread(osv.Model):
                     del msg['reply-to']
                     msg['reply-to'] = res.section_id.reply_to
 
-                smtp_from, = mail_tools_to_email(msg['from'])
+                smtp_from, = tools.email_split(msg['from'])
                 msg['from'] = smtp_from
                 msg['to'] =  ", ".join(forward_to)
                 msg['message-id'] = tools.generate_tracking_message_id(res.id)
@@ -839,7 +840,7 @@ class mail_thread(osv.Model):
                 'datas_fname': 'email.msg',
                 'res_model': 'mail.message',
                 'description': _('original email'),
-            })
+            }))
 
         if not message_id:
             # Very unusual situation, be we should be fault-tolerant here
@@ -1037,7 +1038,7 @@ class mail_thread(osv.Model):
             ('partner_id', 'in', partner_ids),
             ], context=context)
         followers = {}
-        for follow in obj.browse(cr, uid, objids, context=context)
+        for follow in obj.browse(cr, uid, objids, context=context):
             followers.setdefault(follow.partner_id.id, {})[follow.res_id] = True
         create_ids = []
         for res_id in ids:
@@ -1093,6 +1094,6 @@ class mail_thread(osv.Model):
             where
                 message_id in (select id from mail_message where res_id in %s and model=%s)
                 user_id = %s
-        ''', (ids, self._name, uid)
+        ''', (ids, self._name, uid))
         return True
 
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index c6ec7712fe1..7ca33e94f01 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import osv
+from osv import osv, fields
 
 class res_partner_mail(osv.Model):
     """ Inherits partner and adds CRM information in the partner form """
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index fafc866b895..86cf34df04c 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -28,7 +28,11 @@ from osv import fields
 from tools.safe_eval import safe_eval as eval
 from tools.translate import _
 
-from ..mail_message import to_email
+# FP Note: refactor in tools ?
+def mail_tools_to_email(text):
+    """Return a list of the email addresses found in ``text``"""
+    if not text: return []
+    return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
 
 # main mako-like expression pattern
 EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
@@ -56,7 +60,7 @@ class mail_compose_message(osv.TransientModel):
                       related, in case ``mail.compose.message.mode == 'mass_mail'``.
     """
     _name = 'mail.compose.message'
-    _inherit = 'mail.message.common'
+    _inherit = 'mail.message'
     _description = 'Email composition wizard'
 
     def default_get(self, cr, uid, fields, context=None):
@@ -304,8 +308,8 @@ class mail_compose_message(osv.TransientModel):
                             email_from=email_from, email_to=email_to, email_cc=email_cc, 
                             reply_to=reply_to, references=references, attachments=attachment, headers=headers, context=context)
                     else:
-                        mail_message_obj.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body_text,
-                            model=mail_wiz.model, email_cc=to_email(email_cc), reply_to=reply_to,
+                        mail_message_obj.schedule_with_attach(cr, uid, email_from, mail_tools_to_email(email_to), subject, rendered_body_text,
+                            model=mail_wiz.model, email_cc=mail_tools_to_email(email_cc), reply_to=reply_to,
                             attachments=attachment, references=references, res_id=active_id, partner_ids=partner_ids,
                             content_subtype=mail_wiz.content_subtype, headers=headers, context=context)
             else:
@@ -316,8 +320,8 @@ class mail_compose_message(osv.TransientModel):
                         email_from=mail_wiz.email_from, email_to=mail_wiz.email_to, email_cc=mail_wiz.email_cc, 
                         reply_to=mail_wiz.reply_to, references=references, attachments=attachment, headers=headers, context=context)
                 else:
-                    msg_ids = [mail_message_obj.schedule_with_attach(cr, uid, mail_wiz.email_from, to_email(mail_wiz.email_to), subject, mail_wiz.body_text,
-                        type=type, model=mail_wiz.model, email_cc=to_email(mail_wiz.email_cc), reply_to=mail_wiz.reply_to,
+                    msg_ids = [mail_message_obj.schedule_with_attach(cr, uid, mail_wiz.email_from, mail_tools_to_email(mail_wiz.email_to), subject, mail_wiz.body_text,
+                        type=type, model=mail_wiz.model, email_cc=mail_tools_to_email(mail_wiz.email_cc), reply_to=mail_wiz.reply_to,
                         attachments=attachment, references=references, res_id=int(mail_wiz.res_id), partner_ids=partner_ids,
                         content_subtype=mail_wiz.content_subtype, headers=headers, context=context)]
                 # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)

From 811466be2faef29b9a0f53f4ae5126a8a8134bba Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 17 Aug 2012 11:21:34 +0530
Subject: [PATCH 323/999] [IMP] account : Improved the onchange uos_id method.

bzr revid: mdi@tinyerp.com-20120817055134-4p4gcsgusmyk34wd
---
 addons/account/account_invoice.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 225904f28b7..f0d2f2d8360 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1479,10 +1479,11 @@ class account_invoice_line(osv.osv):
             prod = self.pool.get('product.product').browse(cr, uid, product, context=context)
             prod_uom = self.pool.get('product.uom').browse(cr, uid, uom, context=context)
             if prod.uom_id.category_id.id != prod_uom.category_id.id:
-                 warning = {
+                warning = {
                     'title': _('Warning!'),
                     'message': _('The selected unit of measure is not compatible with the unit of measure of the product.')
-            }
+                }
+                res['value'].update({'uos_id': prod.uom_id.id})
             return {'value': res['value'], 'warning': warning}
         return res
 

From 32201e28604f119a0c59f6aee8fe4b511f637c6f Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 17 Aug 2012 11:26:39 +0530
Subject: [PATCH 324/999] [IMP] account : Improved the code.

bzr revid: mdi@tinyerp.com-20120817055639-sc5c9awb2h8d59zl
---
 addons/account/account_invoice.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index f0d2f2d8360..44531a1a266 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1362,7 +1362,7 @@ class account_invoice_line(osv.osv):
         'partner_id': fields.related('invoice_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True)
     }
 
-    def default_account_id(self, cr, uid, ids, context=None):
+    def _default_account_id(self, cr, uid, ids, context=None):
         prop = self.pool.get('ir.property').get(cr, uid, 'property_account_income_categ', 'product.category', context=context)
         return prop and prop.id or False
 
@@ -1370,7 +1370,7 @@ class account_invoice_line(osv.osv):
         'quantity': 1,
         'discount': 0.0,
         'price_unit': _price_unit_default,
-        'account_id': default_account_id,
+        'account_id': _default_account_id,
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):

From cb944d66ea941a3f80025f56d576677fa9d1c59c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 17 Aug 2012 09:02:18 +0200
Subject: [PATCH 325/999] [IMP] mail message

bzr revid: fp@tinyerp.com-20120817070218-rp1ssuhwnf8raitf
---
 addons/event/event.py                         |  6 +-
 addons/mail/mail_followers_view.xml           |  4 +-
 addons/mail/mail_group.py                     |  4 +-
 addons/mail/mail_message_view.xml             | 62 ++++++-------------
 addons/mail/mail_thread.py                    |  4 +-
 addons/mail/res_partner.py                    |  3 +
 addons/mail/res_users.py                      | 38 ------------
 addons/mail/wizard/mail_compose_message.py    |  1 +
 .../mail/wizard/mail_compose_message_view.xml | 12 ++--
 addons/plugin/plugin_handler.py               |  3 +-
 10 files changed, 36 insertions(+), 101 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 7f0c77661e4..48946959551 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -334,7 +334,7 @@ class event_registration(osv.osv):
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
     def confirm_registration(self, cr, uid, ids, context=None):
-        self.message_append(cr, uid, ids,_('State set to open'),body_text= _('Open'))
+        self.message_append_note(cr, uid, ids, body=_('State set to open'))
         return self.write(cr, uid, ids, {'state': 'open'}, context=context)
 
     def create(self, cr, uid, vals, context=None):
@@ -364,13 +364,13 @@ class event_registration(osv.osv):
             if today >= registration.event_id.date_begin:
                 values = {'state': 'done', 'date_closed': today}
                 self.write(cr, uid, ids, values)
-                self.message_append(cr, uid, ids, _('State set to Done'), body_text=_('Done'))
+                self.message_append_note(cr, uid, ids, body=_('State set to Done'))
             else:
                 raise osv.except_osv(_('Error!'),_("You must wait for the starting day of the event to do this action.") )
         return True
 
     def button_reg_cancel(self, cr, uid, ids, context=None, *args):
-        self.message_append(cr, uid, ids,_('State set to Cancel'),body_text= _('Cancel'))
+        self.message_append_note(cr, uid, ids,body = _('State set to Cancel'))
         return self.write(cr, uid, ids, {'state': 'cancel'})
 
     def mail_user(self, cr, uid, ids, context=None):
diff --git a/addons/mail/mail_followers_view.xml b/addons/mail/mail_followers_view.xml
index 62e93430675..0637d4dc11e 100644
--- a/addons/mail/mail_followers_view.xml
+++ b/addons/mail/mail_followers_view.xml
@@ -12,7 +12,7 @@
                 <tree string="Followers">
                     <field name="res_model"/>
                     <field name="res_id"/>
-                    <field name="user_id"/>
+                    <field name="partner_id"/>
                 </tree>
             </field>
         </record>
@@ -24,7 +24,7 @@
             <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Notifications">
-                    <field name="user_id"/>
+                    <field name="partner_id"/>
                     <field name="message_id"/>
                 </tree>
             </field>
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 2c8b9450439..ba3ed292bf8 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -36,7 +36,7 @@ class mail_group(osv.Model):
     """
     _description = 'Discussion group'
     _name = 'mail.group'
-    _inherit = ['mail.thread','ir.needaction']
+    _inherit = ['mail.thread','ir.needaction_mixin']
     _inherits = {'mail.alias': 'alias_id', 'ir.ui.menu': 'menu_id'}
 
     def _get_image(self, cr, uid, ids, name, args, context=None):
@@ -84,7 +84,7 @@ class mail_group(osv.Model):
             help="Small-sized photo of the group. It is automatically "\
                  "resized as a 50x50px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade",
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
             help="The email address associated with this group. New emails received will automatically "
                  "create new topics."),
     }
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index c50e53c8e75..e7c4f9df494 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -10,7 +10,7 @@
                 <tree string="Messages">
                     <field name="date"/>
                     <field name="subject"/>
-                    <field name="user_id"/>
+                    <field name="author_id"/>
                     <field name="model"/>
                     <field name="res_id"/>
                 </tree>
@@ -28,10 +28,9 @@
                         <group>
                             <group>
                                 <field name="subject"/>
-                                <field name="user_id"/>
+                                <field name="author_id"/>
                                 <field name="date"/>
                                 <field name="type"/>
-                                <field name="content_subtype"/>
                             </group>
                             <group>
                                 <field name="model"/>
@@ -40,14 +39,7 @@
                                 <field name="partner_ids" widget="many2many_tags"/>
                             </group>
                         </group>
-                        <notebook>
-                            <page string="Body (Rich)">
-                                <field name="body_html"/>
-                            </page>
-                            <page string="Body (Plain)">
-                                <field name="body_text" widget="text"/>
-                            </page>
-                        </notebook>
+                        <field name="body"/>
                     </sheet>
                 </form>
             </field>
@@ -60,9 +52,8 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <search string="Messages Search">
-                    <field name="model" string="Message"/>
-                    <field name="date"/>
-                    <field name="user_id"/>
+                    <field name="body" string="Message"/>
+                    <field name="author_id"/>
                 </search>
             </field>
         </record>
@@ -76,9 +67,6 @@
                 <search string="Messages Search">
                     <field name="subject" string="Content" filter_domain="['|', ('subject', 'ilike', self), ('body', 'ilike', self)]" />
                     <field name="type"/>
-                    <filter icon="terp-personal+" string="My Feeds"
-                            name="my_feeds" help="My Feeds"
-                            domain="[('user_id','=',uid)]"/>
                     <filter icon="terp-personal+" string="Comments"
                             name="comments" help="Comments"
                             domain="[('type', '=', 'comment')]"/>
@@ -88,31 +76,21 @@
                     <filter icon="terp-personal+" string="Emails"
                             name="emails" help="Emails"
                             domain="[('type', '=', 'email')]"/>
-                    <filter icon="terp-go-today" string="Today"
-                            name="today" help="Today"
-                            domain="[   ('date', '&lt;=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')),
-                                        ('date', '&gt;=', datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00'))
-                                    ]"/>
-                    <filter icon="terp-go-week" string="This week"
-                            name="7_days" help="This week"
-                            domain="[   ('date', '&lt;=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')),
-                                        ('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))
-                                    ]"/>
-                    <field name="user_id"/>
+                    <field name="author_id"/>
                 </search>
             </field>
         </record>
 
         <record model="ir.ui.view" id="view_email_message_form">
-            <field name="name">mail.message.form</field>
-            <field name="model">mail.message</field>
+            <field name="name">mail.mail.form</field>
+            <field name="model">mail.mail</field>
             <field name="arch" type="xml">
                 <form string="Email message" version="7.0">
                     <sheet>
                         <label for="subject" class="oe_edit_only"/>
                         <h2><field name="subject"/></h2>
 						<div>
-                            by <field name="user_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/>
+                            by <field name="author_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/>
                             <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
                                 context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
                         </div>
@@ -126,17 +104,16 @@
                                         <field name="reply_to"/>
                                     </group>
                                     <group>
-                                        <field name="partner_id" readonly="1"/>
                                         <field name="partner_ids" widget="many2many_tags"/>
                                     </group>
                                 </group>
                                 <notebook>
+                                    <page string="Body">
+                                        <field name="body" widget="text"/>
+                                    </page>
                                     <page string="Body (Rich)">
                                         <field name="body_html"/>
                                     </page>
-                                    <page string="Body (Plain)">
-                                        <field name="body_text" widget="text"/>
-                                    </page>
                                 </notebook>
                             </page>
                             <page string="Advanced" groups="base.group_no_one">
@@ -153,7 +130,6 @@
                                     <group>
                                         <field name="message_id"/>
                                         <field name="references"/>
-                                        <field name="headers"/>
                                     </group>
                                 </group>
                             </page>
@@ -173,13 +149,11 @@
                 <tree string="Emails" colors="grey:state in ('sent', 'cancel');blue:state=='outgoing';red:state=='exception';black:state=='received'">
                     <field name="date"/>
                     <field name="subject"/>
-                    <field name="email_from"/>
-                    <field name="user_id" string="User"/>
+                    <field name="author_id" string="User"/>
                     <field name="message_id" invisible="1"/>
-                    <field name="partner_id" invisible="1"/>
+                    <field name="partner_ids" invisible="1"/>
                     <field name="model" invisible="1"/>
                     <field name="res_id" invisible="1"/>
-                    <field name="state"/>
                     <button name="send" string="Send Now" type="object" icon="gtk-media-play" states='outgoing'/>
                     <button name="mark_outgoing" string="Retry" type="object" icon="gtk-redo" states='exception,cancel'/>
                     <button name="cancel" string="Cancel" type="object" icon="terp-gtk-stop" states='outgoing'/>
@@ -188,8 +162,8 @@
         </record>
 
         <record model="ir.ui.view" id="view_email_message_search">
-            <field name="name">mail.message.search</field>
-            <field name="model">mail.message</field>
+            <field name="name">mail.mail.search</field>
+            <field name="model">mail.mail</field>
             <field name="arch" type="xml">
                 <search string="Email Search">
                     <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
@@ -203,8 +177,8 @@
                     <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/>
                     <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
                     <group expand="0" string="Extended Filters...">
-                        <field name="user_id" string="User"/>
-                        <field name="partner_id" string="Partner Name"/>
+                        <field name="author_id"/>
+                        <field name="partner_ids"/>
                         <field name="model"/>
                         <field name="res_id"/>
                     </group>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index ab6ad324125..ec34bc221cb 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -835,9 +835,9 @@ class mail_thread(osv.Model):
             msg_original = message.as_string() if isinstance(message, Message) \
                                                   else message
             attachments.append((0, 0, {
-                'name':'email.msg',
+                'name':'email.eml',
                 'datas': base64.b64encode(msg_original),
-                'datas_fname': 'email.msg',
+                'datas_fname': 'email.eml',
                 'res_model': 'mail.message',
                 'description': _('original email'),
             }))
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 7ca33e94f01..6f1808c1612 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -45,5 +45,8 @@ class res_partner_mail(osv.Model):
             help="Choose in which case you want to receive an email when you "\
                   "receive new feeds."),
     }
+    _defaults = {
+        'notification_email_pref': lambda *args: 'comment'
+    }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 5a8c1b0412e..7f4d278d0c5 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -45,7 +45,6 @@ class res_users(osv.Model):
     }
     
     _defaults = {
-        'notification_email_pref': 'to_me',
         'alias_domain': False, # always hide alias during creation
     }
 
@@ -128,43 +127,6 @@ class res_users(osv.Model):
         alias_pool.unlink(cr, uid, alias_ids, context=context)
         return res
 
-    # --------------------------------------------------
-    # Wrappers on partner methods for Chatter
-    # #FIXME: another branch holds a refactoring of mail.thread
-    # that should help cleaning those wrappers
-    # --------------------------------------------------
-
-    #def message_append(self, cr, uid, threads, subject, body_text=None, body_html=None,
-    #                    type='email', email_date=None, parent_id=False,
-    #                    content_subtype='plain', state=None,
-    #                    partner_ids=None, email_from=False, email_to=False,
-    #                    email_cc=None, email_bcc=None, reply_to=None,
-    #                    headers=None, message_id=False, references=None,
-    #                    attachments=None, original=None, context=None):
-    #    for user in self.browse(cr, uid, threads, context=context):
-    #        user.partner_id.message_append(subject, body_text, body_html, type, email_date, parent_id,
-    #            content_subtype, state, partner_ids, email_from, email_to, email_cc, email_bcc, reply_to,
-    #            headers, message_id, references, attachments, original)
-
-    #def message_read(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
-    #                    limit=100, offset=0, domain=None, context=None):
-    #    for user in self.browse(cr, uid, ids, context=context):
-    #        return user.partner_id.message_read(fetch_ancestors, ancestor_ids, limit, offset, domain)
-
-    #def message_search(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
-    #                    limit=100, offset=0, domain=None, count=False, context=None):
-    #    for user in self.browse(cr, uid, ids, context=context):
-    #        return user.partner_id.message_search(fetch_ancestors, ancestor_ids, limit, offset, domain, count)
-
-    #def message_subscribe(self, cr, uid, ids, user_ids = None, context=None):
-    #    for user in self.browse(cr, uid, ids, context=context):
-    #        return user.partner_id.message_subscribe(user_ids)
-
-    #def message_unsubscribe(self, cr, uid, ids, user_ids = None, context=None):
-    #    for user in self.browse(cr, uid, ids, context=context):
-    #        return user.partner_id.message_unsubscribe(user_ids)
-
-
 class res_users_mail_group(osv.Model):
     """ Update of res.groups class
         - if adding/removing users from a group, check mail.groups linked to
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 86cf34df04c..a38564ef578 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -116,6 +116,7 @@ class mail_compose_message(osv.TransientModel):
         'attachment_ids': fields.many2many('ir.attachment','email_message_send_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
         'auto_delete': fields.boolean('Auto Delete', help="Permanently delete emails after sending"),
         'filter_id': fields.many2one('ir.filters', 'Filters'),
+        'body_html': fields.html('HTML Editor Body'),
     }
 
     def get_value(self, cr, uid, model, res_id, context=None):
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index c2d7420fe14..e1a1020b6b6 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -9,18 +9,14 @@
                     <group>
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
-                        <field name='filter_id' invisible="context.get('active_model',False)"/>
-                        <field name="email_from" required="1"/>
-                        <field name="email_to" required="1"/>
-                        <field name="email_cc"/>
-                        <field name="reply_to"/>
+                        <field name="author_id"/>
+                        <field name="partner_ids"/>
                         <field name="subject" widget="char" size="512"/>
-                        <field name="references"/>
                         <field name="message_id"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Body">
-                            <field name="body_text" colspan="4" nolabel="1" height="300" width="300"/>
+                            <field name="body" colspan="4" nolabel="1" height="300" width="300"/>
                         </page>
                         <page string="Attachments">
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
@@ -44,7 +40,7 @@
                     <group>
                         <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
                                 class="oe_mail_compose_message_subject oe_mail_compose_message_invisible"/>
-                        <field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
+                        <field name="body" colspan="2" nolabel="1" placeholder="What are you working on ?"
                                 class="oe_mail_compose_message_body_text"/>
                         <field name="body_html" colspan="2" nolabel="1" placeholder="What are you working on HTML ?"
                                 class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible"/>
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index e497f902dc2..aaf54d1ac2b 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -108,8 +108,7 @@ class plugin_handler(osv.osv_memory):
         else:
             if model == 'res.partner':
                 model_obj = self.pool.get('mail.thread')
-            res = self.pool.get(model).browse(cr, uid, [res_id])
-            model_obj.message_append_dict(cr, uid, res, msg)
+            model_obj.message_append_note(cr, uid, [res_id], body=msg)
             notify = "Mail succefully pushed"
             
         url = self._make_url(cr, uid, res_id, model)

From bbe0554197c48c3e6bf33e70faf25df5fbcccedb Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 17 Aug 2012 12:48:20 +0530
Subject: [PATCH 326/999] [IMP]l10n_in_hr_payroll:improved pot and po files.

bzr revid: kbh@tinyerp.com-20120817071820-jlnk37zxiz3m2aed
---
 addons/l10n_in_hr_payroll/i18n/bn.po          | 659 +++++++++++++++---
 addons/l10n_in_hr_payroll/i18n/gu.po          | 657 ++++++++++++++---
 addons/l10n_in_hr_payroll/i18n/hi.po          | 657 ++++++++++++++---
 .../i18n/l10n_in_hr_payroll.pot               | 659 +++++++++++++++---
 addons/l10n_in_hr_payroll/i18n/ta.po          | 657 ++++++++++++++---
 addons/l10n_in_hr_payroll/i18n/te.po          | 657 ++++++++++++++---
 6 files changed, 3356 insertions(+), 590 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/i18n/bn.po b/addons/l10n_in_hr_payroll/i18n/bn.po
index 42a4b326386..ea9fcfd7bb3 100644
--- a/addons/l10n_in_hr_payroll/i18n/bn.po
+++ b/addons/l10n_in_hr_payroll/i18n/bn.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-13 12:04+0000\n"
-"PO-Revision-Date: 2012-06-13 12:04+0000\n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-08-17 06:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: Bengali <bn@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,23 +16,58 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,driver_salay:0
-msgid " Allowance for company provided driver."
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,professional_tax:0
-msgid "Professional tax deducted from salary"
+#: field:payment.advice.report,employee_bank_no:0
+msgid "Employee Bank Account"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Salary Rule Category"
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in draft state"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Group By..."
+#: report:salary.detail.byyear:0
+msgid "Title"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice from"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
+msgid "Hr Salary Employee By Category Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Department"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "A/C no."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -40,17 +75,47 @@ msgstr ""
 msgid "Driver Salary"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
+msgid "Yearly Salary by Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "March"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "("
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,company_id:0
 #: field:hr.payroll.advice.line,company_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,company_id:0
 msgid "Company"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ","
@@ -63,22 +128,63 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: help:hr.employee,number_of_year:0
-msgid "Total years of work experience."
+msgid "Total years of work experience"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,short_term_gain:0
-msgid "Short Term Gain from Share Trading/Equity MFs "
+#: report:payroll.advice:0
+msgid "to"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,short_term_gain:0
-msgid "Stocks/equity mutual funds are sold before one year."
+#: report:payroll.advice:0
+msgid "Total :"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: field:hr.payslip.run,available_advice:0
+msgid "Made Payment Advice?"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Advices which are paid using NEFT transfer"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,tds:0
+msgid "Amount for Tax Deduction at Source"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Month of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,batch_id:0
+msgid "Batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -88,23 +194,35 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
 #: report:paylip.details.in:0
 msgid "Reference"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
-#, python-format
-msgid "No Payslips for found for %s Month"
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -118,29 +236,68 @@ msgid "Identification No"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,professional_tax:0
-msgid "Professional Tax "
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "From"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
+#: field:payment.advice.report,bysal:0
+#: report:payroll.advice:0
 msgid "By Salary"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Confirm"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+#: field:payment.advice.report,cheque_nos:0
+msgid "Cheque Numbers"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
+msgid "Yearly Salary by Head"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
 msgid "State"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,employee_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
-msgid "Employee"
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -154,15 +311,44 @@ msgid "Email"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#: help:hr.payslip.run,available_advice:0
+msgid "If this box is checked which means that Payment Advice exists for current batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
 #, python-format
 msgid "Error !"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,other_income:0
-msgid "Other Income "
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,debit_credit:0
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.employee.bymonth:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
+msgid "Print Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -171,8 +357,36 @@ msgid "Employee Salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: selection:payment.advice.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
+#: view:payment.advice.report:0
+msgid "Advices Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc:0
+msgid "IFSC"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -185,24 +399,29 @@ msgstr ""
 msgid "TDS"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.employee,join_date:0
 msgid "Join Date"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,voluntary_provident_fund:0
-msgid "VPF computed as percentage.(%)"
+#: view:hr.payroll.advice:0
+msgid "Confirm Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: constraint:hr.contract:0
-msgid "Error! contract start-date must be lower then contract end-date."
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:res.company,dearness_allowance:0
+msgid "Dearness Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -211,19 +430,71 @@ msgid "Deduction"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,company_transport:0
-msgid "Deduction for company provided transport."
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in confirm state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-msgid "Confirm"
+msgid "Confirm Sheet"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,saving_bank_account:0
-msgid "Saving Bank Account Income "
+#: view:payment.advice.report:0
+#: field:payment.advice.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "or"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
+msgid "Hr Salary Employee By Month Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, python-format
+msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "To Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -236,9 +507,17 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Draft Advice"
+#: selection:hr.payroll.advice,state:0
+#: view:payment.advice.report:0
+#: selection:payment.advice.report,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -252,33 +531,47 @@ msgid "Voluntary Provident Fund"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,medical_insurance:0
-msgid "Deduction towards company provided medical insurance."
+#: report:salary.detail.byyear:0
+msgid "Employee Name"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,long_term_gain:0
-msgid "Stocks/equity mutual funds are kept for more than a year."
+#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
+msgid "Payment Advice Analysis"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: view:payment.advice.report:0
+msgid "Status"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Done Advice"
+#: field:hr.contract,city_type:0
+msgid "Type of City"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,date:0
-msgid "Date"
+#: help:res.company,dearness_allowance:0
+msgid "Check this box if your company provide Dearness Allowance to employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: constraint:hr.employee:0
-msgid "Error ! You cannot create recursive Hierarchy of Employees."
+#: field:hr.payroll.advice.line,ifsc_code:0
+#: field:payment.advice.report,ifsc_code:0
+#: report:payroll.advice:0
+msgid "IFSC Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,nbr:0
+msgid "# Payment Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -286,18 +579,61 @@ msgstr ""
 msgid "PaySlip Details"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:payment.advice.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
+msgid "This report performs analysis on Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "October"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
 msgid "Designation"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
+#: selection:payment.advice.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "Pay Head Employee Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
 msgid "Companies"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:payroll.advice:0
 msgid "Authorized Signature"
 msgstr ""
 
@@ -307,50 +643,83 @@ msgid "Contract"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft"
+#: view:hr.payroll.advice.line:0
+msgid "Advice Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,long_term_gain:0
-msgid "Long Term Gain from Share Trading/Equity MFs"
+#: report:payroll.advice:0
+msgid "To,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid "Check this box if you provide allowance for driver"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice.line,advice_id:0
+#: field:hr.payslip,advice_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
 msgid "Bank Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Code"
+#: report:salary.detail.byyear:0
+msgid "Other No."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: view:hr.payroll.advice:0
+msgid "Draft Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,number:0
+#: help:hr.payroll.advice,neft:0
+msgid "Check this box if your company use online transfer for salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
 msgid "Number"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Done"
+#: selection:payment.advice.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Search Payment advice"
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Information"
+#: view:payment.advice.report:0
+msgid "Day of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "This wizard will print report which display a pay head employee breakup for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -359,13 +728,16 @@ msgid "Pay Slip Details"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.employee,join_date:0
-msgid "joining date of employee "
+#: view:payment.advice.report:0
+msgid "Total Salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,house_rent_income:0
-msgid "Income from house property."
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.report,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -373,6 +745,16 @@ msgstr ""
 msgid "Compute Advice"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr "Dear Sir/Madam,"
+
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,note:0
 msgid "Description"
@@ -384,35 +766,67 @@ msgid ")"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Address"
+#: view:res.company:0
+msgid "Payroll"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,saving_bank_account:0
-msgid "Saving income for bank account."
+#: view:payment.advice.report:0
+msgid "NEFT"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Address"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,bank_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,bank_id:0
+#: report:payroll.advice:0
+#: report:salary.detail.byyear:0
 msgid "Bank"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel"
+#: field:hr.salary.employee.month,end_date:0
+#: field:yearly.salary.detail,date_to:0
+msgid "End Date"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,name:0
 #: report:paylip.details.in:0
+#: field:payment.advice.report,name:0
+#: report:salary.employee.bymonth:0
 msgid "Name"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,company_transport:0
-msgid "Company Provided Transport"
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: field:hr.salary.employee.month,employee_ids:0
+#: view:yearly.salary.detail:0
+#: field:yearly.salary.detail,employee_ids:0
+msgid "Employees"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -421,14 +835,26 @@ msgid "Bank Account"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#: selection:payment.advice.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employe"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
 #, python-format
 msgid "Please define bank account for the %s employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,other_income:0
-msgid "Other income of employee."
+#: field:hr.salary.employee.month,start_date:0
+#: field:yearly.salary.detail,date_from:0
+msgid "Start Date"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -436,6 +862,21 @@ msgstr ""
 msgid "Allowance"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank from which the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "Employee Pay Head Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Phone No."
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Credit"
@@ -443,30 +884,50 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,name:0
+#: report:payroll.advice:0
 msgid "Bank Account No."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "States"
+#: help:hr.payroll.advice,date:0
+msgid "Advice Date is used to search Payslips"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,leave_avail_dedution:0
-msgid "Deduction for emergency leave of employee."
+#: selection:payment.advice.report,month:0
+msgid "May"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,leave_avail_dedution:0
-msgid "Leave Availed Deduction "
+#: view:hr.payslip.run:0
+msgid "Create Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,neft:0
+#: field:payment.advice.report,neft:0
+msgid "NEFT Transaction"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
 msgid "Total"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,house_rent_income:0
-msgid "House Rent Income "
+#: report:payroll.advice:0
+msgid "form period"
 msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/i18n/gu.po b/addons/l10n_in_hr_payroll/i18n/gu.po
index e50fe1c22b9..2c321b13191 100644
--- a/addons/l10n_in_hr_payroll/i18n/gu.po
+++ b/addons/l10n_in_hr_payroll/i18n/gu.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-13 12:04+0000\n"
-"PO-Revision-Date: 2012-06-13 12:04+0000\n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-08-17 06:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,23 +16,58 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,driver_salay:0
-msgid " Allowance for company provided driver."
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,professional_tax:0
-msgid "Professional tax deducted from salary"
+#: field:payment.advice.report,employee_bank_no:0
+msgid "Employee Bank Account"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Salary Rule Category"
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in draft state"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Group By..."
+#: report:salary.detail.byyear:0
+msgid "Title"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice from"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
+msgid "Hr Salary Employee By Category Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Department"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "A/C no."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -40,17 +75,47 @@ msgstr ""
 msgid "Driver Salary"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
+msgid "Yearly Salary by Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "March"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "("
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,company_id:0
 #: field:hr.payroll.advice.line,company_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,company_id:0
 msgid "Company"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ","
@@ -63,22 +128,63 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: help:hr.employee,number_of_year:0
-msgid "Total years of work experience."
+msgid "Total years of work experience"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,short_term_gain:0
-msgid "Short Term Gain from Share Trading/Equity MFs "
+#: report:payroll.advice:0
+msgid "to"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,short_term_gain:0
-msgid "Stocks/equity mutual funds are sold before one year."
+#: report:payroll.advice:0
+msgid "Total :"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: field:hr.payslip.run,available_advice:0
+msgid "Made Payment Advice?"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Advices which are paid using NEFT transfer"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,tds:0
+msgid "Amount for Tax Deduction at Source"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Month of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,batch_id:0
+msgid "Batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -88,23 +194,35 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
 #: report:paylip.details.in:0
 msgid "Reference"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
-#, python-format
-msgid "No Payslips for found for %s Month"
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -118,29 +236,68 @@ msgid "Identification No"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,professional_tax:0
-msgid "Professional Tax "
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "From"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
+#: field:payment.advice.report,bysal:0
+#: report:payroll.advice:0
 msgid "By Salary"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Confirm"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+#: field:payment.advice.report,cheque_nos:0
+msgid "Cheque Numbers"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
+msgid "Yearly Salary by Head"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
 msgid "State"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,employee_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
-msgid "Employee"
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -154,15 +311,44 @@ msgid "Email"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#: help:hr.payslip.run,available_advice:0
+msgid "If this box is checked which means that Payment Advice exists for current batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
 #, python-format
 msgid "Error !"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,other_income:0
-msgid "Other Income "
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,debit_credit:0
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.employee.bymonth:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
+msgid "Print Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -171,8 +357,36 @@ msgid "Employee Salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: selection:payment.advice.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
+#: view:payment.advice.report:0
+msgid "Advices Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc:0
+msgid "IFSC"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -185,24 +399,29 @@ msgstr ""
 msgid "TDS"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.employee,join_date:0
 msgid "Join Date"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,voluntary_provident_fund:0
-msgid "VPF computed as percentage.(%)"
+#: view:hr.payroll.advice:0
+msgid "Confirm Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: constraint:hr.contract:0
-msgid "Error! contract start-date must be lower then contract end-date."
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:res.company,dearness_allowance:0
+msgid "Dearness Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -211,19 +430,71 @@ msgid "Deduction"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,company_transport:0
-msgid "Deduction for company provided transport."
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in confirm state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-msgid "Confirm"
+msgid "Confirm Sheet"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,saving_bank_account:0
-msgid "Saving Bank Account Income "
+#: view:payment.advice.report:0
+#: field:payment.advice.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "or"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
+msgid "Hr Salary Employee By Month Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, python-format
+msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "To Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -236,9 +507,17 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Draft Advice"
+#: selection:hr.payroll.advice,state:0
+#: view:payment.advice.report:0
+#: selection:payment.advice.report,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -252,33 +531,47 @@ msgid "Voluntary Provident Fund"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,medical_insurance:0
-msgid "Deduction towards company provided medical insurance."
+#: report:salary.detail.byyear:0
+msgid "Employee Name"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,long_term_gain:0
-msgid "Stocks/equity mutual funds are kept for more than a year."
+#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
+msgid "Payment Advice Analysis"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: view:payment.advice.report:0
+msgid "Status"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Done Advice"
+#: field:hr.contract,city_type:0
+msgid "Type of City"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,date:0
-msgid "Date"
+#: help:res.company,dearness_allowance:0
+msgid "Check this box if your company provide Dearness Allowance to employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: constraint:hr.employee:0
-msgid "Error ! You cannot create recursive Hierarchy of Employees."
+#: field:hr.payroll.advice.line,ifsc_code:0
+#: field:payment.advice.report,ifsc_code:0
+#: report:payroll.advice:0
+msgid "IFSC Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,nbr:0
+msgid "# Payment Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -286,18 +579,61 @@ msgstr ""
 msgid "PaySlip Details"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:payment.advice.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
+msgid "This report performs analysis on Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "October"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
 msgid "Designation"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
+#: selection:payment.advice.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "Pay Head Employee Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
 msgid "Companies"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:payroll.advice:0
 msgid "Authorized Signature"
 msgstr ""
 
@@ -307,55 +643,83 @@ msgid "Contract"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft"
+#: view:hr.payroll.advice.line:0
+msgid "Advice Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,long_term_gain:0
-msgid "Long Term Gain from Share Trading/Equity MFs"
+#: report:payroll.advice:0
+msgid "To,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid "Check this box if you provide allowance for driver"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice.line,advice_id:0
+#: field:hr.payslip,advice_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
 msgid "Bank Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Code"
+#: report:salary.detail.byyear:0
+msgid "Other No."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: view:hr.payroll.advice:0
+msgid "Draft Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,number:0
+#: help:hr.payroll.advice,neft:0
+msgid "Check this box if your company use online transfer for salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
 msgid "Number"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Done"
+#: selection:payment.advice.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
 msgid "Cancel"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Search Payment advice"
+#: view:payment.advice.report:0
+msgid "Day of Payment Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Information"
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "This wizard will print report which display a pay head employee breakup for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -364,13 +728,16 @@ msgid "Pay Slip Details"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.employee,join_date:0
-msgid "joining date of employee "
+#: view:payment.advice.report:0
+msgid "Total Salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,house_rent_income:0
-msgid "Income from house property."
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.report,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -378,6 +745,16 @@ msgstr ""
 msgid "Compute Advice"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr "Dear Sir/Madam,"
+
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,note:0
 msgid "Description"
@@ -389,30 +766,67 @@ msgid ")"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Address"
+#: view:res.company:0
+msgid "Payroll"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,saving_bank_account:0
-msgid "Saving income for bank account."
+#: view:payment.advice.report:0
+msgid "NEFT"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Address"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,bank_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,bank_id:0
+#: report:payroll.advice:0
+#: report:salary.detail.byyear:0
 msgid "Bank"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,end_date:0
+#: field:yearly.salary.detail,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,name:0
 #: report:paylip.details.in:0
+#: field:payment.advice.report,name:0
+#: report:salary.employee.bymonth:0
 msgid "Name"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,company_transport:0
-msgid "Company Provided Transport"
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: field:hr.salary.employee.month,employee_ids:0
+#: view:yearly.salary.detail:0
+#: field:yearly.salary.detail,employee_ids:0
+msgid "Employees"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -421,14 +835,26 @@ msgid "Bank Account"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#: selection:payment.advice.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employe"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
 #, python-format
 msgid "Please define bank account for the %s employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,other_income:0
-msgid "Other income of employee."
+#: field:hr.salary.employee.month,start_date:0
+#: field:yearly.salary.detail,date_from:0
+msgid "Start Date"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -436,6 +862,21 @@ msgstr ""
 msgid "Allowance"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank from which the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "Employee Pay Head Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Phone No."
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Credit"
@@ -443,30 +884,50 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,name:0
+#: report:payroll.advice:0
 msgid "Bank Account No."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "States"
+#: help:hr.payroll.advice,date:0
+msgid "Advice Date is used to search Payslips"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,leave_avail_dedution:0
-msgid "Deduction for emergency leave of employee."
+#: selection:payment.advice.report,month:0
+msgid "May"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,leave_avail_dedution:0
-msgid "Leave Availed Deduction "
+#: view:hr.payslip.run:0
+msgid "Create Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,neft:0
+#: field:payment.advice.report,neft:0
+msgid "NEFT Transaction"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
 msgid "Total"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,house_rent_income:0
-msgid "House Rent Income "
+#: report:payroll.advice:0
+msgid "form period"
 msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/i18n/hi.po b/addons/l10n_in_hr_payroll/i18n/hi.po
index 55eb291e05c..d7cc9dc1519 100644
--- a/addons/l10n_in_hr_payroll/i18n/hi.po
+++ b/addons/l10n_in_hr_payroll/i18n/hi.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-13 12:04+0000\n"
-"PO-Revision-Date: 2012-06-13 12:04+0000\n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-08-17 06:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,23 +16,58 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,driver_salay:0
-msgid " Allowance for company provided driver."
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,professional_tax:0
-msgid "Professional tax deducted from salary"
+#: field:payment.advice.report,employee_bank_no:0
+msgid "Employee Bank Account"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Salary Rule Category"
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in draft state"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Group By..."
+#: report:salary.detail.byyear:0
+msgid "Title"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice from"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
+msgid "Hr Salary Employee By Category Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Department"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "A/C no."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -40,17 +75,47 @@ msgstr ""
 msgid "Driver Salary"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
+msgid "Yearly Salary by Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "March"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "("
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,company_id:0
 #: field:hr.payroll.advice.line,company_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,company_id:0
 msgid "Company"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ","
@@ -63,22 +128,63 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: help:hr.employee,number_of_year:0
-msgid "Total years of work experience."
+msgid "Total years of work experience"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,short_term_gain:0
-msgid "Short Term Gain from Share Trading/Equity MFs "
+#: report:payroll.advice:0
+msgid "to"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,short_term_gain:0
-msgid "Stocks/equity mutual funds are sold before one year."
+#: report:payroll.advice:0
+msgid "Total :"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: field:hr.payslip.run,available_advice:0
+msgid "Made Payment Advice?"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Advices which are paid using NEFT transfer"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,tds:0
+msgid "Amount for Tax Deduction at Source"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Month of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,batch_id:0
+msgid "Batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -88,23 +194,35 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
 #: report:paylip.details.in:0
 msgid "Reference"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
-#, python-format
-msgid "No Payslips for found for %s Month"
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -118,29 +236,68 @@ msgid "Identification No"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,professional_tax:0
-msgid "Professional Tax "
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "From"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
+#: field:payment.advice.report,bysal:0
+#: report:payroll.advice:0
 msgid "By Salary"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Confirm"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+#: field:payment.advice.report,cheque_nos:0
+msgid "Cheque Numbers"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
+msgid "Yearly Salary by Head"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
 msgid "State"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,employee_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
-msgid "Employee"
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -154,15 +311,44 @@ msgid "Email"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#: help:hr.payslip.run,available_advice:0
+msgid "If this box is checked which means that Payment Advice exists for current batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
 #, python-format
 msgid "Error !"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,other_income:0
-msgid "Other Income "
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,debit_credit:0
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.employee.bymonth:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
+msgid "Print Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -171,8 +357,36 @@ msgid "Employee Salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: selection:payment.advice.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
+#: view:payment.advice.report:0
+msgid "Advices Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc:0
+msgid "IFSC"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -185,24 +399,29 @@ msgstr ""
 msgid "TDS"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.employee,join_date:0
 msgid "Join Date"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,voluntary_provident_fund:0
-msgid "VPF computed as percentage.(%)"
+#: view:hr.payroll.advice:0
+msgid "Confirm Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: constraint:hr.contract:0
-msgid "Error! contract start-date must be lower then contract end-date."
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:res.company,dearness_allowance:0
+msgid "Dearness Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -211,19 +430,71 @@ msgid "Deduction"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,company_transport:0
-msgid "Deduction for company provided transport."
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in confirm state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-msgid "Confirm"
+msgid "Confirm Sheet"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,saving_bank_account:0
-msgid "Saving Bank Account Income "
+#: view:payment.advice.report:0
+#: field:payment.advice.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "or"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
+msgid "Hr Salary Employee By Month Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, python-format
+msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "To Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -236,9 +507,17 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Draft Advice"
+#: selection:hr.payroll.advice,state:0
+#: view:payment.advice.report:0
+#: selection:payment.advice.report,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -252,33 +531,47 @@ msgid "Voluntary Provident Fund"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,medical_insurance:0
-msgid "Deduction towards company provided medical insurance."
+#: report:salary.detail.byyear:0
+msgid "Employee Name"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,long_term_gain:0
-msgid "Stocks/equity mutual funds are kept for more than a year."
+#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
+msgid "Payment Advice Analysis"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: view:payment.advice.report:0
+msgid "Status"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Done Advice"
+#: field:hr.contract,city_type:0
+msgid "Type of City"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,date:0
-msgid "Date"
+#: help:res.company,dearness_allowance:0
+msgid "Check this box if your company provide Dearness Allowance to employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: constraint:hr.employee:0
-msgid "Error ! You cannot create recursive Hierarchy of Employees."
+#: field:hr.payroll.advice.line,ifsc_code:0
+#: field:payment.advice.report,ifsc_code:0
+#: report:payroll.advice:0
+msgid "IFSC Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,nbr:0
+msgid "# Payment Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -286,18 +579,61 @@ msgstr ""
 msgid "PaySlip Details"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:payment.advice.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
+msgid "This report performs analysis on Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "October"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
 msgid "Designation"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
+#: selection:payment.advice.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "Pay Head Employee Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
 msgid "Companies"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:payroll.advice:0
 msgid "Authorized Signature"
 msgstr ""
 
@@ -307,55 +643,83 @@ msgid "Contract"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft"
+#: view:hr.payroll.advice.line:0
+msgid "Advice Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,long_term_gain:0
-msgid "Long Term Gain from Share Trading/Equity MFs"
+#: report:payroll.advice:0
+msgid "To,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid "Check this box if you provide allowance for driver"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice.line,advice_id:0
+#: field:hr.payslip,advice_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
 msgid "Bank Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Code"
+#: report:salary.detail.byyear:0
+msgid "Other No."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: view:hr.payroll.advice:0
+msgid "Draft Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,number:0
+#: help:hr.payroll.advice,neft:0
+msgid "Check this box if your company use online transfer for salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
 msgid "Number"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Done"
+#: selection:payment.advice.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
 msgid "Cancel"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Search Payment advice"
+#: view:payment.advice.report:0
+msgid "Day of Payment Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Information"
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "This wizard will print report which display a pay head employee breakup for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -364,13 +728,16 @@ msgid "Pay Slip Details"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.employee,join_date:0
-msgid "joining date of employee "
+#: view:payment.advice.report:0
+msgid "Total Salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,house_rent_income:0
-msgid "Income from house property."
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.report,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -378,6 +745,16 @@ msgstr ""
 msgid "Compute Advice"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr "Dear Sir/Madam,"
+
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,note:0
 msgid "Description"
@@ -389,30 +766,67 @@ msgid ")"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Address"
+#: view:res.company:0
+msgid "Payroll"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,saving_bank_account:0
-msgid "Saving income for bank account."
+#: view:payment.advice.report:0
+msgid "NEFT"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Address"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,bank_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,bank_id:0
+#: report:payroll.advice:0
+#: report:salary.detail.byyear:0
 msgid "Bank"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,end_date:0
+#: field:yearly.salary.detail,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,name:0
 #: report:paylip.details.in:0
+#: field:payment.advice.report,name:0
+#: report:salary.employee.bymonth:0
 msgid "Name"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,company_transport:0
-msgid "Company Provided Transport"
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: field:hr.salary.employee.month,employee_ids:0
+#: view:yearly.salary.detail:0
+#: field:yearly.salary.detail,employee_ids:0
+msgid "Employees"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -421,14 +835,26 @@ msgid "Bank Account"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#: selection:payment.advice.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employe"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
 #, python-format
 msgid "Please define bank account for the %s employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,other_income:0
-msgid "Other income of employee."
+#: field:hr.salary.employee.month,start_date:0
+#: field:yearly.salary.detail,date_from:0
+msgid "Start Date"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -436,6 +862,21 @@ msgstr ""
 msgid "Allowance"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank from which the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "Employee Pay Head Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Phone No."
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Credit"
@@ -443,30 +884,50 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,name:0
+#: report:payroll.advice:0
 msgid "Bank Account No."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "States"
+#: help:hr.payroll.advice,date:0
+msgid "Advice Date is used to search Payslips"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,leave_avail_dedution:0
-msgid "Deduction for emergency leave of employee."
+#: selection:payment.advice.report,month:0
+msgid "May"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,leave_avail_dedution:0
-msgid "Leave Availed Deduction "
+#: view:hr.payslip.run:0
+msgid "Create Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,neft:0
+#: field:payment.advice.report,neft:0
+msgid "NEFT Transaction"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
 msgid "Total"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,house_rent_income:0
-msgid "House Rent Income "
+#: report:payroll.advice:0
+msgid "form period"
 msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
index 88c54554960..552f85b5997 100644
--- a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
+++ b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
@@ -1,13 +1,13 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* l10n_in_hr_payroll
+#   * l10n_in_hr_payroll
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-13 12:04+0000\n"
-"PO-Revision-Date: 2012-06-13 12:04+0000\n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-08-17 06:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,23 +16,58 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,driver_salay:0
-msgid " Allowance for company provided driver."
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,professional_tax:0
-msgid "Professional tax deducted from salary"
+#: field:payment.advice.report,employee_bank_no:0
+msgid "Employee Bank Account"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Salary Rule Category"
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in draft state"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Group By..."
+#: report:salary.detail.byyear:0
+msgid "Title"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice from"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
+msgid "Hr Salary Employee By Category Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Department"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "A/C no."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -40,17 +75,47 @@ msgstr ""
 msgid "Driver Salary"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
+msgid "Yearly Salary by Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "March"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "("
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,company_id:0
 #: field:hr.payroll.advice.line,company_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,company_id:0
 msgid "Company"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ","
@@ -63,22 +128,63 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: help:hr.employee,number_of_year:0
-msgid "Total years of work experience."
+msgid "Total years of work experience"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,short_term_gain:0
-msgid "Short Term Gain from Share Trading/Equity MFs "
+#: report:payroll.advice:0
+msgid "to"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,short_term_gain:0
-msgid "Stocks/equity mutual funds are sold before one year."
+#: report:payroll.advice:0
+msgid "Total :"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: field:hr.payslip.run,available_advice:0
+msgid "Made Payment Advice?"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Advices which are paid using NEFT transfer"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,tds:0
+msgid "Amount for Tax Deduction at Source"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Month of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,batch_id:0
+msgid "Batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -88,23 +194,35 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
 #: report:paylip.details.in:0
 msgid "Reference"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
-#, python-format
-msgid "No Payslips for found for %s Month"
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -118,29 +236,68 @@ msgid "Identification No"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,professional_tax:0
-msgid "Professional Tax "
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "From"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
+#: field:payment.advice.report,bysal:0
+#: report:payroll.advice:0
 msgid "By Salary"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Confirm"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+#: field:payment.advice.report,cheque_nos:0
+msgid "Cheque Numbers"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
+msgid "Yearly Salary by Head"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
 msgid "State"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,employee_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
-msgid "Employee"
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -154,15 +311,44 @@ msgid "Email"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#: help:hr.payslip.run,available_advice:0
+msgid "If this box is checked which means that Payment Advice exists for current batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
 #, python-format
 msgid "Error !"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,other_income:0
-msgid "Other Income "
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,debit_credit:0
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.employee.bymonth:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
+msgid "Print Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -171,8 +357,36 @@ msgid "Employee Salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: selection:payment.advice.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
+#: view:payment.advice.report:0
+msgid "Advices Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc:0
+msgid "IFSC"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -185,24 +399,29 @@ msgstr ""
 msgid "TDS"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.employee,join_date:0
 msgid "Join Date"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,voluntary_provident_fund:0
-msgid "VPF computed as percentage.(%)"
+#: view:hr.payroll.advice:0
+msgid "Confirm Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: constraint:hr.contract:0
-msgid "Error! contract start-date must be lower then contract end-date."
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:res.company,dearness_allowance:0
+msgid "Dearness Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -211,19 +430,71 @@ msgid "Deduction"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,company_transport:0
-msgid "Deduction for company provided transport."
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in confirm state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-msgid "Confirm"
+msgid "Confirm Sheet"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,saving_bank_account:0
-msgid "Saving Bank Account Income "
+#: view:payment.advice.report:0
+#: field:payment.advice.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "or"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
+msgid "Hr Salary Employee By Month Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, python-format
+msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "To Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -236,9 +507,17 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Draft Advice"
+#: selection:hr.payroll.advice,state:0
+#: view:payment.advice.report:0
+#: selection:payment.advice.report,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -252,33 +531,47 @@ msgid "Voluntary Provident Fund"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,medical_insurance:0
-msgid "Deduction towards company provided medical insurance."
+#: report:salary.detail.byyear:0
+msgid "Employee Name"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,long_term_gain:0
-msgid "Stocks/equity mutual funds are kept for more than a year."
+#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
+msgid "Payment Advice Analysis"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: view:payment.advice.report:0
+msgid "Status"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Done Advice"
+#: field:hr.contract,city_type:0
+msgid "Type of City"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,date:0
-msgid "Date"
+#: help:res.company,dearness_allowance:0
+msgid "Check this box if your company provide Dearness Allowance to employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: constraint:hr.employee:0
-msgid "Error ! You cannot create recursive Hierarchy of Employees."
+#: field:hr.payroll.advice.line,ifsc_code:0
+#: field:payment.advice.report,ifsc_code:0
+#: report:payroll.advice:0
+msgid "IFSC Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,nbr:0
+msgid "# Payment Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -286,18 +579,61 @@ msgstr ""
 msgid "PaySlip Details"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:payment.advice.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
+msgid "This report performs analysis on Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "October"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
 msgid "Designation"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
+#: selection:payment.advice.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "Pay Head Employee Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
 msgid "Companies"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:payroll.advice:0
 msgid "Authorized Signature"
 msgstr ""
 
@@ -307,55 +643,83 @@ msgid "Contract"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft"
+#: view:hr.payroll.advice.line:0
+msgid "Advice Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,long_term_gain:0
-msgid "Long Term Gain from Share Trading/Equity MFs"
+#: report:payroll.advice:0
+msgid "To,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid "Check this box if you provide allowance for driver"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice.line,advice_id:0
+#: field:hr.payslip,advice_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
 msgid "Bank Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Code"
+#: report:salary.detail.byyear:0
+msgid "Other No."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: view:hr.payroll.advice:0
+msgid "Draft Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,number:0
+#: help:hr.payroll.advice,neft:0
+msgid "Check this box if your company use online transfer for salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
 msgid "Number"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Done"
+#: selection:payment.advice.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
 msgid "Cancel"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Search Payment advice"
+#: view:payment.advice.report:0
+msgid "Day of Payment Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Information"
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "This wizard will print report which display a pay head employee breakup for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -364,13 +728,16 @@ msgid "Pay Slip Details"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.employee,join_date:0
-msgid "joining date of employee "
+#: view:payment.advice.report:0
+msgid "Total Salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,house_rent_income:0
-msgid "Income from house property."
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.report,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -378,6 +745,16 @@ msgstr ""
 msgid "Compute Advice"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr "Dear Sir/Madam,"
+
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,note:0
 msgid "Description"
@@ -389,30 +766,67 @@ msgid ")"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Address"
+#: view:res.company:0
+msgid "Payroll"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,saving_bank_account:0
-msgid "Saving income for bank account."
+#: view:payment.advice.report:0
+msgid "NEFT"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Address"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,bank_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,bank_id:0
+#: report:payroll.advice:0
+#: report:salary.detail.byyear:0
 msgid "Bank"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,end_date:0
+#: field:yearly.salary.detail,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,name:0
 #: report:paylip.details.in:0
+#: field:payment.advice.report,name:0
+#: report:salary.employee.bymonth:0
 msgid "Name"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,company_transport:0
-msgid "Company Provided Transport"
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: field:hr.salary.employee.month,employee_ids:0
+#: view:yearly.salary.detail:0
+#: field:yearly.salary.detail,employee_ids:0
+msgid "Employees"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -421,14 +835,26 @@ msgid "Bank Account"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#: selection:payment.advice.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employe"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
 #, python-format
 msgid "Please define bank account for the %s employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,other_income:0
-msgid "Other income of employee."
+#: field:hr.salary.employee.month,start_date:0
+#: field:yearly.salary.detail,date_from:0
+msgid "Start Date"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -436,6 +862,21 @@ msgstr ""
 msgid "Allowance"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank from which the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "Employee Pay Head Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Phone No."
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Credit"
@@ -443,30 +884,50 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,name:0
+#: report:payroll.advice:0
 msgid "Bank Account No."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "States"
+#: help:hr.payroll.advice,date:0
+msgid "Advice Date is used to search Payslips"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,leave_avail_dedution:0
-msgid "Deduction for emergency leave of employee."
+#: selection:payment.advice.report,month:0
+msgid "May"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,leave_avail_dedution:0
-msgid "Leave Availed Deduction "
+#: view:hr.payslip.run:0
+msgid "Create Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,neft:0
+#: field:payment.advice.report,neft:0
+msgid "NEFT Transaction"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
 msgid "Total"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,house_rent_income:0
-msgid "House Rent Income "
+#: report:payroll.advice:0
+msgid "form period"
 msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/i18n/ta.po b/addons/l10n_in_hr_payroll/i18n/ta.po
index 614c2e98d4e..98d00c76a33 100644
--- a/addons/l10n_in_hr_payroll/i18n/ta.po
+++ b/addons/l10n_in_hr_payroll/i18n/ta.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-13 12:04+0000\n"
-"PO-Revision-Date: 2012-06-13 12:04+0000\n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-08-17 06:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: Tamil <ta@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,23 +16,58 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,driver_salay:0
-msgid " Allowance for company provided driver."
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,professional_tax:0
-msgid "Professional tax deducted from salary"
+#: field:payment.advice.report,employee_bank_no:0
+msgid "Employee Bank Account"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Salary Rule Category"
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in draft state"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Group By..."
+#: report:salary.detail.byyear:0
+msgid "Title"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice from"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
+msgid "Hr Salary Employee By Category Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Department"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "A/C no."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -40,17 +75,47 @@ msgstr ""
 msgid "Driver Salary"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
+msgid "Yearly Salary by Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "March"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "("
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,company_id:0
 #: field:hr.payroll.advice.line,company_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,company_id:0
 msgid "Company"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ","
@@ -63,22 +128,63 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: help:hr.employee,number_of_year:0
-msgid "Total years of work experience."
+msgid "Total years of work experience"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,short_term_gain:0
-msgid "Short Term Gain from Share Trading/Equity MFs "
+#: report:payroll.advice:0
+msgid "to"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,short_term_gain:0
-msgid "Stocks/equity mutual funds are sold before one year."
+#: report:payroll.advice:0
+msgid "Total :"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: field:hr.payslip.run,available_advice:0
+msgid "Made Payment Advice?"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Advices which are paid using NEFT transfer"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,tds:0
+msgid "Amount for Tax Deduction at Source"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Month of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,batch_id:0
+msgid "Batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -88,23 +194,35 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
 #: report:paylip.details.in:0
 msgid "Reference"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
-#, python-format
-msgid "No Payslips for found for %s Month"
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -118,29 +236,68 @@ msgid "Identification No"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,professional_tax:0
-msgid "Professional Tax "
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "From"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
+#: field:payment.advice.report,bysal:0
+#: report:payroll.advice:0
 msgid "By Salary"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Confirm"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+#: field:payment.advice.report,cheque_nos:0
+msgid "Cheque Numbers"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
+msgid "Yearly Salary by Head"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
 msgid "State"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,employee_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
-msgid "Employee"
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -154,15 +311,44 @@ msgid "Email"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#: help:hr.payslip.run,available_advice:0
+msgid "If this box is checked which means that Payment Advice exists for current batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
 #, python-format
 msgid "Error !"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,other_income:0
-msgid "Other Income "
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,debit_credit:0
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.employee.bymonth:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
+msgid "Print Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -171,8 +357,36 @@ msgid "Employee Salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: selection:payment.advice.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
+#: view:payment.advice.report:0
+msgid "Advices Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc:0
+msgid "IFSC"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -185,24 +399,29 @@ msgstr ""
 msgid "TDS"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.employee,join_date:0
 msgid "Join Date"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,voluntary_provident_fund:0
-msgid "VPF computed as percentage.(%)"
+#: view:hr.payroll.advice:0
+msgid "Confirm Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: constraint:hr.contract:0
-msgid "Error! contract start-date must be lower then contract end-date."
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:res.company,dearness_allowance:0
+msgid "Dearness Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -211,19 +430,71 @@ msgid "Deduction"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,company_transport:0
-msgid "Deduction for company provided transport."
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in confirm state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-msgid "Confirm"
+msgid "Confirm Sheet"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,saving_bank_account:0
-msgid "Saving Bank Account Income "
+#: view:payment.advice.report:0
+#: field:payment.advice.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "or"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
+msgid "Hr Salary Employee By Month Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, python-format
+msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "To Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -236,9 +507,17 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Draft Advice"
+#: selection:hr.payroll.advice,state:0
+#: view:payment.advice.report:0
+#: selection:payment.advice.report,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -252,33 +531,47 @@ msgid "Voluntary Provident Fund"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,medical_insurance:0
-msgid "Deduction towards company provided medical insurance."
+#: report:salary.detail.byyear:0
+msgid "Employee Name"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,long_term_gain:0
-msgid "Stocks/equity mutual funds are kept for more than a year."
+#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
+msgid "Payment Advice Analysis"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: view:payment.advice.report:0
+msgid "Status"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Done Advice"
+#: field:hr.contract,city_type:0
+msgid "Type of City"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,date:0
-msgid "Date"
+#: help:res.company,dearness_allowance:0
+msgid "Check this box if your company provide Dearness Allowance to employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: constraint:hr.employee:0
-msgid "Error ! You cannot create recursive Hierarchy of Employees."
+#: field:hr.payroll.advice.line,ifsc_code:0
+#: field:payment.advice.report,ifsc_code:0
+#: report:payroll.advice:0
+msgid "IFSC Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,nbr:0
+msgid "# Payment Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -286,18 +579,61 @@ msgstr ""
 msgid "PaySlip Details"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:payment.advice.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
+msgid "This report performs analysis on Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "October"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
 msgid "Designation"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
+#: selection:payment.advice.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "Pay Head Employee Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
 msgid "Companies"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:payroll.advice:0
 msgid "Authorized Signature"
 msgstr ""
 
@@ -307,55 +643,83 @@ msgid "Contract"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft"
+#: view:hr.payroll.advice.line:0
+msgid "Advice Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,long_term_gain:0
-msgid "Long Term Gain from Share Trading/Equity MFs"
+#: report:payroll.advice:0
+msgid "To,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid "Check this box if you provide allowance for driver"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice.line,advice_id:0
+#: field:hr.payslip,advice_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
 msgid "Bank Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Code"
+#: report:salary.detail.byyear:0
+msgid "Other No."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: view:hr.payroll.advice:0
+msgid "Draft Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,number:0
+#: help:hr.payroll.advice,neft:0
+msgid "Check this box if your company use online transfer for salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
 msgid "Number"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Done"
+#: selection:payment.advice.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
 msgid "Cancel"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Search Payment advice"
+#: view:payment.advice.report:0
+msgid "Day of Payment Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Information"
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "This wizard will print report which display a pay head employee breakup for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -364,13 +728,16 @@ msgid "Pay Slip Details"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.employee,join_date:0
-msgid "joining date of employee "
+#: view:payment.advice.report:0
+msgid "Total Salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,house_rent_income:0
-msgid "Income from house property."
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.report,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -378,6 +745,16 @@ msgstr ""
 msgid "Compute Advice"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr "Dear Sir/Madam,"
+
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,note:0
 msgid "Description"
@@ -389,30 +766,67 @@ msgid ")"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Address"
+#: view:res.company:0
+msgid "Payroll"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,saving_bank_account:0
-msgid "Saving income for bank account."
+#: view:payment.advice.report:0
+msgid "NEFT"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Address"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,bank_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,bank_id:0
+#: report:payroll.advice:0
+#: report:salary.detail.byyear:0
 msgid "Bank"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,end_date:0
+#: field:yearly.salary.detail,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,name:0
 #: report:paylip.details.in:0
+#: field:payment.advice.report,name:0
+#: report:salary.employee.bymonth:0
 msgid "Name"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,company_transport:0
-msgid "Company Provided Transport"
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: field:hr.salary.employee.month,employee_ids:0
+#: view:yearly.salary.detail:0
+#: field:yearly.salary.detail,employee_ids:0
+msgid "Employees"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -421,14 +835,26 @@ msgid "Bank Account"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#: selection:payment.advice.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employe"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
 #, python-format
 msgid "Please define bank account for the %s employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,other_income:0
-msgid "Other income of employee."
+#: field:hr.salary.employee.month,start_date:0
+#: field:yearly.salary.detail,date_from:0
+msgid "Start Date"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -436,6 +862,21 @@ msgstr ""
 msgid "Allowance"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank from which the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "Employee Pay Head Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Phone No."
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Credit"
@@ -443,30 +884,50 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,name:0
+#: report:payroll.advice:0
 msgid "Bank Account No."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "States"
+#: help:hr.payroll.advice,date:0
+msgid "Advice Date is used to search Payslips"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,leave_avail_dedution:0
-msgid "Deduction for emergency leave of employee."
+#: selection:payment.advice.report,month:0
+msgid "May"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,leave_avail_dedution:0
-msgid "Leave Availed Deduction "
+#: view:hr.payslip.run:0
+msgid "Create Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,neft:0
+#: field:payment.advice.report,neft:0
+msgid "NEFT Transaction"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
 msgid "Total"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,house_rent_income:0
-msgid "House Rent Income "
+#: report:payroll.advice:0
+msgid "form period"
 msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/i18n/te.po b/addons/l10n_in_hr_payroll/i18n/te.po
index d79a7271437..0c6f6127c4d 100644
--- a/addons/l10n_in_hr_payroll/i18n/te.po
+++ b/addons/l10n_in_hr_payroll/i18n/te.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-13 12:04+0000\n"
-"PO-Revision-Date: 2012-06-13 12:04+0000\n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-08-17 06:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: Telugu <te@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,23 +16,58 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,driver_salay:0
-msgid " Allowance for company provided driver."
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,professional_tax:0
-msgid "Professional tax deducted from salary"
+#: field:payment.advice.report,employee_bank_no:0
+msgid "Employee Bank Account"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Salary Rule Category"
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in draft state"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Group By..."
+#: report:salary.detail.byyear:0
+msgid "Title"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice from"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
+msgid "Hr Salary Employee By Category Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Department"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "A/C no."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -40,17 +75,47 @@ msgstr ""
 msgid "Driver Salary"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
+msgid "Yearly Salary by Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "March"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "("
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,company_id:0
 #: field:hr.payroll.advice.line,company_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,company_id:0
 msgid "Company"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid ","
@@ -63,22 +128,63 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: help:hr.employee,number_of_year:0
-msgid "Total years of work experience."
+msgid "Total years of work experience"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,short_term_gain:0
-msgid "Short Term Gain from Share Trading/Equity MFs "
+#: report:payroll.advice:0
+msgid "to"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,short_term_gain:0
-msgid "Stocks/equity mutual funds are sold before one year."
+#: report:payroll.advice:0
+msgid "Total :"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
+#: field:hr.payslip.run,available_advice:0
+msgid "Made Payment Advice?"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Advices which are paid using NEFT transfer"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,tds:0
+msgid "Amount for Tax Deduction at Source"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Month of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,batch_id:0
+msgid "Batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -88,23 +194,35 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
 #: report:paylip.details.in:0
 msgid "Reference"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
-#, python-format
-msgid "No Payslips for found for %s Month"
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -118,29 +236,68 @@ msgid "Identification No"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,professional_tax:0
-msgid "Professional Tax "
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "From"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
+#: field:payment.advice.report,bysal:0
+#: report:payroll.advice:0
 msgid "By Salary"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Confirm"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+#: field:payment.advice.report,cheque_nos:0
+msgid "Cheque Numbers"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
+msgid "Yearly Salary by Head"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
 msgid "State"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,employee_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
-msgid "Employee"
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -154,15 +311,44 @@ msgid "Email"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:141
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#: help:hr.payslip.run,available_advice:0
+msgid "If this box is checked which means that Payment Advice exists for current batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
 #, python-format
 msgid "Error !"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,other_income:0
-msgid "Other Income "
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,debit_credit:0
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.employee.bymonth:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
+msgid "Print Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -171,8 +357,36 @@ msgid "Employee Salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
+#: selection:payment.advice.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
+#: view:payment.advice.report:0
+msgid "Advices Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc:0
+msgid "IFSC"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -185,24 +399,29 @@ msgstr ""
 msgid "TDS"
 msgstr ""
 
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr ""
-
 #. module: l10n_in_hr_payroll
 #: field:hr.employee,join_date:0
 msgid "Join Date"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,voluntary_provident_fund:0
-msgid "VPF computed as percentage.(%)"
+#: view:hr.payroll.advice:0
+msgid "Confirm Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: constraint:hr.contract:0
-msgid "Error! contract start-date must be lower then contract end-date."
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:res.company,dearness_allowance:0
+msgid "Dearness Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -211,19 +430,71 @@ msgid "Deduction"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,company_transport:0
-msgid "Deduction for company provided transport."
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in confirm state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-msgid "Confirm"
+msgid "Confirm Sheet"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,saving_bank_account:0
-msgid "Saving Bank Account Income "
+#: view:payment.advice.report:0
+#: field:payment.advice.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "or"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
+msgid "Hr Salary Employee By Month Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, python-format
+msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "To Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -236,9 +507,17 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Draft Advice"
+#: selection:hr.payroll.advice,state:0
+#: view:payment.advice.report:0
+#: selection:payment.advice.report,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -252,33 +531,47 @@ msgid "Voluntary Provident Fund"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,medical_insurance:0
-msgid "Deduction towards company provided medical insurance."
+#: report:salary.detail.byyear:0
+msgid "Employee Name"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,long_term_gain:0
-msgid "Stocks/equity mutual funds are kept for more than a year."
+#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
+msgid "Payment Advice Analysis"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
-msgid "Payment Lines"
+#: view:payment.advice.report:0
+msgid "Status"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Done Advice"
+#: field:hr.contract,city_type:0
+msgid "Type of City"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,date:0
-msgid "Date"
+#: help:res.company,dearness_allowance:0
+msgid "Check this box if your company provide Dearness Allowance to employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: constraint:hr.employee:0
-msgid "Error ! You cannot create recursive Hierarchy of Employees."
+#: field:hr.payroll.advice.line,ifsc_code:0
+#: field:payment.advice.report,ifsc_code:0
+#: report:payroll.advice:0
+msgid "IFSC Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,nbr:0
+msgid "# Payment Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -286,18 +579,61 @@ msgstr ""
 msgid "PaySlip Details"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:payment.advice.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
+msgid "This report performs analysis on Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "October"
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
 msgid "Designation"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
+#: selection:payment.advice.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "Pay Head Employee Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
 msgid "Companies"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:payroll.advice:0
 msgid "Authorized Signature"
 msgstr ""
 
@@ -307,55 +643,83 @@ msgid "Contract"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft"
+#: view:hr.payroll.advice.line:0
+msgid "Advice Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,long_term_gain:0
-msgid "Long Term Gain from Share Trading/Equity MFs"
+#: report:payroll.advice:0
+msgid "To,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid "Check this box if you provide allowance for driver"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice.line,advice_id:0
+#: field:hr.payslip,advice_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
 msgid "Bank Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Code"
+#: report:salary.detail.byyear:0
+msgid "Other No."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
+#: view:hr.payroll.advice:0
+msgid "Draft Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,number:0
+#: help:hr.payroll.advice,neft:0
+msgid "Check this box if your company use online transfer for salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
 msgid "Number"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Done"
+#: selection:payment.advice.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
 msgid "Cancel"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Search Payment advice"
+#: view:payment.advice.report:0
+msgid "Day of Payment Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Information"
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "This wizard will print report which display a pay head employee breakup for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -364,13 +728,16 @@ msgid "Pay Slip Details"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.employee,join_date:0
-msgid "joining date of employee "
+#: view:payment.advice.report:0
+msgid "Total Salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,house_rent_income:0
-msgid "Income from house property."
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.report,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -378,6 +745,16 @@ msgstr ""
 msgid "Compute Advice"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr "Dear Sir/Madam,"
+
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,note:0
 msgid "Description"
@@ -389,30 +766,67 @@ msgid ")"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Address"
+#: view:res.company:0
+msgid "Payroll"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,saving_bank_account:0
-msgid "Saving income for bank account."
+#: view:payment.advice.report:0
+msgid "NEFT"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Address"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,bank_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,bank_id:0
+#: report:payroll.advice:0
+#: report:salary.detail.byyear:0
 msgid "Bank"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,end_date:0
+#: field:yearly.salary.detail,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
 #: field:hr.payroll.advice,name:0
 #: report:paylip.details.in:0
+#: field:payment.advice.report,name:0
+#: report:salary.employee.bymonth:0
 msgid "Name"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,company_transport:0
-msgid "Company Provided Transport"
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: field:hr.salary.employee.month,employee_ids:0
+#: view:yearly.salary.detail:0
+#: field:yearly.salary.detail,employee_ids:0
+msgid "Employees"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -421,14 +835,26 @@ msgid "Bank Account"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:144
+#: selection:payment.advice.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employe"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
 #, python-format
 msgid "Please define bank account for the %s employee"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,other_income:0
-msgid "Other income of employee."
+#: field:hr.salary.employee.month,start_date:0
+#: field:yearly.salary.detail,date_from:0
+msgid "Start Date"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
@@ -436,6 +862,21 @@ msgstr ""
 msgid "Allowance"
 msgstr ""
 
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank from which the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "Employee Pay Head Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Phone No."
+msgstr ""
+
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Credit"
@@ -443,30 +884,50 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,name:0
+#: report:payroll.advice:0
 msgid "Bank Account No."
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "States"
+#: help:hr.payroll.advice,date:0
+msgid "Advice Date is used to search Payslips"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: help:hr.contract,leave_avail_dedution:0
-msgid "Deduction for emergency leave of employee."
+#: selection:payment.advice.report,month:0
+msgid "May"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,leave_avail_dedution:0
-msgid "Leave Availed Deduction "
+#: view:hr.payslip.run:0
+msgid "Create Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,neft:0
+#: field:payment.advice.report,neft:0
+msgid "NEFT Transaction"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
 msgid "Total"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-#: field:hr.contract,house_rent_income:0
-msgid "House Rent Income "
+#: report:payroll.advice:0
+msgid "form period"
 msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
\ No newline at end of file

From cb33a1cf130ca60c5fd36cd4202e59997b98f3e1 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Fri, 17 Aug 2012 12:58:30 +0530
Subject: [PATCH 327/999] [IMP]Add class

bzr revid: tch@tinyerp.com-20120817072830-mlsljis5ryd9i66c
---
 addons/crm/crm_lead_view.xml                  | 4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml | 4 ++--
 addons/project/project_view.xml               | 8 ++++----
 addons/project_issue/project_issue_view.xml   | 4 ++--
 addons/survey/survey_view.xml                 | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f2c923844ec..642d282d532 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -311,8 +311,8 @@
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
-                                        <li><a type="edit" >Edit...</a></li>
-                                        <li><a type="delete">Delete</a></li>
+                                        <t t-if="widget.view._is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view._is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
                                         <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
                                         <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index d1866f124af..de6b3c6d286 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -282,8 +282,8 @@
                             <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                 <span class="oe_e">i</span>
                                 <ul class="oe_dropdown_menu">
-                                    <li><a type="edit">Edit...</a></li>
-                                    <li><a type="delete">Delete</a></li>
+                                    <t t-if="widget.view._is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                    <t t-if="widget.view._is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                     <li><a name="action_makeMeeting" type="object">Schedule Interview</a></li>
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6dbcaebd045..3c801d81a54 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -233,8 +233,8 @@
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
-                                        <li><a type="edit">Edit...</a></li>
-                                        <li><a type="delete">Delete</a></li>
+                                        <t t-if="widget.view._is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view._is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
                                 </div>
@@ -514,8 +514,8 @@
                             <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                 <span class="oe_e">í</span>
                                 <ul class="oe_dropdown_menu">
-                                    <li><a type="edit" >Edit...</a></li>
-                                    <li><a type="delete">Delete</a></li>
+                                    <t t-if="widget.view._is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                    <t t-if="widget.view._is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                     <li>
                                       <ul class="oe_kanban_project_times">
                                         <li><a name="set_remaining_time_1" type="object" class="oe_kanban_button">1</a></li>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index b37cf40014e..90cb69cc571 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -257,8 +257,8 @@
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
-                                        <li><a type="edit" >Edit...</a></li>
-                                        <li><a type="delete">Delete</a></li>
+                                        <t t-if="widget.view._is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view._is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
                                 </div>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index b8c6f97e45b..0b0ab177820 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -302,8 +302,8 @@
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
-                                        <li><a type="edit">Edit...</a></li>
-                                        <li><a type="delete">Delete</a></li>
+                                        <t t-if="widget.view._is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view._is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
                                 </div>

From 5458cc1d9239c51b2dc1c0eb97d5f0258e1effdb Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 17 Aug 2012 14:12:42 +0530
Subject: [PATCH 328/999] [IMP] hr_expense: made little changes in code

bzr revid: cha@tinyerp.com-20120817084242-79xf2pa2souihp8d
---
 addons/hr_expense/hr_expense.py       | 3 +--
 addons/hr_expense/hr_expense_view.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 44ecef2ebba..2df0deb6fc4 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -296,8 +296,7 @@ class hr_expense_line(osv.osv):
         uom = self.pool.get('product.uom').browse(cr, uid, uom_id, context=context)
         if uom.category_id.id != product.uom_id.category_id.id:
             res['warning'] = {'title': _('Warning'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure')}
-            uom_id = product.uom_id.id
-            res['value'].update({'uom_id': uom_id})
+            res['value'].update({'uom_id': product.uom_id.id})
         return res
 
 hr_expense_line()
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index c9224d43932..8917588daf5 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -108,7 +108,7 @@
                                     <field name="sequence" invisible="1"/>
                                     <field name="product_id" on_change="onchange_product_id(product_id, context)" context="{'default_hr_expense_ok':1}"/>
                                     <field name="date_value" string="Expense Date"/>
-                                    <field name="name" invisible="1"/>
+                                    <field name="name"/>
                                     <field name="ref"/>
                                     <field domain="[('type','in',['normal','contract']), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
                                     <field name="uom_id" on_change="onchange_uom(product_id, uom_id, context)"/>

From fff7841aa01377f3b9cdb102e7424154bb1a2b48 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 17 Aug 2012 14:50:42 +0530
Subject: [PATCH 329/999] [IMP] res_company : rml_footer1 and rml_footer2
 replaced in rml_footer text field

bzr revid: rpr@tinyerp.com-20120817092042-cqxuoc1vcqom7034
---
 openerp/addons/base/base_data.xml                 | 3 +--
 openerp/addons/base/report/corporate_defaults.xml | 1 -
 openerp/addons/base/res/res_company.py            | 8 +++-----
 openerp/addons/base/res/res_company_view.xml      | 5 ++---
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 0bf4fc9cdb5..a42d90c8e98 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1089,8 +1089,7 @@
             <field name="name">Your Company</field>
             <field name="partner_id" ref="main_partner"/>
             <field name="rml_header1">Your Company Slogan</field>
-            <field name="rml_footer1">Web: http://www.yourcompany.com - Tel: +33 1 49 51 23 94</field>
-            <field name="rml_footer2">Bank Accounts... to be configured in menu Settings > Accounting/Invoicing.</field>
+            <field name="rml_footer">Web: http://www.yourcompany.com - Tel: +33 1 49 51 23 94 - Bank Accounts... to be configured in menu Settings > Accounting/Invoicing.</field>
             <field name="currency_id" ref="base.EUR"/>
         </record>
 
diff --git a/openerp/addons/base/report/corporate_defaults.xml b/openerp/addons/base/report/corporate_defaults.xml
index 12e8bb5eeea..84fb08435f7 100644
--- a/openerp/addons/base/report/corporate_defaults.xml
+++ b/openerp/addons/base/report/corporate_defaults.xml
@@ -3,7 +3,6 @@
     <corporation type="zoom" name="company_id">
         <rml_header1 type="field" name="rml_header1"/>
         <rml_footer1 type="field" name="rml_footer1"/>
-        <rml_footer2 type="field" name="rml_footer2"/>
         <title type="field" name="partner_id.title"/>
         <name type="field" name="partner_id.name"/>
         <street type="field" name="street"/>
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 526ad0e0bad..68bf2b8f93a 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -109,8 +109,7 @@ class res_company(osv.osv):
         'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
         'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
-        'rml_footer1': fields.char('General Information Footer', size=200),
-        'rml_footer2': fields.char('Bank Accounts Footer', size=250, help="Write here your bank accounts for customer payments."),
+        'rml_footer': fields.text('General Information Footer'),
         'rml_header': fields.text('RML Header', required=True),
         'rml_header2': fields.text('RML Internal Header', required=True),
         'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True),
@@ -144,7 +143,7 @@ class res_company(osv.osv):
         if website: val.append(_('Website: ')+website)
         if vat: val.append(_('VAT: ')+vat)
         if reg: val.append(_('Reg: ')+reg)
-        return {'value': {'rml_footer1':' | '.join(val)}}
+        return {'value': {'rml_footer':' | '.join(val)}}
 
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
@@ -294,8 +293,7 @@ class res_company(osv.osv):
 
             <lines>1.2cm 2.15cm 19.9cm 2.15cm</lines>
 
-            <drawCentredString x="10.5cm" y="1.7cm">[[ company.rml_footer1 ]]</drawCentredString>
-            <drawCentredString x="10.5cm" y="1.25cm">[[ company.rml_footer2 ]]</drawCentredString>
+            <drawCentredString x="10.5cm" y="1.7cm">[[ company.rml_footer ]]</drawCentredString>
             <drawCentredString x="10.5cm" y="0.8cm">Contact : [[ user.name ]] - Page: <pageNumber/></drawCentredString>
         </pageGraphics>
     </pageTemplate>
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 1cf32c03753..3061da3c79c 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -67,9 +67,9 @@
                             </group>
                             <group string="Bank Accounts">
                                 <field name="bank_ids" colspan="4" nolabel="1"/>
-                                <label for="rml_footer2"/>
+                                <label for="rml_footer"/>
                                 <div name="bank_acc">
-                                    <field name="rml_footer2"/>
+                                    <field name="rml_footer"/>
                                     <!--<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward" class="oe_inline"/>-->
                                 </div>
                             </group>
@@ -77,7 +77,6 @@
                         <page string="Header/Footer" groups="base.group_no_one">
                             <group>
                                <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
-                                <field name="rml_footer1"/>
                             </group>
                             <label for="rml_header"/>
                             <field name="rml_header"/>

From b2fa4883289b60bacabac1534d61bae56f865e16 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 17 Aug 2012 14:55:03 +0530
Subject: [PATCH 330/999] [IMP] res_company : rml_footer1 and rml_footer2
 replaced in rml_footer text field

bzr revid: rpr@tinyerp.com-20120817092503-1o8155liajl344g5
---
 openerp/addons/base/report/corporate_defaults.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/report/corporate_defaults.xml b/openerp/addons/base/report/corporate_defaults.xml
index 84fb08435f7..12e8bb5eeea 100644
--- a/openerp/addons/base/report/corporate_defaults.xml
+++ b/openerp/addons/base/report/corporate_defaults.xml
@@ -3,6 +3,7 @@
     <corporation type="zoom" name="company_id">
         <rml_header1 type="field" name="rml_header1"/>
         <rml_footer1 type="field" name="rml_footer1"/>
+        <rml_footer2 type="field" name="rml_footer2"/>
         <title type="field" name="partner_id.title"/>
         <name type="field" name="partner_id.name"/>
         <street type="field" name="street"/>

From 4b364238c3ee93130b2918d481a0296e34cd234a Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 17 Aug 2012 15:17:27 +0530
Subject: [PATCH 331/999] [IMP] hr_expense: made little changes in demo data

bzr revid: cha@tinyerp.com-20120817094727-8u7dt2djaawz4lc0
---
 addons/hr_expense/hr_expense_demo.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index e1d6b0a00b0..eddaf03ad38 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -11,6 +11,8 @@
             <field name="type">service</field>
             <field name="name">Car Travel Expenses</field>
             <field name="default_code">CarTRA</field>
+            <field name="uom_id" ref="product.product_uom_km"/>
+            <field name="uom_po_id" ref="product.product_uom_km"/>
             <field name="categ_id" ref="hr_expense.cat_expense"/>
             <field name="hr_expense_ok" eval="True" />
             <field name="image">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</field>

From b62858e83e21bdd80aaf38b6d1149e6c66dc54e1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 17 Aug 2012 12:03:02 +0200
Subject: [PATCH 332/999] [IMP] Merging different ways of posting a message:  
 message_append_note   message_append_dict   message_append   --> merged all
 to message_post

bzr revid: fp@tinyerp.com-20120817100302-bqsqv23ogrchslew
---
 addons/account/account_bank_statement.py      |   2 +-
 addons/account/account_invoice.py             |  10 +-
 addons/account_voucher/account_voucher.py     |   6 +-
 addons/analytic/analytic.py                   |   2 +-
 .../analytic_contract_project.py              |   2 +-
 addons/base_calendar/crm_meeting.py           |   4 +-
 addons/base_status/base_stage.py              |  12 +-
 addons/base_status/base_state.py              |  12 +-
 addons/crm/crm_action_rule.py                 |   2 +-
 addons/crm/crm_lead.py                        |  16 +-
 addons/crm/crm_meeting.py                     |   8 +-
 addons/crm/crm_phonecall.py                   |   6 +-
 .../crm/test/process/lead2opportunity2win.yml |   2 +-
 addons/crm_claim/crm_claim.py                 |   6 +-
 addons/crm_helpdesk/crm_helpdesk.py           |   2 +-
 addons/event/event.py                         |  20 +-
 addons/event_sale/event_sale.py               |   2 +-
 addons/hr/hr.py                               |   2 +-
 addons/hr_holidays/hr_holidays.py             |  25 +-
 addons/hr_recruitment/hr_recruitment.py       |  14 +-
 .../hr_timesheet_invoice.py                   |   8 +-
 addons/idea/idea.py                           |   8 +-
 addons/mail/doc/mail_openchatter_howto.rst    |   4 +-
 addons/mail/mail_thread.py                    | 283 +++---------------
 addons/mail/res_users.py                      |   7 +-
 addons/mrp/mrp.py                             |  14 +-
 addons/mrp/procurement.py                     |   2 +-
 addons/mrp_operations/mrp_operations.py       |  10 +-
 addons/mrp_repair/mrp_repair.py               |  14 +-
 addons/plugin/plugin_handler.py               |   2 +-
 addons/procurement/procurement.py             |   6 +-
 addons/procurement/schedulers.py              |   2 +-
 addons/product/product.py                     |   2 +-
 addons/project/project.py                     |  18 +-
 addons/project_issue/project_issue.py         |  10 +-
 addons/purchase/purchase.py                   |  16 +-
 .../purchase_requisition.py                   |  10 +-
 addons/sale/sale.py                           |  16 +-
 addons/sale_crm/wizard/crm_make_sale.py       |   2 +-
 addons/share/wizard/share_wizard.py           |   2 +-
 addons/stock/stock.py                         |  12 +-
 .../stock/wizard/stock_change_product_qty.py  |   2 +-
 42 files changed, 197 insertions(+), 408 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 8df291a98d1..911086a83e4 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -430,7 +430,7 @@ class account_bank_statement(osv.osv):
                     'name': st_number,
                     'balance_end_real': st.balance_end
             }, context=context)
-            self.message_append_note(cr, uid, [st.id], body=_('Statement %s is confirmed, journal items are created.') % (st_number,), context=context)
+            self.message_post(cr, uid, [st.id], body=_('Statement %s is confirmed, journal items are created.') % (st_number,), context=context)
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 012bde42eff..bca1530abae 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1045,7 +1045,7 @@ class account_invoice(osv.osv):
                 if obj_inv.type in ('out_invoice', 'out_refund'):
                     ctx = self.get_log_context(cr, uid, context=ctx)
                 message = _("Invoice  '%s' is validated.") % name
-                self.message_append_note(cr, uid, [inv_id], body=message, context=context)
+                self.message_post(cr, uid, [inv_id], body=message, context=context)
         return True
 
     def action_cancel(self, cr, uid, ids, *args):
@@ -1275,7 +1275,7 @@ class account_invoice(osv.osv):
             # TODO: use currency's formatting function
             msg = _("Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining).") % \
                     (name, pay_amount, code, invoice.amount_total, code, total, code)
-            self.message_append_note(cr, uid, [inv_id], body=msg, context=context)
+            self.message_post(cr, uid, [inv_id], body=msg, context=context)
             self.pool.get('account.move.line').reconcile_partial(cr, uid, line_ids, 'manual', context)
 
         # Update the stored value (fields.function), so we write to trigger recompute
@@ -1297,15 +1297,15 @@ class account_invoice(osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id],body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id],body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
 
     def confirm_paid_send_note(self, cr, uid, ids, context=None):
          for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s <b>paid</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>paid</b>.") % (self._get_document_type(obj.type)), context=context)
 
     def invoice_cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s <b>cancelled</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>cancelled</b>.") % (self._get_document_type(obj.type)), context=context)
 
 account_invoice()
 
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 1287c7b3c18..fcbe917dc72 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -1292,17 +1292,17 @@ class account_voucher(osv.osv):
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             message = "%s <b>created</b>." % self._document_type[obj.type or False]
-            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+            self.message_post(cr, uid, [obj.id], body=message, context=context)
 
     def post_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             message = "%s '%s' is <b>posted</b>." % (self._document_type[obj.type or False], obj.move_id.name)
-            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+            self.message_post(cr, uid, [obj.id], body=message, context=context)
 
     def reconcile_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             message = "%s <b>reconciled</b>." % self._document_type[obj.type or False]
-            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+            self.message_post(cr, uid, [obj.id], body=message, context=context)
 
 account_voucher()
 
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 3231b1e6d95..2fe361a4f6c 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -297,7 +297,7 @@ class account_analytic_account(osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), context=context)
 
 account_analytic_account()
 
diff --git a/addons/analytic_contract_project/analytic_contract_project.py b/addons/analytic_contract_project/analytic_contract_project.py
index 1ffab1246c9..91dc4498880 100644
--- a/addons/analytic_contract_project/analytic_contract_project.py
+++ b/addons/analytic_contract_project/analytic_contract_project.py
@@ -79,6 +79,6 @@ class task(osv.osv):
         task_id = super(task, self).create(cr, uid, vals, context=context)
         task_browse = self.browse(cr, uid, task_id, context=context)
         if task_browse.project_id.analytic_account_id:
-            self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task <em>%s</em> has been <b>created</b>.") % (task_browse.name), context=context)
+            self.pool.get('account.analytic.account').message_post(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task <em>%s</em> has been <b>created</b>.") % (task_browse.name), context=context)
         return task_id
 task()
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index a66449a8b5d..4bf922a2797 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -78,9 +78,9 @@ class crm_meeting(base_state, osv.Model):
         return 'Meeting'
 
     def case_open_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Meeting has been <b>confirmed</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Meeting has been <b>confirmed</b>."), context=context)
 
     def case_close_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Meeting has been <b>done</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Meeting has been <b>done</b>."), context=context)
 
 
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 775de51394c..d5ac2d78c44 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -395,31 +395,31 @@ class base_stage(object):
     def case_open_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>opened</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_close_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>closed</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_cancel_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>canceled</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_pending_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s is now <b>pending</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_reset_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>renewed</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_escalate_send_note(self, cr, uid, ids, new_section=None, context=None):
@@ -428,5 +428,5 @@ class base_stage(object):
                 msg = '%s has been <b>escalated</b> to <b>%s</b>.' % (self.case_get_note_msg_prefix(cr, uid, id, context=context), new_section.name)
             else:
                 msg = '%s has been <b>escalated</b>.' % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], 'System Notification', msg, context=context)
+            self.message_post(cr, uid, [id], 'System Notification', msg, context=context)
         return True
diff --git a/addons/base_status/base_state.py b/addons/base_status/base_state.py
index 8fa2f92e22a..098e09210f9 100644
--- a/addons/base_status/base_state.py
+++ b/addons/base_status/base_state.py
@@ -185,7 +185,7 @@ class base_state(object):
     def case_open_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>opened</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_escalate_send_note(self, cr, uid, ids, new_section=None, context=None):
@@ -194,29 +194,29 @@ class base_state(object):
                 msg = '%s has been <b>escalated</b> to <b>%s</b>.' % (self.case_get_note_msg_prefix(cr, uid, id, context=context), new_section.name)
             else:
                 msg = '%s has been <b>escalated</b>.' % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], 'System Notification', msg, context=context)
+            self.message_post(cr, uid, [id], 'System Notification', msg, context=context)
         return True
 
     def case_close_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>closed</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_cancel_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>canceled</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_pending_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s is now <b>pending</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_reset_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>renewed</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 3e3bdc90d08..6753484dae0 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -106,7 +106,7 @@ class base_action_rule(osv.osv):
 
         # Put state change by rule in communication history
         if hasattr(obj, 'state') and hasattr(obj, 'message_append') and action.act_state:
-            model_obj.message_append(cr, uid, [obj], _(action.act_state))
+            model_obj.message_post(cr, uid, [obj], _(action.act_state))
 
         model_obj.write(cr, uid, [obj.id], write, context)
         super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context)
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 3569480ba9c..754e11db598 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -488,7 +488,7 @@ class crm_lead(base_stage, osv.osv):
 
         subject = subject[0] + ", ".join(subject[1:])
         details = "\n\n".join(details)
-        return self.message_append_note(cr, uid, [opportunity_id], subject=subject, body=details)
+        return self.message_post(cr, uid, [opportunity_id], subject=subject, body=details)
 
     def _merge_opportunity_history(self, cr, uid, opportunity_id, opportunities, context=None):
         message = self.pool.get('mail.message')
@@ -860,7 +860,7 @@ class crm_lead(base_stage, osv.osv):
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('crm.case.stage').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
 
     def case_get_note_msg_prefix(self, cr, uid, lead, context=None):
         if isinstance(lead, (int, long)):
@@ -870,33 +870,33 @@ class crm_lead(base_stage, osv.osv):
     def create_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             message = _("%s has been <b>created</b>.")% (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=message, context=context)
+            self.message_post(cr, uid, [id], body=message, context=context)
         return True
 
     def case_mark_lost_send_note(self, cr, uid, ids, context=None):
         message = _("Opportunity has been <b>lost</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def case_mark_won_send_note(self, cr, uid, ids, context=None):
         message = _("Opportunity has been <b>won</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def schedule_phonecall_send_note(self, cr, uid, ids, phonecall_id, action, context=None):
         phonecall = self.pool.get('crm.phonecall').browse(cr, uid, [phonecall_id], context=context)[0]
         if action == 'log': prefix = 'Logged'
         else: prefix = 'Scheduled'
         message = _("<b>%s a call</b> for the <em>%s</em>.") % (prefix, phonecall.date)
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def _lead_set_partner_send_note(self, cr, uid, ids, context=None):
         for lead in self.browse(cr, uid, ids, context=context):
             message = _("%s <b>partner</b> is now set to <em>%s</em>." % (self.case_get_note_msg_prefix(cr, uid, lead, context=context), lead.partner_id.name))
-            lead.message_append_note(body=message)
+            lead.message_post(body=message)
         return True
 
     def convert_opportunity_send_note(self, cr, uid, lead, context=None):
         message = _("Lead has been <b>converted to an opportunity</b>.")
-        lead.message_append_note(body=message)
+        lead.message_post(body=message)
         return True
 
 crm_lead()
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 13171d95b9b..de54d8e40ac 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -44,7 +44,7 @@ class crm_meeting(osv.Model):
     def create_send_note(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        # update context: if come from phonecall, default state values can make the message_append_note crash
+        # update context: if come from phonecall, default state values can make the message_post crash
         context.pop('default_state', False)
         for meeting in self.browse(cr, uid, ids, context=context):
             # in the message, transpose meeting.date to the timezone of the current user
@@ -53,14 +53,14 @@ class crm_meeting(osv.Model):
             if meeting.opportunity_id: # meeting can be create from phonecalls or opportunities, therefore checking for the parent
                 lead = meeting.opportunity_id
                 message = _("Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (lead.name, meeting_date_tz)
-                lead.message_append_note(_('System Notification'), message)
+                lead.message_post(_('System Notification'), message)
             elif meeting.phonecall_id:
                 phonecall = meeting.phonecall_id
                 message = _("Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (phonecall.name, meeting_date_tz)
-                phonecall.message_append_note(body=message)
+                phonecall.message_post(body=message)
             else:
                 message = _("A meeting has been <b>scheduled</b> on <em>%s</em>.") % (meeting_date_tz)
-            meeting.message_append_note(body=message)
+            meeting.message_post(body=message)
         return True
 
 class calendar_attendee(osv.osv):
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index e2c2a2b02da..e613733d9ab 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -266,7 +266,7 @@ class crm_phonecall(base_state, osv.osv):
     
     def case_reset_send_note(self, cr, uid, ids, context=None):
         message = _('Phonecall has been <b>reset and set as open</b>.')
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def case_open_send_note(self, cr, uid, ids, context=None):
         lead_obj = self.pool.get('crm.lead')
@@ -280,11 +280,11 @@ class crm_phonecall(base_state, osv.osv):
                 message = _("Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (lead.name, phonecall_date_str)
             else:
                 message = _("Phonecall has been <b>created and opened</b>.")
-            phonecall.message_append_note(body=message)
+            phonecall.message_post(body=message)
         return True
 
     def _call_set_partner_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Partner has been <b>created</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Partner has been <b>created</b>."), context=context)
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index 23713dfca2f..0156dc9a8b1 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -55,7 +55,7 @@
   After communicated  with customer, I put some notes with contract details.
 -
   !python {model: crm.lead}: |
-    self.message_append_note(cr, uid, [ref('crm_case_4')], subject='Test note', body='ces détails envoyés par le client sur ​​le FAX pour la qualité')
+    self.message_post(cr, uid, [ref('crm_case_4')], subject='Test note', body='ces détails envoyés par le client sur ​​le FAX pour la qualité')
 -
   I win this opportunity
 -
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 73d5af68b52..a7ea3d619e7 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -238,16 +238,16 @@ class crm_claim(base_stage, osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         msg = _('Claim has been <b>created</b>.')
-        return self.message_append_note(cr, uid, ids, body=msg, context=context)
+        return self.message_post(cr, uid, ids, body=msg, context=context)
 
     def case_refuse_send_note(self, cr, uid, ids, context=None):
         msg = _('Claim has been <b>refused</b>.')
-        return self.message_append_note(cr, uid, ids, body=msg, context=context)
+        return self.message_post(cr, uid, ids, body=msg, context=context)
 
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('crm.claim.stage').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
 
 
 class res_partner(osv.osv):
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index bb3b0891479..e219263d841 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -148,7 +148,7 @@ class crm_helpdesk(base_state, osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         msg = _('Case has been <b>created</b>.')
-        self.message_append_note(cr, uid, ids, body=msg, context=context)
+        self.message_post(cr, uid, ids, body=msg, context=context)
         return True
 
 
diff --git a/addons/event/event.py b/addons/event/event.py
index 48946959551..a057fe80ac4 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -268,27 +268,27 @@ class event_event(osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         message = _("Event has been <b>created</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def button_cancel_send_note(self, cr, uid, ids, context=None):
         message = _("Event has been <b>cancelled</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def button_draft_send_note(self, cr, uid, ids, context=None):
         message = _("Event has been set to <b>draft</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def button_done_send_note(self, cr, uid, ids, context=None):
         message = _("Event has been <b>done</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def button_confirm_send_note(self, cr, uid, ids, context=None):
         message = _("Event has been <b>confirmed</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
 event_event()
@@ -334,7 +334,7 @@ class event_registration(osv.osv):
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
     def confirm_registration(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_('State set to open'))
+        self.message_post(cr, uid, ids, body=_('State set to open'))
         return self.write(cr, uid, ids, {'state': 'open'}, context=context)
 
     def create(self, cr, uid, vals, context=None):
@@ -364,13 +364,13 @@ class event_registration(osv.osv):
             if today >= registration.event_id.date_begin:
                 values = {'state': 'done', 'date_closed': today}
                 self.write(cr, uid, ids, values)
-                self.message_append_note(cr, uid, ids, body=_('State set to Done'))
+                self.message_post(cr, uid, ids, body=_('State set to Done'))
             else:
                 raise osv.except_osv(_('Error!'),_("You must wait for the starting day of the event to do this action.") )
         return True
 
     def button_reg_cancel(self, cr, uid, ids, context=None, *args):
-        self.message_append_note(cr, uid, ids,body = _('State set to Cancel'))
+        self.message_post(cr, uid, ids,body = _('State set to Cancel'))
         return self.write(cr, uid, ids, {'state': 'cancel'})
 
     def mail_user(self, cr, uid, ids, context=None):
@@ -440,12 +440,12 @@ class event_registration(osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         message = _("Registration has been <b>created</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def do_draft_send_note(self, cr, uid, ids, context=None):
         message = _("Registration has been set as <b>draft</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
 event_registration()
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 681116d064e..1d7a30ee2ee 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -88,5 +88,5 @@ class sale_order_line(osv.osv):
                 }
                 registration_id = registration_obj.create(cr, uid, dic, context=context)
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
-                registration_obj.message_append_note(cr, uid, [registration_id], body=message, context=context)
+                registration_obj.message_post(cr, uid, [registration_id], body=message, context=context)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 966c29cab07..54560863dd0 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -212,7 +212,7 @@ class hr_employee(osv.osv):
         try:
             (model, mail_group_id) = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'group_all_employees')
             employee = self.browse(cr, uid, employee_id, context=context)
-            self.pool.get('mail.group').message_append_note(cr, uid, [mail_group_id], body='Welcome to %s! Please help him make its first steps in OpenERP!' % (employee.name), context=context)
+            self.pool.get('mail.group').message_post(cr, uid, [mail_group_id], body='Welcome to %s! Please help him make its first steps in OpenERP!' % (employee.name), context=context)
         except:
             pass # group deleted: do not push a message
         return employee_id
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 47ca1246240..5748da37c1e 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -366,39 +366,38 @@ class hr_holidays(osv.osv):
 
     def create_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, ids, _('System notification'),
+            self.message_post(cr, uid, ids, 
                         _("The %s request has been <b>created</b> and is waiting confirmation.")
-                        % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+                        % ('leave' if obj.type == 'remove' else 'allocation',), context=context)
         return True
     
     def holidays_confirm_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids):
-            self.message_append_note(cr, uid, [obj.id], _('System notification'), 
-                    _("The %s request has been <b>confirmed</b> and is waiting for validation by the manager.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification')
+            self.message_post(cr, uid, [obj.id], _("The %s request has been <b>confirmed</b> and is waiting for validation by the manager.")
+                    % ('leave' if obj.type == 'remove' else 'allocation',))
     
     def holidays_validate_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids):
             if obj.holiday_status_id.double_validation:
-                self.message_append_note(cr, uid, [obj.id], _('System notification'),
+                self.message_post(cr, uid, [obj.id], 
                     _("The %s request has been <b>approved</b>. A second validation is necessary and is now pending.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+                    % ('leave' if obj.type == 'remove' else 'allocation',), context=context)
             else:
-                self.message_append_note(cr, uid, [obj.id], _('System notification'),
+                self.message_post(cr, uid, [obj.id], 
                     _("The %s request has been <b>approved</b>. The validation process is now over.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+                    % ('leave' if obj.type == 'remove' else 'allocation',), context=context)
     
     def holidays_valid2_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids):
-            self.message_append_note(cr, uid, [obj.id], _('System notification'),
+            self.message_post(cr, uid, [obj.id], 
                     _("The %s request has been <b>double validated</b>. The validation process is now over.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+                    % ('leave' if obj.type == 'remove' else 'allocation',), context=context)
     
     def holidays_refuse_notificate(self, cr, uid, ids, approval, context=None):
         for obj in self.browse(cr, uid, ids):
-            self.message_append_note(cr, uid, [obj.id], _('System notification'),
+            self.message_post(cr, uid, [obj.id], 
                     _("The %s request has been <b>refused</b>. The validation process is now over.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+                    % ('leave' if obj.type == 'remove' else 'allocation',), context=context)
     
 hr_holidays()
 
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 721b5a8dc6d..8446cb93d89 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -464,14 +464,14 @@ class hr_applicant(base_stage, osv.Model):
         """ Override of the (void) default notification method. """
         if not stage_id: return True
         stage_name = self.pool.get('hr.recruitment.stage').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
 
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
 		return 'Applicant'
 
     def case_open_send_note(self, cr, uid, ids, context=None):
         message = _("Applicant has been set <b>in progress</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def case_close_send_note(self, cr, uid, ids, context=None):
         if context is None:
@@ -479,23 +479,23 @@ class hr_applicant(base_stage, osv.Model):
         for applicant in self.browse(cr, uid, ids, context=context):
             if applicant.emp_id:
                 message = _("Applicant has been <b>hired</b> and created as an employee.")
-                self.message_append_note(cr, uid, [applicant.id], body=message, context=context)
+                self.message_post(cr, uid, [applicant.id], body=message, context=context)
             else:
                 message = _("Applicant has been <b>hired</b>.")
-                self.message_append_note(cr, uid, [applicant.id], body=message, context=context)
+                self.message_post(cr, uid, [applicant.id], body=message, context=context)
         return True
 
     def case_cancel_send_note(self, cr, uid, ids, context=None):
         msg = 'Applicant <b>refused</b>.'
-        return self.message_append_note(cr, uid, ids, body=msg, context=context)
+        return self.message_post(cr, uid, ids, body=msg, context=context)
 
     def case_reset_send_note(self,  cr, uid, ids, context=None):
         message =_("Applicant has been set as <b>new</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def create_send_note(self, cr, uid, ids, context=None):
         message = _("Applicant has been <b>created</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
 
 class hr_job(osv.osv):
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 4cba4a18680..a1562d53a61 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -95,25 +95,25 @@ class account_analytic_account(osv.osv):
     def set_close(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'close'}, context=context)
         message = _("Contract has been <b>closed</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def set_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
         message = _("Contract has been <b>cancelled</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def set_open(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'open'}, context=context)
         message = _("Contract has been <b>opened</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def set_pending(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'pending'}, context=context)
         message = _("Contract has been set as <b>pending</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
 account_analytic_account()
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 3be4dd2e28d..e2e5ec50ddf 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -67,21 +67,21 @@ class idea_idea(osv.osv):
 
     def idea_cancel(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, { 'state': 'cancel' })
-        self.message_append_note(cr, uid, ids, body=_('Idea canceled.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea canceled.'), context=context)
         return True
 
     def idea_open(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, { 'state': 'open'})
-        self.message_append_note(cr, uid, ids, body=_('Idea accepted.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea accepted.'), context=context)
         return True
 
     def idea_close(self, cr, uid, ids, context={}):
-        self.message_append_note(cr, uid, ids, body=_('Idea done.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea done.'), context=context)
         self.write(cr, uid, ids, { 'state': 'close' })
         return True
 
     def idea_draft(self, cr, uid, ids, context={}):
-        self.message_append_note(cr, uid, ids, body=_('Idea reset to draft.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea reset to draft.'), context=context)
         self.write(cr, uid, ids, { 'state': 'draft' })
         return True
 idea_idea()
diff --git a/addons/mail/doc/mail_openchatter_howto.rst b/addons/mail/doc/mail_openchatter_howto.rst
index 789acdd87eb..59e038f28eb 100644
--- a/addons/mail/doc/mail_openchatter_howto.rst
+++ b/addons/mail/doc/mail_openchatter_howto.rst
@@ -57,7 +57,7 @@ Use the thread viewer widget inside your form view by using the mail_thread widg
 Send notifications
 +++++++++++++++++++
 
-When sending a notification is required in your workflow or business logic, use the ``message_append_note`` method. This method is a shortcut to the ``message_append`` method that takes all ``mail.message`` fields as arguments. This latter method calls ``message_create`` that
+When sending a notification is required in your workflow or business logic, use the ``message_post`` method. This method is a shortcut to the ``message_append`` method that takes all ``mail.message`` fields as arguments. This latter method calls ``message_create`` that
 
  - creates the message
  - parses the body to find users you want to push the message to (finding and parsing ``@login`` in the message body)
@@ -74,7 +74,7 @@ You should therefore not worry about subscriptions or anything else than sending
     return res
 
   def do_something_send_note(self, cr, uid, ids, context=None):
-    self.message_append_note(cr, uid, ids, _('My subject'),
+    self.message_post(cr, uid, ids, _('My subject'),
     _("has received a <b>notification</b> and is happy for it."), context=context)
 
 Notifications guidelines
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index ec34bc221cb..5f3167cda39 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -154,197 +154,11 @@ class mail_thread(osv.Model):
     # mail.message wrappers and tools
     #------------------------------------------------------
 
-    # FP Note: should we support attachment ? Also, this method must be on
-    # the mail.message object, not on the thread.
-    def message_create(self, cr, uid, thread_id, vals, context=None):
-        """ OpenChatter: wrapper of mail.message create method
-           - creates the mail.message
-           - automatically subscribe the message writer
-           - push the message to followers
-        """
-        context = context or {}
-        message_obj = self.pool.get('mail.message')
-        vals['model'] = self._name
-        vals['res_id'] = thread_id
-        msg_id = message_obj.create(cr, uid, vals, context=context)
-        return msg_id
-
     def _needaction_domain_get(self, cr, uid, context={}):
         if self._needaction:
             return [('message_unread','=',True)]
         return []
 
-    #------------------------------------------------------
-    # Generic message api
-    #------------------------------------------------------
-
-    # I propose to remove this. Everyone should use message_create instead.
-    def message_append(self, cr, uid, threads, subject, body_text=None, body_html=None,
-                        type='email', email_date=None, parent_id=False,
-                        content_subtype='plain', state=None,
-                        partner_ids=None, email_from=False, email_to=False,
-                        email_cc=None, reply_to=None,
-                        headers=None, message_id=False, references=None,
-                        attachments=None, context=None):
-        """ Creates a new mail.message through message_create. The new message
-            is attached to the current mail.thread, containing all the details
-            passed as parameters. All attachments will be attached to the
-            thread record as well as to the actual message.
-
-            This method calls message_create that will handle management of
-            subscription and notifications, and effectively create the message.
-
-            If ``email_from`` is not set or ``type`` not set as 'email',
-            a note message is created (comment or system notification),
-            without the usual envelope attributes (sender, recipients, etc.).
-
-            :param threads: list of thread ids, or list of browse_records
-                representing threads to which a new message should be attached
-            :param subject: subject of the message, or description of the event;
-                this is totally optional as subjects are not important except
-                for specific messages (blog post, job offers) or for emails
-            :param body_text: plaintext contents of the mail or log message
-            :param body_html: html contents of the mail or log message
-            :param type: type of message: 'email', 'comment', 'notification';
-                email by default
-            :param email_date: email date string if different from now, in
-                server timezone
-            :param parent_id: id of the parent message (threaded messaging model)
-            :param content_subtype: optional content_subtype of message: 'plain'
-                or 'html', corresponding to the main body contents (body_text or
-                body_html).
-            :param state: state of message
-            :param partner_ids: destination partners of the message, in addition
-                to the now fully optional email_to; this method is supposed to
-                received a list of ids is not None. The specific many2many
-                instruction will be generated by this method.
-            :param email_from: Email From / Sender address if any
-            :param email_to: Email-To / Recipient address
-            :param email_cc: Comma-Separated list of Carbon Copy Emails To
-                addresses if any
-            :param reply_to: reply_to header
-            :param headers: mail headers to store
-            :param message_id: optional email identifier
-            :param references: optional email references
-            :param dict attachments: map of attachment filenames to binary
-                contents, if any.
-            :param dict context: if a ``thread_model`` value is present in the
-                context, its value will be used to determine the model of the
-                thread to update (instead of the current model).
-        """
-        if context is None:
-            context = {}
-        if attachments is None:
-            attachments = {}
-
-        if email_date:
-            edate = parsedate(email_date)
-            if edate is not None:
-                email_date = time.strftime('%Y-%m-%d %H:%M:%S', edate)
-
-        if all(isinstance(thread_id, (int, long)) for thread_id in threads):
-            model = context.get('thread_model') or self._name
-            model_pool = self.pool.get(model)
-            threads = model_pool.browse(cr, uid, threads, context=context)
-
-        ir_attachment = self.pool.get('ir.attachment')
-
-        new_msg_ids = []
-        for thread in threads:
-            to_attach = []
-            for attachment in attachments:
-                fname, fcontent = attachment
-                if isinstance(fcontent, unicode):
-                    fcontent = fcontent.encode('utf-8')
-                data_attach = {
-                    'name': fname,
-                    'datas': base64.b64encode(str(fcontent)),
-                    'datas_fname': fname,
-                    'description': _('Mail attachment'),
-                }
-                to_attach.append(ir_attachment.create(cr, uid, data_attach, context=context))
-            # find related partner: partner_id column in thread object, or self is res.partner model
-            partner_id = ('partner_id' in thread._columns.keys()) and (thread.partner_id and thread.partner_id.id or False) or False
-            if not partner_id and thread._name == 'res.partner':
-                partner_id = thread.id
-            # destination partners
-            if partner_ids is None:
-                partner_ids = []
-            mail_partner_ids = [(6, 0, partner_ids)]
-
-            data = {
-                'subject': subject,
-                'body_text': body_text or thread._model._columns.get('description') and thread.description or '',
-                'body_html': body_html or '',
-                'parent_id': parent_id,
-                'date': email_date or fields.datetime.now(),
-                'type': type,
-                'content_subtype': content_subtype,
-                'state': state,
-                'message_id': message_id,
-                'partner_ids': mail_partner_ids,
-                'attachment_ids': [(6, 0, to_attach)],
-                'user_id': uid,
-                'model' : thread._name,
-                'res_id': thread.id,
-                'partner_id': partner_id,
-            }
-
-            if email_from or type == 'email':
-                for param in (email_to, email_cc):
-                    if isinstance(param, list):
-                        param = ", ".join(param)
-                data.update({
-                    'email_to': email_to,
-                    'email_from': email_from or \
-                        thread._model._columns.get('user_id') and thread.user_id and thread.user_id.user_email,
-                    'email_cc': email_cc,
-                    'references': references,
-                    'headers': headers,
-                    'reply_to': reply_to,
-                    })
-
-            new_msg_ids.append(self.message_create(cr, uid, thread.id, data, context=context))
-        return new_msg_ids
-
-    # to be removed completly
-    def message_append_dict(self, cr, uid, ids, msg_dict, context=None):
-        """Creates a new mail.message attached to the given threads (``ids``),
-           with the contents of ``msg_dict``, by calling ``message_append``
-           with the mail details. All attachments in msg_dict will be
-           attached to the object record as well as to the actual
-           mail message.
-
-           :param dict msg_dict: a map containing the email details and
-                                 attachments. See ``message_process()`` and
-                                ``mail.message.parse()`` for details on
-                                the dict structure.
-           :param dict context: if a ``thread_model`` value is present
-                                in the context, its value will be used
-                                to determine the model of the thread to
-                                update (instead of the current model).
-        """
-        return self.message_append(cr, uid, ids,
-                            subject = msg_dict.get('subject'),
-                            body_text = msg_dict.get('body_text'),
-                            body_html= msg_dict.get('body_html'),
-                            parent_id = msg_dict.get('parent_id', False),
-                            type = msg_dict.get('type', 'email'),
-                            content_subtype = msg_dict.get('content_subtype'),
-                            state = msg_dict.get('state'),
-                            partner_ids = msg_dict.get('partner_ids'),
-                            email_from = msg_dict.get('from', msg_dict.get('email_from')),
-                            email_to = msg_dict.get('to', msg_dict.get('email_to')),
-                            email_cc = msg_dict.get('cc', msg_dict.get('email_cc')),
-                            reply_to = msg_dict.get('reply', msg_dict.get('reply_to')),
-                            email_date = msg_dict.get('date'),
-                            message_id = msg_dict.get('message-id', msg_dict.get('message_id')),
-                            references = msg_dict.get('references')\
-                                      or msg_dict.get('in-reply-to'),
-                            attachments = msg_dict.get('attachments'),
-                            headers = msg_dict.get('headers'),
-                            context = context)
-
     #------------------------------------------------------
     # Message loading
     #------------------------------------------------------
@@ -665,7 +479,7 @@ class mail_thread(osv.Model):
                 model_pool.message_update(cr, user_id, [thread_id], msg, context=context)
             else:
                 thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
-
+            self.message_post(cr, uid, thread_id, context=context, **msg)
         return True
 
     def message_new(self, cr, uid, msg_dict, custom_values=None, context=None):
@@ -704,7 +518,6 @@ class mail_thread(osv.Model):
         if custom_values and isinstance(custom_values, dict):
             data.update(custom_values)
         res_id = model_pool.create(cr, uid, data, context=context)
-        self.message_append_dict(cr, uid, [res_id], msg_dict, context=context)
         return res_id
 
     def message_update(self, cr, uid, ids, msg_dict, update_vals=None, context=None):
@@ -723,7 +536,7 @@ class mail_thread(osv.Model):
         """
         if update_vals:
             self.write(cr, uid, ids, update_vals, context=context)
-        return self.message_append_dict(cr, uid, ids, msg_dict, context=context)
+        return True
 
     def message_thread_followers(self, cr, uid, ids, context=None):
         """ Returns a list of email addresses of the people following
@@ -834,13 +647,7 @@ class mail_thread(osv.Model):
         if save_original:
             msg_original = message.as_string() if isinstance(message, Message) \
                                                   else message
-            attachments.append((0, 0, {
-                'name':'email.eml',
-                'datas': base64.b64encode(msg_original),
-                'datas_fname': 'email.eml',
-                'res_model': 'mail.message',
-                'description': _('original email'),
-            }))
+            attachments.append(('email.eml', msg_original))
 
         if not message_id:
             # Very unusual situation, be we should be fault-tolerant here
@@ -902,27 +709,14 @@ class mail_thread(osv.Model):
         if 'In-Reply-To' in msg_fields:
             pass
 
-        #msg['headers'] = {}
-        #msg['content_subtype'] = 'plain'
-        #for item in msg_txt.items():
-        #    if item[0].startswith('X-'):
-        #        msg['headers'].update({item[0]: item[1]})
         if not msg_txt.is_multipart() or 'text/plain' in msg.get('content-type', ''):
             encoding = msg_txt.get_content_charset()
             body = msg_txt.get_payload(decode=True)
             if 'text/html' in msg.get('content-type', ''):
                 msg['body'] =  body
-        #        msg['content_subtype'] = 'html'
-        #        if body:
-        #            body = tools.html2plaintext(body)
-        #    msg['body_text'] = tools.ustr(body, encoding)
 
         if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''):
             body = ""
-            if 'multipart/alternative' in msg.get('content-type', ''):
-                msg['content_subtype'] = 'alternative'
-            else:
-                msg['content_subtype'] = 'mixed'
             for part in msg_txt.walk():
                 if part.get_content_maintype() == 'multipart':
                     continue
@@ -932,39 +726,17 @@ class mail_thread(osv.Model):
                 if part.get_content_maintype()=='text':
                     content = part.get_payload(decode=True)
                     if filename:
-                        attachments.append((0, 0, {
-                            'name': filename,
-                            'datas': base64.b64encode(msg_original),
-                            'datas_fname': filename,
-                            'res_model': 'mail.message',
-                            'description': _('email attachment'),
-                        }))
+                        attachments.append(( filename, msg_original))
                     content = tools.ustr(content, encoding)
-                    if part.get_content_subtype() == 'html':
-                        msg['body'] = content
-                        # msg['content_subtype'] = 'html' # html version prevails
-                        # body = tools.ustr(tools.html2plaintext(content))
-                        # body = body.replace('&#13;', '')
-                    elif part.get_content_subtype() == 'plain':
-                        msg['body'] = content
+                    msg['body'] = content
                 elif part.get_content_maintype() in ('application', 'image'):
                     if filename:
-                        attachments.append((0, 0, {
-                            'name': filename,
-                            'datas': part.get_payload(decode=True),
-                            'datas_fname': filename,
-                            'res_model': 'mail.message',
-                            'description': _('email attachment'),
-                        }))
+                        attachments.append(( filename, part.get_payload(decode=True)))
                     else:
                         res = part.get_payload(decode=True)
                         msg['body'] += tools.ustr(res, encoding)
 
         msg['attachments'] = attachments
-
-        # for backwards compatibility:
-        # msg['body'] = msg['body_text']
-        # msg['sub_type'] = msg['content_subtype'] or 'plain'
         return msg
 
     #------------------------------------------------------
@@ -977,19 +749,38 @@ class mail_thread(osv.Model):
                         module instead of by the res.log mechanism. Please \
                         use the mail.thread OpenChatter API instead of the \
                         now deprecated res.log.")
-        self.message_append_note(cr, uid, [id], 'res.log', message, context=context)
+        self.message_post(cr, uid, [id], message, context=context)
+
+    def message_post(self, cr, uid, res_id, body, 
+            mtype='notification', attachments=None, context=None, **kwargs):
+
+        context = context or {}
+        attachments = attachments or {}
+        if type(res_id) in (list, tuple):
+            res_is = res_id[0]
+
+        to_attach = []
+        for fname, fcontent in attachments:
+            if isinstance(fcontent, unicode):
+                fcontent = fcontent.encode('utf-8')
+            data_attach = {
+                'name': fname,
+                'datas': base64.b64encode(str(fcontent)),
+                'datas_fname': fname,
+                'description': _('email attachment'),
+            }
+            to_attach.append((0,0, data_attach))
+
+        value = kwargs
+        value.update( {
+            'res_model': self._name,
+            'res_id': res_id,
+            'body': body,
+            'type': mtype,
+            'attachment_ids': data_attach
+        })
+        return self.pool.get('mail.message').create(cr, uid, value, context=context)
 
-    def message_append_note(self, cr, uid, ids, subject=None, body=None, parent_id=False,
-                            type='notification', content_subtype='html', context=None):
-        if content_subtype == 'html':
-            body_html = body
-            body_text = body
-        else:
-            body_html = body
-            body_text = body
-        return self.message_append(cr, uid, ids, subject, body_html, body_text,
-                                    type, parent_id=parent_id,
-                                    content_subtype=content_subtype, context=context)
 
     #------------------------------------------------------
     # Subscription mechanism
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 7f4d278d0c5..bd61012c806 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -108,11 +108,10 @@ class res_users(osv.Model):
 
     def _create_welcome_message(self, cr, uid, user, context=None):
         company_name = user.company_id.name if user.company_id else _('the company')
-        subject = '''%s has joined %s.''' % (user.name, company_name)
-        body = '''Welcome to OpenERP !''' 
+        body = '''%s has joined %s.''' % (user.name, company_name)
         # TODO change 1 into user.id but catch errors
-        return self.pool.get('res.partner').message_append_note(cr, 1, [user.partner_id.id],
-            subject=subject, body=body, type='comment', content_subtype='html', context=context)
+        return self.pool.get('res.partner').message_post(cr, 1, [user.partner_id.id],
+            body=body, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         # User alias is sync'ed with login
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 16c66655b3c..76f7c7b9f34 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -369,7 +369,7 @@ class mrp_bom(osv.osv):
         prod_obj = self.pool.get('product.product')
         for obj in self.browse(cr, uid, ids, context=context):
             for prod in prod_obj.browse(cr, uid, [obj.product_id], context=context):
-                self.message_append_note(cr, uid, [obj.id], body=_("Bill of Material has been <b>created</b> for <em>%s</em> product.") % (prod.id.name_template), context=context)
+                self.message_post(cr, uid, [obj.id], body=_("Bill of Material has been <b>created</b> for <em>%s</em> product.") % (prod.id.name_template), context=context)
         return True
 
 mrp_bom()
@@ -1047,27 +1047,27 @@ class mrp_production(osv.osv):
     # ---------------------------------------------------
 
     def create_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Manufacturing order has been <b>created</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Manufacturing order has been <b>created</b>."), context=context)
         return True
 
     def action_cancel_send_note(self, cr, uid, ids, context=None):
         message = _("Manufacturing order has been <b>canceled</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def action_ready_send_note(self, cr, uid, ids, context=None):
         message = _("Manufacturing order is <b>ready to produce</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def action_in_production_send_note(self, cr, uid, ids, context=None):
         message = _("Manufacturing order is <b>in production</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def action_done_send_note(self, cr, uid, ids, context=None):
         message = _("Manufacturing order has been <b>done</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def action_confirm_send_note(self, cr, uid, ids, context=None):
@@ -1077,7 +1077,7 @@ class mrp_production(osv.osv):
             obj_datetime = fields.DT.datetime.strptime(obj.date_planned, DEFAULT_SERVER_DATETIME_FORMAT)
             obj_date_str = fields.datetime.context_timestamp(cr, uid, obj_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
             message = _("Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for the <em>%s</em>.") % (obj_date_str)
-            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+            self.message_post(cr, uid, [obj.id], body=message, context=context)
         return True
 
 
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 363f98e35d1..7f417dc18b1 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -43,7 +43,7 @@ class procurement_order(osv.osv):
             cr.execute('update procurement_order set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
             for (id, name) in self.name_get(cr, uid, procurement.id):
                 message = _("Procurement '%s' has an exception: 'No BoM defined for this product !'") % name
-                self.message_append_note(cr, uid, [procurement.id], body=message, context=context)
+                self.message_post(cr, uid, [procurement.id], body=message, context=context)
             return False
         return True
     
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 8692dab5c87..ee2547bc7df 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -224,7 +224,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>created</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_append_note(cr, uid, [workorder.id], body=message, context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
     def action_start_send_note(self, cr, uid, ids, context=None):
@@ -232,7 +232,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>started</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_append_note(cr, uid, [workorder.id], body=message, context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
     def action_done_send_note(self, cr, uid, ids, context=None):
@@ -240,7 +240,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>done</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_append_note(cr, uid, [workorder.id], body=message, context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
     def action_pending_send_note(self, cr, uid, ids, context=None):
@@ -248,7 +248,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order is <b>pending</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_append_note(cr, uid, [workorder.id], body=message, context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
     def action_cancel_send_note(self, cr, uid, ids, context=None):
@@ -256,7 +256,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>cancelled</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_append_note(cr, uid, [workorder.id], body=message, context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
 mrp_production_workcenter_line()
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index f41abb58c08..c1ac8f809ce 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -571,40 +571,40 @@ class mrp_repair(osv.osv):
     def create_send_note(self, cr, uid, ids, context=None):
         for repair in self.browse(cr, uid, ids, context):
             message = _("Repair Order for <em>%s</em> has been <b>created</b>." % (repair.product_id.name))
-            self.message_append_note(cr, uid, [repair.id], body=message, context=context)
+            self.message_post(cr, uid, [repair.id], body=message, context=context)
         return True
 
     def set_start_send_note(self, cr, uid, ids, context=None):
         for repair in self.browse(cr, uid, ids, context):
             message = _("Repair Order for <em>%s</em> has been <b>started</b>." % (repair.product_id.name))
-            self.message_append_note(cr, uid, [repair.id], body=message, context=context)
+            self.message_post(cr, uid, [repair.id], body=message, context=context)
         return True
 
     def set_toinvoiced_send_note(self, cr, uid, ids, context=None):
         for repair in self.browse(cr, uid, ids, context):
             message = _("Draft Invoice of %s %s <b>waiting for validation</b>.") % (repair.invoice_id.amount_total, repair.invoice_id.currency_id.symbol)
-            self.message_append_note(cr, uid, [repair.id], body=message, context=context)
+            self.message_post(cr, uid, [repair.id], body=message, context=context)
         return True
 
     def set_confirm_send_note(self, cr, uid, ids, context=None):
         for repair in self.browse(cr, uid, ids, context):
             message = _( "Repair Order for <em>%s</em> has been <b>accepted</b>." % (repair.product_id.name))
-            self.message_append_note(cr, uid, [repair.id], body=message, context=context)
+            self.message_post(cr, uid, [repair.id], body=message, context=context)
         return True
 
     def set_cancel_send_note(self, cr, uid, ids, context=None):
         message = _("Repair has been <b>cancelled</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def set_ready_send_note(self, cr, uid, ids, context=None):
         message = _("Repair Order is now <b>ready</b> to repair.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def set_done_send_note(self, cr, uid, ids, context=None):
         message = _("Repair Order is <b>closed</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
 mrp_repair()
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index aaf54d1ac2b..1bf3645d646 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -108,7 +108,7 @@ class plugin_handler(osv.osv_memory):
         else:
             if model == 'res.partner':
                 model_obj = self.pool.get('mail.thread')
-            model_obj.message_append_note(cr, uid, [res_id], body=msg)
+            model_obj.message_post(cr, uid, [res_id], body=msg)
             notify = "Mail succefully pushed"
             
         url = self._make_url(cr, uid, res_id, model)
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index d1fb3f8a395..1e435b6cff6 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -289,14 +289,14 @@ class procurement_order(osv.osv):
                 return False
             if not procurement.product_id.seller_ids:
                 message = _('No supplier defined for this product !')
-                self.message_append_note(cr, uid, [procurement.id], body=message)
+                self.message_post(cr, uid, [procurement.id], body=message)
                 cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
                 return False
             partner = procurement.product_id.seller_id #Taken Main Supplier of Product of Procurement.
 
             if not partner:
                 message = _('No default supplier defined for this product')
-                self.message_append_note(cr, uid, [procurement.id], body=message)
+                self.message_post(cr, uid, [procurement.id], body=message)
                 cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
                 return False
             if user.company_id and user.company_id.partner_id:
@@ -306,7 +306,7 @@ class procurement_order(osv.osv):
             address_id = partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery']
             if not address_id:
                 message = _('No address defined for the supplier')
-                self.message_append_note(cr, uid, [procurement.id], body=message)
+                self.message_post(cr, uid, [procurement.id], body=message)
                 cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
                 return False
         return True
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 7a87697f5c8..a8bff6213d7 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -131,7 +131,7 @@ class procurement_order(osv.osv):
 
         Exceptions:\n""") % (start_date, end_date, report_total, report_except, report_later)
                 summary += '\n'.join(report)
-                procurement_obj.message_append_note(cr, uid, ids, body=summary, context=context)
+                procurement_obj.message_post(cr, uid, ids, body=summary, context=context)
 
             if use_new_cursor:
                 cr.commit()
diff --git a/addons/product/product.py b/addons/product/product.py
index ae99711a5ec..80b8a838b41 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -565,7 +565,7 @@ class product_product(osv.osv):
         return obj_id
 
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Product has been <b>created</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Product has been <b>created</b>."), context=context)
 
     def unlink(self, cr, uid, ids, context=None):
         unlink_ids = []
diff --git a/addons/project/project.py b/addons/project/project.py
index caea3c6f23b..7088dccae23 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -534,23 +534,23 @@ def Project():
         return project_id
 
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Project has been <b>created</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Project has been <b>created</b>."), context=context)
 
     def set_open_send_note(self, cr, uid, ids, context=None):
         message = _("Project has been <b>opened</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def set_pending_send_note(self, cr, uid, ids, context=None):
         message = _("Project is now <b>pending</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def set_cancel_send_note(self, cr, uid, ids, context=None):
         message = _("Project has been <b>cancelled</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def set_close_send_note(self, cr, uid, ids, context=None):
         message = _("Project has been <b>closed</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         # if alias_model has been changed, update alias_model_id accordingly
@@ -1204,19 +1204,19 @@ class task(base_stage, osv.osv):
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('project.task.type').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
 
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Task has been <b>created</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Task has been <b>created</b>."), context=context)
 
     def case_draft_send_note(self, cr, uid, ids, context=None):
         msg = _('Task has been set as <b>draft</b>.')
-        return self.message_append_note(cr, uid, ids, body=msg, context=context)
+        return self.message_post(cr, uid, ids, body=msg, context=context)
 
     def do_delegation_send_note(self, cr, uid, ids, context=None):
         for task in self.browse(cr, uid, ids, context=context):
             msg = _('Task has been <b>delegated</b> to <em>%s</em>.') % (task.user_id.name)
-            self.message_append_note(cr, uid, [task.id], body=msg, context=context)
+            self.message_post(cr, uid, [task.id], body=msg, context=context)
         return True
 
 
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index db9d02bfd1e..2f7458627e9 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -501,7 +501,7 @@ class project_issue(base_stage, osv.osv):
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('project.task.type').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
 
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
         """ Override of default prefix for notifications. """
@@ -509,20 +509,20 @@ class project_issue(base_stage, osv.osv):
 
     def convert_to_task_send_note(self, cr, uid, ids, context=None):
         message = _("Project issue has been <b>converted</b> into task.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def create_send_note(self, cr, uid, ids, context=None):
         message = _("Project issue has been <b>created</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def case_escalate_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.project_id:
                 message = _("has been <b>escalated</b> to <em>'%s'</em>.") % (obj.project_id.name)
-                obj.message_append_note(body=message, context=context)
+                obj.message_post(body=message, context=context)
             else:
                 message = _("has been <b>escalated</b>.")
-                obj.message_append_note(body=message, context=context)
+                obj.message_post(body=message, context=context)
         return True
 
 project_issue()
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 350d40526ab..0697ccb339a 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -735,11 +735,11 @@ class purchase_order(osv.osv):
         return [('state','=','draft')]
 
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Request for quotation <b>created</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Request for quotation <b>created</b>."), context=context)
 
     def confirm_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s.") % (obj.partner_id.name, obj.amount_total, obj.pricelist_id.currency_id.symbol), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s.") % (obj.partner_id.name, obj.amount_total, obj.pricelist_id.currency_id.symbol), context=context)
 
     def shipment_send_note(self, cr, uid, ids, picking_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
@@ -748,25 +748,25 @@ class purchase_order(osv.osv):
                 # convert it to the user TZ and re-render it with %Z to add the timezone
                 picking_datetime = fields.DT.datetime.strptime(picking.min_date, DEFAULT_SERVER_DATETIME_FORMAT)
                 picking_date_str = fields.datetime.context_timestamp(cr, uid, picking_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
-                self.message_append_note(cr, uid, [order.id], body=_("Shipment <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
+                self.message_post(cr, uid, [order.id], body=_("Shipment <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
 
     def invoice_send_note(self, cr, uid, ids, invoice_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
             for invoice in (inv for inv in order.invoice_ids if inv.id == invoice_id):
-                self.message_append_note(cr, uid, [order.id], body=_("Draft Invoice of %s %s is <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
+                self.message_post(cr, uid, [order.id], body=_("Draft Invoice of %s %s is <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
 
     def shipment_done_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("""Shipment <b>received</b>."""), context=context)
+        self.message_post(cr, uid, ids, body=_("""Shipment <b>received</b>."""), context=context)
 
     def invoice_done_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Invoice <b>paid</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Invoice <b>paid</b>."), context=context)
 
     def draft_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Purchase Order has been set to <b>draft</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Purchase Order has been set to <b>draft</b>."), context=context)
 
     def cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Purchase Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Purchase Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), context=context)
 
 purchase_order()
 
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index cf0294730a7..bbd011a53a8 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -91,16 +91,16 @@ class purchase_requisition(osv.osv):
         return True
 
     def in_progress_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Draft Requisition has been <b>sent to suppliers</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Draft Requisition has been <b>sent to suppliers</b>."), context=context)
     
     def reset_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been set to <b>draft</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Purchase Requisition has been set to <b>draft</b>."), context=context)
      
     def done_to_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>done</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Purchase Requisition has been <b>done</b>."), context=context)
         
     def cancel_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>cancelled</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Purchase Requisition has been <b>cancelled</b>."), context=context)
 
     def _planned_date(self, requisition, delay=0.0):
         company = requisition.company_id
@@ -184,7 +184,7 @@ class purchase_requisition(osv.osv):
         return res
     
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>created</b>."), context=context)  
+        return self.message_post(cr, uid, ids, body=_("Purchase Requisition has been <b>created</b>."), context=context)  
 
     def create(self, cr, uid, vals, context=None):
         requisition =  super(purchase_requisition, self).create(cr, uid, vals, context=context)
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 27c744f0242..476ee6458f0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1027,15 +1027,15 @@ class sale_order(osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), context=context)
 
     def confirm_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s.") % (obj.partner_id.name, obj.amount_total, obj.pricelist_id.currency_id.symbol), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s.") % (obj.partner_id.name, obj.amount_total, obj.pricelist_id.currency_id.symbol), context=context)
 
     def cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Sale Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Sale Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), context=context)
 
     def delivery_send_note(self, cr, uid, ids, picking_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
@@ -1044,21 +1044,21 @@ class sale_order(osv.osv):
                 # convert it to the user TZ and re-render it with %Z to add the timezone
                 picking_datetime = fields.DT.datetime.strptime(picking.min_date, DEFAULT_SERVER_DATETIME_FORMAT)
                 picking_date_str = fields.datetime.context_timestamp(cr, uid, picking_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
-                self.message_append_note(cr, uid, [order.id], body=_("Delivery Order <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
+                self.message_post(cr, uid, [order.id], body=_("Delivery Order <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
 
     def delivery_end_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Order <b>delivered</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Order <b>delivered</b>."), context=context)
 
     def invoice_paid_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Invoice <b>paid</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Invoice <b>paid</b>."), context=context)
 
     def invoice_send_note(self, cr, uid, ids, invoice_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
             for invoice in (inv for inv in order.invoice_ids if inv.id == invoice_id):
-                self.message_append_note(cr, uid, [order.id], body=_("Draft Invoice of %s %s <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
+                self.message_post(cr, uid, [order.id], body=_("Draft Invoice of %s %s <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
 
     def action_cancel_draft_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body='Sale order has been set in draft.', context=context)
+        return self.message_post(cr, uid, ids, body='Sale order has been set in draft.', context=context)
 
 
 sale_order()
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 6ca9ac8230f..2597c1db56c 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -106,7 +106,7 @@ class crm_make_sale(osv.osv_memory):
                 case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
                 new_ids.append(new_id)
                 message = _("Opportunity has been <b>converted</b> to the quotation <em>%s</em>.") % (sale_order.name)
-                case.message_append_note(body=message)
+                case.message_post(body=message)
             if make.close:
                 case_obj.case_close(cr, uid, data)
             if not new_ids:
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 598bb085967..e41f6828351 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -819,7 +819,7 @@ class share_wizard(osv.TransientModel):
             elif tmp_idx == len(wizard_data.result_line_ids)-2:
                 body += ' and'
         body += '.'
-        return self.pool.get(model_name).message_append_note(cr, uid, [res_id], _('System Notification'), body, context=context)
+        return self.pool.get(model_name).message_post(cr, uid, [res_id], _('System Notification'), body, context=context)
     
     def send_invite_email(self, cr, uid, wizard_data, context=None):
         message_obj = self.pool.get('mail.message')
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b770712429c..bca04325e8d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1379,13 +1379,13 @@ class stock_picking(osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s has been <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
 
     def scrap_send_note(self, cr, uid, ids, quantity, uom, name, context=None):
-        return self.message_append_note(cr, uid, ids, body= _("%s %s %s has been <b>moved to</b> scrap.") % (quantity, uom, name), context=context)
+        return self.message_post(cr, uid, ids, body= _("%s %s %s has been <b>moved to</b> scrap.") % (quantity, uom, name), context=context)
 
     def back_order_send_note(self, cr, uid, ids, back_name, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Back order <em>%s</em> has been <b>created</b>.") % (back_name), context=context)
+        return self.message_post(cr, uid, ids, body=_("Back order <em>%s</em> has been <b>created</b>.") % (back_name), context=context)
 
     def ship_done_send_note(self, cr, uid, ids, context=None):
         type_dict = {
@@ -1394,11 +1394,11 @@ class stock_picking(osv.osv):
                 'internal': 'moved',
         }
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Products have been <b>%s</b>.") % (type_dict.get(obj.type, 'move done')), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Products have been <b>%s</b>.") % (type_dict.get(obj.type, 'move done')), context=context)
 
     def ship_cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s has been <b>cancelled</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>cancelled</b>.") % (self._get_document_type(obj.type)), context=context)
 
 
 stock_picking()
@@ -2541,7 +2541,7 @@ class stock_move(osv.osv):
         product_obj = self.pool.get('product.product')
         for new_move in self.browse(cr, uid, res, context=context):
             message = _("Product has been consumed with '%s' quantity.") % (new_move.product_qty)
-            product_obj.message_append_note(cr, uid, [new_move.product_id.id], body=message, context=context)
+            product_obj.message_post(cr, uid, [new_move.product_id.id], body=message, context=context)
 
         self.action_done(cr, uid, res, context=context)
 
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 0cc97e10298..5aa4649af02 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -113,7 +113,7 @@ class stock_change_product_qty(osv.osv_memory):
         for data in self.browse(cr, uid, ids, context=context):
             location_name = location_obj.browse(cr, uid, data.location_id.id, context=context).name
             message = _("<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location.") % (data.new_quantity, data.product_id.uom_id.name, location_name)
-            prod_obj.message_append_note(cr, uid, [data.product_id.id], body=message, context=context)
+            prod_obj.message_post(cr, uid, [data.product_id.id], body=message, context=context)
 
 stock_change_product_qty()
 

From 271d16637ea61f628da76fe46ce00f2624cc9a50 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 17 Aug 2012 15:36:12 +0530
Subject: [PATCH 333/999] [IMP] res_company : changed the place of partner and
 company slogan

bzr revid: rpr@tinyerp.com-20120817100612-ez3lk9hx1ivw8fv5
---
 openerp/addons/base/res/res_company_view.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 3061da3c79c..2508520441d 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -31,19 +31,15 @@
                         <h1>
                             <field name="name" class="oe_inline"/>
                         </h1>
-                        <label for="rml_header1" class="oe_edit_only"/>
-                        <div>
-                            <field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
-                        </div>
                     </div>
                     <group col="4">
-                        <field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
                         <field name="parent_id"  groups="base.group_multi_company"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <group>
                                 <group>
+                                    <field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
                                     <label for="street" string="Address"/>
                                     <div>
                                         <field name="street" placeholder="Street..."/>
@@ -55,6 +51,11 @@
                                         </div>
                                         <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
                                     </div>
+                                   <label for="rml_header1" class="oe_edit_only"/>
+                                   <div>
+                                            <field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
+                                   </div>
+
                                     <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                                 </group>
                                 <group>

From 66ece041f0a423bc2526a894bae686dc1d8b41ce Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 17 Aug 2012 12:26:50 +0200
Subject: [PATCH 334/999] [IMP] append note

bzr revid: fp@tinyerp.com-20120817102650-1sglq1y2dbb3xqju
---
 .../account_accountant_data.xml                  |  2 +-
 addons/account_voucher/account_voucher_data.xml  |  2 +-
 addons/crm/crm_data.xml                          |  2 +-
 addons/event/event_data.xml                      |  2 +-
 addons/hr/hr_data.xml                            |  2 +-
 addons/hr_evaluation/hr_evaluation_data.xml      |  2 +-
 addons/hr_expense/hr_expense_data.xml            |  2 +-
 addons/hr_holidays/hr_holidays_data.xml          |  2 +-
 addons/hr_recruitment/hr_recruitment_data.xml    |  2 +-
 .../hr_timesheet_sheet_data.xml                  |  2 +-
 addons/mail/data/mail_group_data.xml             |  2 +-
 addons/mail/mail_thread.py                       |  3 ++-
 addons/mrp/mrp_data.xml                          |  2 +-
 addons/point_of_sale/point_of_sale_data.xml      |  2 +-
 addons/procurement/procurement.py                | 16 ++++++++--------
 addons/project/project_data.xml                  |  2 +-
 addons/project_gtd/project_gtd_data.xml          |  2 +-
 addons/project_issue/project_issue_data.xml      |  2 +-
 addons/purchase/purchase_data.xml                |  2 +-
 addons/sale/sale_data.xml                        |  2 +-
 addons/stock/stock_data.xml                      |  2 +-
 21 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index 57fb229ad12..b44b78c9257 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -26,10 +26,10 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Accounting and Finance has been installed.</value>
             <value>With OpenERP's accounting, you can get an instant access to all your financial data, setup your analytic accounting, forecast your taxes, control your budgets, easily create and send invoices, record bank statements, etc.
 
 The accounting features are fully integrated with others OpenERP applications to automate all your processes: creation of customer invoices, control of supplier invoices, point-of-sale integration, automated follow-ups, etc.</value>
+            <value>Module Accounting and Finance has been installed.</value>
         </function>
     </data>
 </openerp>
diff --git a/addons/account_voucher/account_voucher_data.xml b/addons/account_voucher/account_voucher_data.xml
index 8be2851a434..4edbd95ab3d 100644
--- a/addons/account_voucher/account_voucher_data.xml
+++ b/addons/account_voucher/account_voucher_data.xml
@@ -5,12 +5,12 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module eInvoicing &amp; Payments has been installed.</value>
             <value>OpenERP's electronic invoicing allows to ease and fasten the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.
 
 You can track customer payments easily and automate the reminders. You get an overview of the discussion with your customers on each invoice to ensure a full traceability.
 
 If you want to use advanced accounting features, you should install the "Accounting and Finance" module.</value>
+            <value>Module eInvoicing &amp; Payments has been installed.</value>
         </function>
     </data>
 </openerp>
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index c5671385e56..119d76d1dae 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -58,10 +58,10 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module CRM has been installed</value>
             <value>From the top menu Sales, you can: trace leads and opportunities, get accurate forecast on your sales pipeline, plan meetings and phonecalls, get realtime statistics and efficiently organize the communication with your prospects.
 
 To manage quotations and sale orders, install the module "Sales Management".</value>
+            <value>Module CRM has been installed</value>
         </function>
         
         <record model="mail.alias" id="default_sales_alias">
diff --git a/addons/event/event_data.xml b/addons/event/event_data.xml
index d8d75950bcc..8eb1fa09f65 100644
--- a/addons/event/event_data.xml
+++ b/addons/event/event_data.xml
@@ -17,8 +17,8 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Events Organisation has been installed</value>
             <value>From the top menu Events, you can organize events, manage registrations, automate communication around your event and sell events through your quotations.</value>
+            <value>Module Events Organisation has been installed</value>
         </function>
     </data>
 </openerp>
diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml
index 18c50836f07..a3082896a6f 100644
--- a/addons/hr/hr_data.xml
+++ b/addons/hr/hr_data.xml
@@ -5,10 +5,10 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Employee Directory has been installed</value>
             <value>Manage your human resources in OpenERP: employees and hierarchy, HR departments and jobs.
 
 More HR features are available from the following modules: Recruitment Process (manage job positions and recruitment), Timesheets Validation (record timesheets and attendance), Leaves Management (keep track of employee leaves), Expenses Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager.)</value>
+            <value>Module Employee Directory has been installed</value>
         </function>
 
         <record id="employee" model="hr.employee">
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index cf632a795cc..ab823aa9e4f 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -17,8 +17,8 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Employee Appraisals has been installed</value>
             <value>Create evaluations for your subordinates or manager. You can define a plan with several surveys, where you organize evaluation surveys related to the hierarchy levels. Evaluations filled by employees can exported as pdf files.</value>
+            <value>Module Employee Appraisals has been installed</value>
         </function>
 
         <record id="survey_2" model="survey">
diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml
index 6e41f3d4e05..285c9313218 100644
--- a/addons/hr_expense/hr_expense_data.xml
+++ b/addons/hr_expense/hr_expense_data.xml
@@ -5,10 +5,10 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Expenses Management has been installed</value>
             <value>Manage your employee's expenses, with validations by employee manager and accountant, creation and payment of invoices.
 
 This module also uses the analytic accounting and is compatible with the invoice on timesheet module so that you will be able to automatically re-invoice your customer's expenses if your work by project.</value>
+            <value>Module Expenses Management has been installed</value>
         </function>
 
         <!-- Resource: product.uom.categ -->
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index 9db0f2e987a..d9a37767848 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -16,8 +16,8 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Leaves Management has been installed</value>
             <value>Manage employee leaves from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR people.  Once validated, they are visible in the employee's calendar.  HR people can define leave types and allocate off-days for employees.</value>
+            <value>Module Leaves Management has been installed</value>
         </function>
 
         <!-- Casual leave -->
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index d90f5ab596a..8dec740c15c 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -5,10 +5,10 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Recruitment Process has been installed</value>
             <value>Manage job positions and the recruitment process in your company.  This module is integrated with the module Survey to help you to define interviews for different jobs.
 
 You can automatically create application records from an email gateway, that you can configure in the Human Resources Settings.</value>
+            <value>Module Recruitment Process has been installed</value>
         </function>
 
     <!-- Meeting Types (for interview meetings) -->
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index f9c9070ddbf..f121c1ec2ea 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -5,8 +5,8 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Timesheets Validation has been installed</value>
             <value>From the top menu "Human Resources", encode and validate timesheets and attendances.</value>
+            <value>Module Timesheets Validation has been installed</value>
         </function>
 
         <record id="ir_actions_server_timsheet_sheet" model="ir.actions.server">
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 2152706d056..10a94fd42f5 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -16,12 +16,12 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Welcome to OpenERP!</value>
             <value>Your homepage is a summary of messages you received and key information about documents you follow.
 
 The top menu bar contains all applications you installed. You can use this &lt;i&gt;Settings&lt;/i&gt; menu to install more applications, activate others features or give access to new users.
 
 To setup your preferences (name, email signature, avatar), click on the top right corner.</value>
+            <value>Welcome to OpenERP!</value>
         </function>
 
     </data>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 5f3167cda39..7f88ec2093a 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -751,7 +751,7 @@ class mail_thread(osv.Model):
                         now deprecated res.log.")
         self.message_post(cr, uid, [id], message, context=context)
 
-    def message_post(self, cr, uid, res_id, body, 
+    def message_post(self, cr, uid, res_id, body, subject=False,
             mtype='notification', attachments=None, context=None, **kwargs):
 
         context = context or {}
@@ -776,6 +776,7 @@ class mail_thread(osv.Model):
             'res_model': self._name,
             'res_id': res_id,
             'body': body,
+            'subject': subject,
             'type': mtype,
             'attachment_ids': data_attach
         })
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
index e5d5380f96a..520e4038d4b 100644
--- a/addons/mrp/mrp_data.xml
+++ b/addons/mrp/mrp_data.xml
@@ -5,10 +5,10 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module MRP has been installed</value>
             <value>Manage your manufacturing process in OpenERP by defining bill of materials (BoM), routings and work centers.  This module supports complete integration and planification of stockable goods, consumable, and services.
 
 From the Manufacturing Settings, you can choose to compute production schedules periodically or just-in-time.</value>
+            <value>Module MRP has been installed</value>
         </function>
         
         <record id="sequence_mrp_prod_type" model="ir.sequence.type">
diff --git a/addons/point_of_sale/point_of_sale_data.xml b/addons/point_of_sale/point_of_sale_data.xml
index dda0b78e952..628b4191f97 100644
--- a/addons/point_of_sale/point_of_sale_data.xml
+++ b/addons/point_of_sale/point_of_sale_data.xml
@@ -27,10 +27,10 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Point of Sale has been installed</value>
             <value>Encode sale orders, register payments, compute money to return, create invoices, and manage refunds of former sales through a specific, web-based, touch-screen user interface.
 
 If you install the PoS proxy, you will be able to interface OpenERP with retail materials; barcode scanners, printers, cash registers, weighing machine, credit card payments.</value>
+            <value>Module Point of Sale has been installed</value>
         </function>
 
         <record id="unreferenced_product" model="product.product">
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 1e435b6cff6..8efd09a1efc 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -365,7 +365,7 @@ class procurement_order(osv.osv):
         message = _('From stock: products assigned.')
         self.write(cr, uid, ids, {'state': 'running',
                 'message': message}, context=context)
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         self.running_send_note(cr, uid, ids, context=context)
         return True
 
@@ -398,7 +398,7 @@ class procurement_order(osv.osv):
                 if message:
                     message = _("Procurement '%s' is in exception: ") % (procurement.name) + message
                     cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
-                    self.message_append_note(cr, uid, [procurement.id], body=message, context=context)
+                    self.message_post(cr, uid, [procurement.id], body=message, context=context)
         return ok
 
     def action_produce_assign_service(self, cr, uid, ids, context=None):
@@ -496,22 +496,22 @@ class procurement_order(osv.osv):
         return obj_id
 
     def create_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been <b>created</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been <b>created</b>."), context=context)
 
     def confirm_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been <b>confirmed</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been <b>confirmed</b>."), context=context)
 
     def running_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been set to <b>running</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been set to <b>running</b>."), context=context)
 
     def ready_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been set to <b>ready</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been set to <b>ready</b>."), context=context)
 
     def cancel_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been <b>cancelled</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been <b>cancelled</b>."), context=context)
 
     def done_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been <b>done</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been <b>done</b>."), context=context)
 
 procurement_order()
 
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index c2d37f7943d..6c81b5be2e4 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -88,10 +88,10 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Project Management has been installed</value>
             <value>Manage multi-level projects and tasks.  You can delegate tasks, track the work done on tasks, and review your planning based on the entered data.
 
 You can manage todo lists on tasks by installing the module "Todo Lists", which supports the methodology Getting Things Done (GTD).  You can also manage issues/bugs in projects by installing the module "Issues Tracker."</value>
+            <value>Module Project Management has been installed</value>
         </function>
     </data>
 </openerp>
diff --git a/addons/project_gtd/project_gtd_data.xml b/addons/project_gtd/project_gtd_data.xml
index dc1df93dc46..2d588fc9c62 100644
--- a/addons/project_gtd/project_gtd_data.xml
+++ b/addons/project_gtd/project_gtd_data.xml
@@ -29,8 +29,8 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Todo Lists has been installed</value>
             <value>Add todo items on project tasks, to help you organize your work.  This module supports the methodology Getting Things Done (GTD), created by David Allen, and described in the book of the same name.</value>
+            <value>Module Todo Lists has been installed</value>
         </function>
     </data>
 </openerp>
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index a191cb4454f..beee0b0021d 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -35,10 +35,10 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Issues Tracker has been installed.</value>
             <value>Manage the issues you might face in a project, like bugs in a system, client complaints or material breakdowns.  You can record issues, assign them to some responsible person, and keep track of their status as they evolve over time.
 
 You can access issues from the top menu Project, and access the issues of a specific project from the projects gallery view.</value>
+            <value>Module Issues Tracker has been installed.</value>
         </function>
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index 75074d4cedf..7b88f3705ed 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -6,10 +6,10 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Purchase Management has been installed.</value>
             <value>From the top menu Purchases, create purchase orders to buy products from your suppliers, encode supplier invoices and manage your payments.
 
 You can also manage purchase requisitions, see the Purchase Settings.</value>
+            <value>Module Purchase Management has been installed.</value>
         </function>
 
         <record id="req_link_purchase_order" model="res.request.link">
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index bbee9ca7455..4acbd55eaaa 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -44,10 +44,10 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>The Sales Management application has been installed.</value>
             <value>This modules allows you to create and send easily quotations and process your sales orders; from the delivery to the invoicing.
 
 If you need to manage your sales pipeline (leads, opportunities, phonecalls), you can install the module &lt;i&gt;CRM&lt;/i&gt; from the top menu Settings.</value>
+            <value>The Sales Management application has been installed.</value>
         </function>
     </data>
 </openerp>
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index f4b3ab90d9c..9257f4cfb9b 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -5,8 +5,8 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Warehouse Management has been installed</value>
             <value>Manage your product inventoy and stock locations.  You can control your stock moves history and planning, perform stock valuation, and trace product lots upstream and downstream (based on serial numbers.)</value>
+            <value>Module Warehouse Management has been installed</value>
         </function>
 
         <record id="stock_journal_sequence" model="ir.sequence">

From 4e435d335db70863ec732860f4b5009ed13d5279 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 17 Aug 2012 16:17:02 +0530
Subject: [PATCH 335/999] [FIX]hr_timesheet_sheet :fix the issue open timesheet
 by account from timesheet form view and pass a appropriate ids in name_get

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

bzr revid: mma@tinyerp.com-20120817104702-qpzqc8w1s9pccr83
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index ca28b5bdb28..b2ef41f3a46 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -442,8 +442,10 @@ class hr_timesheet_sheet(osv.osv):
         return True
 
     def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
+        if not ids:
             return []
+        if isinstance(ids, (int)):
+            ids = [ids]
         return [(r['id'], r['date_from'] + ' - ' + r['date_to']) \
                 for r in self.read(cr, uid, ids, ['date_from', 'date_to'],
                     context=context, load='_classic_write')]

From 6ac583c0f775475bcb9f62c9c10619970a3f6068 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 17 Aug 2012 13:19:36 +0200
Subject: [PATCH 336/999] [IMP] mail cleaning

bzr revid: fp@tinyerp.com-20120817111936-2d33nlqlbvkjb374
---
 .../account_accountant_data.xml               |  2 +-
 .../account_voucher/account_voucher_data.xml  |  2 +-
 addons/crm/crm_data.xml                       |  2 +-
 addons/event/event_data.xml                   |  2 +-
 addons/hr/hr_data.xml                         |  2 +-
 addons/hr_evaluation/hr_evaluation_data.xml   |  2 +-
 addons/hr_expense/hr_expense_data.xml         |  2 +-
 addons/hr_holidays/hr_holidays_data.xml       |  2 +-
 addons/hr_recruitment/hr_recruitment_data.xml |  2 +-
 .../hr_timesheet_sheet_data.xml               |  2 +-
 addons/mail/__init__.py                       |  2 +-
 addons/mail/data/mail_group_data.xml          |  2 +-
 addons/mail/mail_followers.py                 |  9 ++++-----
 addons/mail/mail_message.py                   | 19 +++++++++++++++++--
 addons/mail/mail_thread.py                    | 10 +++++-----
 addons/mail/static/src/js/mail.js             |  2 +-
 addons/mrp/mrp_data.xml                       |  2 +-
 addons/point_of_sale/point_of_sale_data.xml   |  2 +-
 addons/project/project_data.xml               |  2 +-
 addons/project_gtd/project_gtd_data.xml       |  2 +-
 addons/project_issue/project_issue_data.xml   |  2 +-
 addons/purchase/purchase_data.xml             |  2 +-
 addons/sale/sale_data.xml                     |  2 +-
 addons/stock/stock_data.xml                   |  2 +-
 24 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index b44b78c9257..d8adba25196 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -23,7 +23,7 @@
 
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>With OpenERP's accounting, you can get an instant access to all your financial data, setup your analytic accounting, forecast your taxes, control your budgets, easily create and send invoices, record bank statements, etc.
diff --git a/addons/account_voucher/account_voucher_data.xml b/addons/account_voucher/account_voucher_data.xml
index 4edbd95ab3d..b497f4ee20e 100644
--- a/addons/account_voucher/account_voucher_data.xml
+++ b/addons/account_voucher/account_voucher_data.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>OpenERP's electronic invoicing allows to ease and fasten the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 119d76d1dae..52d779f4584 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -55,7 +55,7 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>From the top menu Sales, you can: trace leads and opportunities, get accurate forecast on your sales pipeline, plan meetings and phonecalls, get realtime statistics and efficiently organize the communication with your prospects.
diff --git a/addons/event/event_data.xml b/addons/event/event_data.xml
index 8eb1fa09f65..83af2f35cfb 100644
--- a/addons/event/event_data.xml
+++ b/addons/event/event_data.xml
@@ -14,7 +14,7 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>From the top menu Events, you can organize events, manage registrations, automate communication around your event and sell events through your quotations.</value>
diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml
index a3082896a6f..0f5bbdf2d26 100644
--- a/addons/hr/hr_data.xml
+++ b/addons/hr/hr_data.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>Manage your human resources in OpenERP: employees and hierarchy, HR departments and jobs.
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index ab823aa9e4f..6f122e44e9b 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -14,7 +14,7 @@
             <field name="sequence">100</field>
         </record>
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>Create evaluations for your subordinates or manager. You can define a plan with several surveys, where you organize evaluation surveys related to the hierarchy levels. Evaluations filled by employees can exported as pdf files.</value>
diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml
index 285c9313218..d5123df7ee8 100644
--- a/addons/hr_expense/hr_expense_data.xml
+++ b/addons/hr_expense/hr_expense_data.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>Manage your employee's expenses, with validations by employee manager and accountant, creation and payment of invoices.
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index d9a37767848..5c8e4922259 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -13,7 +13,7 @@
             <field name="sequence">100</field>
         </record>
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>Manage employee leaves from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR people.  Once validated, they are visible in the employee's calendar.  HR people can define leave types and allocate off-days for employees.</value>
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 8dec740c15c..58a0595c857 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>Manage job positions and the recruitment process in your company.  This module is integrated with the module Survey to help you to define interviews for different jobs.
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index f121c1ec2ea..6ecb8c294e2 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>From the top menu "Human Resources", encode and validate timesheets and attendances.</value>
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index cba9cfe1fe7..da517ee17ad 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 import mail_alias
+import mail_followers
 import mail_message
 import mail_mail
-import mail_followers
 import mail_thread
 import mail_group
 import res_partner
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 10a94fd42f5..a577007bc35 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -13,7 +13,7 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>Your homepage is a summary of messages you received and key information about documents you follow.
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index dcace5c0344..54bf2a93225 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -45,9 +45,8 @@ class mail_followers(osv.Model):
                         ondelete='cascade', required=True, select=1),
     }
 
+
 class mail_notification(osv.Model):
-    """ mail_notification is a relational table modeling messages pushed to partners.
-    """
     _name = 'mail.notification'
     _rec_name = 'partner_id'
     _log_access = False
@@ -55,14 +54,14 @@ class mail_notification(osv.Model):
     _columns = {
         'partner_id': fields.many2one('res.partner', string='Contact',
                         ondelete='cascade', required=True, select=1),
-        'message_id': fields.many2one('mail.message', string='Message',
-                        ondelete='cascade', required=True, select=1),
         'read': fields.boolean('Read'),
+        # this will be added in mail_message.py
+        #'message_id': fields.many2one('mail.message', string='Message',
+        #                ondelete='cascade', required=True, select=1),
     }
     _defaults = {
         'read': False,
     }
-
     # FP Note: todo: check that we can not create a notification for
     # a message we can not read.
     # def create(self, ...)
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 846ba739843..3d6d8bf76cc 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -45,7 +45,6 @@ def decode(text):
     if text:
         text = decode_header(text.replace('\r', ''))
         return ''.join([tools.ustr(x[0], x[1]) for x in text])
-
 class mail_message(osv.Model):
     """Model holding messages: system notification (replacing res.log
     notifications), comments (for OpenChatter feature). This model also
@@ -112,9 +111,13 @@ class mail_message(osv.Model):
         'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
         'body': fields.html('Content', required=True),
     }
+    def _get_default_author(self, cr, uid, context={}):
+        return self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+
     _defaults = {
         'type': 'email',
         'date': lambda *a: fields.datetime.now(),
+        'author_id': _get_default_author
     }
 
     #------------------------------------------------------
@@ -174,7 +177,9 @@ class mail_message(osv.Model):
             notification_obj = self.pool.get('mail.notification')
             modobj = self.pool.get(values.get('model'))
             follower_notify = []
-            for follower in modobj.message_follower_ids:
+            print values.get('res_id'), '**'
+            print modobj.browse(cr, uid, values.get('res_id'), context=context)
+            for follower in modobj.browse(cr, uid, values.get('res_id'), context=context).message_follower_ids:
                 if follower.id <> uid:
                     follower_notify.append(follower.id)
             self.pool.get('mail.notification').notify(cr, uid, follower_notify, newid, context=context)
@@ -202,3 +207,13 @@ class mail_message(osv.Model):
         return super(mail_message, self).unlink(cr, uid, ids, context)
 
 
+class mail_notification(osv.Model):
+    """ mail_notification is a relational table modeling messages pushed to partners.
+    """
+    _inherit = 'mail.notification'
+    _columns = {
+        'message_id': fields.many2one('mail.message', string='Message',
+                        ondelete='cascade', required=True, select=1),
+    }
+
+
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 7f88ec2093a..c9fad981dcb 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -109,7 +109,7 @@ class mail_thread(osv.Model):
     _columns = {
         'message_is_follower': fields.function(_get_is_follower,
             type='boolean', string='Is a Follower'),
-        'message_follower_ids': fields.one2many('mail.subscription', 'res_id',
+        'message_follower_ids': fields.many2many('res.partner', 'mail_subscription', 'res_id', 'partner_id',
             domain=lambda self: [('res_model','=',self._name)],
             string='Followers'),
         'message_ids': fields.one2many('mail.message', 'res_id',
@@ -749,7 +749,7 @@ class mail_thread(osv.Model):
                         module instead of by the res.log mechanism. Please \
                         use the mail.thread OpenChatter API instead of the \
                         now deprecated res.log.")
-        self.message_post(cr, uid, [id], message, context=context)
+        self.message_post(cr, uid, id, message, context=context)
 
     def message_post(self, cr, uid, res_id, body, subject=False,
             mtype='notification', attachments=None, context=None, **kwargs):
@@ -757,7 +757,7 @@ class mail_thread(osv.Model):
         context = context or {}
         attachments = attachments or {}
         if type(res_id) in (list, tuple):
-            res_is = res_id[0]
+            res_id = res_id[0]
 
         to_attach = []
         for fname, fcontent in attachments:
@@ -773,12 +773,12 @@ class mail_thread(osv.Model):
 
         value = kwargs
         value.update( {
-            'res_model': self._name,
+            'model': self._name,
             'res_id': res_id,
             'body': body,
             'subject': subject,
             'type': mtype,
-            'attachment_ids': data_attach
+            'attachment_ids': to_attach
         })
         return self.pool.get('mail.message').create(cr, uid, value, context=context)
 
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 16404b28594..580c71e30cb 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -778,7 +778,7 @@ openerp.mail = function(session) {
             var comment_node = this.$element.find('textarea');
             var body_text = comment_node.val();
             comment_node.val('');
-            return this.ds.call('message_append_note', [[this.params.res_id], '', body_text, this.params.parent_id, 'comment', 'plain']).then(
+            return this.ds.call('message_post', [[this.params.res_id], body_text], {parent_id: this.params.parent_id, mtype: 'comment'}).then(
                 this.proxy('init_comments'));
         },
         
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
index 520e4038d4b..d8d7d2063dc 100644
--- a/addons/mrp/mrp_data.xml
+++ b/addons/mrp/mrp_data.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>Manage your manufacturing process in OpenERP by defining bill of materials (BoM), routings and work centers.  This module supports complete integration and planification of stockable goods, consumable, and services.
diff --git a/addons/point_of_sale/point_of_sale_data.xml b/addons/point_of_sale/point_of_sale_data.xml
index 628b4191f97..33ea01a6f5e 100644
--- a/addons/point_of_sale/point_of_sale_data.xml
+++ b/addons/point_of_sale/point_of_sale_data.xml
@@ -24,7 +24,7 @@
 
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>Encode sale orders, register payments, compute money to return, create invoices, and manage refunds of former sales through a specific, web-based, touch-screen user interface.
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 6c81b5be2e4..d661ad2b68c 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -85,7 +85,7 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>Manage multi-level projects and tasks.  You can delegate tasks, track the work done on tasks, and review your planning based on the entered data.
diff --git a/addons/project_gtd/project_gtd_data.xml b/addons/project_gtd/project_gtd_data.xml
index 2d588fc9c62..d46bc0fda14 100644
--- a/addons/project_gtd/project_gtd_data.xml
+++ b/addons/project_gtd/project_gtd_data.xml
@@ -26,7 +26,7 @@
 
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>Add todo items on project tasks, to help you organize your work.  This module supports the methodology Getting Things Done (GTD), created by David Allen, and described in the book of the same name.</value>
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index beee0b0021d..5df09b683ca 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -32,7 +32,7 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>Manage the issues you might face in a project, like bugs in a system, client complaints or material breakdowns.  You can record issues, assign them to some responsible person, and keep track of their status as they evolve over time.
diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index 7b88f3705ed..802f415d01f 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>From the top menu Purchases, create purchase orders to buy products from your suppliers, encode supplier invoices and manage your payments.
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 4acbd55eaaa..95d7b6d21e2 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -41,7 +41,7 @@
         <function eval="('default',False,'shop_id', [('sale.order', False)], sale_shop_1, True, False, False, False, True)" id="sale_default_set" model="ir.values" name="set"/>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>This modules allows you to create and send easily quotations and process your sales orders; from the delivery to the invoicing.
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 9257f4cfb9b..282929ea6fb 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>Manage your product inventoy and stock locations.  You can control your stock moves history and planning, perform stock valuation, and trace product lots upstream and downstream (based on serial numbers.)</value>

From 63c0cbfc17f0ab4d02f3e542ab82b5fd837936e7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 17 Aug 2012 13:24:18 +0200
Subject: [PATCH 337/999] [IMP] mail installs

bzr revid: fp@tinyerp.com-20120817112418-037118wnayik229c
---
 addons/mail/data/mail_demo.xml | 16 ++++------------
 addons/mail/mail_message.py    |  2 --
 addons/mail/mail_thread.py     |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index e3d7c2ab1e1..f69fd1b5820 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -6,38 +6,31 @@
             <field name="subject">Internal company announce</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Your monthly meal vouchers arrived. You can get them at Christine's office.
+            <field name="body"><![CDATA[Your monthly meal vouchers arrived. You can get them at Christine's office.
 This month you also have 250 EUR of eco-checks for all employees that worked with us since 1 year minimum.]]></field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
         </record>
 
         <record id="message_blogpost0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Great.]]></field>
+            <field name="body"><![CDATA[Great.]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
         </record>
 
         <record id="message_blogpost0_comment1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Yes, that's a good news.]]></field>
+            <field name="body"><![CDATA[Yes, that's a good news.]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_demo"/>
         </record>
 
         <record id="message_blogpost0_comment2" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel.
+            <field name="body"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel.
 
 In quis purus neque. Integer sodales dolor eu elit fringilla blandit. Maecenas lacus nisi, facilisis sit amet viverra eu, tristique vel augue.
 Donec viverra congue dui eu blandit. In lacinia molestie nulla, ut sagittis risus feugiat eu.
@@ -45,7 +38,6 @@ Donec viverra congue dui eu blandit. In lacinia molestie nulla, ut sagittis risu
 Check the file in attachment for more information !  (third comment)]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
         </record>
 
         <record model="ir.config_parameter" id="user_mail_alias">
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 3d6d8bf76cc..a74cc3c9a5d 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -177,8 +177,6 @@ class mail_message(osv.Model):
             notification_obj = self.pool.get('mail.notification')
             modobj = self.pool.get(values.get('model'))
             follower_notify = []
-            print values.get('res_id'), '**'
-            print modobj.browse(cr, uid, values.get('res_id'), context=context)
             for follower in modobj.browse(cr, uid, values.get('res_id'), context=context).message_follower_ids:
                 if follower.id <> uid:
                     follower_notify.append(follower.id)
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c9fad981dcb..d66d3d17c18 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -110,7 +110,7 @@ class mail_thread(osv.Model):
         'message_is_follower': fields.function(_get_is_follower,
             type='boolean', string='Is a Follower'),
         'message_follower_ids': fields.many2many('res.partner', 'mail_subscription', 'res_id', 'partner_id',
-            domain=lambda self: [('res_model','=',self._name)],
+            # FP Note: implement this domain=lambda self: [('res_model','=',self._name)],
             string='Followers'),
         'message_ids': fields.one2many('mail.message', 'res_id',
             domain=lambda self: [('model','=',self._name)],

From a71b01ab24cf173dc52861ca067128258bdeb5f8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 17 Aug 2012 13:55:13 +0200
Subject: [PATCH 338/999] [IMP] mail cleaning

bzr revid: fp@tinyerp.com-20120817115513-3b3faqcl78blyrfo
---
 addons/email_template/email_template.py                     | 6 ++----
 addons/email_template/email_template_view.xml               | 1 -
 addons/email_template/wizard/email_template_preview.py      | 1 -
 .../email_template/wizard/email_template_preview_view.xml   | 1 -
 addons/email_template/wizard/mail_compose_message.py        | 1 -
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index b43b7d19b85..8cad887e0cb 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -38,7 +38,7 @@ except ImportError:
 
 class email_template(osv.osv):
     "Templates for sending email"
-    _inherit = 'mail.message'
+    _inherit = 'mail.mail'
     _name = "email.template"
     _description = 'Email Templates'
     _rec_name = 'name' # override mail.message's behavior
@@ -147,7 +147,6 @@ class email_template(osv.osv):
         'email_from': fields.char('From', size=128, help="Sender address (placeholders may be used here)"),
         'email_to': fields.char('To', size=256, help="Comma-separated recipient addresses (placeholders may be used here)"),
         'email_cc': fields.char('Cc', size=256, help="Carbon copy recipients (placeholders may be used here)"),
-        'email_bcc': fields.char('Bcc', size=256, help="Blind carbon copy recipients (placeholders may be used here)"),
         'reply_to': fields.char('Reply-To', size=250, help="Preferred response address (placeholders may be used here)"),
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing Mail Server', readonly=False,
                                           help="Optional preferred server for outgoing mails. If not set, the highest "
@@ -306,7 +305,6 @@ class email_template(osv.osv):
                   'email_from': False,
                   'email_to': False,
                   'email_cc': False,
-                  'email_bcc': False,
                   'reply_to': False,
                   'auto_delete': False,
                   'model': False,
@@ -326,7 +324,7 @@ class email_template(osv.osv):
         template = self.get_email_template(cr, uid, template_id, res_id, context)
 
         for field in ['subject', 'body_text', 'body_html', 'email_from',
-                      'email_to', 'email_cc', 'email_bcc', 'reply_to',
+                      'email_to', 'email_cc', 'reply_to',
                       'message_id']:
             values[field] = self.render_template(cr, uid, getattr(template, field),
                                                  template.model, res_id, context=context) \
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index a04790d1c1c..09691aec943 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -19,7 +19,6 @@
                                 <field name="email_from" required="1"/>
                                 <field name="email_to" required="1"/>
                                 <field name="email_cc"/>
-                                <field name="email_bcc"/>
                                 <field name="reply_to"/>
                                 <field name="subject" required="1"/>
                                 <notebook  colspan="4">
diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py
index 4ef0e9fa156..edf0a7f3405 100644
--- a/addons/email_template/wizard/email_template_preview.py
+++ b/addons/email_template/wizard/email_template_preview.py
@@ -79,7 +79,6 @@ class email_template_preview(osv.osv_memory):
         model = template.model
         vals['email_to'] = self.render_template(cr, uid, template.email_to, model, res_id, context)
         vals['email_cc'] = self.render_template(cr, uid, template.email_cc, model, res_id, context)
-        vals['email_bcc'] = self.render_template(cr, uid, template.email_bcc, model, res_id, context)
         vals['reply_to'] = self.render_template(cr, uid, template.reply_to, model, res_id, context)
         vals['subject'] = self.render_template(cr, uid, template.subject, model, res_id, context)
         description = self.render_template(cr, uid, template.body_text, model, res_id, context) or ''
diff --git a/addons/email_template/wizard/email_template_preview_view.xml b/addons/email_template/wizard/email_template_preview_view.xml
index 39fb413fcde..84ffa9140a6 100644
--- a/addons/email_template/wizard/email_template_preview_view.xml
+++ b/addons/email_template/wizard/email_template_preview_view.xml
@@ -12,7 +12,6 @@
                     <group col="2" colspan="4">
                         <field name="email_to" readonly="1"/>
                         <field name="email_cc" readonly="1" attrs="{'invisible': [('email_cc','=',False)]}"/>
-                        <field name="email_bcc" readonly="1" attrs="{'invisible': [('email_bcc','=',False)]}"/>
                         <field name="reply_to" readonly="1" attrs="{'invisible': [('reply_to','=',False)]}"/>
                         <field name="subject" readonly="1"/>
                     </group>
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 1b007a990c0..078d495ea90 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -138,7 +138,6 @@ class mail_compose_message(osv.osv_memory):
                 'body_text': record.body_text or False,
                 'email_to': record.email_to or False,
                 'email_cc': record.email_cc or False,
-                'email_bcc': record.email_bcc or False,
                 'reply_to': record.reply_to or False,
                 'model_id': model_id or False,
                 'attachment_ids': [(6, 0, [att.id for att in record.attachment_ids])]

From 06f60b3517cd160030ef2cc7758830604649fee9 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 17 Aug 2012 14:06:06 +0200
Subject: [PATCH 339/999] [FIX] body_text --> body, not ure it's good enough

bzr revid: fp@tinyerp.com-20120817120606-t97l9x2dguuv7kmp
---
 addons/account/edi/invoice_action_data.xml    |  2 +-
 addons/account/i18n/account.pot               |  2 +-
 .../auth_reset_password.xml                   |  2 +-
 addons/base_status/base_stage.py              |  4 ++--
 addons/crm/crm_lead.py                        |  8 +++----
 .../process/communication_with_customer.yml   |  2 +-
 addons/crm_claim/crm_claim.py                 |  4 ++--
 addons/crm_claim/test/ui/claim_demo.yml       |  4 ++--
 addons/crm_helpdesk/crm_helpdesk.py           |  4 ++--
 .../crm_helpdesk/test/process/help-desk.yml   |  2 +-
 .../i18n/crm_partner_assign.pot               |  4 ++--
 .../wizard/crm_forward_to_partner.py          | 22 +++++++++----------
 .../wizard/crm_forward_to_partner_view.xml    |  2 +-
 addons/email_template/email_template.py       |  8 +++----
 addons/email_template/email_template_view.xml |  2 +-
 addons/email_template/i18n/email_template.pot |  8 +++----
 .../wizard/email_template_preview.py          |  4 ++--
 .../wizard/email_template_preview_view.xml    |  2 +-
 .../wizard/mail_compose_message.py            |  2 +-
 addons/event/email_template.xml               |  4 ++--
 .../wizard/mail_compose_message.py            |  2 +-
 addons/hr_recruitment/hr_recruitment.py       |  4 ++--
 addons/import_base/import_framework.py        |  2 +-
 addons/import_sugarcrm/import_sugarcrm.py     |  2 +-
 addons/mail/doc/mail_openchatter_howto.rst    |  2 +-
 addons/mail/mail_mail.py                      |  8 +++----
 addons/mail/mail_message.py                   |  4 ++--
 addons/mail/mail_thread.py                    |  2 +-
 addons/mail/static/src/css/mail.css           | 10 ++++-----
 addons/mail/static/src/js/mail.js             | 14 ++++++------
 addons/mail/wizard/mail_compose_message.py    | 22 +++++++++----------
 .../mail/wizard/mail_compose_message_view.xml |  2 +-
 .../marketing_campaign_demo.xml               |  6 ++---
 .../marketing_campaign_demo.xml               | 16 +++++++-------
 addons/plugin/plugin_handler.py               |  4 ++--
 addons/project_issue/project_issue.py         |  8 +++----
 addons/project_mailgate/project_mailgate.py   |  2 +-
 .../edi/purchase_order_action_data.xml        |  2 +-
 addons/purchase/i18n/purchase.pot             |  2 +-
 addons/sale/edi/sale_order_action_data.xml    |  2 +-
 addons/sale/i18n/sale.pot                     |  2 +-
 41 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index 0eec6d27785..9aa1a4b720f 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -123,7 +123,7 @@
     </div>
 </div>
             ]]></field>
-            <field name="body_text"><![CDATA[
+            <field name="body"><![CDATA[
 Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
 
 A new invoice is available for ${object.partner_id.name}:
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 174002a8d8d..0d5439719e2 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -9538,7 +9538,7 @@ msgid "Refund"
 msgstr ""
 
 #. module: account
-#: model:email.template,body_text:account.email_template_edi_invoice
+#: model:email.template,body:account.email_template_edi_invoice
 msgid "\n"
 "Hello${object.address_invoice_id.name and ' ' or ''}${object.address_invoice_id.name or ''},\n"
 "\n"
diff --git a/addons/auth_reset_password/auth_reset_password.xml b/addons/auth_reset_password/auth_reset_password.xml
index 26ea8878c45..d2256a8911a 100644
--- a/addons/auth_reset_password/auth_reset_password.xml
+++ b/addons/auth_reset_password/auth_reset_password.xml
@@ -9,7 +9,7 @@
             <field name="email_from"><![CDATA[${object.company_id.name} <${object.company_id.email}>]]></field>
             <field name="email_to" eval="False"><!--(set by reset_password module)--></field>
             <field name="subject">Password reset</field>
-            <field name="body_text"><![CDATA[
+            <field name="body"><![CDATA[
 A password reset was requested the OpenERP account linked to this email on ${object._auth_reset_password_host()}
 
 You may change your password following this link:
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index d5ac2d78c44..6b834399dd9 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -312,8 +312,8 @@ class base_stage(object):
             dest = case.user_id.email or ""
             body = case.description or ""
             for message in case.message_ids:
-                if message.email_from and message.body_text:
-                    body = message.body_text
+                if message.email_from and message.body:
+                    body = message.body
                     break
 
             if not destination:
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 754e11db598..a15e18efad5 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -447,7 +447,7 @@ class crm_lead(base_stage, osv.osv):
         oldest_id = opportunity_ids[0]
         return self.browse(cr, uid, oldest_id, context=context)
 
-    def _mail_body_text(self, cr, uid, lead, fields, title=False, context=None):
+    def _mail_body(self, cr, uid, lead, fields, title=False, context=None):
         body = []
         if title:
             body.append("%s\n" % (title))
@@ -484,7 +484,7 @@ class crm_lead(base_stage, osv.osv):
         for opportunity in opportunities:
             subject.append(opportunity.name)
             title = "%s : %s" % (merge_message, opportunity.name)
-            details.append(self._mail_body_text(cr, uid, opportunity, fields, title=title, context=context))
+            details.append(self._mail_body(cr, uid, opportunity, fields, title=title, context=context))
 
         subject = subject[0] + ", ".join(subject[1:])
         details = "\n\n".join(details)
@@ -819,7 +819,7 @@ class crm_lead(base_stage, osv.osv):
         if custom_values is None: custom_values = {}
         custom_values.update({
             'name':  msg.get('subject') or _("No Subject"),
-            'description': msg.get('body_text'),
+            'description': msg.get('body'),
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
@@ -844,7 +844,7 @@ class crm_lead(base_stage, osv.osv):
             'revenue': 'planned_revenue',
             'probability':'probability',
         }
-        for line in msg.get('body_text', '').split('\n'):
+        for line in msg.get('body', '').split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
index c958889bdc1..d18fa5495d9 100644
--- a/addons/crm/test/process/communication_with_customer.yml
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -23,7 +23,7 @@
   !python {model: mail.compose.message}: |
     lead_ids = self.pool.get('crm.lead').search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     context.update({'active_model': 'crm.lead','active_id': lead_ids[0]})
-    id = self.create(cr, uid, {'body_text': "Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci", 'email_from': 'sales@mycompany.com'}, context=context)
+    id = self.create(cr, uid, {'body': "Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci", 'email_from': 'sales@mycompany.com'}, context=context)
     try:
         self.send_mail(cr, uid, [id], context=context)
     except:
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index a7ea3d619e7..39347f8b26a 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -194,7 +194,7 @@ class crm_claim(base_stage, osv.osv):
         if custom_values is None: custom_values = {}
         custom_values.update({
             'name': msg.get('subject') or _("No Subject"),
-            'description': msg.get('body_text'),
+            'description': msg.get('body'),
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
         })
@@ -219,7 +219,7 @@ class crm_claim(base_stage, osv.osv):
             'revenue': 'planned_revenue',
             'probability':'probability'
         }
-        for line in msg['body_text'].split('\n'):
+        for line in msg['body'].split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
diff --git a/addons/crm_claim/test/ui/claim_demo.yml b/addons/crm_claim/test/ui/claim_demo.yml
index ad8fdf3aa44..6b6d380f5be 100644
--- a/addons/crm_claim/test/ui/claim_demo.yml
+++ b/addons/crm_claim/test/ui/claim_demo.yml
@@ -9,7 +9,7 @@
 -
   !python {model: crm.claim}: |
     try:
-      self.message_update(cr, uid,[ref('crm_claim_4')], {'subject': 'Claim Update record','body_text': 'first training session completed',})
+      self.message_update(cr, uid,[ref('crm_claim_4')], {'subject': 'Claim Update record','body': 'first training session completed',})
     except:
       pass
-  
\ No newline at end of file
+  
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index e219263d841..d80bd555811 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -105,7 +105,7 @@ class crm_helpdesk(base_state, osv.osv):
         if custom_values is None: custom_values = {}
         custom_values.update({
             'name': msg.get('subject') or _("No Subject"),
-            'description': msg.get('body_text'),
+            'description': msg.get('body'),
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
@@ -129,7 +129,7 @@ class crm_helpdesk(base_state, osv.osv):
             'revenue': 'planned_revenue',
             'probability':'probability'
         }
-        for line in msg['body_text'].split('\n'):
+        for line in msg['body'].split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
diff --git a/addons/crm_helpdesk/test/process/help-desk.yml b/addons/crm_helpdesk/test/process/help-desk.yml
index 320bd61c2af..4fd6a9ee9d7 100644
--- a/addons/crm_helpdesk/test/process/help-desk.yml
+++ b/addons/crm_helpdesk/test/process/help-desk.yml
@@ -23,7 +23,7 @@
   !python {model: crm.helpdesk}: |
     question_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     try:
-      self.message_update(cr, uid, question_ids, {'subject': 'Link of product', 'body_text': 'www.openerp.com'})
+      self.message_update(cr, uid, question_ids, {'subject': 'Link of product', 'body': 'www.openerp.com'})
     except:
       pass
 
diff --git a/addons/crm_partner_assign/i18n/crm_partner_assign.pot b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
index 3fb9fc0e915..c3ddc66fa3b 100644
--- a/addons/crm_partner_assign/i18n/crm_partner_assign.pot
+++ b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
@@ -72,7 +72,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgid "Highest"
 msgstr ""
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index d479f8b1bd5..ce6087cad69 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -62,9 +62,9 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         res_id = context.get('active_id')
         model = context.get('active_model')
         lead = self.pool.get(model).browse(cr, uid, res_id, context)
-        body_text = self._get_message_body_text(cr, uid, lead, history_type, context=context)
-        if body_text:
-            res = {'value': {'body_text' : body_text}}
+        body = self._get_message_body(cr, uid, lead, history_type, context=context)
+        if body:
+            res = {'value': {'body' : body}}
         return res
     
     def on_change_partner(self, cr, uid, ids, partner_id):
@@ -99,7 +99,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         mode = context.get('mail.compose.message.mode')
         if mode == 'mass_mail':
             lead_ids = context and context.get('active_ids', []) or []
-            value = self.default_get(cr, uid, ['body_text', 'email_to', 'email_cc', 'subject', 'history'], context=context)
+            value = self.default_get(cr, uid, ['body', 'email_to', 'email_cc', 'subject', 'history'], context=context)
             self.write(cr, uid, ids, value, context=context)
             context['mail.compose.message.mode'] = mode
 
@@ -125,7 +125,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             lead.write(cr, uid, [case.id], update_vals, context=context)
         return res
 
-    def _get_info_body_text(self, cr, uid, lead, context=None):
+    def _get_info_body(self, cr, uid, lead, context=None):
         field_names = []
         proxy = self.pool.get(lead._name)
         if lead.type == 'opportunity':
@@ -135,14 +135,14 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             'zip', 'city', 'country_id', 'state_id', 'email_from',
             'phone', 'fax', 'mobile', 'categ_id', 'description',
         ]
-        return proxy._mail_body_text(cr, uid, lead, field_names, context=context)
+        return proxy._mail_body(cr, uid, lead, field_names, context=context)
 
-    def _get_message_body_text(self, cr, uid, lead, mode='whole', context=None):
+    def _get_message_body(self, cr, uid, lead, mode='whole', context=None):
         """This function gets whole communication history and returns as top posting style
         """
         mail_message = self.pool.get('mail.message')
         message_ids = []
-        body = self._get_info_body_text(cr, uid, lead, context=context)
+        body = self._get_info_body(cr, uid, lead, context=context)
         if mode in ('whole', 'latest'):
             message_ids = lead.message_ids
             message_ids = map(lambda x: x.id, filter(lambda x: x.email_from, message_ids))
@@ -153,7 +153,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
                 sender = 'From: %s' %(message.email_from or '')
                 to = 'To: %s' % (message.email_to or '')
                 sentdate = 'Date: %s' % (message.date or '')
-                desc = '\n%s'%(message.body_text)
+                desc = '\n%s'%(message.body)
                 original = [header, sender, to, sentdate, desc, '\n']
                 original = '\n'.join(original)
                 body += original
@@ -174,7 +174,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             email_cc = res.get('email_cc', "")
             email = res.get('email_to', "")
             subject = '%s: %s - %s' % (_('Fwd'), 'Lead forward', lead.name)
-            body = self._get_message_body_text(cr, uid, lead, body_type, context=context)
+            body = self._get_message_body(cr, uid, lead, body_type, context=context)
             partner_assigned_id = lead.partner_assigned_id and lead.partner_assigned_id.id or False
             user_id = False
             if not partner_assigned_id:
@@ -187,7 +187,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             
             res.update({
                 'subject' : subject,
-                'body_text' : body,
+                'body' : body,
                 'email_cc' : email_cc,
                 'email_to' : email,
                 'partner_assigned_id': partner_assigned_id,
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index cecf73954e5..f415a00c680 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -32,7 +32,7 @@
                     <separator string="" colspan="4"/>
                     <notebook colspan="4">
                         <page string="Body">
-                            <field name="body_text" colspan="4" nolabel="1"/>
+                            <field name="body" colspan="4" nolabel="1"/>
                         </page>
                         <page string="Attachments">
                             <label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 8cad887e0cb..ef01533adaa 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -151,7 +151,7 @@ class email_template(osv.osv):
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing Mail Server', readonly=False,
                                           help="Optional preferred server for outgoing mails. If not set, the highest "
                                                "priority one will be used."),
-        'body_text': fields.text('Text Contents', translate=True, help="Plaintext version of the message (placeholders may be used here)"),
+        'body': fields.text('Text Contents', translate=True, help="Plaintext version of the message (placeholders may be used here)"),
         'body_html': fields.text('Rich-text Contents', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"),
         'message_id': fields.char('Message-Id', size=256, help="Message-ID SMTP header to use in outgoing messages based on this template. "
                                                                "Please note that this overrides the 'Resource Tracking' option, "
@@ -300,7 +300,7 @@ class email_template(osv.osv):
             context = {}
         values = {
                   'subject': False,
-                  'body_text': False,
+                  'body': False,
                   'body_html': False,
                   'email_from': False,
                   'email_to': False,
@@ -323,7 +323,7 @@ class email_template(osv.osv):
         report_xml_pool = self.pool.get('ir.actions.report.xml')
         template = self.get_email_template(cr, uid, template_id, res_id, context)
 
-        for field in ['subject', 'body_text', 'body_html', 'email_from',
+        for field in ['subject', 'body', 'body_html', 'email_from',
                       'email_to', 'email_cc', 'reply_to',
                       'message_id']:
             values[field] = self.render_template(cr, uid, getattr(template, field),
@@ -342,7 +342,7 @@ class email_template(osv.osv):
 
         if template.user_signature:
             signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
-            values['body_text'] += '\n\n' + signature
+            values['body'] += '\n\n' + signature
 
         values.update(mail_server_id = template.mail_server_id.id or False,
                       auto_delete = template.auto_delete,
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 09691aec943..a03bd3351ed 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -23,7 +23,7 @@
                                 <field name="subject" required="1"/>
                                 <notebook  colspan="4">
                                     <page string="Body (Text)">
-                                        <field name="body_text" colspan="4" width="250" height="250" nolabel="1"/>
+                                        <field name="body" colspan="4" width="250" height="250" nolabel="1"/>
                                     </page>
                                     <page string="Body (Rich/HTML)">
                                         <field name="body_html" colspan="4" width="250" height="250" nolabel="1"/>
diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot
index 0990a940397..519755ac8f0 100644
--- a/addons/email_template/i18n/email_template.pot
+++ b/addons/email_template/i18n/email_template.pot
@@ -289,8 +289,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -425,8 +425,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py
index edf0a7f3405..a28eb2487cb 100644
--- a/addons/email_template/wizard/email_template_preview.py
+++ b/addons/email_template/wizard/email_template_preview.py
@@ -81,11 +81,11 @@ class email_template_preview(osv.osv_memory):
         vals['email_cc'] = self.render_template(cr, uid, template.email_cc, model, res_id, context)
         vals['reply_to'] = self.render_template(cr, uid, template.reply_to, model, res_id, context)
         vals['subject'] = self.render_template(cr, uid, template.subject, model, res_id, context)
-        description = self.render_template(cr, uid, template.body_text, model, res_id, context) or ''
+        description = self.render_template(cr, uid, template.body, model, res_id, context) or ''
         if template.user_signature:
             signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
             description += '\n' + signature
-        vals['body_text'] = description
+        vals['body'] = description
         if template.body_html:
             vals['body_html'] = self.render_template(cr, uid, template.body_html, model, res_id, context) or ''
         vals['report_name'] = self.render_template(cr, uid, template.report_name, model, res_id, context)
diff --git a/addons/email_template/wizard/email_template_preview_view.xml b/addons/email_template/wizard/email_template_preview_view.xml
index 84ffa9140a6..708ca2b0406 100644
--- a/addons/email_template/wizard/email_template_preview_view.xml
+++ b/addons/email_template/wizard/email_template_preview_view.xml
@@ -18,7 +18,7 @@
                     <group col="4" colspan="4">
                         <notebook>
                             <page string="Body (Text)">
-                                <field name="body_text" nolabel="1" colspan="4" height="350" width="350" readonly="1"/>
+                                <field name="body" nolabel="1" colspan="4" height="350" width="350" readonly="1"/>
                             </page>
                             <page string="Body (Rich/HTML)" attrs="{'invisible': [('body_html','=', False)]}">
                                 <field name="body_html" nolabel="1" colspan="4" height="350" width="350" readonly="1"/>
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 078d495ea90..a05aa232453 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -135,7 +135,7 @@ class mail_compose_message(osv.osv_memory):
                 'name': template_name,
                 'email_from': record.email_from or False,
                 'subject': record.subject or False,
-                'body_text': record.body_text or False,
+                'body': record.body or False,
                 'email_to': record.email_to or False,
                 'email_cc': record.email_cc or False,
                 'reply_to': record.reply_to or False,
diff --git a/addons/event/email_template.xml b/addons/event/email_template.xml
index 2666ece9921..49738185547 100644
--- a/addons/event/email_template.xml
+++ b/addons/event/email_template.xml
@@ -7,7 +7,7 @@
         <field name="email_from" >${object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com'}</field>
         <field name="email_to" >${object.email}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>
-        <field name="body_text">
+        <field name="body">
         hello ${object.name},
 
         The event ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin} to ${object.event_id.date_end}. For any further information please contact our event department.
@@ -27,7 +27,7 @@
         <field name="email_from" >${object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com'}</field>
         <field name="email_to" >${object.email}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>
-        <field name="body_text">
+        <field name="body">
         hello ${object.name},
 
         We confirm you that your registration to the event ${object.event_id.name} has been recorded. You will automatically receive an email providing you more practical information (such as the schedule, the plan...) as soon as the event will be confirmed to be held.
diff --git a/addons/hr_evaluation/wizard/mail_compose_message.py b/addons/hr_evaluation/wizard/mail_compose_message.py
index 7e4ba326947..c02480cf2c5 100644
--- a/addons/hr_evaluation/wizard/mail_compose_message.py
+++ b/addons/hr_evaluation/wizard/mail_compose_message.py
@@ -46,7 +46,7 @@ class mail_compose_message(osv.osv_memory):
                 result.update({
                         'email_to': record_data.user_to_review_id.work_email or False,
                         'subject': _("Reminder to fill up Survey"),
-                        'body_text': msg,
+                        'body': msg,
                     })
         return result
 
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 8446cb93d89..f63a16011ab 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -332,7 +332,7 @@ class hr_applicant(base_stage, osv.Model):
         if custom_values is None: custom_values = {}
         custom_values.update({
             'name':  msg.get('subject') or _("No Subject"),
-            'description': msg.get('body_text'),
+            'description': msg.get('body'),
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
@@ -363,7 +363,7 @@ class hr_applicant(base_stage, osv.Model):
             'revenue': 'planned_revenue',
             'probability': 'probability',
         }
-        for line in msg.get('body_text', '').split('\n'):
+        for line in msg.get('body', '').split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower(), False):
diff --git a/addons/import_base/import_framework.py b/addons/import_base/import_framework.py
index 74d2185b57e..7e0a055d95b 100644
--- a/addons/import_base/import_framework.py
+++ b/addons/import_base/import_framework.py
@@ -425,7 +425,7 @@ class import_framework(Thread):
         email_id = email_obj.create(self.cr, self.uid, {
             'email_from' : 'import@module.openerp',
             'email_to' : self.email,
-            'body_text' : self.get_email_body(result, error),
+            'body' : self.get_email_body(result, error),
             'subject' : self.get_email_subject(result, error),
             'auto_delete' : True})
         email_obj.send(self.cr, self.uid, [email_id])
diff --git a/addons/import_sugarcrm/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py
index 440a7b2b6f6..1646fb7ff2a 100644
--- a/addons/import_sugarcrm/import_sugarcrm.py
+++ b/addons/import_sugarcrm/import_sugarcrm.py
@@ -226,7 +226,7 @@ class sugar_import(import_framework):
                         'model': 'model',
                         'partner_id/.id': 'partner_id/.id',                         
                         'user_id/id': ref(self.TABLE_USER, 'assigned_user_id'),
-                        'body_text': 'description',
+                        'body': 'description',
                         'body_html' : 'description_html',
                         
                 }
diff --git a/addons/mail/doc/mail_openchatter_howto.rst b/addons/mail/doc/mail_openchatter_howto.rst
index 59e038f28eb..e4c86add7bc 100644
--- a/addons/mail/doc/mail_openchatter_howto.rst
+++ b/addons/mail/doc/mail_openchatter_howto.rst
@@ -147,7 +147,7 @@ The best way to direct the messages that will be displayed in the OpenChatter wi
         # add: search in the current task project messages
         '&', '&', ('res_id', '=', my_task.project_id.id), ('model', '=', 'project.project'),
         # ... containing the task name
-        '|', ('body_text', 'like', '%s' % (my_task.name)), ('body_html', 'like', '%s' % (my_task.name))
+        '|', ('body', 'like', '%s' % (my_task.name)), ('body_html', 'like', '%s' % (my_task.name))
         ] + domain, limit=limit, offset=offset, context=context)
     # if asked: add ancestor ids to have complete threads
     if (ascent): msg_ids = self._message_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context)
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 13e0638c299..cfc4946a94f 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -108,7 +108,7 @@ class mail_mail(osv.Model):
                 'model': model,
                 'res_id': res_id,
                 'type': type,
-                'body_text': body if content_subtype != 'html' else False,
+                'body': body if content_subtype != 'html' else False,
                 'body_html': body if content_subtype == 'html' else False,
                 'email_from': email_from,
                 'email_to': email_to and ','.join(email_to) or '',
@@ -214,13 +214,13 @@ class mail_mail(osv.Model):
                 for attach in message.attachment_ids:
                     attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
 
-                body = message.body_html if message.content_subtype == 'html' else message.body_text
+                body = message.body_html if message.content_subtype == 'html' else message.body
                 body_alternative = None
                 content_subtype_alternative = None
-                if message.content_subtype == 'html' and message.body_text:
+                if message.content_subtype == 'html' and message.body:
                     # we have a plain text alternative prepared, pass it to 
                     # build_message instead of letting it build one
-                    body_alternative = message.body_text
+                    body_alternative = message.body
                     content_subtype_alternative = 'plain'
 
                 # handle destination_partners
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index a74cc3c9a5d..a722dca3797 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -72,8 +72,8 @@ class mail_message(osv.Model):
             name = ''
             if message.subject:
                 name = '%s: ' % (message.subject)
-            if message.body_text:
-                name = name + message.body_text[0:20]
+            if message.body:
+                name = name + message.body[0:20]
             res.append((message.id, name))
         return res
 
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index d66d3d17c18..833bba056ec 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -622,7 +622,7 @@ class mail_thread(osv.Model):
                                     #.. all X- headers...
                                   },
                       'content_subtype': msg_mime_subtype,  --> to remove
-                      'body_text': plaintext_body           --> keep body
+                      'body': plaintext_body           --> keep body
                       'body_html': html_body,               --> to remove
                       'attachments': [('file1', 'bytes'),
                                        ('file2', 'bytes') }
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 7cee91e30e5..c542c74bbcd 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -36,7 +36,7 @@
 }
 
 .openerp div.oe_mail_wall_action textarea.oe_mail_compose_textarea,
-.openerp div.oe_mail_wall_action div.oe_mail_compose_message_body_text textarea {
+.openerp div.oe_mail_wall_action div.oe_mail_compose_message_body textarea {
     width: 474px;
     height: 60px;
     padding: 4px;
@@ -165,9 +165,9 @@
     clear: both; 
 }
 
-/* default textarea (oe_mail_compose_textarea), and body_text textarea for compose form view */
+/* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
 .openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea,
-.openerp .oe_mail_msg_content div.oe_mail_compose_message_body_text textarea {
+.openerp .oe_mail_msg_content div.oe_mail_compose_message_body textarea {
     width: 474px;
     height: 60px;
     padding: 4px;
@@ -175,9 +175,9 @@
     border: 1px solid #cccccc;
 }
 
-/* default textarea (oe_mail_compose_textarea), and body_text textarea for compose form view */
+/* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
 .openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea:focus,
-.openerp .oe_mail_msg_content div.oe_mail_compose_message_body_text textarea:focus {
+.openerp .oe_mail_msg_content div.oe_mail_compose_message_body textarea:focus {
     outline: 0;
     border-color: rgba(82, 168, 236, 0.8);
     -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 580c71e30cb..f619480aaf4 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -321,7 +321,7 @@ openerp.mail = function(session) {
         reinit: function() {
             var self = this;
             if (! this.form_view) return;
-            var call_defer = this.ds_compose.call('default_get', [['subject', 'body_text', 'body_html', 'dest_partner_ids'], this.ds_compose.get_context()]).then(
+            var call_defer = this.ds_compose.call('default_get', [['subject', 'body', 'body_html', 'dest_partner_ids'], this.ds_compose.get_context()]).then(
                 function (result) {
                     self.form_view.on_processed_onchange({'value': result}, []);
                 });
@@ -441,7 +441,7 @@ openerp.mail = function(session) {
             this.ds_compose.context.formatting = this.formatting;
             // toggle display
             this.$element.find('span.oe_mail_compose_message_subject').toggleClass('oe_mail_compose_message_invisible');
-            this.$element.find('div.oe_mail_compose_message_body_text').toggleClass('oe_mail_compose_message_invisible');
+            this.$element.find('div.oe_mail_compose_message_body').toggleClass('oe_mail_compose_message_invisible');
             this.$element.find('div.oe_mail_compose_message_body_html').toggleClass('oe_mail_compose_message_invisible');
         },
 
@@ -472,9 +472,9 @@ openerp.mail = function(session) {
 
         /**
          * Update the values of the composition form; with possible different
-         * values for body_text and body_html. */
-        set_body_value: function(body_text, body_html) {
-            this.form_view.fields.body_text.set_value(body_text);
+         * values for body and body_html. */
+        set_body_value: function(body, body_html) {
+            this.form_view.fields.body.set_value(body);
             this.form_view.fields.body_html.set_value(body_html);
         },
     }),
@@ -776,9 +776,9 @@ openerp.mail = function(session) {
         
         do_comment: function () {
             var comment_node = this.$element.find('textarea');
-            var body_text = comment_node.val();
+            var body = comment_node.val();
             comment_node.val('');
-            return this.ds.call('message_post', [[this.params.res_id], body_text], {parent_id: this.params.parent_id, mtype: 'comment'}).then(
+            return this.ds.call('message_post', [[this.params.res_id], body], {parent_id: this.params.parent_id, mtype: 'comment'}).then(
                 this.proxy('init_comments'));
         },
         
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index a38564ef578..072e68748a1 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -140,7 +140,7 @@ class mail_compose_message(osv.TransientModel):
             'res_id': res_id,
             'email_from': user.email or tools.config.get('email_from', False),
             'body_html': False,
-            'body_text': False,
+            'body': False,
             'subject': False,
             'dest_partner_ids': [],
         })
@@ -204,11 +204,11 @@ class mail_compose_message(osv.TransientModel):
         # version. TODO: make it possible to switch to HTML on the fly
         sent_date = _('On %(date)s, ') % {'date': message_data.date} if message_data.date else ''
         sender = _('%(sender_name)s wrote:') % {'sender_name': tools.ustr(message_data.email_from or _('You'))}
-        body_text = message_data.body_text or ''
+        body = message_data.body or ''
         body_html = message_data.body_html or ''
-        quoted_body_text = '> %s' % tools.ustr(body_text.replace('\n', "\n> ") or '')
+        quoted_body = '> %s' % tools.ustr(body.replace('\n', "\n> ") or '')
         quoted_body_html = '<blockquote>%s</blockquote>' % (tools.ustr(body_html)),
-        reply_body_text = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_text, current_user.signature)
+        reply_body = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body, current_user.signature)
         reply_body_html = '<br /><br />%s%s<br />%s<br />%s' % (sent_date, sender, quoted_body_html, current_user.signature)
         # form dest_partner_ids
         dest_partner_ids = [partner.id for partner in message_data.partner_ids]
@@ -221,7 +221,7 @@ class mail_compose_message(osv.TransientModel):
             reply_headers['In-Reply-To'] = message_data.message_id
         # update the result
         result.update({
-            'body_text': reply_body_text,
+            'body': reply_body,
             'body_html': reply_body_html,
             'subject': reply_subject,
             'attachment_ids': [],
@@ -274,7 +274,7 @@ class mail_compose_message(osv.TransientModel):
             partner_ids = [partner.id for partner in mail_wiz.dest_partner_ids]
             references = None
             headers = {}
-            body = mail_wiz.body_html if content_subtype == 'html' else mail_wiz.body_text
+            body = mail_wiz.body_html if content_subtype == 'html' else mail_wiz.body
 
             # get model, active_ids, and check if model is openchatter-enabled
             if mass_mail_mode and context.get('active_ids') and context.get('active_model'):
@@ -295,7 +295,7 @@ class mail_compose_message(osv.TransientModel):
                 for active_id in active_ids:
                     rendered_subject = self.render_template(cr, uid, subject, active_model, active_id)
                     rendered_body_html = self.render_template(cr, uid, mail_wiz.body_html, active_model, active_id)
-                    rendered_body_text = self.render_template(cr, uid, mail_wiz.body_text, active_model, active_id)
+                    rendered_body = self.render_template(cr, uid, mail_wiz.body, active_model, active_id)
                     email_from = self.render_template(cr, uid, mail_wiz.email_from, active_model, active_id)
                     email_to = self.render_template(cr, uid, mail_wiz.email_to, active_model, active_id)
                     email_cc = self.render_template(cr, uid, mail_wiz.email_cc, active_model, active_id)
@@ -304,24 +304,24 @@ class mail_compose_message(osv.TransientModel):
                     # in mass-mailing mode we only schedule the mail for sending, it will be 
                     # processed as soon as the mail scheduler runs.
                     if mail_thread_enabled:
-                        active_model_pool.message_append(cr, uid, [active_id], rendered_subject, rendered_body_text, rendered_body_html,
+                        active_model_pool.message_append(cr, uid, [active_id], rendered_subject, rendered_body, rendered_body_html,
                             type=type, content_subtype=content_subtype, state=state, partner_ids=partner_ids,
                             email_from=email_from, email_to=email_to, email_cc=email_cc, 
                             reply_to=reply_to, references=references, attachments=attachment, headers=headers, context=context)
                     else:
-                        mail_message_obj.schedule_with_attach(cr, uid, email_from, mail_tools_to_email(email_to), subject, rendered_body_text,
+                        mail_message_obj.schedule_with_attach(cr, uid, email_from, mail_tools_to_email(email_to), subject, rendered_body,
                             model=mail_wiz.model, email_cc=mail_tools_to_email(email_cc), reply_to=reply_to,
                             attachments=attachment, references=references, res_id=active_id, partner_ids=partner_ids,
                             content_subtype=mail_wiz.content_subtype, headers=headers, context=context)
             else:
                 # normal mode - no mass-mailing
                 if mail_thread_enabled:
-                    msg_ids = active_model_pool.message_append(cr, uid, active_ids, subject, mail_wiz.body_text, mail_wiz.body_html,
+                    msg_ids = active_model_pool.message_append(cr, uid, active_ids, subject, mail_wiz.body, mail_wiz.body_html,
                         type=type, content_subtype=content_subtype, state=state, partner_ids=partner_ids,
                         email_from=mail_wiz.email_from, email_to=mail_wiz.email_to, email_cc=mail_wiz.email_cc, 
                         reply_to=mail_wiz.reply_to, references=references, attachments=attachment, headers=headers, context=context)
                 else:
-                    msg_ids = [mail_message_obj.schedule_with_attach(cr, uid, mail_wiz.email_from, mail_tools_to_email(mail_wiz.email_to), subject, mail_wiz.body_text,
+                    msg_ids = [mail_message_obj.schedule_with_attach(cr, uid, mail_wiz.email_from, mail_tools_to_email(mail_wiz.email_to), subject, mail_wiz.body,
                         type=type, model=mail_wiz.model, email_cc=mail_tools_to_email(mail_wiz.email_cc), reply_to=mail_wiz.reply_to,
                         attachments=attachment, references=references, res_id=int(mail_wiz.res_id), partner_ids=partner_ids,
                         content_subtype=mail_wiz.content_subtype, headers=headers, context=context)]
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index e1a1020b6b6..d5ff9a7d10f 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -41,7 +41,7 @@
                         <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
                                 class="oe_mail_compose_message_subject oe_mail_compose_message_invisible"/>
                         <field name="body" colspan="2" nolabel="1" placeholder="What are you working on ?"
-                                class="oe_mail_compose_message_body_text"/>
+                                class="oe_mail_compose_message_body"/>
                         <field name="body_html" colspan="2" nolabel="1" placeholder="What are you working on HTML ?"
                                 class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible"/>
                         <field name="dest_partner_ids" colspan="2" nolabel="1" widget="many2many_tags"
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
index 54897cd111a..19e44eb4ace 100644
--- a/addons/marketing_campaign/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -8,7 +8,7 @@
             <field name="subject">Welcome in OpenERP Partner Channel!</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body_text">Hello, We are very happy to send Welcome message.</field>
+            <field name="body">Hello, We are very happy to send Welcome message.</field>
         </record>
         <record id="email_template_2" model="email.template">
             <field name="name">Template for Silver Partner</field>
@@ -16,7 +16,7 @@
             <field name="subject">Congratulation! You become now our Silver Partner.</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body_text">Hello, We are happy to announce that you now become our Silver Partner.</field>
+            <field name="body">Hello, We are happy to announce that you now become our Silver Partner.</field>
         </record>
 
         <record id="email_template_3" model="email.template">
@@ -25,7 +25,7 @@
             <field name="subject">Congratulation! You become our Gold Partner.</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body_text">Hello, We are happy to announce that you become our Gold Partner.</field>
+            <field name="body">Hello, We are happy to announce that you become our Gold Partner.</field>
         </record>
 
 
diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index 0946ff6e129..6545dd93cb2 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -40,7 +40,7 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,</field>
+            <field name="body">Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,</field>
             <field name="name">For OpenERP OnDemand Free Trial 2010</field>
         </record>
         <record id="email_template_2" model="email.template">
@@ -50,7 +50,7 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello,We have very good offer that might suit you.
+            <field name="body">Hello,We have very good offer that might suit you.
             We propose you to subscribe to the OpenERP Discovery Day on May 2010.
             If any further information required kindly revert back.
             We really appreciate your co-operation on this.
@@ -65,7 +65,7 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
+            <field name="body">Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
              If any further information required kindly revert back.
              I really appreciate your co-operation on this.
              Regards,OpenERP Team,</field>
@@ -79,7 +79,7 @@
            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
              <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello,Thanks for showing intrest and buying the OpenERP book.
+            <field name="body">Hello,Thanks for showing intrest and buying the OpenERP book.
             If any further information required kindly revert back.
             I really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
@@ -92,7 +92,7 @@
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello, We have very good offer that might suit you.
+            <field name="body">Hello, We have very good offer that might suit you.
             For our gold partners,We are arranging free technical training on june,2010.
             If any further information required kindly revert back.
             I really appreciate your co-operation on this.
@@ -107,7 +107,7 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello, We have very good offer that might suit you.
+            <field name="body">Hello, We have very good offer that might suit you.
             For our silver partners,We are  paid technical training on june,2010.
             If any further information required kindly revert back.
             I really appreciate your co-operation on this.
@@ -122,7 +122,7 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello, We have very good offer that might suit you.
+            <field name="body">Hello, We have very good offer that might suit you.
             For our silver partners,We are  offering Gold partnership.
             If any further information required kindly revert back.
             I really appreciate your co-operation on this.
@@ -137,7 +137,7 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
+            <field name="body">Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
             <field name="name">For subscribing to technical training</field>
         </record>
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index 1bf3645d646..d493501e1cc 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -132,7 +132,7 @@ class plugin_handler(osv.osv_memory):
         return ('res.partner', partner_id, url)
 
     # Specific to outlook rfc822 is not available so we split in arguments headerd,body,attachemnts
-    def push_message_outlook(self, cr, uid, model, headers,res_id=0 ,body_text=False, body_html=False, attachments=False):
+    def push_message_outlook(self, cr, uid, model, headers,res_id=0 ,body=False, body_html=False, attachments=False):
         # ----------------------------------------
         # solution 1
         # construct a fake rfc822 from the separated arguement
@@ -160,6 +160,6 @@ class plugin_handler(osv.osv_memory):
                 attach_ids.append(ir_attachment_obj.create(cr, uid, vals))
         mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
         if mail_ids:
-            ids =  mail_message.write(cr, uid,mail_ids[0],{ 'attachment_ids': [(6, 0, attach_ids)],'body_text':body_text,'body_html':body_html})
+            ids =  mail_message.write(cr, uid,mail_ids[0],{ 'attachment_ids': [(6, 0, attach_ids)],'body':body,'body_html':body_html})
         url = self._make_url(cr, uid, res_id, model)
         return (model, res_id, url)
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 2f7458627e9..106ea195571 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -454,7 +454,7 @@ class project_issue(base_stage, osv.osv):
 
         custom_values.update({
             'name':  msg.get('subject') or _("No Subject"),
-            'description': msg.get('body_text'),
+            'description': msg.get('body'),
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
@@ -476,16 +476,16 @@ class project_issue(base_stage, osv.osv):
         if update_vals is None: update_vals = {}
 
         # Update doc values according to the message
-        update_vals['description'] = msg.get('body_text', '')
+        update_vals['description'] = msg.get('body', '')
         if msg.get('priority'):
             update_vals['priority'] = msg.get('priority')
-        # Parse 'body_text' to find values to update
+        # Parse 'body' to find values to update
         maps = {
             'cost': 'planned_cost',
             'revenue': 'planned_revenue',
             'probability': 'probability',
         }
-        for line in msg.get('body_text', '').split('\n'):
+        for line in msg.get('body', '').split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower(), False):
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
index cf2bc120fbf..3096a7381e6 100644
--- a/addons/project_mailgate/project_mailgate.py
+++ b/addons/project_mailgate/project_mailgate.py
@@ -50,7 +50,7 @@ class project_tasks(osv.osv):
         maps = {
             'cost':'planned_hours',
         }
-        for line in msg['body_text'].split('\n'):
+        for line in msg['body'].split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res:
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index b97da91fa1d..95e6adda3d9 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -108,7 +108,7 @@
     </div>
 </div>
             ]]></field>
-            <field name="body_text"><![CDATA[
+            <field name="body"><![CDATA[
 Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
 
 Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}:
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index 44355e26cea..a7fd4cfaab8 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -1767,7 +1767,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or ''}${object."
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index 181bd8183d7..478f0b17a8c 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -126,7 +126,7 @@
     </div>
 </div>
             ]]></field>
-            <field name="body_text"><![CDATA[
+            <field name="body"><![CDATA[
 Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
 
 Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}:
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 2c477d1d7a0..393b3e59db3 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -1112,7 +1112,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or ''}${object.partner_order_id."

From 043dc83d20b74e47470652d2edc044e830e485ca Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 17 Aug 2012 14:50:04 +0200
Subject: [PATCH 340/999] [IMP] mails

bzr revid: fp@tinyerp.com-20120817125004-wcchhac2cvxuf93i
---
 addons/email_template/email_template.py | 22 +++++++++++-----------
 addons/mail/mail_message.py             |  1 +
 addons/mail/mail_thread.py              |  2 +-
 addons/procurement/schedulers.py        | 14 --------------
 4 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index ef01533adaa..84d48e1387a 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -137,13 +137,13 @@ class email_template(osv.osv):
         'model': fields.related('model_id','model', type='char', string='Related Document Model',
                                 size=128, select=True, store=True, readonly=True),
         # we need a separate m2m table to avoid ID collisions with the original mail.message entries
-        'attachment_ids': fields.many2many('ir.attachment', 'email_template_attachment_rel', 'email_template_id',
-                                           'attachment_id', 'Files to attach',
-                                           help="You may attach files to this template, to be added to all "
-                                                "emails created from this template"),
+        #'attachment_ids': fields.many2many('ir.attachment', 'email_template_attachment_rel', 'email_template_id',
+        #                                   'attachment_id', 'Files to attach',
+        #                                   help="You may attach files to this template, to be added to all "
+        #                                        "emails created from this template"),
 
         # Overridden mail.message.common fields to make tooltips more appropriate:
-        'subject':fields.char('Subject', size=512, translate=True, help="Subject (placeholders may be used here)",),
+        #'subject':fields.char('Subject', size=512, translate=True, help="Subject (placeholders may be used here)",),
         'email_from': fields.char('From', size=128, help="Sender address (placeholders may be used here)"),
         'email_to': fields.char('To', size=256, help="Comma-separated recipient addresses (placeholders may be used here)"),
         'email_cc': fields.char('Cc', size=256, help="Carbon copy recipients (placeholders may be used here)"),
@@ -151,13 +151,13 @@ class email_template(osv.osv):
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing Mail Server', readonly=False,
                                           help="Optional preferred server for outgoing mails. If not set, the highest "
                                                "priority one will be used."),
-        'body': fields.text('Text Contents', translate=True, help="Plaintext version of the message (placeholders may be used here)"),
+        #'body': fields.text('Text Contents', translate=True, help="Plaintext version of the message (placeholders may be used here)"),
         'body_html': fields.text('Rich-text Contents', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"),
-        'message_id': fields.char('Message-Id', size=256, help="Message-ID SMTP header to use in outgoing messages based on this template. "
-                                                               "Please note that this overrides the 'Resource Tracking' option, "
-                                                               "so if you simply need to track replies to outgoing emails, enable "
-                                                               "that option instead.\n"
-                                                               "Placeholders must be used here, as this value always needs to be unique!"),
+        #'message_id': fields.char('Message-Id', size=256, help="Message-ID SMTP header to use in outgoing messages based on this template. "
+        #                                                       "Please note that this overrides the 'Resource Tracking' option, "
+        #                                                       "so if you simply need to track replies to outgoing emails, enable "
+        #                                                       "that option instead.\n"
+        #                                                       "Placeholders must be used here, as this value always needs to be unique!"),
 
         # Fake fields used to implement the placeholder assistant
         'model_object_field': fields.many2one('ir.model.fields', string="Field",
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index a722dca3797..5de34d18f42 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -169,6 +169,7 @@ class mail_message(osv.Model):
             self.pool.get(model).check_access_rule(cr, uid, mids, mode, context=context)
 
     def create(self, cr, uid, values, context=None):
+        print values
         newid = super(mail_message, self).create(cr, uid, values, context)
         self.check(cr, uid, [newid], mode='create', context=context)
 
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 833bba056ec..1def02bd5fa 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -757,7 +757,7 @@ class mail_thread(osv.Model):
         context = context or {}
         attachments = attachments or {}
         if type(res_id) in (list, tuple):
-            res_id = res_id[0]
+            res_id = res_id and res_id[0] or False
 
         to_attach = []
         for fname, fcontent in attachments:
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index a8bff6213d7..1c8ac5934fc 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -54,7 +54,6 @@ class procurement_order(osv.osv):
         '''
         if context is None:
             context = {}
-
         try:
             if use_new_cursor:
                 cr = pooler.get_db(use_new_cursor).cursor()
@@ -119,19 +118,6 @@ class procurement_order(osv.osv):
                 offset += len(ids)
                 if not ids: break
             end_date = fields.datetime.now()
-            if uid:
-                # Chatter: old res.request is now a chatter on res.users, id=uid
-                summary = _("""Here is the procurement scheduling report.
-
-        Start Time: %s 
-        End Time: %s 
-        Total Procurements processed: %d 
-        Procurements with exceptions: %d 
-        Skipped Procurements (scheduled date outside of scheduler range) %d 
-
-        Exceptions:\n""") % (start_date, end_date, report_total, report_except, report_later)
-                summary += '\n'.join(report)
-                procurement_obj.message_post(cr, uid, ids, body=summary, context=context)
 
             if use_new_cursor:
                 cr.commit()

From a2961cbdc3bc345e91057434026e804b260a41be Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 17 Aug 2012 15:01:26 +0200
Subject: [PATCH 341/999] mail_refactor

bzr revid: fp@tinyerp.com-20120817130126-ldiw28gs13rvf2ka
---
 addons/fetchmail/fetchmail_view.xml | 11 -----------
 addons/mail/mail_message.py         |  1 -
 2 files changed, 12 deletions(-)

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index cf651b5fd3d..7c049dedbb8 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -114,17 +114,6 @@
           </field>
       </record>
 
-      <record model="ir.ui.view" id="email_message_search_view">
-          <field name="name">mail.message.inherit.search</field>
-          <field name="model">mail.message</field>
-          <field name="inherit_id" ref="mail.view_email_message_search"/>
-          <field name="arch" type="xml">
-            <xpath expr="/search/group/filter[@string='Thread']" position="before">
-                <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'fetchmail_server_id'}"/>
-            </xpath>
-          </field>
-      </record>
-
       <act_window
             context="{'search_default_server_id': active_id, 'default_fetchmail_server_id': active_id}"
             id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('fetchmail_server_id', '=', active_id)]"
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 5de34d18f42..a722dca3797 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -169,7 +169,6 @@ class mail_message(osv.Model):
             self.pool.get(model).check_access_rule(cr, uid, mids, mode, context=context)
 
     def create(self, cr, uid, values, context=None):
-        print values
         newid = super(mail_message, self).create(cr, uid, values, context)
         self.check(cr, uid, [newid], mode='create', context=context)
 

From 38073eceafefe96bbd608360d9a94d7dbc54129b Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 17 Aug 2012 18:45:27 +0530
Subject: [PATCH 342/999] [IMP] res_company : new boolean field added and place
 changed in first page of notebook

bzr revid: rpr@tinyerp.com-20120817131527-e4spfz6q9tlu3uab
---
 openerp/addons/base/res/res_company.py       | 4 ++++
 openerp/addons/base/res/res_company_view.xml | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 68bf2b8f93a..1f40f59fd97 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -105,6 +105,7 @@ class res_company(osv.osv):
 
     _columns = {
         'name': fields.related('partner_id', 'name', string='Company Name', size=128, required=True, store=True, type='char'),
+        'customize_footer': fields.boolean('Customize Footer', help="Determines if it is true the onchanges on rml_footer text field do not trigger and become editable."),
         'parent_id': fields.many2one('res.company', 'Parent Company', select=True),
         'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
@@ -138,6 +139,9 @@ class res_company(osv.osv):
     ]
     def on_change_header(self, cr, uid, ids, phone, email, fax, website, vat, reg=False, context=None):
         val = []
+        res_id=self.browse(cr, uid, ids, context=context)[0]
+        if res_id.customize_footer:
+            return {}
         if phone: val.append(_('Phone: ')+phone)
         if fax: val.append(_('Fax: ')+fax)
         if website: val.append(_('Website: ')+website)
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 2508520441d..8e0e034c649 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -68,6 +68,8 @@
                             </group>
                             <group string="Bank Accounts">
                                 <field name="bank_ids" colspan="4" nolabel="1"/>
+                                <field name="customize_footer"/>
+                                <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
                                 <label for="rml_footer"/>
                                 <div name="bank_acc">
                                     <field name="rml_footer"/>
@@ -76,9 +78,6 @@
                             </group>
                         </page>
                         <page string="Header/Footer" groups="base.group_no_one">
-                            <group>
-                               <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
-                            </group>
                             <label for="rml_header"/>
                             <field name="rml_header"/>
                             <label for="rml_header2"/>

From 2045fa1bbc297105f754c058c82f769806414153 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 17 Aug 2012 15:27:38 +0200
Subject: [PATCH 343/999] [IMP] note: update the module's descriptor

bzr revid: abo@openerp.com-20120817132738-dgvgd3in70ylthwm
---
 addons/note/__openerp__.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index c9200324bb7..576d2b82f46 100644
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -19,34 +19,30 @@
 #
 ##############################################################################
 
-
 {
     'name': 'Notes',
     'version': '0.1',
     'category': 'Tools',
     'description': """
 This module allows users to create their own notes inside OpenERP
-==============================================================================
+=================================================================
 
 With this module you can allow users to take notes inside OpenERP.
 These notes can be shared with OpenERP or external users.
-They also can be organized following user dependant categories. 
+They also can be organized following user dependant categories.
 Notes can be found in the 'Home' main menu, under 'Tool' submenu.
 """,
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['base_tools','mail','pad'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/note_security.xml',
         'security/ir.model.access.csv',
         'note_view.xml',
     ],
-    'demo_xml': [
+    'demo': [
         "note_data.xml"
     ],
-    'test':[
-    ],
     'css': [
         'static/src/css/note.css',
     ],
@@ -55,4 +51,5 @@ Notes can be found in the 'Home' main menu, under 'Tool' submenu.
     'category': 'Tools',
     'images': [],
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From a3f8bc2dc54c92b812d112cf946d1eaff9253040 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 17 Aug 2012 15:34:49 +0200
Subject: [PATCH 344/999] [IMP] FIX in MRP demo data + mail stuff

bzr revid: fp@tinyerp.com-20120817133449-y50n3iyh49f6w8j1
---
 addons/crm/crm_lead_demo.xml | 21 +++++----------------
 addons/mail/mail_thread.py   | 25 ++++++++++++++++++++-----
 addons/mrp/mrp_demo.xml      |  2 +-
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index ed51c525335..79aa1676a7e 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -553,50 +553,39 @@ Andrew</field>
             <field name="subject">Kitchen design</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Email0 inquiry]]></field>
+            <field name="body"><![CDATA[Email0 inquiry]]></field>
             <field name="type">email</field>
             <field name="state">sent</field>
-            <field name="user_id" ref="base.user_root"></field>
         </record>
         <record id="message_note0" model="mail.message">
             <field name="subject">Reply</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Internal note0]]></field>
+            <field name="body"><![CDATA[Internal note0]]></field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"></field>
         </record>
         <record id="message_note0_comment0" model="mail.message">
             <field name="subject">Reply</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[comment on note0]]></field>
+            <field name="body"><![CDATA[comment on note0]]></field>
             <field name="parent_id" ref="message_note0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"></field>
         </record>
         <record id="message_note0_comment1" model="mail.message">
             <field name="subject">Reply</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[comment1 on note0]]></field>
+            <field name="body"><![CDATA[comment1 on note0]]></field>
             <field name="parent_id" ref="message_note0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"></field>
         </record>
         <record id="message_email1" model="mail.message">
             <field name="subject">Your inquiry</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[hello, outgoing email]]></field>
+            <field name="body"><![CDATA[hello, outgoing email]]></field>
             <field name="type">email</field>
-            <field name="state">received</field>
-            <field name="user_id" ref="base.user_root"></field>
         </record>
 
 
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 1def02bd5fa..de4759dd835 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -877,15 +877,30 @@ class mail_thread(osv.Model):
     #------------------------------------------------------
 
     # FP Note: this should be a invert function on message_unread field
+    # not sure because if not readonly, it may often write to this field?
+    def message_mark_as_unread(self, cr, uid, ids, context=None):
+        """ Set as read. """
+        notobj = self.pool.get('mail.notification')
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        cr.execute('''
+            UPDATE mail_notification SET 
+                read=false
+            WHERE
+                message_id IN (SELECT id from mail_message where res_id=any(%s) and model=%s limit 1) and
+                partner_id = %s
+        ''', (ids, self._name, partner_id))
+        return True
+
     def message_mark_as_read(self, cr, uid, ids, context=None):
         """ Set as read. """
         notobj = self.pool.get('mail.notification')
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         cr.execute('''
-            update mail_notification set 
+            UPDATE mail_notification SET 
                 read=true
-            where
-                message_id in (select id from mail_message where res_id in %s and model=%s)
-                user_id = %s
-        ''', (ids, self._name, uid))
+            WHERE
+                message_id IN (SELECT id FROM mail_message WHERE res_id=ANY(%s) AND model=%s) AND
+                partner_id = %s
+        ''', (ids, self._name, partner_id))
         return True
 
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index d0f05a2aaff..952a5e0e3de 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -49,7 +49,7 @@
             <field name="costs_hour_account_id" ref="account_assembly_hours"/>
             <field name="costs_cycle">0.05</field>
             <field name="costs_cycle_account_id" ref="account_assembly_cycle"/>
-            <field name="costs_journal_id" ref="account.expenses_journal"/>
+            <field name="costs_journal_id" ref="account.exp"/>
             <field name="costs_general_account_id" ref="account.a_expense"/>
             <field name="costs_general_account_id" ref="account.a_expense"/>
             <field name="calendar_id" ref="resource.timesheet_group1"/>

From 9c811fb481a8df3cea8f9788afe222ef7bea709c Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 17 Aug 2012 15:52:49 +0200
Subject: [PATCH 345/999] [FIX] note: extract demo data in note_demo.xml

bzr revid: abo@openerp.com-20120817135249-mg1eovpwt3u4lli2
---
 addons/note/__openerp__.py |   3 +-
 addons/note/note_data.xml  | 209 ++----------------------------------
 addons/note/note_demo.xml  | 214 +++++++++++++++++++++++++++++++++++++
 3 files changed, 223 insertions(+), 203 deletions(-)
 create mode 100644 addons/note/note_demo.xml

diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index 576d2b82f46..2241e7bd980 100644
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -41,7 +41,7 @@ Notes can be found in the 'Home' main menu, under 'Tool' submenu.
         'note_view.xml',
     ],
     'demo': [
-        "note_data.xml"
+        "note_demo.xml",
     ],
     'css': [
         'static/src/css/note.css',
@@ -49,7 +49,6 @@ Notes can be found in the 'Home' main menu, under 'Tool' submenu.
     'installable': True,
     'application': True,
     'category': 'Tools',
-    'images': [],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/note/note_data.xml b/addons/note/note_data.xml
index 15226bd48b0..2a40923b0f4 100644
--- a/addons/note/note_data.xml
+++ b/addons/note/note_data.xml
@@ -1,224 +1,31 @@
 <?xml version="1.0"?>
 <openerp>
   <data>
+
     <record model="note.stage" id="note_stage_today">
       <field name="name">Today</field>
       <field name="sequence">1</field>
-      <field name="user_id" eval="ref('base.user_root')" />
+      <field name="user_id" eval="ref('base.user_root')"/>
     </record>
+
     <record model="note.stage" id="note_stage_tomorrow">
       <field name="name">Tomorrow</field>
       <field name="sequence">2</field>
-      <field name="user_id" eval="ref('base.user_root')" />
+      <field name="user_id" eval="ref('base.user_root')"/>
     </record>
+
     <record model="note.stage" id="note_stage_week">
       <field name="name">This week</field>
       <field name="sequence">3</field>
-      <field name="user_id" eval="ref('base.user_root')" />
+      <field name="user_id" eval="ref('base.user_root')"/>
     </record>
+
     <record model="note.stage" id="note_stage_month">
       <field name="name">This month</field>
       <field name="sequence">4</field>
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>
-    <record model="note.note" id="note_1">
-      <field name="note"><![CDATA[Buying list
-	* coffee
-	* fruits
-	* ice cream
-	* towels
-	]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_today" />
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>
-    <record model="note.note" id="note_2">
-      <field name="note"><![CDATA[Buying list
-	* more coffee
-	* tee
-	* sugar
-	* towels
-	]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_tomorrow" />
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>
-    <record model="note.note" id="note_3">
-      <field name="note"><![CDATA[Idea to develop
-    * Phasellus vel eros lorem, vel tristique risus.
-    * Cras elementum risus ut massa bibendum ac sollicitudin quam feugiat.
-    * Phasellus ullamcorper mauris quis lectus volutpat non dignissim elit lacinia.
-     
-    Nulla vitae metus risus, nec placerat diam.
-    Proin quis nunc sodales dolor tempus eleifend.
-    Praesent iaculis libero ut orci egestas a dapibus libero ornare.
-     
-    * Proin at nisl sit amet ante feugiat euismod nec at orci.
-    * Nam aliquam massa id neque tincidunt eu pellentesque neque euismod.
-    * Proin eget mi sit amet erat tempus pellentesque.
-     
-    * Phasellus congue est lectus, vitae semper arcu.
-    * Suspendisse sodales tortor ut odio volutpat fringilla.
-    * Vestibulum mattis est quis risus dignissim sit amet faucibus nisl mattis.
-    * Pellentesque ullamcorper neque neque, vitae rhoncus massa.
-    
-    Ut id magna massa, quis scelerisque sapien.
-
-	]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_week" />
-      <field name="user_id" eval="ref('base.user_root')" />
+      <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.note" id="note_4">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_month" />
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>
-
-    <record model="note.note" id="note_6">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_month" />
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>
-    <record model="note.note" id="note_7">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_month" />
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>
-    <record model="note.note" id="note_8">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_month" />
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>
-    <record model="note.note" id="note_9">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_month" />
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>
-    <record model="note.note" id="note_10">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_month" />
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>
-    <record model="note.note" id="note_11">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_month" />
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>
-    <record model="note.note" id="note_12">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_month" />
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>
-    <record model="note.note" id="note_13">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_month" />
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>
-    <record model="note.note" id="note_14">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_month" />
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>
-    <record model="note.note" id="note_15">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_month" />
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>
-    <record model="note.note" id="note_16">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_month" />
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>
-
-
-
-    <record model="note.note" id="note_5">
-      <field name="note"><![CDATA[New computer specs
-      * Motherboard
-      according to processor
-      * Processor
-      need to decide 
-      * Graphic card
-      with great performance for games !
-      * Hard drive
-      big, for lot of internet backups
-      * Tower
-      silent, better when watching films
-      * Blueray drive ?
-      is it interesting yet ?
-      * Screen 
-      a big one, full of pixels, of course !
-      ]]>
-      </field>
-      <field name="note_pad"></field>      
-      <field name="stage_id" ref="note_stage_month" />
-      <field name="user_id" eval="ref('base.user_root')" />
-    </record>    
   </data>
 </openerp>
 
diff --git a/addons/note/note_demo.xml b/addons/note/note_demo.xml
new file mode 100644
index 00000000000..3e960638de0
--- /dev/null
+++ b/addons/note/note_demo.xml
@@ -0,0 +1,214 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+
+    <record model="note.note" id="note_1">
+      <field name="note"><![CDATA[Buying list
+    * coffee
+    * fruits
+    * ice cream
+    * towels
+    ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_today"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+    <record model="note.note" id="note_2">
+      <field name="note"><![CDATA[Buying list
+    * more coffee
+    * tee
+    * sugar
+    * towels
+    ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_tomorrow"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.note" id="note_3">
+      <field name="note"><![CDATA[Idea to develop
+    * Phasellus vel eros lorem, vel tristique risus.
+    * Cras elementum risus ut massa bibendum ac sollicitudin quam feugiat.
+    * Phasellus ullamcorper mauris quis lectus volutpat non dignissim elit lacinia.
+
+    Nulla vitae metus risus, nec placerat diam.
+    Proin quis nunc sodales dolor tempus eleifend.
+    Praesent iaculis libero ut orci egestas a dapibus libero ornare.
+
+    * Proin at nisl sit amet ante feugiat euismod nec at orci.
+    * Nam aliquam massa id neque tincidunt eu pellentesque neque euismod.
+    * Proin eget mi sit amet erat tempus pellentesque.
+
+    * Phasellus congue est lectus, vitae semper arcu.
+    * Suspendisse sodales tortor ut odio volutpat fringilla.
+    * Vestibulum mattis est quis risus dignissim sit amet faucibus nisl mattis.
+    * Pellentesque ullamcorper neque neque, vitae rhoncus massa.
+
+    Ut id magna massa, quis scelerisque sapien.
+
+    ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_week"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.note" id="note_4">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_month"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.note" id="note_5">
+      <field name="note"><![CDATA[New computer specs
+      * Motherboard
+      according to processor
+      * Processor
+      need to decide
+      * Graphic card
+      with great performance for games !
+      * Hard drive
+      big, for lot of internet backups
+      * Tower
+      silent, better when watching films
+      * Blueray drive ?
+      is it interesting yet ?
+      * Screen
+      a big one, full of pixels, of course !
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_month"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.note" id="note_6">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_month"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.note" id="note_7">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_month"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.note" id="note_8">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_month"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.note" id="note_9">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_month"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.note" id="note_10">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_month"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.note" id="note_11">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_month"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.note" id="note_12">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_month"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.note" id="note_13">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_month"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.note" id="note_14">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_month"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.note" id="note_15">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_month"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.note" id="note_16">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_month"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+  </data>
+</openerp>

From 9a7cc1436dba539d1ca1e16343700dabe9227a48 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 17 Aug 2012 15:57:49 +0200
Subject: [PATCH 346/999] [IMP] note: rename the to level menu 'Feeds' into
 'Home'

bzr revid: abo@openerp.com-20120817135749-yr9pg3hc2u5mo62q
---
 addons/note/note_data.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/note/note_data.xml b/addons/note/note_data.xml
index 2a40923b0f4..8d8516b895f 100644
--- a/addons/note/note_data.xml
+++ b/addons/note/note_data.xml
@@ -2,6 +2,11 @@
 <openerp>
   <data>
 
+    <!-- Rename the 'Feeds' main menu into 'Home' -->
+    <!-- Top menu item -->
+    <menuitem name="Home"
+      id="mail_feeds_main"/>
+
     <record model="note.stage" id="note_stage_today">
       <field name="name">Today</field>
       <field name="sequence">1</field>
@@ -28,4 +33,3 @@
 
   </data>
 </openerp>
-

From 07c5ee86d67a573d220803640c73b273456a233d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 17 Aug 2012 16:49:49 +0200
Subject: [PATCH 347/999] fix

bzr revid: fp@tinyerp.com-20120817144949-wrqo086h3dx6f3kx
---
 openerp/addons/base/ir/ir_needaction.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 9112d60c1f4..e40a3030eb8 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -63,5 +63,6 @@ class ir_needaction_mixin(osv.Model):
         dom = self._needaction_domain_get(cr, uid, context=context)
         if dom is False:
             return 0
-        return self.search(cr, uid, domain+dom, context=context, count=True)
+        print domain, dom
+        return self.search(cr, uid, (domain or []) +dom, context=context, count=True)
 

From 2756495b4f68d3a62b400397e46c535ef057ea1b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 17 Aug 2012 16:50:10 +0200
Subject: [PATCH 348/999] fix

bzr revid: fp@tinyerp.com-20120817145010-lnh2496hi1o90eu5
---
 addons/mail/mail_group_menu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_group_menu.py b/addons/mail/mail_group_menu.py
index 72c3ecdba4b..25b85bb7b22 100644
--- a/addons/mail/mail_group_menu.py
+++ b/addons/mail/mail_group_menu.py
@@ -45,7 +45,7 @@ class ir_ui_menu(osv.osv):
         for menu in self.browse(cr, uid, ids, context=context):
             if menu.mail_group_id:
                 sub_ids = follower_obj.search(cr, uid, [
-                    ('user_id', '=', uid), ('res_model', '=', 'mail.group'),
+                    ('partner_id', '=', partner_id), ('res_model', '=', 'mail.group'),
                     ('res_id', '=', menu.mail_group_id.id)
                     ], context=context)
                 if not sub_ids:

From b34138bbeb72312816676546251a57e2951995cf Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 17 Aug 2012 17:13:12 +0200
Subject: [PATCH 349/999] [FIX] note: forgot to add note_data.xml to the
 descriptor

bzr revid: abo@openerp.com-20120817151312-4y2mdrimw8xu4uhy
---
 addons/note/__openerp__.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index 2241e7bd980..1410ff10d9e 100644
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -34,20 +34,24 @@ Notes can be found in the 'Home' main menu, under 'Tool' submenu.
 """,
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
-    'depends': ['base_tools','mail','pad'],
+    'depends': [
+        'base_tools',
+        'mail',
+        'pad',
+    ],
     'data': [
         'security/note_security.xml',
         'security/ir.model.access.csv',
+        'note_data.xml',
         'note_view.xml',
     ],
     'demo': [
-        "note_demo.xml",
+        'note_demo.xml',
     ],
     'css': [
         'static/src/css/note.css',
     ],
     'installable': True,
-    'application': True,
     'category': 'Tools',
 }
 

From 92b32aa7672c31619f2b44c17933d27acaf4ead7 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 17 Aug 2012 18:39:53 +0200
Subject: [PATCH 350/999] [FIX] note: properly override the 'Feeds' top level
 item with 'Home'.  also add a menu section and sub menuitems with temporary
 actions

bzr revid: abo@openerp.com-20120817163953-3aaoe31xlxdnn7vd
---
 addons/note/note_data.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/note/note_data.xml b/addons/note/note_data.xml
index 8d8516b895f..8e896e19783 100644
--- a/addons/note/note_data.xml
+++ b/addons/note/note_data.xml
@@ -2,10 +2,21 @@
 <openerp>
   <data>
 
+    <record id="action_dummy" model="ir.actions.client">
+        <field name="name">News Feed</field>
+        <field name="tag">mail.wall</field>
+        <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
+    </record>
+
     <!-- Rename the 'Feeds' main menu into 'Home' -->
     <!-- Top menu item -->
     <menuitem name="Home"
-      id="mail_feeds_main"/>
+      id="mail.mail_feeds_main"/>
+
+      <menuitem name="My Stuff" id="note_my_stuff" parent="mail.mail_feeds_main"/>
+        <menuitem name="Agenda" id="note_agenda" parent="note_my_stuff" sequence="10" action="action_dummy" type="client"/>
+        <menuitem name="Notes" id="note_notes" parent="note_my_stuff" sequence="20"/>
+        <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" sequence="30"/>
 
     <record model="note.stage" id="note_stage_today">
       <field name="name">Today</field>

From 03f4b992ad57d5a52d4ac8229bab95ba94808969 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 19 Aug 2012 16:59:28 +0200
Subject: [PATCH 351/999] [IMP] need action & mails

bzr revid: fp@openerp.com-20120819145928-5bw5lo6dn4ni4gl7
---
 openerp/addons/base/ir/ir.xml                 |  24 ---
 openerp/addons/base/ir/ir_needaction.py       | 183 +++---------------
 openerp/addons/base/ir/ir_ui_menu.py          |  19 +-
 .../addons/base/security/ir.model.access.csv  |   1 -
 openerp/osv/fields.py                         |  15 +-
 openerp/osv/orm.py                            |  33 +---
 6 files changed, 50 insertions(+), 225 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index fac2946e204..c554a8896aa 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -556,30 +556,6 @@
 
         <menuitem action="ir_action_wizard" id="menu_ir_action_wizard" parent="base.next_id_6"/>
 
-        <!-- Needaction mechanism -->
-        <record model="ir.ui.view" id="view_ir_needaction_users_rel_tree">
-            <field name="name">ir.needaction_users_rel.tree</field>
-            <field name="model">ir.needaction_users_rel</field>
-            <field name="sequence">10</field>
-            <field name="arch" type="xml">
-                <tree string="Subscription">
-                    <field name="user_id"/>
-                    <field name="res_model"/>
-                    <field name="res_id"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="action_view_needaction_users_rel" model="ir.actions.act_window">
-            <field name="name">Need action relationships</field>
-            <field name="res_model">ir.needaction_users_rel</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem id="menu_needaction_users_rel" name="Need actions" parent="base.menu_users" sequence="20" action="action_view_needaction_users_rel" groups="base.group_no_one"/>
-
-
         <!-- View -->
         <record id="view_view_form" model="ir.ui.view">
             <field name="name">ir.ui.view</field>
diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 0f28c33ded9..9112d60c1f4 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -19,180 +19,49 @@
 #
 ##############################################################################
 
-import openerp.pooler as pooler
-from operator import itemgetter
 from osv import osv, fields
-from tools.translate import _
-
-class ir_needaction_users_rel(osv.Model):
-    ''' ir_needaction_users_rel holds data related to the needaction 
-    mechanism inside OpenERP. A row in this model is characterized 
-    by:
-    - res_model: model of the record requiring an action
-    - res_id: ID of the record requiring an action
-    - user_id: foreign key to the res.users table, to the user that has to
-      perform the action
-    This model can be seen as a many2many, linking (res_model, res_id) to users
-    (those whose attention is required on the record). '''
-    
-    _name = 'ir.needaction_users_rel'
-    _description = 'Needaction relationship table'
-    _rec_name = 'id'
-    _order = 'id desc'
-    _columns = {
-        'res_model': fields.char('Related Document Model', size=128,
-                        select=1, required=True),
-        'res_id': fields.integer('Related Document ID',
-                        select=1, required=True),
-        'user_id': fields.many2one('res.users', string='Related User',
-                        ondelete='cascade', select=1, required=True),
-    }
-    
-    def _get_users(self, cr, uid, res_ids, res_model, context=None):
-        """Given res_ids of res_model, get user_ids present in table"""
-        rel_ids = self.search(cr, uid, [('res_model', '=', res_model), ('res_id', 'in', res_ids)], context=context)
-        return list(set(map(itemgetter('user_id'), self.read(cr, uid, rel_ids, ['user_id'], context=context))))
-    
-    def create_users(self, cr, uid, res_ids, res_model, user_ids, context=None):
-        """Given res_ids of res_model, add user_ids to the relationship table"""
-        for res_id in res_ids:
-            for user_id in user_ids:
-                self.create(cr, uid, {'res_model': res_model, 'res_id': res_id, 'user_id': user_id}, context=context)
-        return True
-    
-    def unlink_users(self, cr, uid, res_ids, res_model, context=None):
-        """Given res_ids of res_model, delete all entries in the relationship table"""
-        to_del_ids = self.search(cr, uid, [('res_model', '=', res_model), ('res_id', 'in', res_ids)], context=context)
-        return self.unlink(cr, uid, to_del_ids, context=context)
-    
-    def update_users(self, cr, uid, res_ids, res_model, user_ids, context=None):
-        """Given res_ids of res_model, update their entries in the relationship table to user_ids"""
-        # read current records
-        cur_users = self._get_users(cr, uid, res_ids, res_model, context=context)
-        if len(cur_users) == len(user_ids) and all(cur_user in user_ids for cur_user in cur_users):
-            return True
-        # unlink old records
-        self.unlink_users(cr, uid, res_ids, res_model, context=context)
-        # link new records
-        self.create_users(cr, uid, res_ids, res_model, user_ids, context=context)
-        return True
-
 
 class ir_needaction_mixin(osv.Model):
     '''Mixin class for objects using the need action feature.
-    
-    Need action feature can be used by objects having to be able to 
-    signal that an action is required on a particular record. If in 
-    the business logic an action must be performed by somebody, for 
-    instance validation by a manager, this mechanism allows to set a 
+
+    Need action feature can be used by objects having to be able to
+    signal that an action is required on a particular record. If in
+    the business logic an action must be performed by somebody, for
+    instance validation by a manager, this mechanism allows to set a
     list of users asked to perform an action.
-    
-    This class wraps a class (ir.ir_needaction_users_rel) that 
-    behaves like a many2many field. This class handles the low-level 
-    considerations of updating relationships. Every change made on 
-    the record calls a method that updates the relationships.
-    
-    Objects using the 'need_action' feature should override the 
-    ``get_needaction_user_ids`` method. This methods returns a 
-    dictionary whose keys are record ids, and values a list of user 
-    ids, like in a many2many relationship. Therefore by defining 
-    only one method, you can specify if an action is required by 
-    defining the users that have to do it, in every possible 
-    situation.
-    
-    This class also offers several global services: 
-    - ``needaction_get_record_ids``: for the current model and uid, get
-    all record ids that ask this user to perform an action. This 
-    mechanism is used for instance to display the number of pending 
-    actions in menus, such as Leads (12)
+
+    Objects using the 'need_action' feature should override the
+    ``needaction_domain_get`` method. This methods returns a
+    domain to filter records requiring an action for a specific user.
+
+    This class also offers several global services:
     - ``needaction_get_action_count``: as ``needaction_get_record_ids``
-    but returns only the number of action, not the ids (performs a 
+    but returns only the number of action, not the ids (performs a
     search with count=True)
+    '''
 
-    The ``ir_needaction_mixin`` class adds a calculated field 
-    ``needaction_pending``. This function field allows to state 
-    whether a given record has a needaction for the current user. 
-    This is usefull if you want to customize views according to the 
-    needaction feature. For example, you may want to set records in 
-    bold in a list view if the current user has an action to perform 
-    on the record. '''
-    
     _name = 'ir.needaction_mixin'
-    _description = 'Need action mixin'
-    
-    def get_needaction_pending(self, cr, uid, ids, name, arg, context=None):
-        res = {}
-        needaction_user_ids = self.get_needaction_user_ids(cr, uid, ids, context=context)
-        for id in ids:
-            res[id] = uid in needaction_user_ids[id]
-        return res
+    _needaction = True
 
-    def search_needaction_pending(self, cr, uid, self_again, field_name, criterion, context=None):
-        ids = self.needaction_get_record_ids(
-            cr, uid, uid, limit=1024, context=context)
-        return [('id', 'in', ids)]
-    
-    _columns = {
-        'needaction_pending': fields.function(
-            get_needaction_pending, type='boolean',
-            fnct_search=search_needaction_pending,
-            string='Need action pending',
-            help="If True, this field states that users have to perform an " \
-                 "action This field comes from the ir.needaction_mixin class."),
-    }
-    
     #------------------------------------------------------
     # Addon API
     #------------------------------------------------------
-    
-    def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        """ Returns the user_ids that have to perform an action
-            :return: dict { record_id: [user_ids], }
+
+    def _needaction_domain_get(self, cr, uid, context=None):
+        """ Returns the domain to filter records that require an action
+            :return: domain or False is no need action
         """
-        return dict((id,list()) for id in ids)
-    
-    def create(self, cr, uid, values, context=None):
-        rel_obj = self.pool.get('ir.needaction_users_rel')
-        # perform create
-        obj_id = super(ir_needaction_mixin, self).create(cr, uid, values, context=context)
-        # link user_ids
-        needaction_user_ids = self.get_needaction_user_ids(cr, uid, [obj_id], context=context)
-        rel_obj.create_users(cr, uid, [obj_id], self._name, needaction_user_ids[obj_id], context=context)
-        return obj_id
-    
-    def write(self, cr, uid, ids, values, context=None):
-        rel_obj = self.pool.get('ir.needaction_users_rel')
-        # perform write
-        write_res = super(ir_needaction_mixin, self).write(cr, uid, ids, values, context=context)
-        # get and update user_ids
-        needaction_user_ids = self.get_needaction_user_ids(cr, uid, ids, context=context)
-        for id in ids:
-            rel_obj.update_users(cr, uid, [id], self._name, needaction_user_ids[id], context=context)
-        return write_res
-    
-    def unlink(self, cr, uid, ids, context=None):
-        # unlink user_ids
-        rel_obj = self.pool.get('ir.needaction_users_rel')
-        rel_obj.unlink_users(cr, uid, ids, self._name, context=context)
-        # perform unlink
-        return super(ir_needaction_mixin, self).unlink(cr, uid, ids, context=context)
-    
+        return False
+
     #------------------------------------------------------
     # "Need action" API
     #------------------------------------------------------
-    
-    def needaction_get_record_ids(self, cr, uid, user_id, limit=80, context=None):
-        """Given the current model and a user_id
-           return the record ids that require the user to perform an
-           action"""
-        rel_obj = self.pool.get('ir.needaction_users_rel')
-        rel_ids = rel_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, context=context)
-        return map(itemgetter('res_id'), rel_obj.read(cr, uid, rel_ids, ['res_id'], context=context))
-    
-    def needaction_get_action_count(self, cr, uid, user_id, limit=80, context=None):
+
+    def _needaction_count(self, cr, uid, domain=[], context=None):
         """Given the current model and a user_id
            get the number of actions it has to perform"""
-        rel_obj = self.pool.get('ir.needaction_users_rel')
-        return rel_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, count=True, context=context)
+        dom = self._needaction_domain_get(cr, uid, context=context)
+        if dom is False:
+            return 0
+        return self.search(cr, uid, domain+dom, context=context, count=True)
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index 77c0c4d738a..f5e4ee2ba05 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -255,23 +255,24 @@ class ir_ui_menu(osv.osv):
 
         return res
 
-    def _get_needaction_info(self, cr, uid, id, domain=[], context={}):
-        return [False, 0]
-
     def _get_needaction(self, cr, uid, ids, field_names, args, context=None):
         if context is None:
             context = {}
         res = {}
         for menu in self.browse(cr, uid, ids, context=context):
+            res[menu.id] = {}
+            res[menu.id]['needaction_enabled'] = False
+            res[menu.id]['needaction_counter'] = False
             res[menu.id] = {}
             if menu.action and menu.action.type == 'ir.actions.act_window' and menu.action.res_model:
-                menu_needaction_res = self.pool.get(menu.action.res_model)._get_needaction_info(cr, uid, uid, domain=menu.action.domain, context=context)
-            else:
-                menu_needaction_res = [False, 0]
-            res[menu.id]['needaction_enabled'] = menu_needaction_res[0]
-            res[menu.id]['needaction_counter'] = menu_needaction_res[1]
+                obj = self.pool.get(menu.action.res_model)
+                if obj._needaction:
+                    res[menu.id]['needaction_enabled'] = obj._needaction
+                    # check domain and context: should we evaluate the domain ?
+                    # and add context of the action ?
+                    res[menu.id]['needaction_counter'] = obj._needaction_count(cr, uid, menu.action.domain, context=context)
         return res
-        
+
     _columns = {
         'name': fields.char('Menu', size=64, required=True, translate=True),
         'sequence': fields.integer('Sequence'),
diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index d49aa18db8c..b0218e977bc 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -118,6 +118,5 @@
 "access_ir_config_parameter","ir_config_parameter","model_ir_config_parameter",,1,0,0,0
 "access_ir_mail_server_all","ir_mail_server","model_ir_mail_server",,1,0,0,0
 "access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0
-"access_ir_needaction_users_rel","ir_needaction_users_rel","model_ir_needaction_users_rel",,1,1,1,1
 "access_ir_needaction_mixin","ir_needaction_mixin","model_ir_needaction_mixin",,1,1,1,1
 
diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 5a47601f8a5..da025845759 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -514,7 +514,10 @@ class one2many(_column):
         for id in ids:
             res[id] = []
 
-        ids2 = obj.pool.get(self._obj).search(cr, user, self._domain + [(self._fields_id, 'in', ids)], limit=self._limit, context=context)
+        dom = self._domain
+        if isinstance(self._domain, type(lambda: None)):
+            dom = self._domain(obj)
+        ids2 = obj.pool.get(self._obj).search(cr, user, dom + [(self._fields_id, 'in', ids)], limit=self._limit, context=context)
         for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
             if r[self._fields_id] in res:
                 res[r[self._fields_id]].append(r['id'])
@@ -556,7 +559,10 @@ class one2many(_column):
                 reverse_rel = obj._all_columns.get(self._fields_id)
                 assert reverse_rel, 'Trying to unlink the content of a o2m but the pointed model does not have a m2o'
                 # if the o2m has a static domain we must respect it when unlinking
-                extra_domain = self._domain if isinstance(getattr(self, '_domain', None), list) else [] 
+                dom = self._domain
+                if isinstance(self._domain, type(lambda: None)):
+                    dom = self._domain(obj)
+                extra_domain = dom or []
                 ids_to_unlink = obj.search(cr, user, [(self._fields_id,'=',id)] + extra_domain, context=context)
                 # If the model has cascade deletion, we delete the rows because it is the intended behavior,
                 # otherwise we only nullify the reverse foreign key column.
@@ -574,7 +580,10 @@ class one2many(_column):
         return result
 
     def search(self, cr, obj, args, name, value, offset=0, limit=None, uid=None, operator='like', context=None):
-        return obj.pool.get(self._obj).name_search(cr, uid, value, self._domain, operator, context=context,limit=limit)
+        dom = self._domain
+        if isinstance(self._domain, type(lambda: None)):
+            dom = self._domain(obj)
+        return obj.pool.get(self._obj).name_search(cr, uid, value, dom, operator, context=context,limit=limit)
 
     
     @classmethod
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 7c8085ea8ed..368a37f455a 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -666,6 +666,7 @@ class BaseModel(object):
     _order = 'id'
     _sequence = None
     _description = None
+    _needaction = False
 
     # dict of {field:method}, with method returning the name_get of records
     # to include in the _read_group, if grouped on this field
@@ -4960,37 +4961,7 @@ class BaseModel(object):
     # backwards compatibility
     get_xml_id = get_external_id
     _get_xml_ids = _get_external_ids
-    
-    def _get_needaction_info(self, cr, uid, user_id, limit=None, order=None, domain=False, context=None):
-        """Base method for needaction mechanism
-           - see ir.needaction for actual implementation
-           - if the model uses the need action mechanism
-             (hasattr(model_obj, 'needaction_get_record_ids')):
-              - get the record ids on which the user has actions to perform
-              - evaluate the menu domain
-              - compose a new domain: menu domain, limited to ids of
-                records requesting an action
-              - count the number of records maching that domain, that
-                is the number of actions the user has to perform
-           - this method returns default values
-           :param: model_name: the name of the model (ex: hr.holidays)
-           :param: user_id: the id of user
-           :return: [uses_needaction=True/False, needaction_uid_ctr=%d]
-        """
-        if hasattr(self, 'needaction_get_record_ids'):
-            # Arbitrary limit, but still much lower thant infinity, to avoid
-            # getting too much data.
-            ids = self.needaction_get_record_ids(cr, uid, user_id, limit=8192, context=context)
-            if not ids:
-                return [True, 0]
-            if domain:
-                new_domain = eval(domain, locals_dict={'uid': user_id}) + [('id', 'in', ids)]
-            else:
-                new_domain = [('id', 'in', ids)]
-            return [True, self.search(cr, uid, new_domain, limit=limit, order=order, count=True, context=context)]
-        else:
-            return [False, 0]
-            
+
     # Transience
     def is_transient(self):
         """ Return whether the model is transient.

From 1b8d1908293300f2b2475df028b48d3a522fae90 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 19 Aug 2012 18:28:32 +0200
Subject: [PATCH 352/999] [IMP] merging _get_pushed_messages and message_read,
 still have to add a domain on message_read based on notifications

bzr revid: fp@openerp.com-20120819162832-ffzlm7zej7qrn11l
---
 addons/mail/mail_thread.py        | 34 -------------------------------
 addons/mail/static/src/js/mail.js | 12 ++++++-----
 2 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index de4759dd835..6c9d4dc3904 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -278,40 +278,6 @@ class mail_thread(osv.Model):
         messages = sorted(messages, key=lambda d: (-d['id']))
         return messages
 
-    def message_get_pushed_messages(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None,
-                            limit=100, offset=0, msg_search_domain=[], context=None):
-        """ OpenChatter: wall: get the pushed notifications and used them
-            to fetch messages to display on the wall.
-
-            :param fetch_ancestors: performs an ascended search; will add
-                                    to fetched msgs all their parents until
-                                    ancestor_ids
-            :param ancestor_ids: used when fetching ancestors
-            :param domain: domain to add to the search; especially child_of
-                           is interesting when dealing with threaded display
-            :param ascent: performs an ascended search; will add to fetched msgs
-                           all their parents until root_ids
-            :param root_ids: for ascent search
-            :return: list of mail.messages sorted by date
-        """
-        notification_obj = self.pool.get('mail.notification')
-        msg_obj = self.pool.get('mail.message')
-        # update message search
-        for arg in msg_search_domain:
-            if isinstance(arg, (tuple, list)):
-                arg[0] = 'message_id.' + arg[0]
-        # compose final domain
-        domain = [('user_id', '=', uid)] + msg_search_domain
-        # get notifications
-        notification_ids = notification_obj.search(cr, uid, domain, limit=limit, offset=offset, context=context)
-        notifications = notification_obj.browse(cr, uid, notification_ids, context=context)
-        msg_ids = [notification.message_id.id for notification in notifications]
-        # get messages
-        msg_ids = msg_obj.search(cr, uid, [('id', 'in', msg_ids)], context=context)
-        if (fetch_ancestors): msg_ids = self._message_search_ancestor_ids(cr, uid, ids, msg_ids, ancestor_ids, context=context)
-        msgs = msg_obj.read(cr, uid, msg_ids, context=context)
-        return msgs
-
     def _message_find_partners(self, cr, uid, message, headers=['From'], context=None):
         s = ', '.join([decode(message.get(h)) for h in headers])
         mails = tools.email_split(s)
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index f619480aaf4..9612f73a6b8 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -529,6 +529,7 @@ openerp.mail = function(session) {
             // this.params.limit = 3; // tmp for testing
             this.params.offset = this.params.offset || 0;
             this.params.records = this.params.records || null;
+
             // datasets and internal vars
             this.ds = new session.web.DataSetSearch(this, this.params.res_model);
             this.ds_users = new session.web.DataSetSearch(this, 'res.users');
@@ -550,6 +551,7 @@ openerp.mail = function(session) {
             this.bind_events();
             // display user, fetch comments
             this.display_current_user();
+
             if (this.params.records) var display_done = this.display_comments_from_parameters(this.params.records);
             else var display_done = this.init_comments();
             // customize display
@@ -747,10 +749,10 @@ openerp.mail = function(session) {
                 record.mini_url = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', record.user_id[0]);
             }
             // body text manipulation
-            if (record.subtype == 'plain') {
-                record.body = mail.ChatterUtils.do_text_remove_html_tags(record.body);
-            }
-            record.body = mail.ChatterUtils.do_replace_expressions(record.body);
+	    // if (record.subtype == 'plain') {
+            //     record.body = mail.ChatterUtils.do_text_remove_html_tags(record.body);
+            // }
+            // record.body = mail.ChatterUtils.do_replace_expressions(record.body);
             // format date according to the user timezone
             record.date = session.web.format_value(record.date, {type:"datetime"});
             // is the user the author ?
@@ -1041,7 +1043,7 @@ openerp.mail = function(session) {
             else var fetch_domain = this.search['domain'];
             if (additional_context) var fetch_context = _.extend(this.search['context'], additional_context);
             else var fetch_context = this.search['context'];
-            return this.ds_thread.call('message_get_pushed_messages', 
+            return this.ds_thread.call('message_read', 
                 [[this.session.uid], true, [], (limit || 0), (offset || 0), fetch_domain, fetch_context]).then(this.proxy('display_comments'));
         },
 

From 229096453c6fed151ab5edebffa4fcee42263110 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 19 Aug 2012 18:50:39 +0200
Subject: [PATCH 353/999] [IMP] remove formatting code and unused method

bzr revid: fp@openerp.com-20120819165039-kgs71kkn436753tz
---
 addons/mail/mail_thread.py        | 12 +---------
 addons/mail/static/src/js/mail.js | 39 -------------------------------
 2 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 6c9d4dc3904..615dcf9c306 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -251,6 +251,7 @@ class mail_thread(osv.Model):
 
             Please see message_search for more information about the parameters.
         """
+        print 'MSG READ', uid, ids, fetch_ancestors, ancestor_ids, limit, offset, domain, context
         message_ids = self.message_search(cr, uid, ids, fetch_ancestors, ancestor_ids,
             limit, offset, domain, context=context)
         messages = self.pool.get('mail.message').read(cr, uid, message_ids, context=context)
@@ -753,17 +754,6 @@ class mail_thread(osv.Model):
     # Subscription mechanism
     #------------------------------------------------------
 
-    # FP Note: replaced by message_follower_ids
-    # def message_get_followers(self, cr, uid, ids, context=None):
-
-    def message_read_followers(self, cr, uid, ids, fields=['id', 'name', 'image_small'], context=None):
-        """ Returns the current document followers as a read result. Used
-            mainly for Chatter having only one method to call to have
-            details about users.
-        """
-        user_ids = self.message_get_followers(cr, uid, ids, context=context)
-        return self.pool.get('res.users').read(cr, uid, user_ids, fields=fields, context=context)
-
     def message_is_follower(self, cr, uid, ids, user_id = None, context=None):
         """ Check if uid or user_id (if set) is a follower to the current
             document.
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 9612f73a6b8..a6d6f17958e 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -164,18 +164,6 @@ openerp.mail = function(session) {
          *      5. 'My Label'
          */
 
-        /** Removes html tags, except b, em, br, ul, li */
-        do_text_remove_html_tags: function (string) {
-            var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em|br|br /|ul|li|div)\\s*&gt;', 'gi'), '<$1$2>');
-            return html;
-        },
-        
-        /** Replaces line breaks by html line breaks (br) */
-        do_text_nl2br: function (str, is_xhtml) {   
-            var break_tag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';    
-            return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2');
-        },
-
         /* Add a prefix before each new line of the original string */
         do_text_quote: function (str, prefix) {
             return str.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2' + prefix || '> ');
@@ -191,28 +179,6 @@ openerp.mail = function(session) {
         do_replace_expressions: function (string) {
             var self = this;
             var icon_list = ['al', 'pinky']
-            /* shortcut to user: @login */
-            var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
-            var regex_res = regex_login.exec(string);
-            while (regex_res != null) {
-                var login = regex_res[2];
-                string = string.replace(regex_res[0], regex_res[1] + '<a href="#" class="oe_mail_internal_link" data-res-model="res.users" data-res-login = ' + login + '>@' + login + '</a>');
-                regex_res = regex_login.exec(string);
-            }
-            /* shortcut for internal document */
-            var regex_login = new RegExp(/(^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]/g);
-            var regex_res = regex_login.exec(string);
-            while (regex_res != null) {
-                var res_model = regex_res[2] + '.' + regex_res[3];
-                var res_id = regex_res[4];
-                if (! regex_res[5]) {
-                    var label = res_model + ':' + res_id }
-                else {
-                    var label = regex_res[5];
-                }
-                string = string.replace(regex_res[0], regex_res[1] + '<a href="#model=' + res_model + '&id=' + res_id + '>' + label + '</a>');
-                regex_res = regex_login.exec(string);
-            }
             /* special shortcut: :name, try to find an icon if in list */
             var regex_login = new RegExp(/(^|\s):((\w)*)/g);
             var regex_res = regex_login.exec(string);
@@ -741,17 +707,12 @@ openerp.mail = function(session) {
 
         /** Displays a record, performs text/link formatting */
         display_comment: function (record) {
-            record.body = mail.ChatterUtils.do_text_nl2br($.trim(record.body), true);
             // if (record.type == 'email' && record.state == 'received') {
             if (record.type == 'email') {
                 record.mini_url = ('/mail/static/src/img/email_icon.png');
             } else {
                 record.mini_url = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', record.user_id[0]);
             }
-            // body text manipulation
-	    // if (record.subtype == 'plain') {
-            //     record.body = mail.ChatterUtils.do_text_remove_html_tags(record.body);
-            // }
             // record.body = mail.ChatterUtils.do_replace_expressions(record.body);
             // format date according to the user timezone
             record.date = session.web.format_value(record.date, {type:"datetime"});

From 17c295a96478117cbffd59ef10730cb05aec0e23 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 19 Aug 2012 19:53:09 +0200
Subject: [PATCH 354/999] [IMP] removing some options and requirement of
 ds_thread

bzr revid: fp@openerp.com-20120819175309-9c3bl70yg10mmkqr
---
 addons/mail/mail_group_view.xml   |  1 +
 addons/mail/mail_message_view.xml |  4 +--
 addons/mail/static/src/js/mail.js | 45 ++++++++++++++++++++-----------
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index b1d7971e2ac..bc8624cc0ba 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+        <!-- this record will be dynamically adapted to each new menu created -->
         <record id="action_mail_group_feeds" model="ir.actions.client">
             <field name="name">Discussion Group</field>
             <field name="tag">mail.wall</field>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index e7c4f9df494..b31b94eaa61 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -227,13 +227,13 @@
         <record id="action_mail_all_feeds" model="ir.actions.client">
             <field name="name">News Feed</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
+            <field name="params" eval="{'search_view_id': ref('view_message_search_wall'), 'domain':[('partner_ids.user_ids','=',uid)]}"/>
         </record>
 
         <record id="action_mail_my_feeds" model="ir.actions.client">
             <field name="name">My Feeds</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="{'search_view_id': ref('view_message_search_wall'), 'my_feeds': True}"/>
+            <field name="params" eval="{'search_view_id': ref('view_message_search_wall'), 'domain':[('partner_id.user_ids','=',uid)]}"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index a6d6f17958e..3eb5018b9fd 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -498,7 +498,6 @@ openerp.mail = function(session) {
 
             // datasets and internal vars
             this.ds = new session.web.DataSetSearch(this, this.params.res_model);
-            this.ds_users = new session.web.DataSetSearch(this, 'res.users');
             this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
             this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
             // display customization vars
@@ -805,7 +804,6 @@ openerp.mail = function(session) {
             this.params.thread_level = this.params.thread_level || 0;
             this.thread = null;
             this.ds = new session.web.DataSet(this, this.view.model);
-            this.ds_users = new session.web.DataSet(this, 'res.users');
         },
         
         start: function() {
@@ -866,23 +864,38 @@ openerp.mail = function(session) {
          */
         init: function (parent, params) {
             this._super(parent);
+
             this.params = {};
-            this.params.limit = params.limit || 25;
+            // this.params.limit = params.limit || 25;
+
             this.params.domain = params.domain || [];
             this.params.context = params.context || {};
+
+            // FP Note: do we need this ?
+            // Should be in domain/context instead ?
             this.params.res_model = params.res_model || false;
             this.params.res_id = params.res_id || false;
-            this.params.search_view_id = params.search_view_id || false;
+
+            // Do we need this ?
+            // this.params.search_view_id = params.search_view_id || false;
+
             this.params.thread_level = params.thread_level || 1;
+
+	    // FP Note: looks strange, this is not the way to build a tree structure
             this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
-            this.display_show_more = true;
+
+            // FP Note: I changed: always true
+            // this.display_show_more = true;
+
             this.thread_list = [];
             this.search = {'domain': [], 'context': {}, 'groupby': {}}
             this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
             // datasets
             this.ds_msg = new session.web.DataSet(this, 'mail.message');
-            this.ds_thread = new session.web.DataSet(this, 'mail.thread');
-            this.ds_users = new session.web.DataSet(this, 'res.users');
+
+	    // I don't think we need this ?
+	    // message_read and others methods must be on mail.message
+            // this.ds_thread = new session.web.DataSet(this, 'mail.thread');
         },
 
         start: function () {
@@ -891,7 +904,7 @@ openerp.mail = function(session) {
             // add events
             this.add_event_handlers();
             // load mail.message search view
-            var search_view_ready = this.load_search_view(this.params.search_view_id, {}, false);
+            var search_view_ready = this.load_search_view({}, false);
             // load composition form
             var compose_done = this.instantiate_composition_form();
             // fetch first threads
@@ -940,9 +953,9 @@ openerp.mail = function(session) {
          * @param {Object} defaults ??
          * @param {Boolean} hidden some kind of trick we do not care here
          */
-        load_search_view: function (view_id, defaults, hidden) {
+        load_search_view: function (defaults, hidden) {
             var self = this;
-            this.searchview = new session.web.SearchView(this, this.ds_msg, view_id || false, defaults || {}, hidden || false);
+            this.searchview = new session.web.SearchView(this, this.ds_msg, false, defaults || {}, hidden || false);
             var search_view_loaded = this.searchview.appendTo(this.$element.find('.oe_view_manager_view_search'));
             return $.when(search_view_loaded).then(function () {
                 self.searchview.on_search.add(self.do_searchview_search);
@@ -985,7 +998,6 @@ openerp.mail = function(session) {
         init_and_fetch_comments: function() {
             this.search['domain'] = _.union(this.params.domain, this.search_results.domain);
             this.search['context'] = _.extend(this.params.context, this.search_results.context);
-            this.display_show_more = true;
             this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
             this.$element.find('ul.oe_mail_wall_threads').empty();
             return this.fetch_comments(this.params.limit, 0);
@@ -1004,7 +1016,8 @@ openerp.mail = function(session) {
             else var fetch_domain = this.search['domain'];
             if (additional_context) var fetch_context = _.extend(this.search['context'], additional_context);
             else var fetch_context = this.search['context'];
-            return this.ds_thread.call('message_read', 
+	    // FP Note: call to review
+            return this.ds_msg.call('message_read', 
                 [[this.session.uid], true, [], (limit || 0), (offset || 0), fetch_domain, fetch_context]).then(this.proxy('display_comments'));
         },
 
@@ -1052,9 +1065,11 @@ openerp.mail = function(session) {
         
         /** Display update: show more button */
         do_update_show_more: function (new_value) {
-            if (new_value != undefined) this.display_show_more = new_value;
-            if (this.display_show_more) this.$element.find('div.oe_mail_wall_more:last').show();
-            else this.$element.find('div.oe_mail_wall_more:last').hide();
+            if (new_value) {
+                    this.$element.find('div.oe_mail_wall_more:last').show();
+            } else {
+                    this.$element.find('div.oe_mail_wall_more:last').hide();
+            }
         },
         
         /** Action: Shows more discussions */

From 432740bf6057af488360426344878badfccc47db Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 19 Aug 2012 22:39:41 +0200
Subject: [PATCH 355/999] [DUMMY] temporary add TODO.txt to keep track of
 remaining cleanings

bzr revid: fp@openerp.com-20120819203941-8yllg5g3i9mmorsl
---
 addons/mail/TODO.txt              | 23 ++++++++++++++++
 addons/mail/static/src/js/mail.js | 44 -------------------------------
 2 files changed, 23 insertions(+), 44 deletions(-)
 create mode 100644 addons/mail/TODO.txt

diff --git a/addons/mail/TODO.txt b/addons/mail/TODO.txt
new file mode 100644
index 00000000000..96c12dc17b8
--- /dev/null
+++ b/addons/mail/TODO.txt
@@ -0,0 +1,23 @@
+Web Stuff to Do:
+* replace comments_structure by a real tree structure
+* rewrite completly records_struct_add_records
+* remove records_struct_update_after_display:
+* remove all is_wall stuff and pass real arguments
+* remove init_and_fetch_comments
+* rename fetch_comments into message_read
+* implement display_current_user --> check why it's present two times
+
+Backend:
+* remove _message_search_ancestor_ids and implement in message_read (must use browse records instead of IDS)
+* remove message_search_get_domain
+* remove message_search (object can overwrite message_ids if they want a custom list of messages)
+* remove _message_find_partners
+* remove _message_find_user_id
+* remove message_thread_followers
+* remove method message_is_follower (conflict with column of same name)
+* remove message_subscribe_users and use message_subscribe instead
+* remove message_unsubscribe_get_command
+
+To Check:
+* message_forward for mail gateway
+
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 3eb5018b9fd..09e4d7dae3d 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -164,11 +164,6 @@ openerp.mail = function(session) {
          *      5. 'My Label'
          */
 
-        /* Add a prefix before each new line of the original string */
-        do_text_quote: function (str, prefix) {
-            return str.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2' + prefix || '> ');
-        },
-
         /**
          * Replaces some expressions
          * - @login - shorcut to link to a res.user, given its login
@@ -191,45 +186,6 @@ openerp.mail = function(session) {
             return string;
         },
 
-        /**
-         * Checks a string to find an expression that will be replaced
-         * by an internal link and requiring a name_get to replace
-         * the expression.
-         * :param mapping: structure to keep a trace of internal links mapping
-         *                  mapping['model'] = {
-         *                      name_get': [[id,label], [id,label], ...]
-         *                      'to_fetch_ids': [id, id, ...]
-         *                  }
-         * CURRENTLY NOT IMPLEMENTED */
-        do_check_for_name_get_mapping: function(string, mapping) {
-            /* shortcut to user: @login */
-            //var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
-            //var regex_res = regex_login.exec(string);
-            //while (regex_res != null) {
-                //var login = regex_res[2];
-                //if (! ('res.users' in this.map_hash)) { this.map_hash['res.users']['name'] = []; }
-                //this.map_hash['res.users']['login'].push(login);
-                //regex_res = regex_login.exec(string);
-            //}
-            /* document link with name_get: [res.model,name] */
-            /* internal link with id: [res.model,id], or [res.model,id|display_name] */
-            //var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
-            //regex_res = regex_intlink.exec(string);
-            //while (regex_res != null) {
-                //var res_model = regex_res[2] + '.' + regex_res[3];
-                //var res_name = regex_res[4];
-                //if (! (res_model in this.map_hash)) { this.map_hash[res_model]['name'] = []; }
-                //this.map_hash[res_model]['name'].push(res_name);
-                //regex_res = regex_intlink.exec(string);
-            //}
-        },
-        
-        /**
-         * Updates the mapping; check for to_fetch_ids for each recorded
-         * model, and perform a name_get to update the mapping.
-         * CURRENTLY NOT IMPLEMENTED */
-        do_update_name_get_mapping: function(mapping) {
-        },
     };
 
 

From 26881fb462cdf655e621e1807f7abcc12d704aa1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 19 Aug 2012 22:40:45 +0200
Subject: [PATCH 356/999] [DUMMY] temporary add TODO.txt to keep track of
 remaining cleanings

bzr revid: fp@openerp.com-20120819204045-wz4r82kmh87j0s3b
---
 addons/mail/TODO.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/TODO.txt b/addons/mail/TODO.txt
index 96c12dc17b8..4d35702526b 100644
--- a/addons/mail/TODO.txt
+++ b/addons/mail/TODO.txt
@@ -19,5 +19,5 @@ Backend:
 * remove message_unsubscribe_get_command
 
 To Check:
-* message_forward for mail gateway
+* message_forward for mail gateway (redundant with notifications by emails ?)
 

From 6741e7a653063d71fd2cbce5da101c631166de7d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 19 Aug 2012 22:44:21 +0200
Subject: [PATCH 357/999] imp

bzr revid: fp@openerp.com-20120819204421-mbcxtc9uxx0zjcra
---
 addons/mail/TODO.txt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/mail/TODO.txt b/addons/mail/TODO.txt
index 4d35702526b..96eafc203e7 100644
--- a/addons/mail/TODO.txt
+++ b/addons/mail/TODO.txt
@@ -1,12 +1,3 @@
-Web Stuff to Do:
-* replace comments_structure by a real tree structure
-* rewrite completly records_struct_add_records
-* remove records_struct_update_after_display:
-* remove all is_wall stuff and pass real arguments
-* remove init_and_fetch_comments
-* rename fetch_comments into message_read
-* implement display_current_user --> check why it's present two times
-
 Backend:
 * remove _message_search_ancestor_ids and implement in message_read (must use browse records instead of IDS)
 * remove message_search_get_domain
@@ -18,6 +9,15 @@ Backend:
 * remove message_subscribe_users and use message_subscribe instead
 * remove message_unsubscribe_get_command
 
+Web Stuff to Do:
+* replace comments_structure by a real tree structure, provided by message_read directly
+* rewrite completly records_struct_add_records, merge existing messages with those coming from another message_read
+* remove records_struct_update_after_display:
+* remove all is_wall stuff and pass real arguments
+* remove init_and_fetch_comments
+* rename fetch_comments into message_read
+* implement display_current_user --> check why it's present two times
+
 To Check:
 * message_forward for mail gateway (redundant with notifications by emails ?)
-
+* check if addons modules rely on some stuff changed in the aboce backend section

From 18353be9e154c9488d01d988500910c78a99c26c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 09:09:56 +0200
Subject: [PATCH 358/999] [IMP] todo.txt

bzr revid: fp@tinyerp.com-20120820070956-el8ltgfqxwstvep1
---
 addons/mail/TODO.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/TODO.txt b/addons/mail/TODO.txt
index 96eafc203e7..764046da9d0 100644
--- a/addons/mail/TODO.txt
+++ b/addons/mail/TODO.txt
@@ -1,7 +1,8 @@
 Backend:
 * remove _message_search_ancestor_ids and implement in message_read (must use browse records instead of IDS)
+* I propose to move message_read in mail.message and rename to message_fetch
 * remove message_search_get_domain
-* remove message_search (object can overwrite message_ids if they want a custom list of messages)
+* remove message_search (objects can overwrite message_ids if they want a custom list of messages)
 * remove _message_find_partners
 * remove _message_find_user_id
 * remove message_thread_followers

From d862e2daa604f54cc65185e91d015e9db9b77651 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 09:26:03 +0200
Subject: [PATCH 359/999] [IMP] removing unused code

bzr revid: fp@tinyerp.com-20120820072603-94bb7eki8ec01gap
---
 addons/mail/TODO.txt       |  7 ++--
 addons/mail/mail_thread.py | 86 +++-----------------------------------
 2 files changed, 8 insertions(+), 85 deletions(-)

diff --git a/addons/mail/TODO.txt b/addons/mail/TODO.txt
index 764046da9d0..f5def9b7423 100644
--- a/addons/mail/TODO.txt
+++ b/addons/mail/TODO.txt
@@ -5,10 +5,9 @@ Backend:
 * remove message_search (objects can overwrite message_ids if they want a custom list of messages)
 * remove _message_find_partners
 * remove _message_find_user_id
-* remove message_thread_followers
-* remove method message_is_follower (conflict with column of same name)
-* remove message_subscribe_users and use message_subscribe instead
-* remove message_unsubscribe_get_command
+
+I was wrong:
+    * remove message_subscribe_users and use message_subscribe instead
 
 Web Stuff to Do:
 * replace comments_structure by a real tree structure, provided by message_read directly
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 615dcf9c306..fe746dc6a33 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -394,9 +394,7 @@ class mail_thread(osv.Model):
 
            Once the target model is known, its ``message_new`` method
            is called with the new message (if the thread record did not exist)
-            or its ``message_update`` method (if it did). Finally,
-           ``message_forward`` is called to automatically notify other
-           people that should receive this message.
+            or its ``message_update`` method (if it did).
 
            :param string model: the fallback model to use if the message
                does not match any of the currently configured mail aliases
@@ -505,66 +503,6 @@ class mail_thread(osv.Model):
             self.write(cr, uid, ids, update_vals, context=context)
         return True
 
-    def message_thread_followers(self, cr, uid, ids, context=None):
-        """ Returns a list of email addresses of the people following
-            this thread, including the sender of each mail, and the
-            people who were in CC of the messages, if any.
-        """
-        res = {}
-        if isinstance(ids, (str, int, long)):
-            ids = [long(ids)]
-        for thread in self.browse(cr, uid, ids, context=context):
-            l = set()
-            for message in thread.message_ids:
-                l.add((message.user_id and message.user_id.email) or '')
-                l.add(message.email_from or '')
-                l.add(message.email_cc or '')
-            res[thread.id] = filter(None, l)
-        return res
-
-    def message_forward(self, cr, uid, model, thread_ids, msg, email_error=False, context=None):
-        """Sends an email to all people following the given threads.
-           The emails are forwarded immediately, not queued for sending,
-           and not archived.
-
-        :param str model: thread model
-        :param list thread_ids: ids of the thread records
-        :param msg: email.message.Message object to forward
-        :param email_error: optional email address to notify in case
-                            of any delivery error during the forward.
-        :return: True
-        """
-        model_pool = self.pool.get(model)
-        smtp_server_obj = self.pool.get('ir.mail_server')
-        for res in model_pool.browse(cr, uid, thread_ids, context=context):
-            if hasattr(model_pool, 'message_thread_followers'):
-                followers = model_pool.message_thread_followers(cr, uid, [res.id])[res.id]
-            else:
-                followers = self.message_thread_followers(cr, uid, [res.id])[res.id]
-            message_followers_emails = tools.email_split(','.join(filter(None, followers)))
-            message_recipients = tools.email_split(','.join(filter(None,
-                                                                       [decode(msg['from']),
-                                                                        decode(msg['to']),
-                                                                        decode(msg['cc'])])))
-            forward_to = [i for i in message_followers_emails if (i and (i not in message_recipients))]
-            if forward_to:
-                # TODO: we need an interface for this for all types of objects, not just leads
-                if model_pool._columns.get('section_id'):
-                    del msg['reply-to']
-                    msg['reply-to'] = res.section_id.reply_to
-
-                smtp_from, = tools.email_split(msg['from'])
-                msg['from'] = smtp_from
-                msg['to'] =  ", ".join(forward_to)
-                msg['message-id'] = tools.generate_tracking_message_id(res.id)
-                if not smtp_server_obj.send_email(cr, uid, msg) and email_error:
-                    subj = msg['subject']
-                    del msg['subject'], msg['to'], msg['cc'], msg['bcc']
-                    msg['subject'] = _('[OpenERP-Forward-Failed] %s') % subj
-                    msg['to'] = email_error
-                    smtp_server_obj.send_email(cr, uid, msg)
-        return True
-
     def parse_message(self, message, save_original=False, context=None):
         """Parses a string or email.message.Message representing an
            RFC-2822 email, and returns a generic dict holding the
@@ -754,18 +692,6 @@ class mail_thread(osv.Model):
     # Subscription mechanism
     #------------------------------------------------------
 
-    def message_is_follower(self, cr, uid, ids, user_id = None, context=None):
-        """ Check if uid or user_id (if set) is a follower to the current
-            document.
-
-            :param user_id: if set, check is done on user_id; if not set
-                            check is done on uid
-        """
-        sub_user_id = uid if user_id is None else user_id
-        if sub_user_id in self.message_get_followers(cr, uid, ids, context=context):
-            return True
-        return False
-
     def message_subscribe_users(self, cr, uid, ids, user_ids=None, context=None):
         if not user_ids: user_ids = [uid]
         partners = {}
@@ -806,13 +732,11 @@ class mail_thread(osv.Model):
                              uid instead
             :param return: new value of followers, for Chatter
         """
-        to_unsubscribe_uids = [uid] if user_ids is None else user_ids
-        write_res = self.write(cr, uid, ids, {'message_follower_ids': self.message_unsubscribe_get_command(cr, uid, to_unsubscribe_uids, context)}, context=context)
-        return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        self.write(cr, uid, ids, [(3, partner_id)], context=context)
 
-    def message_unsubscribe_get_command(self, cr, uid, follower_ids, context=None):
-        """ Generate the many2many command to remove followers. """
-        return [(3, id) for id in follower_ids]
+        # FP Note: do we need this ?
+        return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
 
     #------------------------------------------------------
     # Notification API

From 6e9edd77c0ad026816f5a8aae958c70fe877be73 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 09:26:42 +0200
Subject: [PATCH 360/999] imp

bzr revid: fp@tinyerp.com-20120820072642-k1zx5o9lk0e26ikf
---
 addons/mail/TODO.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/mail/TODO.txt b/addons/mail/TODO.txt
index f5def9b7423..e32f2b56027 100644
--- a/addons/mail/TODO.txt
+++ b/addons/mail/TODO.txt
@@ -19,5 +19,8 @@ Web Stuff to Do:
 * implement display_current_user --> check why it's present two times
 
 To Check:
-* message_forward for mail gateway (redundant with notifications by emails ?)
 * check if addons modules rely on some stuff changed in the aboce backend section
+
+To ask ODO:
+* message_forward for mail gateway (redundant with notifications by emails ?)
+    -> I removed it to rely on notifications

From 56177da6c576f4927dd35b4ae8584c166847cb1e Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Mon, 20 Aug 2012 13:00:38 +0530
Subject: [PATCH 361/999] [IMP] Improved default view and method of set
 accounting options wizard

bzr revid: pso@tinyerp.com-20120820073038-3dmkx96br61t9gd0
---
 addons/account/account.py       | 9 +++------
 addons/account/account_view.xml | 1 +
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index ad1d5a9bca3..c10935a38fc 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3039,12 +3039,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             company_id = res.get('company_id') or False
             if company_id:
                 company_obj = self.pool.get('res.company')
-                company = company_obj.browse(cr, uid, company_id, context=context)
-                if company.country_id and company.country_id.currency_id:
-                    res.update({'currency_id': company.country_id.currency_id.id})
-                else:
-                    currency_id = company_obj._get_euro(cr, uid, context=context)
-                    res.update({'currency_id': currency_id})
+                country_id = company_obj.browse(cr, uid, company_id, context=context).country_id.id
+                currency_id = company_obj.on_change_country(cr, uid, company_id, country_id, context=context)['value']['currency_id']
+                res.update({'currency_id': currency_id})
 
         ids = self.pool.get('account.chart.template').search(cr, uid, [('visible', '=', True)], context=context)
         if ids:
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 33d15184ec2..33d360a386a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2371,6 +2371,7 @@
                     <div groups="base.group_multi_company">
                         <label for="company_id"/>
                         <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+                        <label for="currency_id"/>
                         <field name="currency_id" />
                     </div>
                     <group>

From ff28513b150301476812f054c8f910563b8524e4 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Mon, 20 Aug 2012 13:01:45 +0530
Subject: [PATCH 362/999] [IMP] Improved default method to fetch correct
 currency in company object

bzr revid: pso@tinyerp.com-20120820073145-fac3kt31u6qemzgu
---
 openerp/addons/base/res/res_company.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 7bc3245e723..ec3550c09b9 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -232,12 +232,9 @@ class res_company(osv.osv):
         return super(res_company, self).write(cr, *args, **argv)
 
     def _get_euro(self, cr, uid, context=None):
-        try:
-            data_obj = self.pool.get('ir.model.data')
-            data_id = data_obj._get_id(cr, uid, 'base', 'EUR')
-            return data_obj.browse(cr, uid, data_id, context=context).res_id
-        except:
-            return False
+        rate_obj = self.pool.get('res.currency.rate')
+        rate_id = rate_obj.search(cr, uid, [('rate', '=', 1)], context=context)
+        return rate_id and rate_obj.browse(cr, uid, rate_id[0], context=context).currency_id.id or False
 
     def _get_logo(self, cr, uid, ids):
         return open(os.path.join( tools.config['root_path'], 'addons', 'base', 'res', 'res_company_logo.png'), 'rb') .read().encode('base64')

From b386ee3c4a9f5457d34eace947e51acca73c152f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 09:42:42 +0200
Subject: [PATCH 363/999] [IMP] remove unused code, I still have to rewrite
 message_read

bzr revid: fp@tinyerp.com-20120820074242-w6n1nmwu315r2bhj
---
 addons/mail/TODO.txt       | 11 ++---
 addons/mail/mail_thread.py | 94 ++++----------------------------------
 2 files changed, 13 insertions(+), 92 deletions(-)

diff --git a/addons/mail/TODO.txt b/addons/mail/TODO.txt
index e32f2b56027..9dd9262888f 100644
--- a/addons/mail/TODO.txt
+++ b/addons/mail/TODO.txt
@@ -1,13 +1,12 @@
 Backend:
 * remove _message_search_ancestor_ids and implement in message_read (must use browse records instead of IDS)
 * I propose to move message_read in mail.message and rename to message_fetch
-* remove message_search_get_domain
-* remove message_search (objects can overwrite message_ids if they want a custom list of messages)
-* remove _message_find_partners
-* remove _message_find_user_id
 
-I was wrong:
-    * remove message_subscribe_users and use message_subscribe instead
+* remove message_search (objects can overwrite message_ids if they want a custom list of messages)
+    - requires to reimplement message_read
+
+* remove _message_find_user_id and use _message_find_partners
+    - it requires to change the route code
 
 Web Stuff to Do:
 * replace comments_structure by a real tree structure, provided by message_read directly
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index fe746dc6a33..614adcf9697 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -163,86 +163,6 @@ class mail_thread(osv.Model):
     # Message loading
     #------------------------------------------------------
 
-    def _message_search_ancestor_ids(self, cr, uid, ids, child_ids, ancestor_ids, context=None):
-        """ Given message child_ids ids, find their ancestors until ancestor_ids
-            using their parent_id relationship.
-
-            :param child_ids: the first nodes of the search
-            :param ancestor_ids: list of ancestors. When the search reach an
-                                 ancestor, it stops.
-        """
-        def _get_parent_ids(message_list, ancestor_ids, child_ids):
-            """ Tool function: return the list of parent_ids of messages
-                contained in message_list. Parents that are in ancestor_ids
-                or in child_ids are not returned. """
-            return [message['parent_id'][0] for message in message_list
-                        if message['parent_id']
-                        and message['parent_id'][0] not in ancestor_ids
-                        and message['parent_id'][0] not in child_ids
-                    ]
-
-        message_obj = self.pool.get('mail.message')
-        messages_temp = message_obj.read(cr, uid, child_ids, ['id', 'parent_id'], context=context)
-        parent_ids = _get_parent_ids(messages_temp, ancestor_ids, child_ids)
-        child_ids += parent_ids
-        cur_iter = 0; max_iter = 100; # avoid infinite loop
-        while (parent_ids and (cur_iter < max_iter)):
-            cur_iter += 1
-            messages_temp = message_obj.read(cr, uid, parent_ids, ['id', 'parent_id'], context=context)
-            parent_ids = _get_parent_ids(messages_temp, ancestor_ids, child_ids)
-            child_ids += parent_ids
-        if (cur_iter > max_iter):
-            _logger.warning("Possible infinite loop in _message_search_ancestor_ids. "\
-                "Note that this algorithm is intended to check for cycle in "\
-                "message graph, leading to a curious error. Have fun.")
-        return child_ids
-
-    def message_search_get_domain(self, cr, uid, ids, context=None):
-        """ OpenChatter feature: get the domain to search the messages related
-            to a document. mail.thread defines the default behavior as
-            being messages with model = self._name, id in ids.
-            This method should be overridden if a model has to implement a
-            particular behavior.
-        """
-        return ['&', ('res_id', 'in', ids), ('model', '=', self._name)]
-
-    def message_search(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None,
-                        limit=100, offset=0, domain=None, count=False, context=None):
-        """ OpenChatter feature: return thread messages ids according to the
-            search domain given by ``message_search_get_domain``.
-
-            It is possible to add in the search the parent of messages by
-            setting the fetch_ancestors flag to True. In that case, using
-            the parent_id relationship, the method returns the id list according
-            to the search domain, but then calls ``_message_search_ancestor_ids``
-            that will add to the list the ancestors ids. The search is limited
-            to parent messages having an id in ancestor_ids or having
-            parent_id set to False.
-
-            If ``count==True``, the number of ids is returned instead of the
-            id list. The count is done by hand instead of passing it as an
-            argument to the search call because we might want to perform
-            a research including parent messages until some ancestor_ids.
-
-            :param fetch_ancestors: performs an ascended search; will add
-                                    to fetched msgs all their parents until
-                                    ancestor_ids
-            :param ancestor_ids: used when fetching ancestors
-            :param domain: domain to add to the search; especially child_of
-                           is interesting when dealing with threaded display.
-                           Note that the added domain is anded with the
-                           default domain.
-            :param limit, offset, count, context: as usual
-        """
-        search_domain = self.message_search_get_domain(cr, uid, ids, context=context)
-        if domain:
-            search_domain += domain
-        message_obj = self.pool.get('mail.message')
-        message_res = message_obj.search(cr, uid, search_domain, limit=limit, offset=offset, count=count, context=context)
-        if not count and fetch_ancestors:
-            message_res += self._message_search_ancestor_ids(cr, uid, ids, message_res, ancestor_ids, context=context)
-        return message_res
-
     def message_read(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None,
                         limit=100, offset=0, domain=None, context=None):
         """ OpenChatter feature: read the messages related to some threads.
@@ -279,6 +199,10 @@ class mail_thread(osv.Model):
         messages = sorted(messages, key=lambda d: (-d['id']))
         return messages
 
+    #------------------------------------------------------
+    # Mail gateway
+    #------------------------------------------------------
+
     def _message_find_partners(self, cr, uid, message, headers=['From'], context=None):
         s = ', '.join([decode(message.get(h)) for h in headers])
         mails = tools.email_split(s)
@@ -289,14 +213,12 @@ class mail_thread(osv.Model):
 
     def _message_find_user_id(self, cr, uid, message, context=None):
         from_local_part = tools.email_split(decode(message.get('From')))[0]
-        user_ids = self.pool.get('res.users').search(cr, uid, [('login', '=', from_local_part)], context=context)
+        # FP Note: canonification required, the minimu: .lower()
+        user_ids = self.pool.get('res.users').search(cr, uid, ['|', 
+            ('login', '=', from_local_part),
+            ('email', '=', from_local_part)], context=context)
         return user_ids[0] if user_ids else uid
 
-    #------------------------------------------------------
-    # Mail gateway
-    #------------------------------------------------------
-    # message_process will call either message_new or message_update.
-
     def message_route(self, cr, uid, message, model=None, thread_id=None,
                       custom_values=None, context=None):
         """Attempt to figure out the correct target model, thread_id,

From f73372e7a25cd480e309b31bb818ccb0e93e36cc Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 11:06:36 +0200
Subject: [PATCH 364/999] [IMP] better implementation of message read, no
 ancestror yet

bzr revid: fp@tinyerp.com-20120820090636-gyyp3n47sjs0fbhc
---
 addons/mail/TODO.txt        | 14 ++++-----
 addons/mail/mail_message.py | 59 +++++++++++++++++++++++++++++++++++++
 addons/mail/mail_thread.py  | 40 -------------------------
 3 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/addons/mail/TODO.txt b/addons/mail/TODO.txt
index 9dd9262888f..eb6d0ccd761 100644
--- a/addons/mail/TODO.txt
+++ b/addons/mail/TODO.txt
@@ -1,25 +1,21 @@
 Backend:
-* remove _message_search_ancestor_ids and implement in message_read (must use browse records instead of IDS)
 * I propose to move message_read in mail.message and rename to message_fetch
 
-* remove message_search (objects can overwrite message_ids if they want a custom list of messages)
-    - requires to reimplement message_read
-
 * remove _message_find_user_id and use _message_find_partners
     - it requires to change the route code
 
 Web Stuff to Do:
 * replace comments_structure by a real tree structure, provided by message_read directly
 * rewrite completly records_struct_add_records, merge existing messages with those coming from another message_read
-* remove records_struct_update_after_display:
+     -> false records with domain message_read
+* remove records_struct_update_after_display
 * remove all is_wall stuff and pass real arguments
 * remove init_and_fetch_comments
 * rename fetch_comments into message_read
-* implement display_current_user --> check why it's present two times
+Not Sure:
+    * implement display_current_user --> check why it's present two times
 
 To Check:
 * check if addons modules rely on some stuff changed in the aboce backend section
 
-To ask ODO:
-* message_forward for mail gateway (redundant with notifications by emails ?)
-    -> I removed it to rely on notifications
+
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index a722dca3797..15cb1218218 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -120,6 +120,65 @@ class mail_message(osv.Model):
         'author_id': _get_default_author
     }
 
+
+    #------------------------------------------------------
+    # Message loading for web interface
+    #------------------------------------------------------
+
+    _limit = 10
+    def _message_read(self, cr, uid, messages, domain=[], thread_level=0, fetch_ancestors=False, context=None):
+        result = []
+        for msg in messages[:-1]:
+            if len(result)<(self._limit-1):
+                record = {
+                    'id': msg.id,
+                    'type': msg.type,
+                    'attachment_ids': msg.attachment_ids.name_get(context=context),
+                    'body': msg.body,
+                    'model': msg.model,
+                    'res_id': msg.res_id,
+                    'record_name': msg.record_name,
+                    'subject': msg.subject,
+                    'date': msg.date,
+                    'author_id': msg.author_id.id
+                }
+                if thread_level>0:
+                    dom = [('parent_id','=', msg.id)]
+                    if thread_level==1:
+                        dom = [('parent_id','child_of', [msg.id])]
+                    newids = self.search(cr, uid, domain+dom, context=context, limit=self._limit)
+                    objs = self.browse(cr, uid, newids, context=context)
+                    record['child_ids'] = self._message_read(cr, uid, objs, domain+dom, thread_level-1, context=context)
+                result.append(record)
+            else:
+                result.append({
+                    'type': 'expandable',
+                    'domain': [('id','<=', msg.id)]+domain,
+                    'context': context
+                })
+                break
+
+    def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, fetch_ancestors=False, context=None):
+        """ 
+            If IDS are provided, fetch these records, otherwise use the domain to
+            fetch the matching records. After having fetched the records provided
+            by IDS, it will fetch children (according to thread_level) and/or the
+            parents if fetch_ancestrors is True.
+            
+            Return [
+            
+            ]
+        """
+        if ids is False:
+            dom = []
+            if thread_level>0:
+                dom = [('parent_id', '=', False)]
+            ids = self.search(cr, uid, domain+dom, context=context, limit=10)
+
+        messages = self.browse(cr, uid, ids, context=context)
+        return self._message_read(cr, uid, messages, thread_level, domain=domain, context=context)
+
+
     #------------------------------------------------------
     # Email api
     #------------------------------------------------------
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 614adcf9697..c962e36fc2c 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -159,46 +159,6 @@ class mail_thread(osv.Model):
             return [('message_unread','=',True)]
         return []
 
-    #------------------------------------------------------
-    # Message loading
-    #------------------------------------------------------
-
-    def message_read(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None,
-                        limit=100, offset=0, domain=None, context=None):
-        """ OpenChatter feature: read the messages related to some threads.
-            This method is used mainly the Chatter widget, to directly have
-            read result instead of searching then reading.
-
-            Please see message_search for more information about the parameters.
-        """
-        print 'MSG READ', uid, ids, fetch_ancestors, ancestor_ids, limit, offset, domain, context
-        message_ids = self.message_search(cr, uid, ids, fetch_ancestors, ancestor_ids,
-            limit, offset, domain, context=context)
-        messages = self.pool.get('mail.message').read(cr, uid, message_ids, context=context)
-
-        """ Retrieve all attachments names """
-        map_id_to_name = dict((attachment_id, '') for message in messages for attachment_id in message['attachment_ids'])
-
-        ids = map_id_to_name.keys()
-        names = self.pool.get('ir.attachment').name_get(cr, uid, ids, context=context)
-
-        # convert the list of tuples into a dictionnary
-        for name in names:
-            map_id_to_name[name[0]] = name[1]
-
-        # give corresponding ids and names to each message
-        for msg in messages:
-            msg["attachments"] = []
-
-            for attach_id in msg["attachment_ids"]:
-                msg["attachments"].append({'id': attach_id, 'name': map_id_to_name[attach_id]})
-
-        # Set the threads as read
-        self.message_mark_as_read(cr, uid, ids, context=context)
-        # Sort and return the messages
-        messages = sorted(messages, key=lambda d: (-d['id']))
-        return messages
-
     #------------------------------------------------------
     # Mail gateway
     #------------------------------------------------------

From 7a44634a38ff5daacecd78e8362a95221c63ffae Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 11:39:22 +0200
Subject: [PATCH 365/999] [IMP] message_read with ancestrors and threads and
 expandable domains

bzr revid: fp@tinyerp.com-20120820093922-b3aokqftfcptwmpp
---
 addons/mail/mail_message.py | 46 ++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 15cb1218218..4da9115620c 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -126,22 +126,27 @@ class mail_message(osv.Model):
     #------------------------------------------------------
 
     _limit = 10
+    def _message_dict_get(self, cr, uid, msg, context={}):
+        return {
+            'id': msg.id,
+            'type': msg.type,
+            'attachment_ids': msg.attachment_ids.name_get(context=context),
+            'body': msg.body,
+            'model': msg.model,
+            'res_id': msg.res_id,
+            'record_name': msg.record_name,
+            'subject': msg.subject,
+            'date': msg.date,
+            'author_id': msg.author_id.id,
+            'child_ids': [] # will be filled after by _message_read
+        }
+
     def _message_read(self, cr, uid, messages, domain=[], thread_level=0, fetch_ancestors=False, context=None):
         result = []
-        for msg in messages[:-1]:
+        tree = {} # key: ID, value: record
+        for msg in messages:
             if len(result)<(self._limit-1):
-                record = {
-                    'id': msg.id,
-                    'type': msg.type,
-                    'attachment_ids': msg.attachment_ids.name_get(context=context),
-                    'body': msg.body,
-                    'model': msg.model,
-                    'res_id': msg.res_id,
-                    'record_name': msg.record_name,
-                    'subject': msg.subject,
-                    'date': msg.date,
-                    'author_id': msg.author_id.id
-                }
+                record = self._message_dict_get(msg)
                 if thread_level>0:
                     dom = [('parent_id','=', msg.id)]
                     if thread_level==1:
@@ -149,7 +154,20 @@ class mail_message(osv.Model):
                     newids = self.search(cr, uid, domain+dom, context=context, limit=self._limit)
                     objs = self.browse(cr, uid, newids, context=context)
                     record['child_ids'] = self._message_read(cr, uid, objs, domain+dom, thread_level-1, context=context)
-                result.append(record)
+
+                if fetch_ancestrors and record.parent_id:
+                    while record.parent_id:
+                        if record.parent_id.id in tree:
+                            record_parent = tree[record.parent_id.id]
+                        else:
+                            record_parent = self._message_dict(record.parent_id)
+                            if record.parent_id.parent_id:
+                                tree[record.parent_id.id] = record.parent_id
+                        record_parent['child_ids'].append(record)
+                        record = record.parent_id
+                if record.id not in tree:
+                    result.append(record)
+                    tree[record.id] = record
             else:
                 result.append({
                     'type': 'expandable',

From 3169475b3e4644c2ba5f4f2dace75ad0b397a624 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 12:14:34 +0200
Subject: [PATCH 366/999] [IMP] message_read on mail.message

bzr revid: fp@tinyerp.com-20120820101434-429mgbhbuk1wjqa2
---
 addons/base_calendar/base_calendar.py | 60 +++++++++++++--------------
 addons/mail/mail_message.py           | 34 ++++++++-------
 2 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index be3244f8a5b..d1b8709e1e9 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1616,36 +1616,36 @@ class calendar_todo(osv.osv):
 
 calendar_todo()
 
-class ir_attachment(osv.osv):
-    _name = 'ir.attachment'
-    _inherit = 'ir.attachment'
-
-    def search_count(self, cr, user, args, context=None):
-        new_args = []
-        for domain_item in args:
-            if isinstance(domain_item, (list, tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_id':
-                new_args.append((domain_item[0], domain_item[1], base_calendar_id2real_id(domain_item[2])))
-            else:
-                new_args.append(domain_item)
-        return super(ir_attachment, self).search_count(cr, user, new_args, context)
-
-    def create(self, cr, uid, vals, context=None):
-        if context:
-            id = context.get('default_res_id', False)
-            context.update({'default_res_id' : base_calendar_id2real_id(id)})
-        return super(ir_attachment, self).create(cr, uid, vals, context=context)
-
-    def search(self, cr, uid, args, offset=0, limit=None, order=None,
-            context=None, count=False):
-        new_args = []
-        for domain_item in args:
-            if isinstance(domain_item, (list, tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_id':
-                new_args.append((domain_item[0], domain_item[1], base_calendar_id2real_id(domain_item[2])))
-            else:
-                new_args.append(domain_item)
-        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset,
-                            limit=limit, order=order, context=context, count=False)
-ir_attachment()
+#class ir_attachment(osv.osv):
+#    _name = 'ir.attachment'
+#    _inherit = 'ir.attachment'
+#
+#    def search_count(self, cr, user, args, context=None):
+#        new_args = []
+#        for domain_item in args:
+#            if isinstance(domain_item, (list, tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_id':
+#                new_args.append((domain_item[0], domain_item[1], base_calendar_id2real_id(domain_item[2])))
+#            else:
+#                new_args.append(domain_item)
+#        return super(ir_attachment, self).search_count(cr, user, new_args, context)
+#
+#    def create(self, cr, uid, vals, context=None):
+#        if context:
+#            id = context.get('default_res_id', False)
+#            context.update({'default_res_id' : base_calendar_id2real_id(id)})
+#        return super(ir_attachment, self).create(cr, uid, vals, context=context)
+#
+#    def search(self, cr, uid, args, offset=0, limit=None, order=None,
+#            context=None, count=False):
+#        new_args = []
+#        for domain_item in args:
+#            if isinstance(domain_item, (list, tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_id':
+#                new_args.append((domain_item[0], domain_item[1], base_calendar_id2real_id(domain_item[2])))
+#            else:
+#                new_args.append(domain_item)
+#        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset,
+#                            limit=limit, order=order, context=context, count=False)
+#ir_attachment()
 
 class ir_values(osv.osv):
     _inherit = 'ir.values'
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 4da9115620c..59750f9b34b 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -127,10 +127,11 @@ class mail_message(osv.Model):
 
     _limit = 10
     def _message_dict_get(self, cr, uid, msg, context={}):
+        attachs = self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)
         return {
             'id': msg.id,
             'type': msg.type,
-            'attachment_ids': msg.attachment_ids.name_get(context=context),
+            'attachment_ids': attachs,
             'body': msg.body,
             'model': msg.model,
             'res_id': msg.res_id,
@@ -146,28 +147,29 @@ class mail_message(osv.Model):
         tree = {} # key: ID, value: record
         for msg in messages:
             if len(result)<(self._limit-1):
-                record = self._message_dict_get(msg)
+                record = self._message_dict_get(cr, uid, msg, context=context)
                 if thread_level>0:
                     dom = [('parent_id','=', msg.id)]
                     if thread_level==1:
-                        dom = [('parent_id','child_of', [msg.id])]
+                        dom = [('parent_id','child_of', [x.id for x in msg.child_ids])]
                     newids = self.search(cr, uid, domain+dom, context=context, limit=self._limit)
                     objs = self.browse(cr, uid, newids, context=context)
                     record['child_ids'] = self._message_read(cr, uid, objs, domain+dom, thread_level-1, context=context)
 
-                if fetch_ancestrors and record.parent_id:
-                    while record.parent_id:
-                        if record.parent_id.id in tree:
-                            record_parent = tree[record.parent_id.id]
+                if fetch_ancestors and msg.parent_id:
+                    while msg.parent_id:
+                        if msg.parent_id.id in tree:
+                            record_parent = tree[msg.parent_id.id]
                         else:
-                            record_parent = self._message_dict(record.parent_id)
-                            if record.parent_id.parent_id:
-                                tree[record.parent_id.id] = record.parent_id
+                            record_parent = self._message_dict_get(cr, uid, msg.parent_id, context=context)
+                            if msg.parent_id.parent_id:
+                                tree[msg.parent_id.id] = record_parent
                         record_parent['child_ids'].append(record)
-                        record = record.parent_id
-                if record.id not in tree:
+                        record = record_parent
+                        msg = msg.parent_id
+                if msg.id not in tree:
                     result.append(record)
-                    tree[record.id] = record
+                    tree[msg.id] = record
             else:
                 result.append({
                     'type': 'expandable',
@@ -175,13 +177,14 @@ class mail_message(osv.Model):
                     'context': context
                 })
                 break
+        return result
 
     def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, fetch_ancestors=False, context=None):
         """ 
             If IDS are provided, fetch these records, otherwise use the domain to
             fetch the matching records. After having fetched the records provided
             by IDS, it will fetch children (according to thread_level) and/or the
-            parents if fetch_ancestrors is True.
+            parents if fetch_ancestors is True.
             
             Return [
             
@@ -194,7 +197,8 @@ class mail_message(osv.Model):
             ids = self.search(cr, uid, domain+dom, context=context, limit=10)
 
         messages = self.browse(cr, uid, ids, context=context)
-        return self._message_read(cr, uid, messages, thread_level, domain=domain, context=context)
+        result = self._message_read(cr, uid, messages, thread_level=thread_level, domain=domain, fetch_ancestors=fetch_ancestors, context=context)
+        return result
 
 
     #------------------------------------------------------

From 6b00de9917620a55f8ed02e173181c533b1d0fd0 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Mon, 20 Aug 2012 15:50:22 +0530
Subject: [PATCH 367/999] [IMP] res_company : changes for text field default
 readonly and boolean field

bzr revid: rpr@tinyerp.com-20120820102022-r06x7ovnl3l2dyjv
---
 openerp/addons/base/report/corporate_defaults.xml   |  3 +--
 openerp/addons/base/report/corporate_defaults.xsl   |  6 ++----
 openerp/addons/base/report/corporate_sxw_header.xml |  3 +--
 openerp/addons/base/report/mako_footer.html         | 11 ++---------
 openerp/addons/base/res/res_company_view.xml        |  4 ++--
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/openerp/addons/base/report/corporate_defaults.xml b/openerp/addons/base/report/corporate_defaults.xml
index 12e8bb5eeea..751693e7e89 100644
--- a/openerp/addons/base/report/corporate_defaults.xml
+++ b/openerp/addons/base/report/corporate_defaults.xml
@@ -2,8 +2,7 @@
 <corporate-header>
     <corporation type="zoom" name="company_id">
         <rml_header1 type="field" name="rml_header1"/>
-        <rml_footer1 type="field" name="rml_footer1"/>
-        <rml_footer2 type="field" name="rml_footer2"/>
+        <rml_footer type="field" name="rml_footer"/>
         <title type="field" name="partner_id.title"/>
         <name type="field" name="partner_id.name"/>
         <street type="field" name="street"/>
diff --git a/openerp/addons/base/report/corporate_defaults.xsl b/openerp/addons/base/report/corporate_defaults.xsl
index e0f6918ec59..9e976381e48 100644
--- a/openerp/addons/base/report/corporate_defaults.xsl
+++ b/openerp/addons/base/report/corporate_defaults.xsl
@@ -39,8 +39,7 @@
 		<!--page bottom-->
 
 		<lines>1.5cm 2.2cm 19.9cm 2.2cm</lines>
-		<drawCentredString x="10.5cm" y="1.7cm"><xsl:value-of select="//corporate-header/corporation/rml_footer1"/></drawCentredString>
-		<drawCentredString x="10.5cm" y="1.25cm"><xsl:value-of select="//corporate-header/corporation/rml_footer2"/></drawCentredString>
+		<drawCentredString x="10.5cm" y="1.7cm"><xsl:value-of select="//corporate-header/corporation/rml_footer"/></drawCentredString>
 		<drawCentredString x="10.5cm" y="0.8cm">Your contact : <xsl:value-of select="//corporate-header/user/name"/></drawCentredString>
 
 	</xsl:template>
@@ -73,8 +72,7 @@
 		<!--page bottom-->
 
 		<lines>1.5cm 1.2cm 19.9cm 1.2cm</lines>
-		<drawCentredString x="10.5cm" y="1.7cm"><xsl:value-of select="//corporate-header/corporation/rml_footer1"/></drawCentredString>
-		<drawCentredString x="10.5cm" y="1.25cm"><xsl:value-of select="//corporate-header/corporation/rml_footer2"/></drawCentredString>
+		<drawCentredString x="10.5cm" y="1.7cm"><xsl:value-of select="//corporate-header/corporation/rml_footer"/></drawCentredString>
 <!--		<drawCentredString x="10.5cm" y="0.8cm">Your contact : <xsl:value-of select="//corporate-header/user/name"/></drawCentredString>-->
 	</xsl:template>
 
diff --git a/openerp/addons/base/report/corporate_sxw_header.xml b/openerp/addons/base/report/corporate_sxw_header.xml
index d752ffa91a5..6cd8e5a218f 100644
--- a/openerp/addons/base/report/corporate_sxw_header.xml
+++ b/openerp/addons/base/report/corporate_sxw_header.xml
@@ -233,8 +233,7 @@
                     <table:table-column table:style-name="Table1.A"/>
                     <table:table-row>
                         <table:table-cell table:style-name="Table1.A1" table:value-type="string">
-                            <text:p text:style-name="P7">[[ company.rml_footer1 ]]</text:p>
-                            <text:p text:style-name="P7">[[ company.rml_footer2 ]]</text:p>
+                            <text:p text:style-name="P7">[[ company.rml_footer ]]</text:p>
                             <text:p text:style-name="P7">Contact : [[ user.name ]]</text:p>
                         </table:table-cell>
                     </table:table-row>
diff --git a/openerp/addons/base/report/mako_footer.html b/openerp/addons/base/report/mako_footer.html
index 7c2d5b67a08..434f4955828 100644
--- a/openerp/addons/base/report/mako_footer.html
+++ b/openerp/addons/base/report/mako_footer.html
@@ -7,15 +7,8 @@
 	</tr>
 	<tr>
 		<td>
-			% if company['rml_footer1']:
-				<p align = "center"><small><b>${company.rml_footer1}</b></small></br></p>
-			%endif
-		</td>
-	</tr>
-	<tr>
-		<td>
-			% if company['rml_footer2']:
-				<p align = "center"><small><b>${company.rml_footer2}</b></small></br></p>
+			% if company['rml_footer']:
+				<p align = "center"><small><b>${company.rml_footer}</b></small></br></p>
 			%endif
 		</td>
 	</tr>
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 8e0e034c649..8bfb8c78478 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -51,7 +51,7 @@
                                         </div>
                                         <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
                                     </div>
-                                   <label for="rml_header1" class="oe_edit_only"/>
+                                   <label for="rml_header1"/>
                                    <div>
                                             <field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
                                    </div>
@@ -72,7 +72,7 @@
                                 <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
                                 <label for="rml_footer"/>
                                 <div name="bank_acc">
-                                    <field name="rml_footer"/>
+                                    <field name="rml_footer" attrs="{'readonly':[('customize_footer','=',False)]}"/>
                                     <!--<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward" class="oe_inline"/>-->
                                 </div>
                             </group>

From 0f364e1acd876183e5957db99e73d6869b684d08 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 20 Aug 2012 16:10:55 +0530
Subject: [PATCH 368/999] [IMP] removed Import action if create = false

bzr revid: jam@tinyerp.com-20120820104055-mgw4y5csa31poa33
---
 addons/web/static/src/js/view_list.js |  6 +++++-
 addons/web/static/src/xml/base.xml    | 12 +++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index fa6f48b37fa..bf8ee05d925 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -351,8 +351,12 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         if (!this.sidebar && this.options.$sidebar) {
             this.sidebar = new instance.web.Sidebar(this);
             this.sidebar.appendTo(this.options.$sidebar);
+            if (self._is_action_enabled('create')){
+                this.sidebar.add_items('other', [
+                    { label: _t("Import"), callback: this.on_sidebar_import }
+                ]);
+            }
             this.sidebar.add_items('other', [
-                { label: _t("Import"), callback: this.on_sidebar_import },
                 { label: _t("Export"), callback: this.on_sidebar_export }
             ]);
             if (self._is_action_enabled('delete')){
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 2d86b40f44f..61a1a834d0d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -671,14 +671,12 @@
     </tfoot>
 </table>
 <div t-name="ListView.buttons" class="oe_list_buttons">
-    <t t-if="!widget.no_leaf and widget.options.action_buttons !== false and widget.options.addable">
-        <t t-if="widget._is_action_enabled('create')">
-            <button type="button" class="oe_button oe_list_add oe_highlight">
-                <t t-esc="widget.options.addable"/>
-            </button>
-        </t>
+    <t t-if="!widget.no_leaf and widget.options.action_buttons !== false and widget.options.addable and widget._is_action_enabled('create')">
+        <button type="button" class="oe_button oe_list_add oe_highlight">
+            <t t-esc="widget.options.addable"/>
+        </button>
         <span class="oe_alternative" t-if="widget.options.import_enabled">
-            <span class="oe_fade" t-if="widget._is_action_enabled('create')">or</span> <a href="#" class="oe_bold oe_list_button_import">Import</a>
+            <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_list_button_import">Import</a>
         </span>
     </t>
 </div>

From 7fc19eba9919fd34e408b3db56b896087769aa80 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 12:45:00 +0200
Subject: [PATCH 369/999] [IMP] removed ancestror, merged with thread level

bzr revid: fp@tinyerp.com-20120820104500-8m246hwoexejjobt
---
 addons/mail/mail_message.py | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 59750f9b34b..6e6445dae82 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -142,21 +142,13 @@ class mail_message(osv.Model):
             'child_ids': [] # will be filled after by _message_read
         }
 
-    def _message_read(self, cr, uid, messages, domain=[], thread_level=0, fetch_ancestors=False, context=None):
+    def _message_read(self, cr, uid, messages, domain=[], thread_level=0, context=None):
         result = []
         tree = {} # key: ID, value: record
         for msg in messages:
             if len(result)<(self._limit-1):
                 record = self._message_dict_get(cr, uid, msg, context=context)
-                if thread_level>0:
-                    dom = [('parent_id','=', msg.id)]
-                    if thread_level==1:
-                        dom = [('parent_id','child_of', [x.id for x in msg.child_ids])]
-                    newids = self.search(cr, uid, domain+dom, context=context, limit=self._limit)
-                    objs = self.browse(cr, uid, newids, context=context)
-                    record['child_ids'] = self._message_read(cr, uid, objs, domain+dom, thread_level-1, context=context)
-
-                if fetch_ancestors and msg.parent_id:
+                if thread_level and msg.parent_id:
                     while msg.parent_id:
                         if msg.parent_id.id in tree:
                             record_parent = tree[msg.parent_id.id]
@@ -179,25 +171,24 @@ class mail_message(osv.Model):
                 break
         return result
 
-    def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, fetch_ancestors=False, context=None):
+    def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, context=None):
         """ 
             If IDS are provided, fetch these records, otherwise use the domain to
             fetch the matching records. After having fetched the records provided
-            by IDS, it will fetch children (according to thread_level) and/or the
-            parents if fetch_ancestors is True.
+            by IDS, it will fetch children (according to thread_level).
             
             Return [
             
             ]
         """
         if ids is False:
-            dom = []
-            if thread_level>0:
-                dom = [('parent_id', '=', False)]
-            ids = self.search(cr, uid, domain+dom, context=context, limit=10)
+            ids = self.search(cr, uid, domain, context=context, limit=10)
+
+
+        # FP Todo: flatten to max X level of mail_thread
 
         messages = self.browse(cr, uid, ids, context=context)
-        result = self._message_read(cr, uid, messages, thread_level=thread_level, domain=domain, fetch_ancestors=fetch_ancestors, context=context)
+        result = self._message_read(cr, uid, messages, thread_level=thread_level, domain=domain, context=context)
         return result
 
 

From e18c83106c45c58a0c4b1f59efbe50eaaa76b9d8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 12:45:56 +0200
Subject: [PATCH 370/999] imp

bzr revid: fp@tinyerp.com-20120820104556-li9wfg2riqb85c8a
---
 addons/mail/tests/write_test.py | 79 +++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 addons/mail/tests/write_test.py

diff --git a/addons/mail/tests/write_test.py b/addons/mail/tests/write_test.py
new file mode 100644
index 00000000000..920fbb92dbe
--- /dev/null
+++ b/addons/mail/tests/write_test.py
@@ -0,0 +1,79 @@
+##############################################################################
+#
+# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#                    Fabien Pinckaers <fp@tiny.Be>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+#
+# This module test all RPC methods
+#
+
+import xmlrpclib
+
+uid = 1
+passwd='admin'
+server = 'localhost'
+db = 'trunk'
+
+sock = xmlrpclib.ServerProxy('http://'+server+':8069/xmlrpc/object')
+
+def _print_data(data, level=0):
+    for d in data:
+        print '    '*level, d['id']
+        _print_data(d['child_ids'], level+1)
+
+print 'With Domain', [('model','=','mail.group')], 'thread_level'
+data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', False, [('model','=','mail.group')], 1)
+_print_data(data)
+
+print 'With Domain', [('model','=','mail.group')], 'no thread_level'
+data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', False, [('model','=','mail.group')], 0)
+_print_data(data)
+
+
+print 'With Domain', [('model','=','mail.group'), ('parent_id','=',False)], 'thread_level=0'
+data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', False, [('model','=','mail.group'), ('parent_id','=',False)], 0)
+_print_data(data)
+
+print 'With Domain', [('model','=','mail.group'), ('parent_id','=',False)], 'thread_level=2'
+data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', False, [('model','=','mail.group'), ('parent_id','=',False)], 2)
+_print_data(data)
+
+print 'Fixed IDS', [2,3,41,43], 'thread_level'
+data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', [2,3,41,43], [], 1)
+_print_data(data)
+
+print 'Fixed IDS', [2,43], 'no thread_level'
+data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', [2,43], [], 0)
+_print_data(data)
+
+print 'Fixed IDS', [2,43], 'thread_level'
+data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', [2,43], [], 1)
+_print_data(data)
+
+print 'domain [id in 3,41]', 'thread_level'
+data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', False, [('id','in',[3,41])], 1)
+_print_data(data)
+

From 6021b4473aa0b5cdf436e61320ffcba503de53f3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 12:52:52 +0200
Subject: [PATCH 371/999] [IMP] message_read on mail.message

bzr revid: fp@tinyerp.com-20120820105252-o1eqy5yfqb66hga9
---
 openerp/osv/fields.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index da025845759..496aab5407b 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -517,6 +517,7 @@ class one2many(_column):
         dom = self._domain
         if isinstance(self._domain, type(lambda: None)):
             dom = self._domain(obj)
+        print self._obj, user, dom + [(self._fields_id, 'in', ids)]
         ids2 = obj.pool.get(self._obj).search(cr, user, dom + [(self._fields_id, 'in', ids)], limit=self._limit, context=context)
         for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
             if r[self._fields_id] in res:

From 1d4dbc3440772893e58f77d5cd20f0202380d444 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 12:57:49 +0200
Subject: [PATCH 372/999] [IMP] message_read

bzr revid: fp@tinyerp.com-20120820105749-y5fqaztvj5put395
---
 addons/mail/mail_message.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 6e6445dae82..b8746042664 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -128,6 +128,8 @@ class mail_message(osv.Model):
     _limit = 10
     def _message_dict_get(self, cr, uid, msg, context={}):
         attachs = self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)
+        author = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id,], context=context)[0]
+        partner_ids = self.pool.get('res.partner').name_get(cr, uid, [x.id for x in msg.partner_ids], context=context)
         return {
             'id': msg.id,
             'type': msg.type,
@@ -138,11 +140,13 @@ class mail_message(osv.Model):
             'record_name': msg.record_name,
             'subject': msg.subject,
             'date': msg.date,
-            'author_id': msg.author_id.id,
+            'author_id': author,
+            'partner_ids': partner_ids,
             'child_ids': [] # will be filled after by _message_read
         }
 
     def _message_read(self, cr, uid, messages, domain=[], thread_level=0, context=None):
+        context = context or {}
         result = []
         tree = {} # key: ID, value: record
         for msg in messages:
@@ -169,6 +173,8 @@ class mail_message(osv.Model):
                     'context': context
                 })
                 break
+        for r in result:
+            print r
         return result
 
     def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, context=None):

From 20981ac1a30cf05f82f2467b65664931b5ebf579 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 20 Aug 2012 16:29:42 +0530
Subject: [PATCH 373/999] [IMP] account: make little change in onchange method.

bzr revid: cha@tinyerp.com-20120820105942-zkyrqrebn3s3j9nc
---
 addons/account/wizard/account_report_common.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index f84c4e909a2..604806f6e31 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -30,11 +30,11 @@ class account_common_report(osv.osv_memory):
     _description = "Account Common Report"
 
     def onchange_chart_id(self, cr, uid, ids, chart_account_id=False, context=None):
+        res = {}
         if chart_account_id:
             company_id = self.pool.get('account.account').browse(cr, uid, chart_account_id, context=context).company_id.id
-        else:
-            return {'value': {'company_id': False}}
-        return {'value': {'company_id': company_id}}
+            res['value'] = {'company_id': company_id}
+        return res
 
     _columns = {
         'chart_account_id': fields.many2one('account.account', 'Chart of Account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]),

From a054299277113f1ae09f47b0cd52f9752ef10a82 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 13:04:55 +0200
Subject: [PATCH 374/999] imp

bzr revid: fp@tinyerp.com-20120820110455-jelu0xl7jil36q18
---
 openerp/osv/fields.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 496aab5407b..da025845759 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -517,7 +517,6 @@ class one2many(_column):
         dom = self._domain
         if isinstance(self._domain, type(lambda: None)):
             dom = self._domain(obj)
-        print self._obj, user, dom + [(self._fields_id, 'in', ids)]
         ids2 = obj.pool.get(self._obj).search(cr, user, dom + [(self._fields_id, 'in', ids)], limit=self._limit, context=context)
         for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
             if r[self._fields_id] in res:

From 4b0ff5f3427cc5db1d8ddde12c57c7efa1636aa0 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Mon, 20 Aug 2012 16:41:40 +0530
Subject: [PATCH 375/999] [IMP] Removed group from currency on set accounting
 options wizard

bzr revid: pso@tinyerp.com-20120820111140-b9vnkll7ifx1gz0w
---
 addons/account/account_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 33d360a386a..ca032808716 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2371,9 +2371,9 @@
                     <div groups="base.group_multi_company">
                         <label for="company_id"/>
                         <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
-                        <label for="currency_id"/>
-                        <field name="currency_id" />
                     </div>
+                    <label for="currency_id"/>
+                    <field name="currency_id" />
                     <group>
                         <div attrs="{'invisible': [('only_one_chart_template','=',True)]}">
                             <label for="chart_template_id"/>

From 9a2f884e1c8efe85ed29f02b11e0e03aa9d6fdf2 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 13:14:17 +0200
Subject: [PATCH 376/999] [IMP] indentation

bzr revid: abo@openerp.com-20120820111417-2spnfk02v2t2zarc
---
 addons/note/note_data.xml |  18 +-----
 addons/note/note_view.xml | 112 ++++++++++++++++++++++----------------
 2 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/addons/note/note_data.xml b/addons/note/note_data.xml
index 8e896e19783..11eecc94b1b 100644
--- a/addons/note/note_data.xml
+++ b/addons/note/note_data.xml
@@ -1,22 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-  <data>
-
-    <record id="action_dummy" model="ir.actions.client">
-        <field name="name">News Feed</field>
-        <field name="tag">mail.wall</field>
-        <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
-    </record>
-
-    <!-- Rename the 'Feeds' main menu into 'Home' -->
-    <!-- Top menu item -->
-    <menuitem name="Home"
-      id="mail.mail_feeds_main"/>
-
-      <menuitem name="My Stuff" id="note_my_stuff" parent="mail.mail_feeds_main"/>
-        <menuitem name="Agenda" id="note_agenda" parent="note_my_stuff" sequence="10" action="action_dummy" type="client"/>
-        <menuitem name="Notes" id="note_notes" parent="note_my_stuff" sequence="20"/>
-        <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" sequence="30"/>
+  <data noupdate="1">
 
     <record model="note.stage" id="note_stage_today">
       <field name="name">Today</field>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 39dca553c39..1c4cc2f58c2 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -2,6 +2,22 @@
 <openerp>
   <data>
 
+    <record id="action_dummy" model="ir.actions.client">
+        <field name="name">News Feed</field>
+        <field name="tag">mail.wall</field>
+        <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
+    </record>
+
+    <!-- Rename the 'Feeds' main menu into 'Home' -->
+    <!-- Top menu item -->
+    <menuitem name="Home"
+      id="mail.mail_feeds_main"/>
+
+      <menuitem name="My Stuff" id="note_my_stuff" parent="mail.mail_feeds_main"/>
+        <menuitem name="Agenda" id="note_agenda" parent="note_my_stuff" sequence="10" action="action_dummy" type="client"/>
+        <menuitem name="Notes" id="note_notes" parent="note_my_stuff" sequence="20"/>
+        <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" sequence="30"/>
+
     <!-- Note Stage Form View -->
     <record model="ir.ui.view" id="view_note_stage_form">
       <field name="name">note.stage.form</field>
@@ -25,9 +41,9 @@
 
       <field name="arch" type="xml">
         <tree string="Stages of notes" editable="top">
-	  <field name="sequence" invisible="1" />
-          <field name="name" />
-	  <field name="fold" />
+          <field name="sequence" invisible="1"/>
+                <field name="name"/>
+          <field name="fold"/>
         </tree>
       </field>
     </record>
@@ -44,7 +60,7 @@
     <menuitem name="Notes" parent="base.menu_tools" id="menu_notes" sequence="20"/>
 
     <menuitem name="Categories" parent="menu_notes"
-    	      id="menu_notes_stage" action="action_note_stage" sequence="2" />
+            id="menu_notes_stage" action="action_note_stage" sequence="2"/>
 
     <!-- New Note Kanban View -->
     <record model="ir.ui.view" id="view_note_note_kanban">
@@ -52,44 +68,44 @@
       <field name="model">note.note</field>
       <field name="type">kanban</field>
       <field name="arch" type="xml">
-        <kanban default_group_by="stage_id" >
-	  <field name="color" />
-	  <field name="sequence" />
-	  <field name="name" />
-	  <field name="stage_id" />
-	  <field name="active" />
-	  <field name="note" />
-	  <field name="follower_ids" />
-	  <templates>
-	    <t t-name="kanban-box">
-	      <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
-		<!-- dropdown menu -->
-		<div class="oe_dropdown_toggle oe_dropdown_kanban">
-		  <span class="oe_e">í</span>
-		  <ul class="oe_dropdown_menu">
-		    <li><a type="edit" >Edit...</a></li>
-                    <li><a type="delete">Delete</a></li>
-                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-		  </ul>
-		</div>
+        <kanban default_group_by="stage_id">
+          <field name="color"/>
+          <field name="sequence"/>
+          <field name="name"/>
+          <field name="stage_id"/>
+          <field name="active"/>
+          <field name="note"/>
+          <field name="follower_ids"/>
+          <templates>
+            <t t-name="kanban-box">
+              <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+              <!-- dropdown menu -->
+              <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                <span class="oe_e">í</span>
+                <ul class="oe_dropdown_menu">
+                  <li><a type="edit" >Edit...</a></li>
+                  <li><a type="delete">Delete</a></li>
+                  <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                </ul>
+              </div>
 
-		<!-- kanban note -->
-		<div class="oe_kanban_content">
-		  <!-- title -->
-		  <field name="name" />
-		</div>
-		
-		<div class="oe_kanban_project_avatars">
-		  <t t-foreach="record.follower_ids.raw_value" t-as="follower">
-                    <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
-		  </t>
-		</div>
-		
-	      </div>
-	      <div class="oe_clear"></div>
-	    </t>
-	  </templates>
-	</kanban>
+              <!-- kanban note -->
+              <div class="oe_kanban_content">
+                <!-- title -->
+                <field name="name"/>
+              </div>
+
+              <div class="oe_kanban_project_avatars">
+                <t t-foreach="record.follower_ids.raw_value" t-as="follower">
+                  <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
+                </t>
+              </div>
+
+              </div>
+              <div class="oe_clear"></div>
+            </t>
+          </templates>
+        </kanban>
       </field>
     </record>
 
@@ -100,11 +116,11 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Note" version="7.0">
-	  <header>
-	    <!-- todo: remove domain -->
-	    <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1" />
-	  </header>
-          <field name="note_pad" widget="pad" />
+          <header>
+            <!-- todo: remove domain -->
+            <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
+          </header>
+          <field name="note_pad" widget="pad"/>
           <div class="oe_chatter">
             <field name="message_ids" widget="mail_thread"/>
           </div>
@@ -129,7 +145,7 @@
       </field>
     </record>
 
-    <!-- New Note Tree View -->    
+    <!-- New Note Tree View -->
     <record model="ir.ui.view" id="view_note_note_tree">
       <field name="name">note.note.tree</field>
       <field name="model">note.note</field>
@@ -143,7 +159,7 @@
       <field name="view_mode">kanban,tree,form</field>
       <field name="search_view_id" ref="view_note_note_filter"/>
     </record>
-    
+
     <menuitem name="My notes" parent="menu_notes" id="menu_notes_note" action="action_note_note" sequence="1"/>
 
   </data>

From b7c078b651b2b51be779e704514896e818078488 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 13:31:50 +0200
Subject: [PATCH 377/999] [IMP] some fixes

bzr revid: fp@tinyerp.com-20120820113150-bgcsylj7k64s26iq
---
 addons/mail/mail_message.py       | 53 ++++++++++++++++---------------
 addons/mail/mail_message_view.xml |  2 +-
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index b8746042664..20a14ce9203 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -45,6 +45,7 @@ def decode(text):
     if text:
         text = decode_header(text.replace('\r', ''))
         return ''.join([tools.ustr(x[0], x[1]) for x in text])
+
 class mail_message(osv.Model):
     """Model holding messages: system notification (replacing res.log
     notifications), comments (for OpenChatter feature). This model also
@@ -106,6 +107,7 @@ class mail_message(osv.Model):
             string='Message Record Name',
             help="Name get of the related document."),
 
+        'notification_ids': fields.one2many('mail.notification', 'message_id', 'Notifications'),
         'subject': fields.char('Subject', size=128),
         'date': fields.datetime('Date'),
         'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
@@ -127,6 +129,8 @@ class mail_message(osv.Model):
 
     _limit = 10
     def _message_dict_get(self, cr, uid, msg, context={}):
+        print msg
+        print msg.attachment_ids
         attachs = self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)
         author = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id,], context=context)[0]
         partner_ids = self.pool.get('res.partner').name_get(cr, uid, [x.id for x in msg.partner_ids], context=context)
@@ -142,11 +146,26 @@ class mail_message(osv.Model):
             'date': msg.date,
             'author_id': author,
             'partner_ids': partner_ids,
-            'child_ids': [] # will be filled after by _message_read
+            'child_ids': []
         }
 
-    def _message_read(self, cr, uid, messages, domain=[], thread_level=0, context=None):
+    def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, context=None):
+        """ 
+            If IDS are provided, fetch these records, otherwise use the domain to
+            fetch the matching records. After having fetched the records provided
+            by IDS, it will fetch children (according to thread_level).
+            
+            Return [
+            
+            ]
+        """
         context = context or {}
+        if ids is False:
+            ids = self.search(cr, uid, domain, context=context, limit=10)
+
+        # FP Todo: flatten to max X level of mail_thread
+        messages = self.browse(cr, uid, ids, context=context)
+
         result = []
         tree = {} # key: ID, value: record
         for msg in messages:
@@ -170,31 +189,10 @@ class mail_message(osv.Model):
                 result.append({
                     'type': 'expandable',
                     'domain': [('id','<=', msg.id)]+domain,
-                    'context': context
+                    'context': context,
+                    'thread_level': thread_level  # should be improve accodting to level of records
                 })
                 break
-        for r in result:
-            print r
-        return result
-
-    def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, context=None):
-        """ 
-            If IDS are provided, fetch these records, otherwise use the domain to
-            fetch the matching records. After having fetched the records provided
-            by IDS, it will fetch children (according to thread_level).
-            
-            Return [
-            
-            ]
-        """
-        if ids is False:
-            ids = self.search(cr, uid, domain, context=context, limit=10)
-
-
-        # FP Todo: flatten to max X level of mail_thread
-
-        messages = self.browse(cr, uid, ids, context=context)
-        result = self._message_read(cr, uid, messages, thread_level=thread_level, domain=domain, context=context)
         return result
 
 
@@ -230,7 +228,10 @@ class mail_message(osv.Model):
         ], context=context)
         notifications = {}
         for notification in not_obj.browse(cr, uid, not_ids, context=context):
-            ids.remove(notification.message_id.id)
+            if notification.message_id.id in ids:
+                pass
+                # FO Note: we should put this again !!!
+                #ids.remove(notification.message_id.id)
 
         # check messages according to related documents
         res_ids = {}
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index b31b94eaa61..9532bf6b17f 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -227,7 +227,7 @@
         <record id="action_mail_all_feeds" model="ir.actions.client">
             <field name="name">News Feed</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="{'search_view_id': ref('view_message_search_wall'), 'domain':[('partner_ids.user_ids','=',uid)]}"/>
+            <field name="params" eval="{'search_view_id': ref('view_message_search_wall'), 'domain':[('notification_ids.partner_id.user_ids','in',[uid])]}"/>
         </record>
 
         <record id="action_mail_my_feeds" model="ir.actions.client">

From 7a2e5962abfce3548dcca1c0265b58b553d455e1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 13:32:10 +0200
Subject: [PATCH 378/999] fix

bzr revid: fp@tinyerp.com-20120820113210-4lxap11yk9xxkv9d
---
 addons/mail/mail_message.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 20a14ce9203..4cb545c146c 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -129,8 +129,6 @@ class mail_message(osv.Model):
 
     _limit = 10
     def _message_dict_get(self, cr, uid, msg, context={}):
-        print msg
-        print msg.attachment_ids
         attachs = self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)
         author = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id,], context=context)[0]
         partner_ids = self.pool.get('res.partner').name_get(cr, uid, [x.id for x in msg.partner_ids], context=context)

From 25233cd5137255f707f6830f720b2ca76f6567aa Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 13:32:27 +0200
Subject: [PATCH 379/999] [IMP] add user_ids on partners

bzr revid: fp@tinyerp.com-20120820113227-5k9d7m41vjcof26c
---
 openerp/addons/base/res/res_partner.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 93d12228ebe..d9ae1d8595e 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -215,6 +215,7 @@ class res_partner(osv.osv):
                  "Use this field anywhere a small image is required."),
         'company_id': fields.many2one('res.company', 'Company', select=1),
         'color': fields.integer('Color Index'),
+        'user_ids': fields.one2many('res.users', 'partner_id', 'Users'),
         'contact_address': fields.function(_address_display,  type='char', string='Complete Address'),
     }
 

From 264885ad77cf8321d26cf7793fe31a7c07a2056a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 13:33:51 +0200
Subject: [PATCH 380/999] [IMP] domains

bzr revid: fp@tinyerp.com-20120820113351-wo982pj7ii2e78k0
---
 addons/mail/mail_message_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 9532bf6b17f..e29027712ba 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -233,7 +233,7 @@
         <record id="action_mail_my_feeds" model="ir.actions.client">
             <field name="name">My Feeds</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="{'search_view_id': ref('view_message_search_wall'), 'domain':[('partner_id.user_ids','=',uid)]}"/>
+            <field name="params" eval="{'search_view_id': ref('view_message_search_wall'), 'domain':[('partner_id.user_ids','in',[uid])]}"/>
         </record>
     </data>
 </openerp>

From aef562c3bec8f35368bca32292b0e9a91e58b898 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Mon, 20 Aug 2012 17:03:57 +0530
Subject: [PATCH 381/999] [IMP] account : rml_footer1 and rml_footer2 are
 merged in rml_footer text field

bzr revid: rpr@tinyerp.com-20120820113357-lzcj72pl3hjh9xts
---
 addons/account/res_config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 658f87962ff..f7b4a83c689 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -43,7 +43,7 @@ class account_config_settings(osv.osv_memory):
             string='Default company currency', help="Main currency of the company."),
         'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
             string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer  will be able to pay your invoices or quotations with a button \"Pay with  Paypal\" in automated emails or through the OpenERP portal."),
-        'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True,
+        'company_footer': fields.related('company_id', 'rml_footer', type='text', readonly=True,
             string='Bank accounts on reports will display as followed', help="Bank accounts as printed in the footer of each customer  document. This is for information purpose only, you should configure these bank accounts through the above button \"Configure Bank Accounts\"."),
 
         'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
@@ -154,7 +154,7 @@ class account_config_settings(osv.osv_memory):
             'expects_chart_of_accounts': company.expects_chart_of_accounts,
             'currency_id': company.currency_id.id,
             'paypal_account': company.paypal_account,
-            'company_footer': company.rml_footer2,
+            'company_footer': company.rml_footer,
             'has_chart_of_accounts': has_chart_of_accounts,
             'has_fiscal_year': bool(fiscalyear_count),
             'chart_template_id': False,

From c1b7de054cbc59fa93f367d46ab31e31eb794801 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 20 Aug 2012 17:50:20 +0530
Subject: [PATCH 382/999] [IMP] Kanban type action edit and delete on edit and
 delete falase

bzr revid: jam@tinyerp.com-20120820122020-8tszb43bivfgq72v
---
 addons/web_kanban/static/src/js/kanban.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 154df0f8b6b..96f28dff196 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -734,7 +734,9 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
             var $action = $(this),
                 type = $action.data('type') || 'button',
                 method = 'do_action_' + (type === 'action' ? 'object' : type);
-            if (_.str.startsWith(type, 'switch_')) {
+            if ((type === 'edit' || type === 'delete') && ! self.view._is_action_enabled(type)){
+                self.view.open_record(self.id);
+            } else if (_.str.startsWith(type, 'switch_')) {
                 self.view.do_switch_view(type.substr(7));
             } else if (typeof self[method] === 'function') {
                 self[method]($action);

From 2f228383abd2105c712c39136ef12a69e40cef74 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 14:32:11 +0200
Subject: [PATCH 383/999] [IMP] indentation

bzr revid: abo@openerp.com-20120820123211-4bqf7dajj33767vm
---
 addons/crm/crm_meeting_view.xml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index d7f59267a30..1133dc17b37 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -3,16 +3,15 @@
     <data>
 
     <!-- Calendar Attendee Form View -->
-
     <record id="attendee_form_view_inherit" model="ir.ui.view">
-            <field name="name">calendar.attendee.form.inherit</field>
-            <field name="model">calendar.attendee</field>
-            <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
-            <field name="arch" type="xml">
-                <field name="ref" position="after">
-                    <field name="categ_id" string="Event Type"/>
-                </field>
+        <field name="name">calendar.attendee.form.inherit</field>
+        <field name="model">calendar.attendee</field>
+        <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
+        <field name="arch" type="xml">
+            <field name="ref" position="after">
+                <field name="categ_id" string="Event Type"/>
             </field>
+        </field>
     </record>
 
     </data>

From 2be5f9424ae0784dd4219885242576f6e9b9b429 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 14:42:05 +0200
Subject: [PATCH 384/999] fix

bzr revid: fp@tinyerp.com-20120820124205-qomccfiwd6zjtc1w
---
 addons/mail/mail_thread.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c962e36fc2c..d77049226e2 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -69,7 +69,7 @@ class mail_thread(osv.Model):
     # TODO: may be we should make it _inherit ir.needaction
 
     def _get_is_follower(self, cr, uid, ids, name, args, context=None):
-        subobj = self.pool.get('mail.subscription')
+        subobj = self.pool.get('mail.followers')
         subids = subobj.search(cr, uid, [
             ('res_model','=',self._name),
             ('res_id', 'in', ids),
@@ -109,7 +109,7 @@ class mail_thread(osv.Model):
     _columns = {
         'message_is_follower': fields.function(_get_is_follower,
             type='boolean', string='Is a Follower'),
-        'message_follower_ids': fields.many2many('res.partner', 'mail_subscription', 'res_id', 'partner_id',
+        'message_follower_ids': fields.many2many('res.partner', 'mail_followers', 'res_id', 'partner_id',
             # FP Note: implement this domain=lambda self: [('res_model','=',self._name)],
             string='Followers'),
         'message_ids': fields.one2many('mail.message', 'res_id',

From d6395938cebac6245910022572daea543c3910fb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 14:55:25 +0200
Subject: [PATCH 385/999] [FIX] small fixes

bzr revid: fp@tinyerp.com-20120820125525-daa8ghuqse6csgbg
---
 addons/mail/mail_thread.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index d77049226e2..a0d2ae5065f 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -73,10 +73,10 @@ class mail_thread(osv.Model):
         subids = subobj.search(cr, uid, [
             ('res_model','=',self._name),
             ('res_id', 'in', ids),
-            ('user_id','=',uid)], context=context)
+            ('partner_id.user_ids','in',[uid])], context=context)
         result = dict.fromkeys(ids, False)
         for sub in subobj.browse(cr, uid, subids, context=context):
-            result[res_id] = True
+            result[sub.res_id] = True
         return result
 
     def _get_message_data(self, cr, uid, ids, name, args, context=None):
@@ -84,17 +84,17 @@ class mail_thread(osv.Model):
         for id in ids:
             res[id] = {
                 'message_unread': False,
-                'message_Summary': ''
+                'message_summary': ''
             }
         nobj = self.pool.get('mail.notification')
-        notifs = nobj.search(cr, uid, [
-            ('user_id','=',uid),
+        nids = nobj.search(cr, uid, [
+            ('partner_id.user_ids','in',[uid]),
             ('message_id.res_id','in', ids),
             ('message_id.model','=', self._name),
             ('read','=',False)
         ], context=context)
         for notif in nobj.browse(cr, uid, nids, context=context):
-            res[notif.message_id.id]['message_unread'] = True
+            res[notif.message_id.res_id]['message_unread'] = True
 
         for thread in self.browse(cr, uid, ids, context=context):
             message_ids = thread.message_ids

From de096a967d30eedd64c603940edced3729f886fd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 15:02:32 +0200
Subject: [PATCH 386/999] fix

bzr revid: fp@tinyerp.com-20120820130232-qrw1zk5i2fhe22qk
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index a0d2ae5065f..544ebf20a8e 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -560,7 +560,7 @@ class mail_thread(osv.Model):
 
         value = kwargs
         value.update( {
-            'model': self._name,
+            'model': res_id and self._name or False,
             'res_id': res_id,
             'body': body,
             'subject': subject,

From ccb78bfdd9ebc528e423e1b563b19dfee701308c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 20 Aug 2012 15:06:31 +0200
Subject: [PATCH 387/999] [FIX] fetchmail: fetchmail_server_id added to
 mail.mail form view.

bzr revid: tde@openerp.com-20120820130631-3kn57wnvj4ssyrjt
---
 addons/fetchmail/fetchmail.py       | 6 +++---
 addons/fetchmail/fetchmail_view.xml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 544a4f81b96..24c977bba1d 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -77,7 +77,7 @@ class fetchmail_server(osv.osv):
                                                                                              "emails to the existing conversations (documents)."),
         'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Defines the order of processing, "
                                                                                                                   "lower values mean higher priority"),
-        'message_ids': fields.one2many('mail.message', 'fetchmail_server_id', 'Messages', readonly=True),
+        'message_ids': fields.one2many('mail.mail', 'fetchmail_server_id', 'Messages', readonly=True),
         'configuration' : fields.text('Configuration'),
         'script' : fields.char('Script', readonly=True, size=64),
     }
@@ -232,8 +232,8 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
             server.write({'date': time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)})
         return True
 
-class mail_message(osv.osv):
-    _inherit = "mail.message"
+class mail_mail(osv.osv):
+    _inherit = "mail.mail"
     _columns = {
         'fetchmail_server_id': fields.many2one('fetchmail.server', "Inbound Mail Server",
                                                readonly=True,
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 7c049dedbb8..bdb1ebf2fa5 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -104,11 +104,11 @@
         />
 
       <record model="ir.ui.view" id="email_message_tree_view">
-          <field name="name">mail.message.list.fetchmail</field>
-          <field name="model">mail.message</field>
-          <field name="inherit_id" ref="mail.view_email_message_tree"/>
+          <field name="name">mail.mail.list.fetchmail</field>
+          <field name="model">mail.mail</field>
+          <field name="inherit_id" ref="mail.view_email_message_form"/>
           <field name="arch" type="xml">
-              <field name="user_id" position="after">
+              <field name="references" position="after">
                   <field name="fetchmail_server_id"/>
               </field>
           </field>

From daf0f7412ebda47b40106e3bbd4907c4f7221c44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 20 Aug 2012 15:07:30 +0200
Subject: [PATCH 388/999] [WIP] mail.js: first cleaning of Wall.

bzr revid: tde@openerp.com-20120820130730-lpjt9wpj7ggqq4yv
---
 addons/mail/mail_message_view.xml   |   4 +-
 addons/mail/static/src/js/mail.js   | 214 ++++++++++++----------------
 addons/mail/static/src/xml/mail.xml |   6 +-
 3 files changed, 94 insertions(+), 130 deletions(-)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index e29027712ba..8b3d21677d0 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -227,13 +227,13 @@
         <record id="action_mail_all_feeds" model="ir.actions.client">
             <field name="name">News Feed</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="{'search_view_id': ref('view_message_search_wall'), 'domain':[('notification_ids.partner_id.user_ids','in',[uid])]}"/>
+            <field name="params" eval="{'domain': [('notification_ids.partner_id.user_ids', 'in', '[uid]')] }"/>
         </record>
 
         <record id="action_mail_my_feeds" model="ir.actions.client">
             <field name="name">My Feeds</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="{'search_view_id': ref('view_message_search_wall'), 'domain':[('partner_id.user_ids','in',[uid])]}"/>
+            <field name="params" eval="{'domain':[('partner_id.user_ids', 'in', '[uid]')]}"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 09e4d7dae3d..a5633dcfc2a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -42,18 +42,6 @@ openerp.mail = function(session) {
 
     mail.ChatterUtils = {
 
-        /**
-        * mail_int_mapping: structure to keep a trace of internal links mapping
-        *      mail_int_mapping['model'] = {
-        *          'name_get': [[id,label], [id,label], ...]
-        *          'fetch_ids': [id, id, ...] } */
-        //var mail_int_mapping = {};
-        
-        /**
-        * mail_msg_struct: structure to orrganize chatter messages
-        */
-        //var mail_msg_struct = {}; // TODO: USE IT OR NOT :)
-
         /* generic chatter events binding */
         bind_events: function(widget) {
             // event: click on an internal link to a document: model, login
@@ -100,50 +88,50 @@ openerp.mail = function(session) {
         *           'for_thread_msgs': [records],
         *           'ancestors': [msg_ids], } }
         */
-        records_struct_add_records: function(cs, records, parent_id) {
-            var cur_iter = 0; var max_iter = 10; var modif = true;
-            while ( modif && (cur_iter++) < max_iter) {
-                modif = false;
-                _(records).each(function (record) {
-                    // root and not yet recorded
-                    if ( (record.parent_id == false || record.parent_id[0] == parent_id) && ! cs['msgs'][record.id]) {
-                        // add to model -> root_list ids
-                        if (! cs['model_to_root_ids'][record.model]) cs['model_to_root_ids'][record.model] = [record.id];
-                        else cs['model_to_root_ids'][record.model].push(record.id);
-                        // add root data
-                        cs['new_root_ids'].push(record.id);
-                        // add record
-                        cs['tree_struct'][record.id] = {'level': 0, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [record], 'msg_nbr': -1, 'ancestors': []};
-                        cs['msgs'][record.id] = record;
-                        modif = true;
-                    }
-                    // not yet recorded, but parent is recorded
-                    else if (! cs['msgs'][record.id] && cs['msgs'][record.parent_id[0]]) {
-                        var parent_level = cs['tree_struct'][record.parent_id[0]]['level'];
-                        // update parent structure
-                        cs['tree_struct'][record.parent_id[0]]['direct_childs'].push(record.id);
-                        cs['tree_struct'][record.parent_id[0]]['for_thread_msgs'].push(record);
-                        // update ancestors structure
-                        for (ancestor_id in cs['tree_struct'][record.parent_id[0]]['ancestors']) {
-                            cs['tree_struct'][ancestor_id]['all_childs'].push(record.id);
-                        }
-                        // add record
-                        cs['tree_struct'][record.id] = {'level': parent_level+1, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [], 'msg_nbr': -1, 'ancestors': []};
-                        cs['msgs'][record.id] = record;
-                        modif = true;
-                    }
-                });
-            }
-            return cs;
-        },
+        // records_struct_add_records: function(cs, records, parent_id) {
+        //     var cur_iter = 0; var max_iter = 10; var modif = true;
+        //     while ( modif && (cur_iter++) < max_iter) {
+        //         modif = false;
+        //         _(records).each(function (record) {
+        //             // root and not yet recorded
+        //             if ( (record.parent_id == false || record.parent_id[0] == parent_id) && ! cs['msgs'][record.id]) {
+        //                 // add to model -> root_list ids
+        //                 if (! cs['model_to_root_ids'][record.model]) cs['model_to_root_ids'][record.model] = [record.id];
+        //                 else cs['model_to_root_ids'][record.model].push(record.id);
+        //                 // add root data
+        //                 cs['new_root_ids'].push(record.id);
+        //                 // add record
+        //                 cs['tree_struct'][record.id] = {'level': 0, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [record], 'msg_nbr': -1, 'ancestors': []};
+        //                 cs['msgs'][record.id] = record;
+        //                 modif = true;
+        //             }
+        //             // not yet recorded, but parent is recorded
+        //             else if (! cs['msgs'][record.id] && cs['msgs'][record.parent_id[0]]) {
+        //                 var parent_level = cs['tree_struct'][record.parent_id[0]]['level'];
+        //                 // update parent structure
+        //                 cs['tree_struct'][record.parent_id[0]]['direct_childs'].push(record.id);
+        //                 cs['tree_struct'][record.parent_id[0]]['for_thread_msgs'].push(record);
+        //                 // update ancestors structure
+        //                 for (ancestor_id in cs['tree_struct'][record.parent_id[0]]['ancestors']) {
+        //                     cs['tree_struct'][ancestor_id]['all_childs'].push(record.id);
+        //                 }
+        //                 // add record
+        //                 cs['tree_struct'][record.id] = {'level': parent_level+1, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [], 'msg_nbr': -1, 'ancestors': []};
+        //                 cs['msgs'][record.id] = record;
+        //                 modif = true;
+        //             }
+        //         });
+        //     }
+        //     return cs;
+        // },
 
         /* copy cs.new_root_ids into cs.root_ids */
-        records_struct_update_after_display: function(cs) {
-            // update TODO
-            cs['root_ids'] = _.union(cs['root_ids'], cs['new_root_ids']);
-            cs['new_root_ids'] = [];
-            return cs;
-        },
+        // records_struct_update_after_display: function(cs) {
+        //     // update TODO
+        //     cs['root_ids'] = _.union(cs['root_ids'], cs['new_root_ids']);
+        //     cs['new_root_ids'] = [];
+        //     return cs;
+        // },
 
         /**
          *    CONTENT MANIPULATION
@@ -623,7 +611,7 @@ openerp.mail = function(session) {
         display_comments: function (records) {
             var self = this;
             // sort the records
-            mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, this.params.parent_id);
+            // mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, this.params.parent_id);
             //build attachments download urls and compute time-relative from dates
             for (var k in records) {
                 records[k].timerelative = $.timeago(records[k].date);
@@ -636,14 +624,14 @@ openerp.mail = function(session) {
             }
             _(records).each(function (record) {
                 var sub_msgs = [];
-                if ((record.parent_id == false || record.parent_id[0] == self.params.parent_id) && self.params.thread_level > 0 ) {
-                    var sub_list = self.comments_structure['tree_struct'][record.id]['direct_childs'];
-                    _(records).each(function (record) {
-                        //if (record.parent_id == false || record.parent_id[0] == self.params.parent_id) return;
-                        if (_.indexOf(sub_list, record.id) != -1) {
-                            sub_msgs.push(record);
-                        }
-                    });
+                if ((record.parent_id == undefined || record.parent_id == false || record.parent_id[0] == self.params.parent_id) && self.params.thread_level > 0 ) {
+                    // var sub_list = self.comments_structure['tree_struct'][record.id]['direct_childs'];
+                    // _(records).each(function (record) {
+                    //     //if (record.parent_id == false || record.parent_id[0] == self.params.parent_id) return;
+                    //     if (_.indexOf(sub_list, record.id) != -1) {
+                    //         sub_msgs.push(record);
+                    //     }
+                    // });
                     self.display_comment(record);
                     self.thread = new mail.Thread(self, {'res_model': self.params.res_model, 'res_id': self.params.res_id, 'uid': self.params.uid,
                                                             'records': sub_msgs, 'thread_level': (self.params.thread_level-1), 'parent_id': record.id,
@@ -655,7 +643,7 @@ openerp.mail = function(session) {
                     self.display_comment(record);
                 }
             });
-            mail.ChatterUtils.records_struct_update_after_display(this.comments_structure);
+            // mail.ChatterUtils.records_struct_update_after_display(this.comments_structure);
             // update offset for "More" buttons
             if (this.params.thread_level == 0) this.params.offset += records.length;
         },
@@ -666,13 +654,13 @@ openerp.mail = function(session) {
             if (record.type == 'email') {
                 record.mini_url = ('/mail/static/src/img/email_icon.png');
             } else {
-                record.mini_url = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', record.user_id[0]);
+                record.mini_url = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.partner', 'image_small', record.author_id[0]);
             }
             // record.body = mail.ChatterUtils.do_replace_expressions(record.body);
             // format date according to the user timezone
             record.date = session.web.format_value(record.date, {type:"datetime"});
             // is the user the author ?
-            record.is_author = mail.ChatterUtils.is_author(this, record.user_id[0]);
+            record.is_author = mail.ChatterUtils.is_author(this, record.author_id[0]);
             // render
             var rendered = session.web.qweb.render('mail.thread.message', {'record': record, 'thread': this, 'params': this.params, 'display': this.display});
             // expand feature
@@ -756,10 +744,9 @@ openerp.mail = function(session) {
 
        init: function() {
             this._super.apply(this, arguments);
-            this.params = this.get_definition_options();
+            this.params = this.options;
             this.params.thread_level = this.params.thread_level || 0;
             this.thread = null;
-            this.ds = new session.web.DataSet(this, this.view.model);
         },
         
         start: function() {
@@ -785,6 +772,7 @@ openerp.mail = function(session) {
                 this.$element.find('.oe_mail_thread').hide();
                 return;
             }
+            // debugger
             // create and render Thread widget
             this.$element.find('div.oe_mail_recthread_main').empty();
             if (this.thread) this.thread.destroy();
@@ -815,48 +803,29 @@ openerp.mail = function(session) {
          * @param {Object} parent parent
          * @param {Object} [params]
          * @param {Number} [params.limit=20] number of messages to show and fetch
-         * @param {Number} [params.search_view_id=false] search view id for messages
          * @var {Array} comments_structure (see chatter utils)
          */
-        init: function (parent, params) {
+        init: function (parent, options) {
             this._super(parent);
-
-            this.params = {};
-            // this.params.limit = params.limit || 25;
-
-            this.params.domain = params.domain || [];
-            this.params.context = params.context || {};
-
-            // FP Note: do we need this ?
+            // console.log(options);
+            this.options = options || {};
+            this.options.domain = options.domain || [];
+            this.options.context = options.context || {};
+            // FP Note: do we need this ? --> not sure, use mail.message create instead ?
             // Should be in domain/context instead ?
-            this.params.res_model = params.res_model || false;
-            this.params.res_id = params.res_id || false;
-
-            // Do we need this ?
-            // this.params.search_view_id = params.search_view_id || false;
-
-            this.params.thread_level = params.thread_level || 1;
-
-	    // FP Note: looks strange, this is not the way to build a tree structure
-            this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
-
-            // FP Note: I changed: always true
-            // this.display_show_more = true;
-
+            this.options.context.res_model = options.res_model || 'mail.thread';
+            this.options.context.res_id = options.res_id || false;
+            this.options.thread_level = options.thread_level || 1;
             this.thread_list = [];
             this.search = {'domain': [], 'context': {}, 'groupby': {}}
             this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
             // datasets
             this.ds_msg = new session.web.DataSet(this, 'mail.message');
-
-	    // I don't think we need this ?
-	    // message_read and others methods must be on mail.message
-            // this.ds_thread = new session.web.DataSet(this, 'mail.thread');
+            // this.ds_post = new session.web.DataSet(this, this.options.context.res_model);
         },
 
         start: function () {
             this._super.apply(this, arguments);
-            this.display_current_user();
             // add events
             this.add_event_handlers();
             // load mail.message search view
@@ -864,7 +833,7 @@ openerp.mail = function(session) {
             // load composition form
             var compose_done = this.instantiate_composition_form();
             // fetch first threads
-            var comments_ready = this.init_and_fetch_comments(this.params.limit, 0);
+            var comments_ready = this.init_and_fetch_comments(this.options.limit, 0);
             return (search_view_ready && comments_ready && compose_done);
         },
 
@@ -888,8 +857,8 @@ openerp.mail = function(session) {
                 this.compose_message_widget.destroy();
             }
             this.compose_message_widget = new mail.ComposeMessage(this, {
-                'extended_mode': false, 'uid': this.session.uid, 'res_model': this.params.res_model,
-                'res_id': this.params.res_id, 'mode': mode || 'comment', 'msg_id': msg_id });
+                'extended_mode': false, 'uid': this.session.uid, 'res_model': this.options.res_model,
+                'res_id': this.options.res_id, 'mode': mode || 'comment', 'msg_id': msg_id });
             var composition_node = this.$element.find('div.oe_mail_wall_action');
             composition_node.empty();
             var compose_done = this.compose_message_widget.appendTo(composition_node);
@@ -940,10 +909,6 @@ openerp.mail = function(session) {
             });
         },
 
-        display_current_user: function () {
-            //return this.$element.find('img.oe_mail_msg_image').attr('src', this.thread_get_avatar('res.users', 'avatar', this.session.uid));
-        }, 
-
         /**
          * Initializes the wall and calls fetch_comments
          * @param {Number} limit: number of notifications to fetch
@@ -952,11 +917,11 @@ openerp.mail = function(session) {
          * @param {Array} context
          */
         init_and_fetch_comments: function() {
-            this.search['domain'] = _.union(this.params.domain, this.search_results.domain);
-            this.search['context'] = _.extend(this.params.context, this.search_results.context);
-            this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
+            this.search['domain'] = _.union(this.options.domain, this.search_results.domain);
+            this.search['context'] = _.extend(this.options.context, this.search_results.context);
+            // this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
             this.$element.find('ul.oe_mail_wall_threads').empty();
-            return this.fetch_comments(this.params.limit, 0);
+            return this.fetch_comments(this.options.limit);
         },
 
         /**
@@ -966,40 +931,39 @@ openerp.mail = function(session) {
          * @param {Array} domain
          * @param {Array} context
          */
-        fetch_comments: function (limit, offset, additional_domain, additional_context) {
+        fetch_comments: function (limit, additional_domain, additional_context) {
             var self = this;
             if (additional_domain) var fetch_domain = this.search['domain'].concat(additional_domain);
             else var fetch_domain = this.search['domain'];
             if (additional_context) var fetch_context = _.extend(this.search['context'], additional_context);
             else var fetch_context = this.search['context'];
-	    // FP Note: call to review
+            // FP Note: call to review
             return this.ds_msg.call('message_read', 
-                [[this.session.uid], true, [], (limit || 0), (offset || 0), fetch_domain, fetch_context]).then(this.proxy('display_comments'));
+                [[this.session.uid], false, [] ]).then(this.proxy('display_comments'));
         },
 
         /**
          * @param {Array} records records to show in threads
          */
         display_comments: function (records) {
+            console.log(records);
+            // debugger
             var self = this;
-            this.do_update_show_more(records.length >= self.params.limit);
-            mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, false);
-            _(this.comments_structure['new_root_ids']).each(function (root_id) {
-                var records = self.comments_structure.tree_struct[root_id]['for_thread_msgs'];
-                var model_name = self.comments_structure.msgs[root_id]['model'];
-                var res_id = self.comments_structure.msgs[root_id]['res_id'];
+            this.do_update_show_more(records.length >= self.options.limit);
+
+            _(records).each(function (root_record) {
+                console.log(root_record);
+
                 var render_res = session.web.qweb.render('mail.wall_thread_container', {});
                 $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads'));
                 var thread = new mail.Thread(self, {
-                    'res_model': model_name, 'res_id': res_id, 'uid': self.session.uid, 'records': records,
-                    'parent_id': false, 'thread_level': self.params.thread_level, 'show_hide': true, 'is_wall': true}
+                    'res_model': root_record.model, 'res_id': root_record.res_id, 'uid': self.session.uid, 'records': [root_record],
+                    'parent_id': false, 'thread_level': self.options.thread_level, 'show_hide': true, 'is_wall': true}
                     );
                 self.thread_list.push(thread);
                 return thread.appendTo(self.$element.find('li.oe_mail_wall_thread:last'));
             });
-            // update TODO
-            this.comments_structure['root_ids'] = _.union(this.comments_structure['root_ids'], this.comments_structure['new_root_ids']);
-            this.comments_structure['new_root_ids'] = [];
+
         },
 
         /**
@@ -1013,9 +977,9 @@ openerp.mail = function(session) {
             var self = this;
             var model_to_root = {};
             var fetch_domain = [];
-            _(this.comments_structure['model_to_root_ids']).each(function (sc_model, model_name) {
-                fetch_domain.push('|', ['model', '!=', model_name], '!', ['id', 'child_of', sc_model]);
-            });
+            // _(this.comments_structure['model_to_root_ids']).each(function (sc_model, model_name) {
+            //     fetch_domain.push('|', ['model', '!=', model_name], '!', ['id', 'child_of', sc_model]);
+            // });
             return fetch_domain;
         },
         
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7f49b7f3943..8a0fc1d90e0 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -17,8 +17,8 @@
                 <td colspan="2">
                     <h2 class="oe_view_title">
                         <span class="oe_view_title_text">
-                            <t t-if="! widget.params.res_model">News Feeds</t>
-                            <t t-if="widget.params.res_model" t-esc="widget.params.res_model"/>
+                            <t t-if="! widget.options.res_model">News Feeds</t>
+                            <t t-if="widget.options.res_model" t-esc="widget.options.res_model"/>
                         </span>
                     </h2>
                 </td>
@@ -136,7 +136,7 @@
                     <div class="oe_clear"/>
                     <ul class="oe_mail_msg_footer">
                       <li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a></li>
-                      <li><a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a></li>
+                      <li><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>
                       <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
                       <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
                       <!-- uncomment when merging vote

From 0d5a185956cefd92b4b2825d0cb78e27376bd5a2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 15:17:26 +0200
Subject: [PATCH 389/999] fix

bzr revid: fp@tinyerp.com-20120820131726-7iassml4p93z7qsg
---
 openerp/osv/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index da025845759..4e5d8e97691 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1553,7 +1553,7 @@ def field_to_dict(model, cr, user, field, context=None):
     # when client is started in debug mode.
     if isinstance(field, function):
         res['function'] = field._fnct and field._fnct.func_name or False
-        res['store'] = field.store
+    #    res['store'] = field.store
         if isinstance(field.store, dict):
             res['store'] = str(field.store)
         res['fnct_search'] = field._fnct_search and field._fnct_search.func_name or False

From 1bd841d10109ddcaebfde5bbf79a1b24fa6ac82f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 15:19:21 +0200
Subject: [PATCH 390/999] fix

bzr revid: fp@tinyerp.com-20120820131921-7ydvs9x784t4hn4l
---
 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 4e5d8e97691..57c84d6a5a8 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1554,8 +1554,8 @@ def field_to_dict(model, cr, user, field, context=None):
     if isinstance(field, function):
         res['function'] = field._fnct and field._fnct.func_name or False
     #    res['store'] = field.store
-        if isinstance(field.store, dict):
-            res['store'] = str(field.store)
+    #    if isinstance(field.store, dict):
+    #        res['store'] = str(field.store)
         res['fnct_search'] = field._fnct_search and field._fnct_search.func_name or False
         res['fnct_inv'] = field._fnct_inv and field._fnct_inv.func_name or False
         res['fnct_inv_arg'] = field._fnct_inv_arg or False

From 64dc05afc658e318aaa3724827daca0b6a8d2a14 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 15:25:01 +0200
Subject: [PATCH 391/999] fix

bzr revid: fp@tinyerp.com-20120820132501-7724jwavhzan3xyp
---
 openerp/osv/fields.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 57c84d6a5a8..b996d66035f 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1585,6 +1585,9 @@ def field_to_dict(model, cr, user, field, context=None):
             res['selection'] = field.selection(model, cr, user, context)
     if res['type'] in ('one2many', 'many2many', 'many2one'):
         res['relation'] = field._obj
+        dom = field._domain
+        if isinstance(field._domain, type(lambda: None)):
+            dom = field._domain(model)
         res['domain'] = field._domain
         res['context'] = field._context
 

From f21f1a68aace85dca8deef197a0d2f46d77d2146 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 15:29:09 +0200
Subject: [PATCH 392/999] fix

bzr revid: fp@tinyerp.com-20120820132909-iw8faaon2z4c5e77
---
 openerp/osv/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index b996d66035f..27a3f2d8814 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1588,7 +1588,7 @@ def field_to_dict(model, cr, user, field, context=None):
         dom = field._domain
         if isinstance(field._domain, type(lambda: None)):
             dom = field._domain(model)
-        res['domain'] = field._domain
+        res['domain'] = dom
         res['context'] = field._context
 
     if isinstance(field, one2many):

From 12cf6b614adcab32791e9aeb5707985049bcc4f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 20 Aug 2012 15:38:38 +0200
Subject: [PATCH 393/999] [FIX] mail_group_view: fixed missing field
 declaratrion in kanban view.

bzr revid: tde@openerp.com-20120820133838-biep91sf0eb2fds2
---
 addons/mail/mail_group_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index bc8624cc0ba..17aec2d69ea 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -17,6 +17,7 @@
                 <kanban>
                     <field name="message_follower_ids"/>
                     <field name="message_is_follower"/>
+                    <field name="message_summary"/>
                     <templates>
                         <t t-name="kanban-description">
                             <div class="oe_group_description" t-if="record.description.raw_value">

From 352aa1391afb42a4bcf07d8868b03cd7902b6dab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 20 Aug 2012 15:59:58 +0200
Subject: [PATCH 394/999] [WIP] mail.js: removed dead code about message
 structure generation, renamed params to options in composition form.

bzr revid: tde@openerp.com-20120820135958-8xgwh9u7xnk7lw9d
---
 addons/mail/static/src/js/mail.js | 141 +++++++++---------------------
 1 file changed, 40 insertions(+), 101 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index a5633dcfc2a..033781c6d20 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -72,67 +72,6 @@ openerp.mail = function(session) {
             return (widget.session && widget.session.uid != 0 && widget.session.uid == message_user_id);
         },
 
-        /**
-        * Add records to comments_structure array
-        * @param {Array} records records from mail.message sorted by date desc
-        * @returns {Object} cs comments_structure: dict
-        *       cs.model_to_root_ids = {model: [root_ids], }
-        *       cs.new_root_ids = [new_root_ids]
-        *       cs.root_ids = [root_ids]
-        *       cs.msgs = {record.id: record,}
-        *       cs.tree_struct = {record.id: {
-        *           'level': record_level in hierarchy, 0 is root,
-        *           'msg_nbr': number of childs,
-        *           'direct_childs': [msg_ids],
-        *           'all_childs': [msg_ids],
-        *           'for_thread_msgs': [records],
-        *           'ancestors': [msg_ids], } }
-        */
-        // records_struct_add_records: function(cs, records, parent_id) {
-        //     var cur_iter = 0; var max_iter = 10; var modif = true;
-        //     while ( modif && (cur_iter++) < max_iter) {
-        //         modif = false;
-        //         _(records).each(function (record) {
-        //             // root and not yet recorded
-        //             if ( (record.parent_id == false || record.parent_id[0] == parent_id) && ! cs['msgs'][record.id]) {
-        //                 // add to model -> root_list ids
-        //                 if (! cs['model_to_root_ids'][record.model]) cs['model_to_root_ids'][record.model] = [record.id];
-        //                 else cs['model_to_root_ids'][record.model].push(record.id);
-        //                 // add root data
-        //                 cs['new_root_ids'].push(record.id);
-        //                 // add record
-        //                 cs['tree_struct'][record.id] = {'level': 0, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [record], 'msg_nbr': -1, 'ancestors': []};
-        //                 cs['msgs'][record.id] = record;
-        //                 modif = true;
-        //             }
-        //             // not yet recorded, but parent is recorded
-        //             else if (! cs['msgs'][record.id] && cs['msgs'][record.parent_id[0]]) {
-        //                 var parent_level = cs['tree_struct'][record.parent_id[0]]['level'];
-        //                 // update parent structure
-        //                 cs['tree_struct'][record.parent_id[0]]['direct_childs'].push(record.id);
-        //                 cs['tree_struct'][record.parent_id[0]]['for_thread_msgs'].push(record);
-        //                 // update ancestors structure
-        //                 for (ancestor_id in cs['tree_struct'][record.parent_id[0]]['ancestors']) {
-        //                     cs['tree_struct'][ancestor_id]['all_childs'].push(record.id);
-        //                 }
-        //                 // add record
-        //                 cs['tree_struct'][record.id] = {'level': parent_level+1, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [], 'msg_nbr': -1, 'ancestors': []};
-        //                 cs['msgs'][record.id] = record;
-        //                 modif = true;
-        //             }
-        //         });
-        //     }
-        //     return cs;
-        // },
-
-        /* copy cs.new_root_ids into cs.root_ids */
-        // records_struct_update_after_display: function(cs) {
-        //     // update TODO
-        //     cs['root_ids'] = _.union(cs['root_ids'], cs['new_root_ids']);
-        //     cs['new_root_ids'] = [];
-        //     return cs;
-        // },
-
         /**
          *    CONTENT MANIPULATION
          * 
@@ -192,33 +131,33 @@ openerp.mail = function(session) {
         
         /**
          * @param {Object} parent parent
-         * @param {Object} [params]
-         * @param {String} [params.res_model] res_model of document [REQUIRED]
-         * @param {Number} [params.res_id] res_id of record [REQUIRED]
-         * @param {Number} [params.email_mode] true/false, tells whether
+         * @param {Object} [options]
+         * @param {String} [options.res_model] res_model of document [REQUIRED]
+         * @param {Number} [options.res_id] res_id of record [REQUIRED]
+         * @param {Number} [options.email_mode] true/false, tells whether
          *      we are in email sending mode
-         * @param {Number} [params.formatting] true/false, tells whether
+         * @param {Number} [options.formatting] true/false, tells whether
          *      we are in advance formatting mode
-         * @param {String} [params.model] mail.compose.message.mode (see
+         * @param {String} [options.model] mail.compose.message.mode (see
          *      composition wizard)
-         * @param {Number} [params.msg_id] id of a message in case we are in
+         * @param {Number} [options.msg_id] id of a message in case we are in
          *      reply mode
          */
-        init: function(parent, params) {
+        init: function(parent, options) {
             var self = this;
             this._super(parent);
             // options
-            this.params = params || {};
-            this.params.context = params.context || {};
-            this.params.email_mode = params.email_mode || false;
-            this.params.formatting = params.formatting || false;
-            this.params.mode = params.mode || 'comment';
-            this.params.form_xml_id = params.form_xml_id || 'email_compose_message_wizard_form_chatter';
-            this.params.form_view_id = false;
-            if (this.params.mode == 'reply') {
-                this.params.active_id = this.params.msg_id;
+            this.options = options || {};
+            this.options.context = options.context || {};
+            this.options.email_mode = options.email_mode || false;
+            this.options.formatting = options.formatting || false;
+            this.options.mode = options.mode || 'comment';
+            this.options.form_xml_id = options.form_xml_id || 'email_compose_message_wizard_form_chatter';
+            this.options.form_view_id = false;
+            if (this.options.mode == 'reply') {
+                this.options.active_id = this.options.msg_id;
             } else {
-                this.params.active_id = this.params.res_id;
+                this.options.active_id = this.options.res_id;
             }
             this.email_mode = false;
             this.formatting = false;
@@ -258,17 +197,17 @@ openerp.mail = function(session) {
             this.$element.find('div.oe_mail_msg_content').empty();
             // create a context for the default_get of the compose form
             var widget_context = {
-                'active_model': this.params.res_model,
-                'active_id': this.params.active_id,
-                'mail.compose.message.mode': this.params.mode,
+                'active_model': this.options.res_model,
+                'active_id': this.options.active_id,
+                'mail.compose.message.mode': this.options.mode,
             };
-            var context = _.extend({}, this.params.context, widget_context);
+            var context = _.extend({}, this.options.context, widget_context);
             this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
             // find the id of the view to display in the chatter form
             var data_ds = new session.web.DataSetSearch(this, 'ir.model.data');
-            var deferred_form_id =data_ds.call('get_object_reference', ['mail', this.params.form_xml_id]).then( function (result) {
+            var deferred_form_id =data_ds.call('get_object_reference', ['mail', this.options.form_xml_id]).then( function (result) {
                 if (result) {
-                    self.params.form_view_id = result[1];
+                    self.options.form_view_id = result[1];
                 }
             }).pipe(this.proxy('create_form_view'));
             return deferred_form_id;
@@ -281,7 +220,7 @@ openerp.mail = function(session) {
             // destroy previous form_view if any
             if (this.form_view) { this.form_view.destroy(); }
             // create the FormView
-            this.form_view = new session.web.FormView(this, this.ds_compose, this.params.form_view_id, {
+            this.form_view = new session.web.FormView(this, this.ds_compose, this.options.form_view_id, {
                 action_buttons: false,
                 pager: false,
                 initial_mode: 'edit',
@@ -292,8 +231,8 @@ openerp.mail = function(session) {
             return $.when(this.form_view.appendTo(msg_node)).pipe(function() {
                 self.bind_events();
                 self.form_view.do_show();
-                if (self.params.email_mode) { self.toggle_email_mode(); }
-                if (self.params.formatting) { self.toggle_formatting_mode(); }
+                if (self.options.email_mode) { self.toggle_email_mode(); }
+                if (self.options.formatting) { self.toggle_formatting_mode(); }
             });
         },
 
@@ -343,7 +282,7 @@ openerp.mail = function(session) {
             var self = this;
             this.formatting = ! this.formatting;
             // calls onchange
-            var call_defer = this.ds_compose.call('onchange_formatting', [[], this.formatting, this.params.res_model, this.params.res_id]).then(
+            var call_defer = this.ds_compose.call('onchange_formatting', [[], this.formatting, this.options.res_model, this.options.res_id]).then(
                 function (result) {
                     self.form_view.on_processed_onchange(result, []);
                 });
@@ -361,7 +300,7 @@ openerp.mail = function(session) {
             var self = this;
             this.email_mode = ! this.email_mode;
             // calls onchange
-            var call_defer = this.ds_compose.call('onchange_email_mode', [[], this.email_mode, this.params.res_model, this.params.res_id]).then(
+            var call_defer = this.ds_compose.call('onchange_email_mode', [[], this.email_mode, this.options.res_model, this.options.res_id]).then(
                 function (result) {
                     self.form_view.on_processed_onchange(result, []);
                 });
@@ -410,22 +349,22 @@ openerp.mail = function(session) {
 
         /**
          * @param {Object} parent parent
-         * @param {Object} [params]
-         * @param {String} [params.res_model] res_model of document [REQUIRED]
-         * @param {Number} [params.res_id] res_id of record [REQUIRED]
-         * @param {Number} [params.uid] user id [REQUIRED]
-         * @param {Bool}   [params.parent_id=false] parent_id of message
-         * @param {Number} [params.thread_level=0] number of levels in the thread
+         * @param {Object} [options]
+         * @param {String} [options.res_model] res_model of document [REQUIRED]
+         * @param {Number} [options.res_id] res_id of record [REQUIRED]
+         * @param {Number} [options.uid] user id [REQUIRED]
+         * @param {Bool}   [options.parent_id=false] parent_id of message
+         * @param {Number} [options.thread_level=0] number of levels in the thread
          *      (only 0 or 1 currently)
-         * @param {Bool}   [params.is_wall=false] thread is displayed in the wall
-         * @param {Number} [params.msg_more_limit=150] number of character to
+         * @param {Bool}   [options.is_wall=false] thread is displayed in the wall
+         * @param {Number} [options.msg_more_limit=150] number of character to
          *      display before having a "show more" link; note that the text
          *      will not be truncated if it does not have 110% of the parameter
          *      (ex: 110 characters needed to be truncated and be displayed as
          *      a 100-characters message)
-         * @param {Number} [params.limit=100] maximum number of messages to fetch
-         * @param {Number} [params.offset=0] offset for fetching messages
-         * @param {Number} [params.records=null] records to show instead of fetching messages
+         * @param {Number} [options.limit=100] maximum number of messages to fetch
+         * @param {Number} [options.offset=0] offset for fetching messages
+         * @param {Number} [options.records=null] records to show instead of fetching messages
          */
         init: function(parent, params) {
             this._super(parent);

From 014c1335181fbe6d225a3190319d7ef41c099357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 20 Aug 2012 16:04:04 +0200
Subject: [PATCH 395/999] [FIX] mail_followers: added forgotten notification
 obj.

bzr revid: tde@openerp.com-20120820140404-zglfrn799kw48n0d
---
 addons/mail/mail_followers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 54bf2a93225..fcdd27de618 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -73,6 +73,7 @@ class mail_notification(osv.Model):
         context = context or {}
         partner_obj = self.pool.get('res.partner')
         msg_obj = self.pool.get('mail.message')
+        notification_obj = self.pool.get('mail.notification')
         msg = msg_obj.browse(cr, uid, msg_id, context=context)
 
         towrite = {

From 9fd90c604ea945f057f77e66326757c7aa2f36d3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 16:09:01 +0200
Subject: [PATCH 396/999] test

bzr revid: fp@tinyerp.com-20120820140901-pqvj3fj8zruit3f4
---
 addons/mail/mail_followers.py              |  4 +-
 addons/mail/mail_mail.py                   | 88 ----------------------
 addons/mail/mail_thread.py                 |  2 +-
 addons/mail/wizard/mail_compose_message.py | 57 +++-----------
 4 files changed, 14 insertions(+), 137 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 54bf2a93225..28a9c66baa5 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -105,7 +105,9 @@ class mail_notification(osv.Model):
             if towrite.get('subject', False):
                 towrite['subject'] = msg.name_get(cr, uid, [msg.id], context=context)[0][1]
             towrite['message_id'] = msg.id
-            self.pool.get('mail.mail').create(cr, uid, towrite, context=context)
+            mail_message_obj = self.pool.get('mail.mail')
+            newid = mail_message_obj.create(cr, uid, towrite, context=context)
+            mail_message_obj.send(cr, uid, [newid], context=context)
         return True
 
 
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index cfc4946a94f..cae27e99a55 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -50,94 +50,6 @@ class mail_mail(osv.Model):
         'content_subtype': 'plain',
     }
 
-    # FP Note: should we use a dict instead ?
-    def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, type='email',
-                             email_cc=None, reply_to=False, partner_ids=None, attachments=None,
-                             message_id=False, references=False, res_id=False, content_subtype='plain',
-                             headers=None, mail_server_id=False, auto_delete=False, context=None):
-        """ Schedule sending a new email message, to be sent the next time the
-            mail scheduler runs, or the next time :meth:`process_email_queue` is
-            called explicitly.
-
-            :param string email_from: sender email address
-            :param list email_to: list of recipient addresses (to be joined with commas) 
-            :param string subject: email subject (no pre-encoding/quoting necessary)
-            :param string body: email body, according to the ``content_subtype`` 
-                (by default, plaintext). If html content_subtype is used, the
-                message will be automatically converted to plaintext and wrapped
-                in multipart/alternative.
-            :param list email_cc: optional list of string values for CC header
-                (to be joined with commas)
-            :param string model: optional model name of the document this mail
-                is related to (this will also be used to generate a tracking id,
-                used to match any response related to the same document)
-            :param int res_id: optional resource identifier this mail is related
-                to (this will also be used to generate a tracking id, used to
-                match any response related to the same document)
-            :param string reply_to: optional value of Reply-To header
-            :param partner_ids: destination partner_ids
-            :param string content_subtype: optional mime content_subtype for
-                the text body (usually 'plain' or 'html'), must match the format
-                of the ``body`` parameter. Default is 'plain', making the content
-                part of the mail "text/plain".
-            :param dict attachments: map of filename to filecontents, where
-                filecontents is a string containing the bytes of the attachment
-            :param dict headers: optional map of headers to set on the outgoing
-                mail (may override the other headers, including Subject,
-                Reply-To, Message-Id, etc.)
-            :param int mail_server_id: optional id of the preferred outgoing
-                mail server for this mail
-            :param bool auto_delete: optional flag to turn on auto-deletion of
-                the message after it has been successfully sent (default to False)
-        """
-        if context is None:
-            context = {}
-        if attachments is None:
-            attachments = {}
-        if partner_ids is None:
-            partner_ids = []
-        attachment_obj = self.pool.get('ir.attachment')
-        for param in (email_to, email_cc):
-            if param and not isinstance(param, list):
-                param = [param]
-        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
-        msg_vals = {
-                'subject': subject,
-                'date': fields.datetime.now(),
-                'author_id': partner_id,
-                'model': model,
-                'res_id': res_id,
-                'type': type,
-                'body': body if content_subtype != 'html' else False,
-                'body_html': body if content_subtype == 'html' else False,
-                'email_from': email_from,
-                'email_to': email_to and ','.join(email_to) or '',
-                'email_cc': email_cc and ','.join(email_cc) or '',
-                'partner_ids': partner_ids,
-                'reply_to': reply_to,
-                'message_id': message_id,
-                'references': references,
-                'content_subtype': content_subtype,
-                'headers': headers, # serialize the dict on the fly
-                'mail_server_id': mail_server_id,
-                'state': 'outgoing',
-                'auto_delete': auto_delete
-            }
-        email_msg_id = self.create(cr, uid, msg_vals, context)
-        msg = self.browse(cr, uid, email_msg_id, context)
-        for fname, fcontent in attachments.iteritems():
-            attachment_data = {
-                    'name': fname,
-                    'datas_fname': fname,
-                    'datas': fcontent and fcontent.encode('base64'),
-                    'res_model': 'mail.message',
-                    'res_id': msg.mail_message_id.id,
-            }
-            # FP Note: what's this ???
-            # if context.has_key('default_type'):
-            #     del context['default_type']
-        return email_msg_id
-
     def mark_outgoing(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'outgoing'}, context=context)
 
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 544ebf20a8e..d9dfc4a474e 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -552,7 +552,7 @@ class mail_thread(osv.Model):
                 fcontent = fcontent.encode('utf-8')
             data_attach = {
                 'name': fname,
-                'datas': base64.b64encode(str(fcontent)),
+                'datas': fcontent,
                 'datas_fname': fname,
                 'description': _('email attachment'),
             }
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 072e68748a1..7e33e4152f0 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -254,6 +254,7 @@ class mail_compose_message(osv.TransientModel):
         '''
         if context is None:
             context = {}
+
         # composition wizard options
         email_mode = context.get('email_mode')
         formatting = context.get('formatting')
@@ -264,70 +265,32 @@ class mail_compose_message(osv.TransientModel):
             # attachments
             attachment = {}
             for attach in mail_wiz.attachment_ids:
-                attachment[attach.datas_fname] = attach.datas and attach.datas.decode('base64')
+                attachment[attach.datas_fname] = attach.datas and attach.datas or False
 
             # default values, according to the wizard options
             subject = mail_wiz.subject if formatting else False
-            content_subtype = 'html' if formatting else 'plain'
-            type = 'email' if email_mode else 'comment'
-            state = 'outgoing' if email_mode else False
             partner_ids = [partner.id for partner in mail_wiz.dest_partner_ids]
-            references = None
-            headers = {}
             body = mail_wiz.body_html if content_subtype == 'html' else mail_wiz.body
 
+            active_model_pool = self.pool.get(active_model)
+
             # get model, active_ids, and check if model is openchatter-enabled
             if mass_mail_mode and context.get('active_ids') and context.get('active_model'):
                 active_ids = context['active_ids']
                 active_model = context['active_model']
             elif mass_mail_mode:
                 active_model = mail_wiz.model
-                active_model_pool = self.pool.get(active_model)
                 active_ids = active_model_pool.search(cr, uid, ast.literal_eval(mail_wiz.filter_id.domain), context=ast.literal_eval(mail_wiz.filter_id.context))
             else:
                 active_model = mail_wiz.model
                 active_ids = [mail_wiz.res_id]
-            active_model_pool = self.pool.get(active_model)
-            mail_thread_enabled = hasattr(active_model_pool, 'message_append')
 
-            if context.get('mail.compose.message.mode') == 'mass_mail':
-                # Mass mailing: must render the template patterns
-                for active_id in active_ids:
-                    rendered_subject = self.render_template(cr, uid, subject, active_model, active_id)
-                    rendered_body_html = self.render_template(cr, uid, mail_wiz.body_html, active_model, active_id)
-                    rendered_body = self.render_template(cr, uid, mail_wiz.body, active_model, active_id)
-                    email_from = self.render_template(cr, uid, mail_wiz.email_from, active_model, active_id)
-                    email_to = self.render_template(cr, uid, mail_wiz.email_to, active_model, active_id)
-                    email_cc = self.render_template(cr, uid, mail_wiz.email_cc, active_model, active_id)
-                    reply_to = self.render_template(cr, uid, mail_wiz.reply_to, active_model, active_id)
-
-                    # in mass-mailing mode we only schedule the mail for sending, it will be 
-                    # processed as soon as the mail scheduler runs.
-                    if mail_thread_enabled:
-                        active_model_pool.message_append(cr, uid, [active_id], rendered_subject, rendered_body, rendered_body_html,
-                            type=type, content_subtype=content_subtype, state=state, partner_ids=partner_ids,
-                            email_from=email_from, email_to=email_to, email_cc=email_cc, 
-                            reply_to=reply_to, references=references, attachments=attachment, headers=headers, context=context)
-                    else:
-                        mail_message_obj.schedule_with_attach(cr, uid, email_from, mail_tools_to_email(email_to), subject, rendered_body,
-                            model=mail_wiz.model, email_cc=mail_tools_to_email(email_cc), reply_to=reply_to,
-                            attachments=attachment, references=references, res_id=active_id, partner_ids=partner_ids,
-                            content_subtype=mail_wiz.content_subtype, headers=headers, context=context)
-            else:
-                # normal mode - no mass-mailing
-                if mail_thread_enabled:
-                    msg_ids = active_model_pool.message_append(cr, uid, active_ids, subject, mail_wiz.body, mail_wiz.body_html,
-                        type=type, content_subtype=content_subtype, state=state, partner_ids=partner_ids,
-                        email_from=mail_wiz.email_from, email_to=mail_wiz.email_to, email_cc=mail_wiz.email_cc, 
-                        reply_to=mail_wiz.reply_to, references=references, attachments=attachment, headers=headers, context=context)
-                else:
-                    msg_ids = [mail_message_obj.schedule_with_attach(cr, uid, mail_wiz.email_from, mail_tools_to_email(mail_wiz.email_to), subject, mail_wiz.body,
-                        type=type, model=mail_wiz.model, email_cc=mail_tools_to_email(mail_wiz.email_cc), reply_to=mail_wiz.reply_to,
-                        attachments=attachment, references=references, res_id=int(mail_wiz.res_id), partner_ids=partner_ids,
-                        content_subtype=mail_wiz.content_subtype, headers=headers, context=context)]
-                # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
-                if type == 'email':
-                    mail_message_obj.send(cr, uid, msg_ids, context=context)
+            for active_id in active_ids:
+                if context.get('mail.compose.message.mode') == 'mass_mail':
+                    subject = self.render_template(cr, uid, subject, active_model, active_id)
+                    body = self.render_template(cr, uid, mail_wiz.body_html, active_model, active_id)
+                active_model_pool.message_append(cr, uid, active_id, body, subject, 'comment', 
+                    attachments=attachments, context=context)
 
         return {'type': 'ir.actions.act_window_close'}
 

From d28f95ea85cd9f82eb031dbef8cfa9f1f6c63d7b Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 16:11:58 +0200
Subject: [PATCH 397/999] [IMP] mail: rename 'Feeds' into 'Home'

bzr revid: abo@openerp.com-20120820141158-q7hkgolr07kkw0b1
---
 addons/mail/mail_thread_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 68727832e53..35acad57bc2 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <!-- Top menu item -->
-        <menuitem name="Feeds"
+        <menuitem name="Home"
           id="mail_feeds_main"
           groups="base.group_user"
           sequence="10"/>

From ad16f2e48cc98cd6ea52bb5f7b7f91aa096e56ba Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 16:12:21 +0200
Subject: [PATCH 398/999] [IMP] note: add proper actions to Calendar, Notes and
 Contacts menu items

bzr revid: abo@openerp.com-20120820141221-si82z13n05h5lkt1
---
 addons/note/note_view.xml | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 1c4cc2f58c2..21d67309492 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -2,21 +2,9 @@
 <openerp>
   <data>
 
-    <record id="action_dummy" model="ir.actions.client">
-        <field name="name">News Feed</field>
-        <field name="tag">mail.wall</field>
-        <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
-    </record>
-
-    <!-- Rename the 'Feeds' main menu into 'Home' -->
-    <!-- Top menu item -->
-    <menuitem name="Home"
-      id="mail.mail_feeds_main"/>
-
-      <menuitem name="My Stuff" id="note_my_stuff" parent="mail.mail_feeds_main"/>
-        <menuitem name="Agenda" id="note_agenda" parent="note_my_stuff" sequence="10" action="action_dummy" type="client"/>
-        <menuitem name="Notes" id="note_notes" parent="note_my_stuff" sequence="20"/>
-        <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" sequence="30"/>
+    <menuitem name="My Stuff" id="note_my_stuff" parent="mail.mail_feeds_main"/>
+      <menuitem name="Calendar" id="note_agenda" parent="note_my_stuff" action="base_calendar.action_crm_meeting" sequence="10"/>
+      <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" action="base.action_partner_form" sequence="30"/>
 
     <!-- Note Stage Form View -->
     <record model="ir.ui.view" id="view_note_stage_form">
@@ -38,7 +26,6 @@
       <field name="model">note.stage</field>
       <field name="type">tree</field>
       <field name="field_parent"></field>
-
       <field name="arch" type="xml">
         <tree string="Stages of notes" editable="top">
           <field name="sequence" invisible="1"/>
@@ -47,7 +34,6 @@
         </tree>
       </field>
     </record>
-
     <!-- Note Stage Action -->
     <record model="ir.actions.act_window" id="action_note_stage">
       <field name="name">Stages</field>
@@ -57,10 +43,8 @@
       <field name="domain">[('user_id','=',uid)]</field>
     </record>
 
-    <menuitem name="Notes" parent="base.menu_tools" id="menu_notes" sequence="20"/>
-
-    <menuitem name="Categories" parent="menu_notes"
-            id="menu_notes_stage" action="action_note_stage" sequence="2"/>
+    <menuitem name="Categories"
+      id="menu_notes_stage" parent="note_my_stuff" action="action_note_stage" sequence="40" groups="base.group_no_one"/>
 
     <!-- New Note Kanban View -->
     <record model="ir.ui.view" id="view_note_note_kanban">
@@ -160,7 +144,7 @@
       <field name="search_view_id" ref="view_note_note_filter"/>
     </record>
 
-    <menuitem name="My notes" parent="menu_notes" id="menu_notes_note" action="action_note_note" sequence="1"/>
+    <menuitem name="Notes" id="note_notes" parent="note_my_stuff" sequence="20" action="action_note_note"/>
 
   </data>
 </openerp>

From aa5a055c6d10d60b70abdd365eb6e52f51764555 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 16:51:38 +0200
Subject: [PATCH 399/999] [IMP] note: reorganize code

bzr revid: abo@openerp.com-20120820145138-l7a4985im5nua3xq
---
 addons/note/note.py       | 48 +++++++++++++++++----------------------
 addons/note/note_view.xml | 41 +++++++++++++++++----------------
 2 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/addons/note/note.py b/addons/note/note.py
index 05c5ea6eadf..96c7cea9602 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -22,7 +22,7 @@
 from openerp.osv import osv, fields
 from tools.translate import _
 
-class note_stage(osv.Model):
+class note_stage(osv.osv):
     """ Category of Note """
 
     _name = "note.stage"
@@ -46,13 +46,7 @@ class note_stage(osv.Model):
     }
 
 
-# class many2many_filter(fields.many2many)
-
-# grep many2many_mod dans le code
-
-
-
-class note_note(osv.Model):
+class note_note(osv.osv):
     """ Note """
     _name = 'note.note'
     _inherit = ['mail.thread','pad.common']
@@ -71,6 +65,25 @@ class note_note(osv.Model):
         #
         return self.write(cr, uid, [id], {'name': value}, context=context)
 
+
+    def _get_default_stage_id(self,cr,uid,context=None):
+        id = self.pool.get('note.stage').search(cr,uid,[('sequence','=','1')])
+        return id[0]
+
+    def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
+        access_rights_uid = access_rights_uid or uid
+        stage_obj = self.pool.get('note.stage')
+
+        # only show stage groups not folded and owned by user
+        search_domain = [('fold', '=', False),('user_id', '=', uid)]
+
+        stage_ids = stage_obj._search(cr, uid, search_domain, order=self._order, access_rights_uid=access_rights_uid, context=context)
+        result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
+        return result
+
+    def stage_set(self,cr,uid,ids,stage_id,context=None):
+        self.write(cr,uid,ids,{'stage_id': stage_id})
+
     _columns = {
         'name': fields.function(_get_note_first_line,_fnct_inv=_set_note_first_line, string='Note Summary', type="text", store=True),
         'note': fields.text('Pad Content'),
@@ -85,11 +98,6 @@ class note_note(osv.Model):
     _sql_constraints = [
     ]
 
-
-    def _get_default_stage_id(self,cr,uid,context=None):
-        id = self.pool.get('note.stage').search(cr,uid,[('sequence','=','1')])
-        return id[0]
-
     _defaults = {
         'active' : 1,
         'stage_id' : _get_default_stage_id,
@@ -98,20 +106,6 @@ class note_note(osv.Model):
 
     _order = 'sequence asc'
 
-    def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
-        access_rights_uid = access_rights_uid or uid
-        stage_obj = self.pool.get('note.stage')
-
-        # only show stage groups not folded and owned by user
-        search_domain = [('fold', '=', False),('user_id', '=', uid)]
-
-        stage_ids = stage_obj._search(cr, uid, search_domain, order=self._order, access_rights_uid=access_rights_uid, context=context)
-        result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
-        return result
-
     _group_by_full = {
         'stage_id' : _read_group_stage_ids,
     }
-
-    def stage_set(self,cr,uid,ids,stage_id,context=None):
-        self.write(cr,uid,ids,{'stage_id': stage_id})
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 21d67309492..fd35e32de42 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -34,6 +34,7 @@
         </tree>
       </field>
     </record>
+
     <!-- Note Stage Action -->
     <record model="ir.actions.act_window" id="action_note_stage">
       <field name="name">Stages</field>
@@ -63,28 +64,27 @@
           <templates>
             <t t-name="kanban-box">
               <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
-              <!-- dropdown menu -->
-              <div class="oe_dropdown_toggle oe_dropdown_kanban">
-                <span class="oe_e">í</span>
-                <ul class="oe_dropdown_menu">
-                  <li><a type="edit" >Edit...</a></li>
-                  <li><a type="delete">Delete</a></li>
-                  <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-                </ul>
-              </div>
+                <!-- dropdown menu -->
+                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                  <span class="oe_e">í</span>
+                  <ul class="oe_dropdown_menu">
+                    <li><a type="edit">Edit...</a></li>
+                    <li><a type="delete">Delete</a></li>
+                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                  </ul>
+                </div>
 
-              <!-- kanban note -->
-              <div class="oe_kanban_content">
-                <!-- title -->
-                <field name="name"/>
-              </div>
-
-              <div class="oe_kanban_project_avatars">
-                <t t-foreach="record.follower_ids.raw_value" t-as="follower">
-                  <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
-                </t>
-              </div>
+                <!-- kanban note -->
+                <div class="oe_kanban_content">
+                  <!-- title -->
+                  <field name="name"/>
+                </div>
 
+                <div class="oe_kanban_project_avatars">
+                  <t t-foreach="record.follower_ids.raw_value" t-as="follower">
+                    <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
+                  </t>
+                </div>
               </div>
               <div class="oe_clear"></div>
             </t>
@@ -136,6 +136,7 @@
       <field name="type">tree</field>
     </record>
 
+    <!-- Note Action -->
     <record model="ir.actions.act_window" id="action_note_note">
       <field name="name">Notes</field>
       <field name="res_model">note.note</field>

From bb3c9d573fec6e624c56826cc0db8eea83b82c16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 20 Aug 2012 17:51:24 +0200
Subject: [PATCH 400/999] [CLEAN] mail views: cleaned names, removed dead and
 not necessary code.

bzr revid: tde@openerp.com-20120820155124-iyve6xumamearb11
---
 addons/fetchmail/fetchmail_view.xml |  4 +-
 addons/mail/mail_group.py           |  2 +-
 addons/mail/mail_group_view.xml     |  1 -
 addons/mail/mail_message_view.xml   | 65 +++++++++++++----------------
 4 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index bdb1ebf2fa5..3cdc886ba2b 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -104,9 +104,9 @@
         />
 
       <record model="ir.ui.view" id="email_message_tree_view">
-          <field name="name">mail.mail.list.fetchmail</field>
+          <field name="name">mail.mail.form.fetchmail</field>
           <field name="model">mail.mail</field>
-          <field name="inherit_id" ref="mail.view_email_message_form"/>
+          <field name="inherit_id" ref="mail.view_mail_form"/>
           <field name="arch" type="xml">
               <field name="references" position="after">
                   <field name="fetchmail_server_id"/>
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index ba3ed292bf8..173295b59df 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -130,7 +130,7 @@ class mail_group(osv.Model):
         # Create client action for this group and link the menu to it
         ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'action_mail_group_feeds')
         if ref:
-            search_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'view_message_search_wall')
+            search_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'view_message_search')
             params = {
                 'search_view_id': search_ref and search_ref[1] or False,
                 'domain': [('model','=','mail.group'),('res_id','=',mail_group_id)],
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 17aec2d69ea..1aa1e1aa687 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -5,7 +5,6 @@
         <record id="action_mail_group_feeds" model="ir.actions.client">
             <field name="name">Discussion Group</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
         </record>
 
         <!-- Group Kanban View  !-->
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 8b3d21677d0..513a6bd1015 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
         <!-- mail.message tree: short view !-->
-        <record model="ir.ui.view" id="view_message_tree_short">
-            <field name="name">mail.message.tree.short</field>
+        <record model="ir.ui.view" id="view_message_tree">
+            <field name="name">mail.message.tree</field>
             <field name="model">mail.message</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
@@ -18,8 +18,8 @@
         </record>
 
         <!-- mail.message form: short view !-->
-        <record model="ir.ui.view" id="view_message_form_short">
-            <field name="name">mail.message.form.short</field>
+        <record model="ir.ui.view" id="view_message_form">
+            <field name="name">mail.message.form</field>
             <field name="model">mail.message</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
@@ -45,28 +45,16 @@
             </field>
         </record>
 
-        <!-- mail.message search: short view !-->
-        <record model="ir.ui.view" id="view_message_search_short">
-            <field name="name">mail.message.search.short</field>
-            <field name="model">mail.message</field>
-            <field name="priority">20</field>
-            <field name="arch" type="xml">
-                <search string="Messages Search">
-                    <field name="body" string="Message"/>
-                    <field name="author_id"/>
-                </search>
-            </field>
-        </record>
-
         <!-- mail.message search: wall view !-->
-        <record model="ir.ui.view" id="view_message_search_wall">
-            <field name="name">mail.message.search.wall</field>
+        <record model="ir.ui.view" id="view_message_search">
+            <field name="name">mail.message.search</field>
             <field name="model">mail.message</field>
             <field name="priority">25</field>
             <field name="arch" type="xml">
                 <search string="Messages Search">
                     <field name="subject" string="Content" filter_domain="['|', ('subject', 'ilike', self), ('body', 'ilike', self)]" />
                     <field name="type"/>
+                    <field name="author_id"/>
                     <filter icon="terp-personal+" string="Comments"
                             name="comments" help="Comments"
                             domain="[('type', '=', 'comment')]"/>
@@ -81,7 +69,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_email_message_form">
+        <record model="ir.ui.view" id="view_mail_form">
             <field name="name">mail.mail.form</field>
             <field name="model">mail.mail</field>
             <field name="arch" type="xml">
@@ -142,9 +130,9 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_email_message_tree">
+        <record model="ir.ui.view" id="view_mail_tree">
             <field name="name">mail.message.tree</field>
-            <field name="model">mail.message</field>
+            <field name="model">mail.mail</field>
             <field name="arch" type="xml">
                 <tree string="Emails" colors="grey:state in ('sent', 'cancel');blue:state=='outgoing';red:state=='exception';black:state=='received'">
                     <field name="date"/>
@@ -154,6 +142,9 @@
                     <field name="partner_ids" invisible="1"/>
                     <field name="model" invisible="1"/>
                     <field name="res_id" invisible="1"/>
+                    <field name="email_from" invisible="1"/>
+                    <field name="state" invisible="1"/>
+                    <field name="type" invisible="1"/>
                     <button name="send" string="Send Now" type="object" icon="gtk-media-play" states='outgoing'/>
                     <button name="mark_outgoing" string="Retry" type="object" icon="gtk-redo" states='exception,cancel'/>
                     <button name="cancel" string="Cancel" type="object" icon="terp-gtk-stop" states='outgoing'/>
@@ -161,7 +152,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_email_message_search">
+        <record model="ir.ui.view" id="view_mail_search">
             <field name="name">mail.mail.search</field>
             <field name="model">mail.mail</field>
             <field name="arch" type="xml">
@@ -193,22 +184,21 @@
             </field>
         </record>
 
-        <record id="action_view_all_messages_short" model="ir.actions.act_window">
-            <field name="name">Messages</field>
-            <field name="res_model">mail.message</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'tree_view_ref': 'mail.view_message_tree_short', 'form_view_ref': 'mail.view_message_form_short'}</field>
-            <field name="search_view_id" ref="view_message_search_short"/>
-        </record>
-
         <record id="action_view_mail_message" model="ir.actions.act_window">
             <field name="name">Messages</field>
             <field name="res_model">mail.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_message_search"/>
+        </record>
+
+        <record id="action_view_mail_mail" model="ir.actions.act_window">
+            <field name="name">Messages</field>
+            <field name="res_model">mail.mail</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
             <field name="context">{'search_default_received': 1, 'search_default_type_email': 1}</field>
-            <field name="search_view_id" ref="view_email_message_search"/>
+            <field name="search_view_id" ref="view_mail_search"/>
         </record>
 
         <act_window domain="[('partner_id', '=', active_id), ('email_from', '!=', False)]"
@@ -216,18 +206,19 @@
             id="act_res_partner_emails" name="Emails"
             res_model="mail.message"
             src_model="res.partner"
-            view_id="view_email_message_tree"/>
+            view_id="view_message_tree"/>
 
         <!-- Add menu entry in Settings/Email -->
-        <menuitem name="Messages" id="menu_email_message" parent="base.menu_email" action="action_view_mail_message" />
+        <menuitem name="Mails" id="menu_mail_mail" parent="base.menu_email" action="action_view_mail_mail" />
         
         <!-- Add menu entry in Settings/Email -->
-        <menuitem name="Feeds" id="menu_email_message_all" parent="base.menu_email" action="action_view_all_messages_short" groups="base.group_no_one"/>
+        <menuitem name="Messages" id="menu_mail_message" parent="base.menu_email" action="action_view_mail_message"/>
 
         <record id="action_mail_all_feeds" model="ir.actions.client">
             <field name="name">News Feed</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="{'domain': [('notification_ids.partner_id.user_ids', 'in', '[uid]')] }"/>
+            <field name="params" eval=""/>
+            <!-- <field name="params" eval="{'domain': [('notification_ids.partner_id.user_ids', 'in', '[uid]')] }"/> -->
         </record>
 
         <record id="action_mail_my_feeds" model="ir.actions.client">

From 759134ea3056c344dc2e65d522a9e3d8661cb92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 20 Aug 2012 17:52:02 +0200
Subject: [PATCH 401/999] [WIP] mail.js: Wall: cleaned code, removed dead code,
 updated method name, propagated changes in mail API.

bzr revid: tde@openerp.com-20120820155202-00y1ysi13lvv4nfk
---
 addons/mail/static/src/js/mail.js | 157 +++++++++++++-----------------
 1 file changed, 70 insertions(+), 87 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 033781c6d20..4e151fd962a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -750,45 +750,34 @@ openerp.mail = function(session) {
             this.options = options || {};
             this.options.domain = options.domain || [];
             this.options.context = options.context || {};
-            // FP Note: do we need this ? --> not sure, use mail.message create instead ?
-            // Should be in domain/context instead ?
             this.options.context.res_model = options.res_model || 'mail.thread';
             this.options.context.res_id = options.res_id || false;
             this.options.thread_level = options.thread_level || 1;
             this.thread_list = [];
+            this.ds_msg = new session.web.DataSet(this, 'mail.message');
+            // for search view
             this.search = {'domain': [], 'context': {}, 'groupby': {}}
             this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
-            // datasets
-            this.ds_msg = new session.web.DataSet(this, 'mail.message');
-            // this.ds_post = new session.web.DataSet(this, this.options.context.res_model);
         },
 
         start: function () {
             this._super.apply(this, arguments);
-            // add events
-            this.add_event_handlers();
+            this.bind_events();
             // load mail.message search view
             var search_view_ready = this.load_search_view({}, false);
             // load composition form
             var compose_done = this.instantiate_composition_form();
             // fetch first threads
-            var comments_ready = this.init_and_fetch_comments(this.options.limit, 0);
-            return (search_view_ready && comments_ready && compose_done);
-        },
-
-        /**
-         * Override-hack of do_action: automatically reload the chatter.
-         * Normally it should be called only when clicking on 'Post/Send'
-         * in the composition form. */
-        do_action: function(action, on_close) {
-            this.init_and_fetch_comments();
-            if (this.compose_message_widget) {
-                this.compose_message_widget.reinit(); }
-            return this._super(action, on_close);
+            var messages_fetched = this.message_fetch();
+            return (search_view_ready && compose_done && messages_fetched);
         },
 
         destroy: function () {
             this._super.apply(this, arguments);
+            if (this.thread_list) {
+                // #TODO: destroy threads
+            }
+
         },
 
         instantiate_composition_form: function(mode, msg_id) {
@@ -804,24 +793,35 @@ openerp.mail = function(session) {
             return compose_done;
         },
 
-        /** Add events */
-        add_event_handlers: function () {
+        /**
+         * Override-hack of do_action: automatically reload the chatter.
+         * Normally it should be called only when clicking on 'Post/Send'
+         * in the composition form. */
+        do_action: function(action, on_close) {
+            this.init_and_fetch_comments();
+            if (this.compose_message_widget) {
+                this.compose_message_widget.reinit(); }
+            return this._super(action, on_close);
+        },
+
+        /** Bind events */
+        bind_events: function () {
             var self = this;
-            // display more threads
-            this.$element.find('button.oe_mail_wall_button_more').click(function () { return self.do_more(); });
+            // Click on 'show more'
+            this.$element.find('button.oe_mail_wall_button_more').click(function () {
+                return self.do_fetch_more(); 
+            });
         },
 
         /**
-         * Loads the mail.message search view
-         * @param {Number} view_id id of the search view to load
+         * Load the mail.message search view
          * @param {Object} defaults ??
          * @param {Boolean} hidden some kind of trick we do not care here
          */
         load_search_view: function (defaults, hidden) {
             var self = this;
             this.searchview = new session.web.SearchView(this, this.ds_msg, false, defaults || {}, hidden || false);
-            var search_view_loaded = this.searchview.appendTo(this.$element.find('.oe_view_manager_view_search'));
-            return $.when(search_view_loaded).then(function () {
+            return this.searchview.appendTo(this.$element.find('.oe_view_manager_view_search')).then(function () {
                 self.searchview.on_search.add(self.do_searchview_search);
             });
         },
@@ -844,86 +844,70 @@ openerp.mail = function(session) {
                 self.search_results['context'] = results.context;
                 self.search_results['domain'] = results.domain;
                 self.search_results['groupby'] = results.group_by;
-                return self.init_and_fetch_comments();
+                self.message_clean();
+                return self.message_fetch();
             });
         },
 
-        /**
-         * Initializes the wall and calls fetch_comments
-         * @param {Number} limit: number of notifications to fetch
-         * @param {Number} offset: offset in notifications search
-         * @param {Array} domain
-         * @param {Array} context
-         */
-        init_and_fetch_comments: function() {
-            this.search['domain'] = _.union(this.options.domain, this.search_results.domain);
-            this.search['context'] = _.extend(this.options.context, this.search_results.context);
-            // this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
+        /** Clean the wall */
+        message_clean: function() {
             this.$element.find('ul.oe_mail_wall_threads').empty();
-            return this.fetch_comments(this.options.limit);
         },
 
-        /**
-         * Fetches wall messages
-         * @param {Number} limit: number of notifications to fetch
-         * @param {Number} offset: offset in notifications search
+        /** Fetch messages
          * @param {Array} domain
          * @param {Array} context
          */
-        fetch_comments: function (limit, additional_domain, additional_context) {
-            var self = this;
+        message_fetch: function (additional_domain, additional_context) {
+            this.search['domain'] = _.union(this.options.domain, this.search_results.domain);
+            this.search['context'] = _.extend(this.options.context, this.search_results.context);
             if (additional_domain) var fetch_domain = this.search['domain'].concat(additional_domain);
             else var fetch_domain = this.search['domain'];
             if (additional_context) var fetch_context = _.extend(this.search['context'], additional_context);
             else var fetch_context = this.search['context'];
-            // FP Note: call to review
-            return this.ds_msg.call('message_read', 
-                [[this.session.uid], false, [] ]).then(this.proxy('display_comments'));
+            return this.ds_msg.call('message_read',
+                [false, fetch_domain, this.options.thread_level, fetch_context]
+                ).then(this.proxy('display_comments'));
         },
 
-        /**
-         * @param {Array} records records to show in threads
+        /** Display comments
+         * @param {Array} records tree structure of records
          */
         display_comments: function (records) {
             console.log(records);
             // debugger
             var self = this;
-            this.do_update_show_more(records.length >= self.options.limit);
-
+            var _expendable = false;
             _(records).each(function (root_record) {
-                console.log(root_record);
-
-                var render_res = session.web.qweb.render('mail.wall_thread_container', {});
-                $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads'));
-                var thread = new mail.Thread(self, {
-                    'res_model': root_record.model, 'res_id': root_record.res_id, 'uid': self.session.uid, 'records': [root_record],
-                    'parent_id': false, 'thread_level': self.options.thread_level, 'show_hide': true, 'is_wall': true}
+                /* expandable type: add a 'Show more button' */
+                if (root_record.type == 'expandable') {
+                    _expendable = true;
+                    self.update_fetch_more(true);
+                    self.fetch_more_domain = root_record.domain;
+                    self.fetch_more_context = root_record.context;
+                }
+                // display classic root record
+                else {
+                    var render_res = session.web.qweb.render('mail.wall_thread_container', {});
+                    $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads'));
+                    var thread = new mail.Thread(self, {
+                        'res_model': root_record.model, 'res_id': root_record.res_id,
+                        'uid': self.session.uid, 'records': [root_record],
+                        'parent_id': false, 'thread_level': self.options.thread_level,
+                        'show_hide': true, 'is_wall': true
+                        }
                     );
-                self.thread_list.push(thread);
-                return thread.appendTo(self.$element.find('li.oe_mail_wall_thread:last'));
+                    self.thread_list.push(thread);
+                    thread.appendTo(self.$element.find('li.oe_mail_wall_thread:last'));
+                }
             });
-
-        },
-
-        /**
-         * Create a domain to fetch new comments according to
-         * comments already present in comments_structure
-         * - for each model:
-         * -- should not be child of already displayed ids
-         * @returns {Array} fetch_domain (OpenERP domain style)
-         */
-        get_fetch_domain: function () {
-            var self = this;
-            var model_to_root = {};
-            var fetch_domain = [];
-            // _(this.comments_structure['model_to_root_ids']).each(function (sc_model, model_name) {
-            //     fetch_domain.push('|', ['model', '!=', model_name], '!', ['id', 'child_of', sc_model]);
-            // });
-            return fetch_domain;
+            if (! _expendable) {
+                self.update_fetch_more(false);
+            }
         },
         
-        /** Display update: show more button */
-        do_update_show_more: function (new_value) {
+        /** Display 'show more' button */
+        update_fetch_more: function (new_value) {
             if (new_value) {
                     this.$element.find('div.oe_mail_wall_more:last').show();
             } else {
@@ -931,10 +915,9 @@ openerp.mail = function(session) {
             }
         },
         
-        /** Action: Shows more discussions */
-        do_more: function () {
-            var domain = this.get_fetch_domain();
-            return this.fetch_comments(this.params.limit, 0, domain);
+        /** Action: 'shows more' to fetch new messages */
+        do_fetch_more: function () {
+            return this.message_fetch(this.fetch_more_domain, this.fetch_more_context);
         },
     });
 };

From 73d90f0fbb828de87ab97b243ec1ca3b5fed2956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 20 Aug 2012 18:08:00 +0200
Subject: [PATCH 402/999] [FIX] mail: res_users: fixed user creation.

bzr revid: tde@openerp.com-20120820160800-7imca9256gun25yi
---
 addons/mail/res_users.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index bd61012c806..1ae72246e69 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -99,14 +99,16 @@ class res_users(osv.Model):
         data.pop('alias_name', None) # prevent errors during copy()
 
         # create user that follows its related partner
+        user_id = super(res_users, self).create(cr, uid, data, context=context)
         self.pool.get('res.partner').message_subscribe_users(cr, uid, [user_id], [user_id], context=context)
         # alias
         mail_alias.write(cr, SUPERUSER_ID, [alias_id], {"alias_force_thread_id": user_id}, context)
         # create a welcome message
-        self._create_welcome_message(cr, uid, user, context=context)
+        self._create_welcome_message(cr, uid, user_id, context=context)
         return user_id
 
-    def _create_welcome_message(self, cr, uid, user, context=None):
+    def _create_welcome_message(self, cr, uid, user_id, context=None):
+        user = self.browse(cr, uid, user_id, context=context)
         company_name = user.company_id.name if user.company_id else _('the company')
         body = '''%s has joined %s.''' % (user.name, company_name)
         # TODO change 1 into user.id but catch errors

From 9ea504a53ab2bc063c1743a0421f18276c877250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 20 Aug 2012 18:15:47 +0200
Subject: [PATCH 403/999] [WIP] mail.js: removed dead code about generic
 chatter functions (regular expressions, internal links, ...).

bzr revid: tde@openerp.com-20120820161547-saqw5ay01mlyuq7l
---
 addons/mail/mail_message.py       |  2 +-
 addons/mail/static/src/js/mail.js | 68 ++++++++-----------------------
 2 files changed, 19 insertions(+), 51 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 4cb545c146c..2b18fa72086 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -127,7 +127,7 @@ class mail_message(osv.Model):
     # Message loading for web interface
     #------------------------------------------------------
 
-    _limit = 10
+    _limit = 3
     def _message_dict_get(self, cr, uid, msg, context={}):
         attachs = self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)
         author = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id,], context=context)[0]
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 4e151fd962a..d019d5dee49 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -38,30 +38,25 @@ openerp.mail = function(session) {
      * 
      * This class holds a few tools method that will be used by
      * the various Chatter widgets.
+     *
+     * Some regular expressions not used anymore, kept because I want to
+     * - (^|\s)@((\w|@|\.)*): @login@log.log, supports inner '@' for
+     *   logins that are emails
+     *      1. '(void)'
+     *      2. login@log.log
+     * - (^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]: [ir.attachment,3|My Label],
+     *   for internal links to model ir.attachment, id=3, and with
+     *   optional label 'My Label'. Note that having a '|Label' is not
+     *   mandatory, because the regex should still be correct.
+     *      1. '(void)'
+     *      2. 'ir'
+     *      3. 'attachment'
+     *      4. '3'
+     *      5. 'My Label'
      */
 
     mail.ChatterUtils = {
 
-        /* generic chatter events binding */
-        bind_events: function(widget) {
-            // event: click on an internal link to a document: model, login
-            widget.$element.delegate('a.oe_mail_internal_link', 'click', function (event) {
-                event.preventDefault();
-                // lazy implementation: fetch data and try to redirect
-                if (! event.srcElement.dataset.resModel) return false;
-                else var res_model = event.srcElement.dataset.resModel;
-                var res_login = event.srcElement.dataset.resLogin;
-                if (! res_login) return false;
-                var ds = new session.web.DataSet(widget, res_model);
-                var defer = ds.call('search', [[['login', '=', res_login]]]).pipe(function (records) {
-                    if (records[0]) {
-                        widget.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(records[0]), views: [[false, 'form']]});
-                    }
-                    else return false;
-                });
-            });
-        },
-
         /** get an image in /web/binary/image?... */
         get_image: function(session_prefix, session_id, model, field, id) {
             return session_prefix + '/web/binary/image?session_id=' + session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
@@ -72,30 +67,7 @@ openerp.mail = function(session) {
             return (widget.session && widget.session.uid != 0 && widget.session.uid == message_user_id);
         },
 
-        /**
-         *    CONTENT MANIPULATION
-         * 
-         * Regular expressions
-         * - (^|\s)@((\w|@|\.)*): @login@log.log, supports inner '@' for
-         *   logins that are emails
-         *      1. '(void)'
-         *      2. login@log.log
-         * - (^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]: [ir.attachment,3|My Label],
-         *   for internal links to model ir.attachment, id=3, and with
-         *   optional label 'My Label'. Note that having a '|Label' is not
-         *   mandatory, because the regex should still be correct.
-         *      1. '(void)'
-         *      2. 'ir'
-         *      3. 'attachment'
-         *      4. '3'
-         *      5. 'My Label'
-         */
-
-        /**
-         * Replaces some expressions
-         * - @login - shorcut to link to a res.user, given its login
-         * - [ir.attachment,3|My Label] - shortcut to an internal
-         *   document
+        /** Replaces some expressions
          * - :name - shortcut to an image
          */
         do_replace_expressions: function (string) {
@@ -112,7 +84,6 @@ openerp.mail = function(session) {
             }
             return string;
         },
-
     };
 
 
@@ -446,8 +417,6 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            // generic events from Chatter Mixin
-            mail.ChatterUtils.bind_events(this);
             // event: click on 'more' at bottom of thread
             this.$element.find('button.oe_mail_button_more').click(function () {
                 self.do_more();
@@ -693,7 +662,6 @@ openerp.mail = function(session) {
             // any other method to know if the view is in create mode anymore
             this.view.on("change:actual_mode", this, this._check_visibility);
             this._check_visibility();
-            mail.ChatterUtils.bind_events(this);
         },
         
         _check_visibility: function() {
@@ -746,7 +714,6 @@ openerp.mail = function(session) {
          */
         init: function (parent, options) {
             this._super(parent);
-            // console.log(options);
             this.options = options || {};
             this.options.domain = options.domain || [];
             this.options.context = options.context || {};
@@ -798,9 +765,10 @@ openerp.mail = function(session) {
          * Normally it should be called only when clicking on 'Post/Send'
          * in the composition form. */
         do_action: function(action, on_close) {
-            this.init_and_fetch_comments();
             if (this.compose_message_widget) {
                 this.compose_message_widget.reinit(); }
+            this.message_clean();
+            this.message_fetch();
             return this._super(action, on_close);
         },
 

From c23bd0cf0102aee6cd9270e3cff0619b4257e4df Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 18:26:24 +0200
Subject: [PATCH 404/999] [FIX] project: remove useless dummy method (made
 useless by RCO review - revno 6692.2.175)

bzr revid: abo@openerp.com-20120820162624-l6q3sinwedkyvlbe
---
 addons/project/project.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 1a8f8c8bfe5..ab1c3c47dfe 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -250,9 +250,6 @@ class project(osv.osv):
                         type='many2many', relation='res.users', string='Followers'),
      }
 
-    def dummy(self, cr, uid, ids, context):
-        return True
-
     def _get_type_common(self, cr, uid, context):
         ids = self.pool.get('project.task.type').search(cr, uid, [('case_default','=',1)], context=context)
         return ids
@@ -526,7 +523,7 @@ def Project():
         mail_alias = self.pool.get('mail.alias')
         if not vals.get('alias_id'):
             vals.pop('alias_name', None) # prevent errors during copy()
-            alias_id = mail_alias.create_unique_alias(cr, uid, 
+            alias_id = mail_alias.create_unique_alias(cr, uid,
                           # Using '+' allows using subaddressing for those who don't
                           # have a catchall domain setup.
                           {'alias_name': "project+"+short_name(vals['name'])},

From 1fec472ce18ea1ffc644e059e3e815a43bf7ee7e Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 18:27:16 +0200
Subject: [PATCH 405/999] [FIX] note: add dependance to base_calendar

bzr revid: abo@openerp.com-20120820162716-wfczdudtaa03uh79
---
 addons/note/__openerp__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index 1410ff10d9e..0f9e0860e8d 100644
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -35,6 +35,7 @@ Notes can be found in the 'Home' main menu, under 'Tool' submenu.
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': [
+        'base_calendar',
         'base_tools',
         'mail',
         'pad',
@@ -52,7 +53,8 @@ Notes can be found in the 'Home' main menu, under 'Tool' submenu.
         'static/src/css/note.css',
     ],
     'installable': True,
-    'category': 'Tools',
+    'application': True,
+    'auto_install': False,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 6de8c4b8e4f037f5297741e08ab643eada09728d Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 18:27:48 +0200
Subject: [PATCH 406/999] [IMP] note: rename the field 'note_pad' into
 'note_pad_url'

bzr revid: abo@openerp.com-20120820162748-f92eq99kywwq7vz7
---
 addons/note/note.py       | 4 ++--
 addons/note/note_view.xml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/note/note.py b/addons/note/note.py
index 96c7cea9602..25f6c170f42 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -87,7 +87,7 @@ class note_note(osv.osv):
     _columns = {
         'name': fields.function(_get_note_first_line,_fnct_inv=_set_note_first_line, string='Note Summary', type="text", store=True),
         'note': fields.text('Pad Content'),
-        'note_pad': fields.char('Pad Url', size=250),
+        'note_pad_url': fields.char('Pad Url', size=250),
         'sequence': fields.integer('Sequence'),
         'stage_id': fields.many2one('note.stage', 'Stage'),
         'active': fields.boolean('Active'),
@@ -101,7 +101,7 @@ class note_note(osv.osv):
     _defaults = {
         'active' : 1,
         'stage_id' : _get_default_stage_id,
-        'note_pad': lambda self, cr, uid, context: self.pad_generate_url(cr, uid, context),
+        'note_pad_url': lambda self, cr, uid, context: self.pad_generate_url(cr, uid, context),
     }
 
     _order = 'sequence asc'
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index fd35e32de42..4a025a45b23 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -104,7 +104,8 @@
             <!-- todo: remove domain -->
             <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
           </header>
-          <field name="note_pad" widget="pad"/>
+          <field name="note"/>
+          <field name="note_pad_url"/>
           <div class="oe_chatter">
             <field name="message_ids" widget="mail_thread"/>
           </div>

From a366e61803492e9179f7772489acdaee1e960b4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 20 Aug 2012 18:49:24 +0200
Subject: [PATCH 407/999] [WIP] mail.js: continuing the cleaning of the Thread
 widget (params -> options, tracking not necessary options, make them more
 explicit).

bzr revid: tde@openerp.com-20120820164924-j1clr4dwif5pmoxi
---
 addons/mail/static/src/js/mail.js | 91 ++++++++++++++-----------------
 1 file changed, 42 insertions(+), 49 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index d019d5dee49..dff0204ebe3 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -337,46 +337,41 @@ openerp.mail = function(session) {
          * @param {Number} [options.offset=0] offset for fetching messages
          * @param {Number} [options.records=null] records to show instead of fetching messages
          */
-        init: function(parent, params) {
+        init: function(parent, options) {
             this._super(parent);
             // options
-            this.params = params;
-            this.params.parent_id = this.params.parent_id || false;
-            this.params.thread_level = this.params.thread_level || 0;
-            this.params.is_wall = this.params.is_wall || (this.params.records != undefined) || false;
-            this.params.msg_more_limit = this.params.msg_more_limit || 250;
-            this.params.limit = this.params.limit || 100;
-            // this.params.limit = 3; // tmp for testing
-            this.params.offset = this.params.offset || 0;
-            this.params.records = this.params.records || null;
-
+            this.options = options || {};
+            this.options.parent_id = this.options.parent_id || false;
+            this.options.thread_level = this.options.thread_level || 0;
+            this.options.fetch_limit = this.options.fetch_limit || 100;
+            this.options.records = this.options.records || null;
             // datasets and internal vars
-            this.ds = new session.web.DataSetSearch(this, this.params.res_model);
+            this.ds = new session.web.DataSetSearch(this, this.options.res_model);
             this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
-            this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
             // display customization vars
             this.display = {};
-            this.display.show_post_comment = this.params.show_post_comment || false;
-            this.display.show_reply = (this.params.thread_level > 0 && this.params.is_wall);
-            this.display.show_delete = ! this.params.is_wall;
-            this.display.show_hide = this.params.is_wall;
-            this.display.show_reply_by_email = ! this.params.is_wall;
-            this.display.show_more = (this.params.thread_level == 0);
+            this.display.truncate_limit = this.options.truncate_limit || 250;
+            this.display.show_header_compose = this.options.show_header_compose || false; // only for thread record
+            this.display.show_reply = this.options.show_reply || true;
+            this.display.show_delete = this.options.show_delete || true;
+            this.display.show_hide = this.options.show_hide || true;
+            this.display.show_reply_by_email = this.options.show_reply_by_email || true;
+            this.display.show_more = this.options.show_more || true;
         },
         
         start: function() {
             this._super.apply(this, arguments);
-            // add events
+            // bind events
             this.bind_events();
             // display user, fetch comments
             this.display_current_user();
 
-            if (this.params.records) var display_done = this.display_comments_from_parameters(this.params.records);
+            if (this.options.records) var display_done = this.display_comments_from_parameters(this.options.records);
             else var display_done = this.init_comments();
             // customize display
             $.when(display_done).then(this.proxy('do_customize_display'));            
             // add message composition form view
-            if (this.display.show_post_comment) {
+            if (this.display.show_header_compose) {
                 var compose_done = this.instantiate_composition_form();
             }
             return display_done && compose_done;
@@ -398,8 +393,8 @@ openerp.mail = function(session) {
                 this.compose_message_widget.destroy();
             }
             this.compose_message_widget = new mail.ComposeMessage(this, {
-                'extended_mode': false, 'uid': this.params.uid, 'res_model': this.params.res_model,
-                'res_id': this.params.res_id, 'mode': mode || 'comment', 'msg_id': msg_id,
+                'extended_mode': false, 'uid': this.options.uid, 'res_model': this.options.res_model,
+                'res_id': this.options.res_id, 'mode': mode || 'comment', 'msg_id': msg_id,
                 'email_mode': email_mode || false, 'formatting': formatting || false,
                 'context': context || false } );
             var composition_node = this.$element.find('div.oe_mail_thread_action');
@@ -476,24 +471,22 @@ openerp.mail = function(session) {
             });
         },
         
-        destroy: function () {
-            this._super.apply(this, arguments);
-        },
-        
         init_comments: function() {
             var self = this;
-            this.params.offset = 0;
-            this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
+            // TDE: not necessary
+            // this.params.offset = 0;
+            // this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
+
             this.$element.find('div.oe_mail_thread_display').empty();
-            var domain = this.get_fetch_domain(this.comments_structure);
-            return this.fetch_comments(this.params.limit, this.params.offset, domain).then();
+            // var domain = this.get_fetch_domain(this.comments_structure);
+            return this.fetch_comments(this.options.limit, this.options.offset, domain).then();
         },
         
         fetch_comments: function (limit, offset, domain) {
             var self = this;
-            var defer = this.ds.call('message_read', [[this.params.res_id], (this.params.thread_level > 0), (this.comments_structure['root_ids']),
-                                    (limit+1) || (this.params.limit+1), offset||this.params.offset, domain||undefined ]).then(function (records) {
-                if (records.length <= self.params.limit) self.display.show_more = false;
+            var defer = this.ds.call('message_read', [[this.options.res_id], (this.options.thread_level > 0), (this.comments_structure['root_ids']),
+                                    (limit+1) || (this.options.limit+1), offset||this.options.offset, domain||undefined ]).then(function (records) {
+                if (records.length <= self.options.limit) self.display.show_more = false;
                 // else { self.display.show_more = true; records.pop(); }
                 // else { self.display.show_more = true; records.splice(0, 1); }
                 else { self.display.show_more = true; }
@@ -532,7 +525,7 @@ openerp.mail = function(session) {
             }
             _(records).each(function (record) {
                 var sub_msgs = [];
-                if ((record.parent_id == undefined || record.parent_id == false || record.parent_id[0] == self.params.parent_id) && self.params.thread_level > 0 ) {
+                if ((record.parent_id == undefined || record.parent_id == false || record.parent_id[0] == self.options.parent_id) && self.options.thread_level > 0 ) {
                     // var sub_list = self.comments_structure['tree_struct'][record.id]['direct_childs'];
                     // _(records).each(function (record) {
                     //     //if (record.parent_id == false || record.parent_id[0] == self.params.parent_id) return;
@@ -541,19 +534,19 @@ openerp.mail = function(session) {
                     //     }
                     // });
                     self.display_comment(record);
-                    self.thread = new mail.Thread(self, {'res_model': self.params.res_model, 'res_id': self.params.res_id, 'uid': self.params.uid,
-                                                            'records': sub_msgs, 'thread_level': (self.params.thread_level-1), 'parent_id': record.id,
-                                                            'is_wall': self.params.is_wall});
+                    self.thread = new mail.Thread(self, {'res_model': self.options.res_model, 'res_id': self.options.res_id, 'uid': self.options.uid,
+                                                            'records': record.child_ids, 'thread_level': (self.options.thread_level-1), 'parent_id': record.id,
+                                                            'is_wall': self.options.is_wall});
                     self.$element.find('li.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');
                     self.thread.appendTo(self.$element.find('div.oe_mail_thread_subthread:last'));
                 }
-                else if (self.params.thread_level == 0) {
+                else if (self.options.thread_level == 0) {
                     self.display_comment(record);
                 }
             });
             // mail.ChatterUtils.records_struct_update_after_display(this.comments_structure);
             // update offset for "More" buttons
-            if (this.params.thread_level == 0) this.params.offset += records.length;
+            if (this.options.thread_level == 0) this.options.offset += records.length;
         },
 
         /** Displays a record, performs text/link formatting */
@@ -570,11 +563,11 @@ openerp.mail = function(session) {
             // is the user the author ?
             record.is_author = mail.ChatterUtils.is_author(this, record.author_id[0]);
             // render
-            var rendered = session.web.qweb.render('mail.thread.message', {'record': record, 'thread': this, 'params': this.params, 'display': this.display});
+            var rendered = session.web.qweb.render('mail.thread.message', {'record': record, 'thread': this, 'params': this.options, 'display': this.display});
             // expand feature
             $(rendered).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
             this.$element.find('div.oe_mail_msg_record_body').expander({
-                slicePoint: this.params.msg_more_limit,
+                slicePoint: this.options.msg_more_limit,
                 expandText: 'read more',
                 userCollapseText: '[^]',
                 detailClass: 'oe_mail_msg_tail',
@@ -584,7 +577,7 @@ openerp.mail = function(session) {
         },
 
         display_current_user: function () {
-            var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.params.uid);
+            var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.options.uid);
             return this.$element.find('img.oe_mail_icon').attr('src', avatar);
         },
         
@@ -592,7 +585,7 @@ openerp.mail = function(session) {
             var comment_node = this.$element.find('textarea');
             var body = comment_node.val();
             comment_node.val('');
-            return this.ds.call('message_post', [[this.params.res_id], body], {parent_id: this.params.parent_id, mtype: 'comment'}).then(
+            return this.ds.call('message_post', [[this.options.res_id], body], {parent_id: this.options.parent_id, mtype: 'comment'}).then(
                 this.proxy('init_comments'));
         },
         
@@ -607,13 +600,13 @@ openerp.mail = function(session) {
             var ids = comments_structure.root_ids.slice();
             var ids2 = [];
             // must be child of current parent
-            if (this.params.parent_id) { domain.push(['id', 'child_of', this.params.parent_id]); }
+            if (this.options.parent_id) { domain.push(['id', 'child_of', this.options.parent_id]); }
             _(comments_structure.root_ids).each(function (id) { // each record
                 ids.push(id);
                 ids2.push(id);
             });
-            if (this.params.parent_id != false) {
-                ids2.push(this.params.parent_id);
+            if (this.options.parent_id != false) {
+                ids2.push(this.options.parent_id);
             }
             // must not be children of already fetched messages
             if (ids.length > 0) {
@@ -629,7 +622,7 @@ openerp.mail = function(session) {
         
         do_more: function () {
             domain = this.get_fetch_domain(this.comments_structure);
-            return this.fetch_comments(this.params.limit, this.params.offset, domain);
+            return this.fetch_comments(this.options.limit, this.options.offset, domain);
         },
     });
 

From 9d61a88b40d1eb9f21e5a9cbfb457cdd303ef3e6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 18:51:10 +0200
Subject: [PATCH 408/999] [IMP] compose wizards

bzr revid: fp@tinyerp.com-20120820165110-h6dub7l7zaufpj3n
---
 addons/mail/mail_followers.py              |  6 ---
 addons/mail/mail_mail.py                   |  8 +++-
 addons/mail/wizard/mail_compose_message.py | 52 ++++------------------
 3 files changed, 15 insertions(+), 51 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 28a9c66baa5..f93d59299b4 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -90,10 +90,6 @@ class mail_notification(osv.Model):
             if partner.notification_email_pref=='comment' and msg.type in ('email','comment'):
                 continue
 
-            if not msg.email_from:
-                current_user = res_users_obj.browse(cr, uid, uid, context=context)
-                towrite['email_from'] = current_user.email
-
             towrite['state'] = 'outgoing'
             if not towrite.get('email_to', False):
                 towrite['email_to'] = email_to
@@ -109,5 +105,3 @@ class mail_notification(osv.Model):
             newid = mail_message_obj.create(cr, uid, towrite, context=context)
             mail_message_obj.send(cr, uid, [newid], context=context)
         return True
-
-
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index cae27e99a55..3d7c6fa2ec7 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -1,4 +1,3 @@
-
 import ast
 import base64
 import email
@@ -45,9 +44,16 @@ class mail_mail(osv.Model):
         'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML version of the message"),
     }
 
+    def _get_default_from(self, cr, uid, context={}):
+        cur = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if not cur.alias_domain:
+            raise osv.except_osv(_('Invalid Action!'), _('Unable to send email, set an alias domain in your server settings.'))
+        return cur.alias_name + '@' + cur.alias_domain
+
     _defaults = {
         'state': 'outgoing',
         'content_subtype': 'plain',
+        'email_from': _get_default_from
     }
 
     def mark_outgoing(self, cr, uid, ids, context=None):
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 7e33e4152f0..e37b035c16a 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -100,11 +100,6 @@ class mail_compose_message(osv.TransientModel):
             result['model'] = active_model
         if not result.get('res_id') and active_id:
             result['res_id'] = active_id
-
-        # Try to provide default email_from if not specified yet
-        if not result.get('email_from'):
-            current_user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            result['email_from'] = current_user.email or False
         return result
 
     _columns = {
@@ -139,7 +134,6 @@ class mail_compose_message(osv.TransientModel):
             'model': model,
             'res_id': res_id,
             'email_from': user.email or tools.config.get('email_from', False),
-            'body_html': False,
             'body': False,
             'subject': False,
             'dest_partner_ids': [],
@@ -199,44 +193,28 @@ class mail_compose_message(osv.TransientModel):
         reply_subject = tools.ustr(message_data.subject or '')
         if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)):
             reply_subject = "%s %s" % (re_prefix, reply_subject)
+
         # Form the bodies (text and html). We use the plain text version of the
         # original mail, by default, as it is easier to quote than the HTML
         # version. TODO: make it possible to switch to HTML on the fly
+
         sent_date = _('On %(date)s, ') % {'date': message_data.date} if message_data.date else ''
         sender = _('%(sender_name)s wrote:') % {'sender_name': tools.ustr(message_data.email_from or _('You'))}
+
         body = message_data.body or ''
-        body_html = message_data.body_html or ''
-        quoted_body = '> %s' % tools.ustr(body.replace('\n', "\n> ") or '')
-        quoted_body_html = '<blockquote>%s</blockquote>' % (tools.ustr(body_html)),
-        reply_body = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body, current_user.signature)
-        reply_body_html = '<br /><br />%s%s<br />%s<br />%s' % (sent_date, sender, quoted_body_html, current_user.signature)
+        quoted_body = '<blockquote>%s</blockquote>' % (tools.ustr(body)),
+        reply_body = '<br /><br />%s%s<br />%s<br />%s' % (sent_date, sender, quoted_body, current_user.signature)
+
         # form dest_partner_ids
         dest_partner_ids = [partner.id for partner in message_data.partner_ids]
-        # Update header and references
-        reply_headers = {}
-        reply_references = message_data.references and tools.ustr(message_data.references) or False
-        reply_message_id = message_data.message_id or False
-        if reply_message_id:
-            reply_references = (reply_references or '') + " " + message_data.message_id
-            reply_headers['In-Reply-To'] = message_data.message_id
+
         # update the result
         result.update({
             'body': reply_body,
-            'body_html': reply_body_html,
             'subject': reply_subject,
-            'attachment_ids': [],
             'dest_partner_ids': dest_partner_ids,
             'model': message_data.model or False,
             'res_id': message_data.res_id or False,
-            'email_from': current_user.email or message_data.email_to or False,
-            'email_to': message_data.reply_to or message_data.email_from or False,
-            'email_cc': message_data.email_cc or False,
-            'user_id': uid,
-            # pass msg-id and references of mail we're replying to, to construct the
-            # new ones later when sending
-            'message_id': reply_message_id,
-            'references': reply_references,
-            'headers': reply_headers,
         })
         return result
 
@@ -289,7 +267,7 @@ class mail_compose_message(osv.TransientModel):
                 if context.get('mail.compose.message.mode') == 'mass_mail':
                     subject = self.render_template(cr, uid, subject, active_model, active_id)
                     body = self.render_template(cr, uid, mail_wiz.body_html, active_model, active_id)
-                active_model_pool.message_append(cr, uid, active_id, body, subject, 'comment', 
+                active_model_pool.message_post(cr, uid, active_id, body, subject, 'comment', 
                     attachments=attachments, context=context)
 
         return {'type': 'ir.actions.act_window_close'}
@@ -339,20 +317,6 @@ class mail_compose_message_extended(osv.TransientModel):
     _inherit = 'mail.compose.message'
 
     def get_value(self, cr, uid, model, res_id, context=None):
-        """ Overrides the default implementation to provide more default field values
-            related to the corresponding CRM case.
-        """
-        result = super(mail_compose_message_extended, self).get_value(cr, uid, model, res_id, context=context)
-        model_obj = self.pool.get(model)
-        if getattr(model_obj, '_mail_compose_message', False) and res_id:
-            data = model_obj.browse(cr, uid , res_id, context)
-            result.update({
-                'email_to': data.email_from or False,
-                'email_cc': tools.ustr(data.email_cc or ''),
-                'subject': data.name or False,
-            })
-            if hasattr(data, 'section_id'):
-                result['reply_to'] = data.section_id and data.section_id.reply_to or False
         return result
 
     def onchange_email_mode(self, cr, uid, ids, value, model, res_id, context=None):

From ae7a429e345cd685aa74175a05e48e78367869a4 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 19:23:16 +0200
Subject: [PATCH 409/999] [IMP] remove rotation while hovering notes

bzr revid: abo@openerp.com-20120820172316-fv3dt5q8gc24y7ty
---
 addons/note/static/src/css/note.css | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
index 39800834417..e5a3d1455c2 100644
--- a/addons/note/static/src/css/note.css
+++ b/addons/note/static/src/css/note.css
@@ -7,7 +7,7 @@
     padding:1em;
     margin-right: 1em;
     margin-bottom: 1em;
-    
+
     -moz-box-shadow:5px 5px 7px rgba(33,33,33,1);
     -webkit-box-shadow: 5px 5px 7px rgba(33,33,33,.7);
     box-shadow: 5px 5px 7px rgba(33,33,33,.7);
@@ -67,15 +67,15 @@
     -moz-transform:rotate(-1deg);
 }
 
-.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card:hover, 
+.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card:hover,
 .openerp  .oe_kanban_column .oe_fold_column .oe_kanban_card:focus
 {
     box-shadow:10px 10px 7px rgba(0,0,0,.7);
     -moz-box-shadow:10px 10px 7px rgba(0,0,0,.7);
     -webkit-box-shadow: 10px 10px 7px rgba(0,0,0,.7);
-    -webkit-transform: scale(1.25);
-    -moz-transform: scale(1.25);
-    -o-transform: scale(1.25);
+    -webkit-transform: rotate(0);
+    -moz-transform: rotate(0);
+    -o-transform: rotate(0);
     position:relative;
     z-index:5;
 }

From 6dd74a31b0f6087faeaba155cd861a5a4f03343b Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 19:23:48 +0200
Subject: [PATCH 410/999] [IMP] rename some of the mail menuitems

bzr revid: abo@openerp.com-20120820172348-t1i0r9lwkid0796v
---
 addons/mail/mail_group_view.xml  | 8 ++++----
 addons/mail/mail_thread_view.xml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index a71ec972326..4ef54da2611 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -61,8 +61,8 @@
                         <field name="image_small" widget='image' class="oe_avatar oe_left"/>
                         <div class="oe_title">
                             <div class="oe_edit_only">
-                                <label for="name" string="Group Name"/> 
-                            </div> 
+                                <label for="name" string="Group Name"/>
+                            </div>
                             <h1><field name="name"/></h1>
                             <div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
                                     <field name="alias_id" invisible="1" required="0"/>
@@ -123,7 +123,7 @@
 
         <!-- group record !-->
         <record id="action_view_groups" model="ir.actions.act_window">
-            <field name="name">Groups</field>
+            <field name="name">Join a group</field>
             <field name="res_model">mail.group</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
@@ -132,6 +132,6 @@
 
         <!-- left-side menu: Groups !-->
         <menuitem id="mail_group_root" parent="mail_feeds_main" sequence="12" name="My Groups"/>
-        <menuitem id="mail_allgroups" parent="mail_feeds" sequence="12" action="action_view_groups"/>
+        <menuitem id="mail_allgroups" parent="mail_group_root" sequence="100" action="action_view_groups"/>
     </data>
 </openerp>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 35acad57bc2..302d28f5509 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -12,13 +12,13 @@
         <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main" groups="base.group_user" sequence="10"/>
 
         <record id="mail_wallfeeds" model="ir.ui.menu">
-          <field name="name">News Feed</field>
+          <field name="name">My Feeds</field>
           <field name="sequence" eval="10"/>
           <field name="action" ref="action_mail_all_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
         <record id="mail_myfeeds" model="ir.ui.menu">
-          <field name="name">My Feeds</field>
+          <field name="name">My Posts</field>
           <field name="sequence" eval="11"/>
           <field name="action" ref="action_mail_my_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>

From 39421ebddbd61343ec2d404b57ef4213d12aa251 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 19:24:21 +0200
Subject: [PATCH 411/999] [IMP] notes data and demo data

bzr revid: abo@openerp.com-20120820172421-5eh0fe1bw2pl5gxb
---
 addons/note/note_data.xml |  18 +++----
 addons/note/note_demo.xml | 110 +++++++++-----------------------------
 addons/note/note_view.xml |   2 +-
 3 files changed, 31 insertions(+), 99 deletions(-)

diff --git a/addons/note/note_data.xml b/addons/note/note_data.xml
index 11eecc94b1b..29bd78d5223 100644
--- a/addons/note/note_data.xml
+++ b/addons/note/note_data.xml
@@ -2,29 +2,23 @@
 <openerp>
   <data noupdate="1">
 
-    <record model="note.stage" id="note_stage_today">
-      <field name="name">Today</field>
+    <record model="note.stage" id="note_stage_01">
+      <field name="name">Todo today</field>
       <field name="sequence">1</field>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.stage" id="note_stage_tomorrow">
-      <field name="name">Tomorrow</field>
+    <record model="note.stage" id="note_stage_02">
+      <field name="name">Todo later</field>
       <field name="sequence">2</field>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.stage" id="note_stage_week">
-      <field name="name">This week</field>
+    <record model="note.stage" id="note_stage_03">
+      <field name="name">For information</field>
       <field name="sequence">3</field>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.stage" id="note_stage_month">
-      <field name="name">This month</field>
-      <field name="sequence">4</field>
-      <field name="user_id" eval="ref('base.user_root')"/>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/note/note_demo.xml b/addons/note/note_demo.xml
index 3e960638de0..76f525b88ca 100644
--- a/addons/note/note_demo.xml
+++ b/addons/note/note_demo.xml
@@ -2,7 +2,7 @@
 <openerp>
   <data>
 
-    <record model="note.note" id="note_1">
+    <record id="note_1" model="note.note">
       <field name="note"><![CDATA[Buying list
     * coffee
     * fruits
@@ -11,10 +11,11 @@
     ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_today"/>
+      <field name="stage_id" ref="note_stage_01"/>
       <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="color">2</field>
     </record>
-    <record model="note.note" id="note_2">
+    <record id="note_2" model="note.note">
       <field name="note"><![CDATA[Buying list
     * more coffee
     * tee
@@ -23,11 +24,11 @@
     ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_tomorrow"/>
+      <field name="stage_id" ref="note_stage_02"/>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.note" id="note_3">
+    <record id="note_3" model="note.note">
       <field name="note"><![CDATA[Idea to develop
     * Phasellus vel eros lorem, vel tristique risus.
     * Cras elementum risus ut massa bibendum ac sollicitudin quam feugiat.
@@ -51,22 +52,22 @@
     ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_week"/>
+      <field name="stage_id" ref="note_stage_01"/>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.note" id="note_4">
+    <record id="note_4" model="note.note">
       <field name="note"><![CDATA[Read those books
       * Open ERP Version 6: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
+      <field name="stage_id" ref="note_stage_02"/>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.note" id="note_5">
+    <record id="note_5" model="note.note">
       <field name="note"><![CDATA[New computer specs
       * Motherboard
       according to processor
@@ -85,129 +86,66 @@
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
+      <field name="stage_id" ref="note_stage_02"/>
       <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="color">3</field>
     </record>
 
-    <record model="note.note" id="note_6">
+    <record id="note_6" model="note.note">
       <field name="note"><![CDATA[Read those books
       * Open ERP Version 6: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
+      <field name="stage_id" ref="note_stage_02"/>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.note" id="note_7">
+    <record id="note_7" model="note.note">
       <field name="note"><![CDATA[Read those books
       * Open ERP Version 6: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
+      <field name="stage_id" ref="note_stage_02"/>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.note" id="note_8">
+    <record id="note_8" model="note.note">
       <field name="note"><![CDATA[Read those books
       * Open ERP Version 6: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
+      <field name="stage_id" ref="note_stage_02"/>
       <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="color">5</field>
     </record>
 
-    <record model="note.note" id="note_9">
+    <record id="note_9" model="note.note">
       <field name="note"><![CDATA[Read those books
       * Open ERP Version 6: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
+      <field name="stage_id" ref="note_stage_03"/>
       <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
-    <record model="note.note" id="note_10">
+    <record id="note_10" model="note.note">
       <field name="note"><![CDATA[Read those books
       * Open ERP Version 6: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
-    </record>
-
-    <record model="note.note" id="note_11">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
-    </record>
-
-    <record model="note.note" id="note_12">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
-    </record>
-
-    <record model="note.note" id="note_13">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
-    </record>
-
-    <record model="note.note" id="note_14">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
-    </record>
-
-    <record model="note.note" id="note_15">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
-    </record>
-
-    <record model="note.note" id="note_16">
-      <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_month"/>
+      <field name="stage_id" ref="note_stage_03"/>
       <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="color">7</field>
     </record>
 
   </data>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 4a025a45b23..2086794bb04 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -2,7 +2,7 @@
 <openerp>
   <data>
 
-    <menuitem name="My Stuff" id="note_my_stuff" parent="mail.mail_feeds_main"/>
+    <menuitem name="Organizer" id="note_my_stuff" parent="mail.mail_feeds_main"/>
       <menuitem name="Calendar" id="note_agenda" parent="note_my_stuff" action="base_calendar.action_crm_meeting" sequence="10"/>
       <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" action="base.action_partner_form" sequence="30"/>
 

From 5fd1c3f9f213bf09c483322063a90e454af5f055 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 20 Aug 2012 19:33:27 +0200
Subject: [PATCH 412/999] [IMP] override original actions to modify their name
 and/or context

bzr revid: abo@openerp.com-20120820173327-zb3o37yrid3khf7k
---
 addons/note/note_view.xml | 42 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 2086794bb04..c31850d1a65 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -3,8 +3,46 @@
   <data>
 
     <menuitem name="Organizer" id="note_my_stuff" parent="mail.mail_feeds_main"/>
-      <menuitem name="Calendar" id="note_agenda" parent="note_my_stuff" action="base_calendar.action_crm_meeting" sequence="10"/>
-      <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" action="base.action_partner_form" sequence="30"/>
+
+    <!-- Override original action to modify its name -->
+    <record id="action_crm_meeting" model="ir.actions.act_window">
+        <field name="name">Calendar</field>
+        <field name="res_model">crm.meeting</field>
+        <field name="view_mode">calendar,tree,form,gantt</field>
+        <field name="view_id" ref="base_calendar.view_crm_meeting_calendar"/>
+        <field name="search_view_id" ref="base_calendar.view_crm_meeting_search"/>
+        <field name="context">{"calendar_default_user_id": uid}</field>
+        <field name="help" type="html">
+          <p class="oe_view_nocontent_create">
+            Click to schedule a new meeting.
+          </p><p>
+            The agenda is shared between employees and fully integrated with
+            other applications such as the employee holidays or the business
+            opportunities.
+          </p>
+        </field>
+    </record>
+    <menuitem name="Calendar" id="note_agenda" parent="note_my_stuff" action="action_crm_meeting" sequence="10"/>
+
+    <!-- Override original action to modify its name and context -->
+    <record id="action_partner_form" model="ir.actions.act_window">
+        <field name="name">Contacts</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.partner</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">kanban,tree,form</field>
+        <field name="search_view_id" ref="base.view_res_partner_filter"/>
+        <field name="help" type="html">
+          <p class="oe_view_nocontent_create">
+            Click to add a contact in your address book.
+          </p><p>
+            OpenERP helps you easily track all activities related to
+            a customer; discussions, history of business opportunities,
+            documents, etc.
+          </p>
+        </field>
+    </record>
+    <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" action="action_partner_form" sequence="30"/>
 
     <!-- Note Stage Form View -->
     <record model="ir.ui.view" id="view_note_stage_form">

From 4b6303f2053370c17a238524f9b90cc41f07fe3e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 20:46:02 +0200
Subject: [PATCH 413/999] fix

bzr revid: fp@tinyerp.com-20120820184602-dlz954b8wisethpi
---
 addons/mail/mail_message_view.xml          | 5 ++---
 addons/mail/wizard/mail_compose_message.py | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 513a6bd1015..38181033a51 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -217,14 +217,13 @@
         <record id="action_mail_all_feeds" model="ir.actions.client">
             <field name="name">News Feed</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval=""/>
-            <!-- <field name="params" eval="{'domain': [('notification_ids.partner_id.user_ids', 'in', '[uid]')] }"/> -->
+            <field name="params" eval="{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid])] }"/>
         </record>
 
         <record id="action_mail_my_feeds" model="ir.actions.client">
             <field name="name">My Feeds</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="{'domain':[('partner_id.user_ids', 'in', '[uid]')]}"/>
+            <field name="params" eval="{'domain':[('partner_id.user_ids', 'in', [uid])]}"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index e37b035c16a..d1dd9e66103 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -317,7 +317,7 @@ class mail_compose_message_extended(osv.TransientModel):
     _inherit = 'mail.compose.message'
 
     def get_value(self, cr, uid, model, res_id, context=None):
-        return result
+        return {}
 
     def onchange_email_mode(self, cr, uid, ids, value, model, res_id, context=None):
         """ Overrides the default implementation to provide default values for

From afbcc4b579404b39c0be54699a969e886eb05ec2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 21:02:31 +0200
Subject: [PATCH 414/999] [FIX] compisition seems to work

bzr revid: fp@tinyerp.com-20120820190231-3cnvj7dtmfgojal4
---
 addons/mail/wizard/mail_compose_message.py | 42 +++++++++++-----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index d1dd9e66103..a27bb884d7f 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -112,7 +112,17 @@ class mail_compose_message(osv.TransientModel):
         'auto_delete': fields.boolean('Auto Delete', help="Permanently delete emails after sending"),
         'filter_id': fields.many2one('ir.filters', 'Filters'),
         'body_html': fields.html('HTML Editor Body'),
+        'content_subtype': fields.char('Message content subtype', size=32,
+            oldname="subtype", readonly=1,
+            help="Type of message, usually 'html' or 'plain', used to select "\
+                  "plain-text or rich-text contents accordingly"),
     }
+    _defaults = {
+        'content_subtype': lambda self,cr, uid, context={}: 'plain',
+        'body_html': lambda self,cr, uid, context={}: '',
+        'body': lambda self,cr, uid, context={}: ''
+    }
+
 
     def get_value(self, cr, uid, model, res_id, context=None):
         """ Returns a defaults-like dict with initial values for the composition
@@ -233,14 +243,12 @@ class mail_compose_message(osv.TransientModel):
         if context is None:
             context = {}
 
-        # composition wizard options
         email_mode = context.get('email_mode')
         formatting = context.get('formatting')
         mass_mail_mode = context.get('mail.compose.message.mode') == 'mass_mail'
 
         mail_message_obj = self.pool.get('mail.message')
         for mail_wiz in self.browse(cr, uid, ids, context=context):
-            # attachments
             attachment = {}
             for attach in mail_wiz.attachment_ids:
                 attachment[attach.datas_fname] = attach.datas and attach.datas or False
@@ -248,27 +256,17 @@ class mail_compose_message(osv.TransientModel):
             # default values, according to the wizard options
             subject = mail_wiz.subject if formatting else False
             partner_ids = [partner.id for partner in mail_wiz.dest_partner_ids]
-            body = mail_wiz.body_html if content_subtype == 'html' else mail_wiz.body
+            body = mail_wiz.body_html if mail_wiz.content_subtype == 'html' else mail_wiz.body
 
-            active_model_pool = self.pool.get(active_model)
-
-            # get model, active_ids, and check if model is openchatter-enabled
-            if mass_mail_mode and context.get('active_ids') and context.get('active_model'):
-                active_ids = context['active_ids']
-                active_model = context['active_model']
-            elif mass_mail_mode:
-                active_model = mail_wiz.model
-                active_ids = active_model_pool.search(cr, uid, ast.literal_eval(mail_wiz.filter_id.domain), context=ast.literal_eval(mail_wiz.filter_id.context))
-            else:
-                active_model = mail_wiz.model
-                active_ids = [mail_wiz.res_id]
-
-            for active_id in active_ids:
-                if context.get('mail.compose.message.mode') == 'mass_mail':
-                    subject = self.render_template(cr, uid, subject, active_model, active_id)
-                    body = self.render_template(cr, uid, mail_wiz.body_html, active_model, active_id)
-                active_model_pool.message_post(cr, uid, active_id, body, subject, 'comment', 
-                    attachments=attachments, context=context)
+            active_model_pool = self.pool.get('mail.thread')
+            active_id = context.get('default_res_id', False)
+            if context.get('mail.compose.message.mode') == 'mass_mail' and context.get('default_model', False) and context.get('default_res_id', False):
+                active_model = context.get('default_model', False)
+                active_model_pool = self.pool.get(active_model)
+                subject = self.render_template(cr, uid, subject, active_model, active_id)
+                body = self.render_template(cr, uid, mail_wiz.body_html, active_model, active_id)
+            active_model_pool.message_post(cr, uid, active_id, body, subject, 'comment', 
+                attachments=attachment, context=context)
 
         return {'type': 'ir.actions.act_window_close'}
 

From 11ab424912b54fe5bb725e881fab59f44501a41c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 21:10:58 +0200
Subject: [PATCH 415/999] [IMP]

bzr revid: fp@tinyerp.com-20120820191058-kpjymskvxdasoq6c
---
 addons/mail/mail_group.py           | 2 +-
 addons/mail/mail_message.py         | 1 +
 addons/mail/static/src/xml/mail.xml | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 173295b59df..145b9c9bdb4 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -36,7 +36,7 @@ class mail_group(osv.Model):
     """
     _description = 'Discussion group'
     _name = 'mail.group'
-    _inherit = ['mail.thread','ir.needaction_mixin']
+    _inherit = ['mail.thread']
     _inherits = {'mail.alias': 'alias_id', 'ir.ui.menu': 'menu_id'}
 
     def _get_image(self, cr, uid, ids, name, args, context=None):
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 2b18fa72086..0a059d59f61 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -54,6 +54,7 @@ class mail_message(osv.Model):
 
     _name = 'mail.message'
     _description = 'Message'
+    _inherit = ['ir.needaction_mixin']
     _order = 'id desc'
 
     def get_record_name(self, cr, uid, ids, name, arg, context=None):
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 8a0fc1d90e0..8ed3925d8e8 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -17,7 +17,8 @@
                 <td colspan="2">
                     <h2 class="oe_view_title">
                         <span class="oe_view_title_text">
-                            <t t-if="! widget.options.res_model">News Feeds</t>
+                            News Feed
+                            <t t-if="widget.options.res_model"> / </t>
                             <t t-if="widget.options.res_model" t-esc="widget.options.res_model"/>
                         </span>
                     </h2>

From 7586e24a6514d7c9df914a9d5b769471f11959e8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 21:22:03 +0200
Subject: [PATCH 416/999] fix

bzr revid: fp@tinyerp.com-20120820192203-7zkbh3uiw8f9wooo
---
 addons/crm/crm_lead.py       | 11 -----------
 addons/crm/crm_lead_view.xml |  4 ----
 2 files changed, 15 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index a15e18efad5..bc29fa449a6 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -174,16 +174,6 @@ class crm_lead(base_stage, osv.osv):
         else:
             return [('id', '=', '0')]
 
-    def _get_email_subject(self, cr, uid, ids, fields, args, context=None):
-        res = {}
-        for obj in self.browse(cr, uid, ids, context=context):
-            res[obj.id] = ''
-            for msg in obj.message_ids:
-                if msg.email_from:
-                    res[obj.id] = msg.subject
-                    break
-        return res
-
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null',
             select=True, help="Optional linked partner, usually after conversion of the lead"),
@@ -227,7 +217,6 @@ class crm_lead(base_stage, osv.osv):
                       When the case is over, the state is set to \'Done\'.\
                       If the case needs to be reviewed then the state is \
                       set to \'Pending\'.'),
-        'subjects': fields.function(_get_email_subject, fnct_search=_history_search, string='Subject of Email', type='char', size=64),
 
         # Only used for type opportunity
         'probability': fields.float('Success Rate (%)',group_operator="avg"),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4109bca5b17..6340c8b12d5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -261,7 +261,6 @@
                     <field name="type_id" invisible="1"/>
                     <field name="referred" invisible="1"/>
                     <field name="channel_id" invisible="1"/>
-                    <field name="subjects" invisible="1"/>
                     <field name="message_unread" invisible="1"/>
                 </tree>
             </field>
@@ -361,8 +360,6 @@
                 <search string="Search Leads">
                     <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]" />
-                    <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
-                    <field name="subjects"/>
                     <field name="create_date"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
@@ -554,7 +551,6 @@
                     <field name="title_action" />
                     <field name="channel_id" invisible="1"/>
                     <field name="type_id" invisible="1"/>
-                    <field name="subjects" invisible="1"/>
                     <field name="stage_id"/>
                     <field name="planned_revenue" sum="Expected Revenues"/>
                     <field name="probability" widget="progressbar" avg="Avg. of Probability"/>

From 4c65e524be0f6cc12e890e0092c6bf41e0a19d4a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 20 Aug 2012 21:29:10 +0200
Subject: [PATCH 417/999] fix

bzr revid: fp@tinyerp.com-20120820192910-eodns32qy7pmoq6c
---
 addons/mail/static/src/js/mail.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index dff0204ebe3..ecc4ecd3c7b 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -479,10 +479,10 @@ openerp.mail = function(session) {
 
             this.$element.find('div.oe_mail_thread_display').empty();
             // var domain = this.get_fetch_domain(this.comments_structure);
-            return this.fetch_comments(this.options.limit, this.options.offset, domain).then();
+            return this.fetch_comments(this.options.domain || []).then();
         },
         
-        fetch_comments: function (limit, offset, domain) {
+        fetch_comments: function (domain) {
             var self = this;
             var defer = this.ds.call('message_read', [[this.options.res_id], (this.options.thread_level > 0), (this.comments_structure['root_ids']),
                                     (limit+1) || (this.options.limit+1), offset||this.options.offset, domain||undefined ]).then(function (records) {
@@ -622,7 +622,7 @@ openerp.mail = function(session) {
         
         do_more: function () {
             domain = this.get_fetch_domain(this.comments_structure);
-            return this.fetch_comments(this.options.limit, this.options.offset, domain);
+            return this.fetch_comments(domain);
         },
     });
 
@@ -645,7 +645,7 @@ openerp.mail = function(session) {
 
        init: function() {
             this._super.apply(this, arguments);
-            this.params = this.options;
+            this.params = this.options || {};
             this.params.thread_level = this.params.thread_level || 0;
             this.thread = null;
         },

From 7245850cf75d038483cf85fa09c7d25fbef57f3a Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Tue, 21 Aug 2012 11:06:25 +0530
Subject: [PATCH 418/999] Fixed footer for wizard navigation

bzr revid: vba@tinyerp.com-20120821053625-wwoki5pcd4xrw4fj
---
 addons/survey/__openerp__.py            |  1 -
 addons/survey/static/src/css/survey.css |  2 +-
 addons/survey/static/src/js/survey.js   | 24 ---------------
 addons/survey/survey.py                 | 22 ++++++++++++--
 addons/survey/survey_view.xml           | 12 ++++----
 addons/survey/wizard/survey_answer.py   | 40 +++++++++++++------------
 6 files changed, 48 insertions(+), 53 deletions(-)
 delete mode 100644 addons/survey/static/src/js/survey.js

diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 7f8a0f63fb4..62f0848ebcc 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -59,6 +59,5 @@ user name and password for the invitation of the survey.
     'certificate' : '001131639736864143245',
     'images': ['images/survey_answers.jpeg','images/survey_pages.jpeg','images/surveys.jpeg'],   
     'css': ['static/src/css/survey.css','static/css/survey.css'],
-    'js' : ['static/src/js/survey.js'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index 746f7a1d465..ef79300fbbd 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -6,7 +6,7 @@
 }
 
 .oe_survey_title_height{
-    height: 33px;  
+    height: 26px;  
 }
 
 .oe_survey_title_page {
diff --git a/addons/survey/static/src/js/survey.js b/addons/survey/static/src/js/survey.js
deleted file mode 100644
index 13b32321735..00000000000
--- a/addons/survey/static/src/js/survey.js
+++ /dev/null
@@ -1,24 +0,0 @@
-openerp.survey = function (instance) {
-    var QWeb = instance.web.qweb,
-    _t = instance.web._t;
-    instance.web.ViewManagerAction = instance.web.ViewManagerAction.extend({
-        on_mode_switch: function (view_type, no_store, options) {
-            var self = this;
-            return $.when(this._super.apply(this, arguments)).then(function () {
-                var controller = self.views[self.active_view].controller,
-                    fvg = controller.fields_view,
-                    view_id = (fvg && fvg.view_id) || '--';
-                self.$element.find('.oe_debug_view').html(QWeb.render('ViewManagerDebug', {
-                    view: controller,
-                    view_manager: self
-                }));
-                if (!self.action.name && fvg) {
-                    var title = self.$element.find('.oe_view_title_text');
-                    if(!_.isEmpty(title))
-                        title = $('.ui-dialog-title');
-                        title.text(fvg.arch.attrs.string || fvg.name);
-                }
-            });
-        },
-    });
-};
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 4a07f887b6b..255128ffba0 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -149,15 +149,33 @@ class survey(osv.osv):
         return report
     
     def fill_survey(self, cr, uid, ids, context=None):
+        sur_obj = self.read(cr, uid, ids,['title'], context=context)
+        for sur in sur_obj:
+            name = sur['title']
+            context.update({'active':False,'survey_id': ids[0]})
         return {
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'survey.question.wiz',
             'type': 'ir.actions.act_window',
             'target': 'new',
-            'context': {'survey_id': ids[0]}
+            'name': name,
+            'context': context
+        }
+    def test_survey(self, cr, uid, ids, context=None):
+        sur_obj = self.read(cr, uid, ids,['title'], context=context)
+        for sur in sur_obj:
+            name = sur['title']
+            context.update({'active':True,'survey_id': ids[0]})
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'survey.question.wiz',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'name': name,
+            'context': context
         }
-
 survey()
 
 class survey_history(osv.osv):
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 159d1673d5f..753dfab208b 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -26,8 +26,8 @@
                 </header>
                 <sheet>
                     <div class="oe_button_box oe_right">
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
-                        <button name="%(action_view_survey_question_message)d" states="open" string="Answer Survey" type="action" icon="gtk-execute" context="{'active':False, 'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
+                        <button name="test_survey" states="open,draft,close,cancel" string="Test Survey" type="object" icon="gtk-new" context="{'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
+                        <button name="fill_survey" states="open" string="Answer Survey" type="object" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
                     </div>
                     <div class="oe_title">
                         <label for="title" class="oe_edit_only"/>
@@ -254,11 +254,11 @@
                     <field name="tot_start_survey" string="Started"/>
                     <field name="tot_comp_survey" string="Completed"/>
                     <field name="state"/>
-                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                        string="Test Survey" type="action" icon="gtk-new"
-                        context="{'active':True,'survey_id': active_id}"/>
+                    <button name="test_survey" states="open,draft,close,cancel"
+                        string="Test Survey" type="object" icon="gtk-new"
+                        context="{'survey_id': active_id}"/>
                     <button name="fill_survey" states="open"
-                        string="Answer Survey" type="object" icon="gtk-execute" context="{'active':False,'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>                   
+                        string="Answer Survey" type="object" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>                   
                     <button name="action_print_survey" states="open,draft,close,cancel"
                                     string="Print Answer" type="object" icon="gtk-print"/>
                 </tree>
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 67e9aa1c45b..da7db34243e 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -152,24 +152,8 @@ class survey_question_wiz(osv.osv_memory):
 
                     etree.SubElement(xml_header_title, 'label', {'string': tools.ustr(pag_rec.title) ,'colspan': '2' ,'class' : 'oe_survey_title'})
                     xml_header_group = etree.SubElement(xml_header_title, 'group', {'col': '4', 'colspan': '1'})
-                    xml_group = etree.SubElement(xml_form, 'group', {'col': '8', 'colspan': '4'})
-
-                    etree.SubElement(xml_header_group, 'button', {'special': "cancel",'string':"Exit", 'class':"oe_right"})
-                    if pre_button:
-                        etree.SubElement(xml_header_group, 'button', {'name':"action_previous",'string':"Previous",'type':"object", 'class':"oe_right"})
-                    but_string = "Next"
-                    if int(page_number) + 1 == total_pages:
-                        but_string = "Done"
-                    if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
-                        etree.SubElement(xml_header_group, 'button', {'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
-                    elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
-                        etree.SubElement(xml_header_group, 'button', {'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
-                    elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
-                        etree.SubElement(xml_header_group, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
-                    else:
-                        etree.SubElement(xml_header_group, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
-                    etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_right1 oe_survey_title_page"})
 
+# Button and page
                     if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
                         etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
                         context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer})
@@ -386,6 +370,24 @@ class survey_question_wiz(osv.osv_memory):
 
                     etree.SubElement(xml_form, 'separator', {'colspan': '4'})
  
+                    xml_button_group = etree.SubElement(xml_form, 'group', {'col': '8', 'colspan': '1', 'class':"oe_right"})
+
+                    etree.SubElement(xml_button_group, 'button', {'special': "cancel",'string':"Exit", 'class':"oe_right", 'width':'80%'})
+                    if pre_button:
+                        etree.SubElement(xml_button_group, 'button', {'name':"action_previous",'string':"Previous",'type':"object", 'class':"oe_right"})
+                    but_string = "Next"
+                    if int(page_number) + 1 == total_pages:
+                        but_string = "Done"
+                    if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
+                        etree.SubElement(xml_button_group, 'button', {'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
+                    elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
+                        etree.SubElement(xml_button_group, 'button', {'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
+                    elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
+                        etree.SubElement(xml_button_group, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
+                    else:
+                        etree.SubElement(xml_button_group, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
+                    etree.SubElement(xml_button_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_survey_title_page"})
+
                     root = xml_form.getroottree()
                     result['arch'] = etree.tostring(root)
                     result['fields'] = fields
@@ -402,7 +404,7 @@ class survey_question_wiz(osv.osv_memory):
                     if sur_rec.send_response:
                         survey_data = survey_obj.browse(cr, uid, survey_id)
                         response_id = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))['response']
-                        context.update({'response_id':response_id})
+
                         report = self.create_report(cr, uid, [survey_id], 'report.survey.browse.response', survey_data.title,context)
                         attachments = {}
                         file = open(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")
@@ -416,7 +418,7 @@ class survey_question_wiz(osv.osv_memory):
                         attachments[survey_data.title + ".pdf"] = file_data
                         file.close()
                         os.remove(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")
-                        
+                        context.update({'response_id':response_id})
                         user_email = user_obj.browse(cr, uid, uid, context).email
                         resp_email = survey_data.responsible_id and survey_data.responsible_id.email or False
 

From 1937247840f50a4333c5618c538a27253573b06f Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 21 Aug 2012 11:21:50 +0530
Subject: [PATCH 419/999] [IMP]hr_timesheet_sheet :improve name_get method

bzr revid: mma@tinyerp.com-20120821055150-60n2k2fva99mqi9m
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index b2ef41f3a46..f2a5df1ba0c 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -442,9 +442,7 @@ class hr_timesheet_sheet(osv.osv):
         return True
 
     def name_get(self, cr, uid, ids, context=None):
-        if not ids:
-            return []
-        if isinstance(ids, (int)):
+        if ids and isinstance(ids, int):
             ids = [ids]
         return [(r['id'], r['date_from'] + ' - ' + r['date_to']) \
                 for r in self.read(cr, uid, ids, ['date_from', 'date_to'],

From 6b4af94d1552918642c6dc9b32e64b27d2a8cd5a Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Tue, 21 Aug 2012 12:13:26 +0530
Subject: [PATCH 420/999] [IMP] res.company : remove readonly attribute of
 rml_footer field

bzr revid: rpr@tinyerp.com-20120821064326-bvsn8ctu0kbi5tx9
---
 openerp/addons/base/res/res_company.py       | 1 +
 openerp/addons/base/res/res_company_view.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index b45cdbf75ed..5f9e61545bf 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -144,6 +144,7 @@ class res_company(osv.osv):
             return {}
         if phone: val.append(_('Phone: ')+phone)
         if fax: val.append(_('Fax: ')+fax)
+        if email: val.append(_('Email: ')+email)
         if website: val.append(_('Website: ')+website)
         if vat: val.append(_('TIN: ')+vat)
         if reg: val.append(_('Reg: ')+reg)
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 8bfb8c78478..4c12833a2af 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -72,7 +72,7 @@
                                 <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
                                 <label for="rml_footer"/>
                                 <div name="bank_acc">
-                                    <field name="rml_footer" attrs="{'readonly':[('customize_footer','=',False)]}"/>
+                                    <field name="rml_footer"/>
                                     <!--<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward" class="oe_inline"/>-->
                                 </div>
                             </group>

From 9262f8f8c5f4bcd50bbe6980d921d024e538ab7c Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Tue, 21 Aug 2012 12:31:06 +0530
Subject: [PATCH 421/999] [IMP] Footer with right alignment.

bzr revid: vba@tinyerp.com-20120821070106-aobaleupjvkctdvc
---
 addons/survey/wizard/survey_answer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index da7db34243e..7cc8c65bf54 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -386,7 +386,7 @@ class survey_question_wiz(osv.osv_memory):
                         etree.SubElement(xml_button_group, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
                     else:
                         etree.SubElement(xml_button_group, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
-                    etree.SubElement(xml_button_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_survey_title_page"})
+                    etree.SubElement(xml_button_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_survey_title_page oe_right"})
 
                     root = xml_form.getroottree()
                     result['arch'] = etree.tostring(root)

From 09f031cd99d41dd3ef8e89439d575e5aac8f10ed Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 21 Aug 2012 12:47:02 +0530
Subject: [PATCH 422/999] [IMP] If edit = false and trww views Editable shoue
 not allow edit column instead redirect normal behaviour

bzr revid: jam@tinyerp.com-20120821071702-pknuv44poe1hvlfx
---
 addons/web/static/src/js/view_list_editable.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 9a101a5ac1a..74dba11394f 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -750,7 +750,8 @@ openerp.web.list_editable = function (instance) {
 
     instance.web.ListView.List.include(/** @lends instance.web.ListView.List# */{
         row_clicked: function (event) {
-            if (!this.view.editable()) {
+        
+            if (!this.view.editable() || ! this.view._is_action_enabled('edit')) {
                 return this._super.apply(this, arguments);
             }
             var record_id = $(event.currentTarget).data('id');

From a02de882a2f711414c64213ef0382c5bada5fbf5 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 21 Aug 2012 12:48:42 +0530
Subject: [PATCH 423/999] [USA] Reomved the unxpected lines

bzr revid: jam@tinyerp.com-20120821071842-srbnqutwfia8m5cb
---
 addons/web/static/src/js/view_list_editable.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 74dba11394f..cea51b38833 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -750,7 +750,6 @@ openerp.web.list_editable = function (instance) {
 
     instance.web.ListView.List.include(/** @lends instance.web.ListView.List# */{
         row_clicked: function (event) {
-        
             if (!this.view.editable() || ! this.view._is_action_enabled('edit')) {
                 return this._super.apply(this, arguments);
             }

From 2e73b8ddea7917dcbf8948197b0cdd98339f96d7 Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Tue, 21 Aug 2012 14:29:56 +0530
Subject: [PATCH 424/999] [IMP] put buttons bottom left and pager is on the
 bottom right.

bzr revid: vba@tinyerp.com-20120821085956-zeksfgkoq7ra9jxf
---
 addons/survey/wizard/survey_answer.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 7cc8c65bf54..c43b78fdf3c 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -370,22 +370,23 @@ class survey_question_wiz(osv.osv_memory):
 
                     etree.SubElement(xml_form, 'separator', {'colspan': '4'})
  
-                    xml_button_group = etree.SubElement(xml_form, 'group', {'col': '8', 'colspan': '1', 'class':"oe_right"})
+                    xml_button_group = etree.SubElement(xml_form, 'group', {'col': '8', 'colspan': '1'})
+
 
-                    etree.SubElement(xml_button_group, 'button', {'special': "cancel",'string':"Exit", 'class':"oe_right", 'width':'80%'})
                     if pre_button:
-                        etree.SubElement(xml_button_group, 'button', {'name':"action_previous",'string':"Previous",'type':"object", 'class':"oe_right"})
+                        etree.SubElement(xml_button_group, 'button', {'name':"action_previous",'string':"Previous",'type':"object"})
                     but_string = "Next"
                     if int(page_number) + 1 == total_pages:
                         but_string = "Done"
                     if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
-                        etree.SubElement(xml_button_group, 'button', {'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
+                        etree.SubElement(xml_button_group, 'button', {'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context), 'class':"oe_highlight"})
                     elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
-                        etree.SubElement(xml_button_group, 'button', {'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
+                        etree.SubElement(xml_button_group, 'button', {'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context), 'class':"oe_highlight"})
                     elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
-                        etree.SubElement(xml_button_group, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
+                        etree.SubElement(xml_button_group, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_highlight"})
                     else:
-                        etree.SubElement(xml_button_group, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right oe_highlight"})
+                        etree.SubElement(xml_button_group, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_highlight"})
+                    etree.SubElement(xml_button_group, 'button', {'special': "cancel",'string':"Exit"})
                     etree.SubElement(xml_button_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_survey_title_page oe_right"})
 
                     root = xml_form.getroottree()

From 6c337bcd64b53f234872d9f7026f342755de9c60 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 21 Aug 2012 14:37:50 +0530
Subject: [PATCH 425/999] [IMP]hr_timesheet_sheet :improved as per ids

bzr revid: mma@tinyerp.com-20120821090750-zkr0loqnmslqslcr
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index f2a5df1ba0c..7a7e05a80e0 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -442,7 +442,9 @@ class hr_timesheet_sheet(osv.osv):
         return True
 
     def name_get(self, cr, uid, ids, context=None):
-        if ids and isinstance(ids, int):
+        if not ids:
+            return []
+        if isinstance(ids, int):
             ids = [ids]
         return [(r['id'], r['date_from'] + ' - ' + r['date_to']) \
                 for r in self.read(cr, uid, ids, ['date_from', 'date_to'],

From 5562931eab6f9521a52531cf774c50dbbde6e1b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 11:20:15 +0200
Subject: [PATCH 426/999] [WIP] [CLEAN] mail.js: massive refactoring / cleaning
 of code, part 1: all logic delegated to the Thread widget, to avoid code
 duplication (Thread and Wall); Wall and RecordThread should be as small as
 possible, without specific logic or message fetching. WIP commit.

bzr revid: tde@openerp.com-20120821092015-u8q1osikpgf12pq6
---
 addons/mail/static/src/css/mail.css |   8 +-
 addons/mail/static/src/js/mail.js   | 445 ++++++++++++++++++----------
 addons/mail/static/src/xml/mail.xml |  12 +-
 3 files changed, 292 insertions(+), 173 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index c542c74bbcd..6125b3bf39b 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -81,7 +81,7 @@
 
 .openerp div.oe_mail_wall_more {
     text-align: center;
-    display: none;
+    /*display: none;*/
 }
 
 
@@ -152,7 +152,7 @@
 /* ------------------------------------------------------------ */
 
 .openerp div.oe_mail_thread_action {
-    display: none;
+    /*display: none;*/
     white-space: normal;
     padding: 8px;
     background: #eee;
@@ -198,7 +198,7 @@
 }
 
 .openerp div.oe_mail_thread_more {
-    display: none;
+    /*display: none;*/
     border-bottom: 1px solid #D2D9E7;
 }
 
@@ -391,7 +391,7 @@
 
 /* Attachments list */
 .openerp ul.oe_mail_msg_attachments {
-    display: none;
+    /*display: none;*/
     width: 100%;
     border-top: 1px solid #CCC;
     margin: .5em 0 0 0;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ecc4ecd3c7b..576800431fc 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -132,6 +132,10 @@ openerp.mail = function(session) {
             }
             this.email_mode = false;
             this.formatting = false;
+            // debug
+            console.groupCollapsed('New ComposeMessage: model', this.options.res_model, ', id', this.options.res_id);
+            console.log('context:', this.options.context);
+            console.groupEnd();
         },
 
         /**
@@ -341,22 +345,38 @@ openerp.mail = function(session) {
             this._super(parent);
             // options
             this.options = options || {};
-            this.options.parent_id = this.options.parent_id || false;
-            this.options.thread_level = this.options.thread_level || 0;
-            this.options.fetch_limit = this.options.fetch_limit || 100;
-            this.options.records = this.options.records || null;
+            this.options.domain = options.domain || [];
+            this.options.context = options.context || {};
+            // check in parents, should not define multiple times
+            this.options.context.res_model = options.context.res_model || 'mail.thread';
+            this.options.context.res_id = options.context.res_id || false;
+            this.options.context.parent_id = options.context.parent_id || false;
+            this.options.thread_level = options.thread_level || 0;
+            this.options.fetch_limit = options.fetch_limit || 100;
+            // TDE: not sure, here for testing / compatibility
+            this.options.records = options.records || null;
+            this.options.ids = options.ids || null;
             // datasets and internal vars
-            this.ds = new session.web.DataSetSearch(this, this.options.res_model);
+            // this.ds = new session.web.DataSetSearch(this, this.options.res_model);
             this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
             // display customization vars
             this.display = {};
-            this.display.truncate_limit = this.options.truncate_limit || 250;
-            this.display.show_header_compose = this.options.show_header_compose || false; // only for thread record
-            this.display.show_reply = this.options.show_reply || true;
-            this.display.show_delete = this.options.show_delete || true;
-            this.display.show_hide = this.options.show_hide || true;
-            this.display.show_reply_by_email = this.options.show_reply_by_email || true;
-            this.display.show_more = this.options.show_more || true;
+            this.display.truncate_limit = options.truncate_limit || 250;
+            this.display.show_header_compose = options.show_header_compose || true;
+            this.display.show_reply = options.show_reply || true;
+            this.display.show_delete = options.show_delete || true;
+            this.display.show_hide = options.show_hide || true;
+            this.display.show_reply_by_email = options.show_reply_by_email || true;
+            this.display.show_more = options.show_more || true;
+            // for search view
+            this.search = {'domain': [], 'context': {}, 'groupby': {}}
+            this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
+            // debug
+            console.group('New Thread: model', this.options.context.res_model, 'id', this.options.context.res_id, 'thread level', this.options.thread_level);
+            console.log('records:', this.options.records, 'ids:', this.options.ids);
+            console.log('options:', this.options);
+            console.log('display:', this.display);
+            console.groupEnd();
         },
         
         start: function() {
@@ -366,8 +386,11 @@ openerp.mail = function(session) {
             // display user, fetch comments
             this.display_current_user();
 
-            if (this.options.records) var display_done = this.display_comments_from_parameters(this.options.records);
+            // if (this.options.records) var display_done = this.display_comments_from_parameters(this.options.records);
+            if (this.options.records) var display_done = this.display_comments(this.options.records);
+
             else var display_done = this.init_comments();
+
             // customize display
             $.when(display_done).then(this.proxy('do_customize_display'));            
             // add message composition form view
@@ -479,36 +502,88 @@ openerp.mail = function(session) {
 
             this.$element.find('div.oe_mail_thread_display').empty();
             // var domain = this.get_fetch_domain(this.comments_structure);
-            return this.fetch_comments(this.options.domain || []).then();
-        },
-        
-        fetch_comments: function (domain) {
-            var self = this;
-            var defer = this.ds.call('message_read', [[this.options.res_id], (this.options.thread_level > 0), (this.comments_structure['root_ids']),
-                                    (limit+1) || (this.options.limit+1), offset||this.options.offset, domain||undefined ]).then(function (records) {
-                if (records.length <= self.options.limit) self.display.show_more = false;
-                // else { self.display.show_more = true; records.pop(); }
-                // else { self.display.show_more = true; records.splice(0, 1); }
-                else { self.display.show_more = true; }
-                self.display_comments(records);
-                // TODO: move to customize display
-                if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show();
-                else  self.$element.find('div.oe_mail_thread_more:last').hide();
-            });
-            
-            return defer;
+            return this.message_fetch(this.options.domain || []).then();
         },
 
-        display_comments_from_parameters: function (records) {
-            if (records.length > 0 && records.length < (records[0].child_ids.length+1) ) this.display.show_more = true;
-            else this.display.show_more = false;
-            var defer = this.display_comments(records);
-            // TODO: move to customize display
-            if (this.display.show_more == true) $('div.oe_mail_thread_more').eq(-2).show();
-            else $('div.oe_mail_thread_more').eq(-2).hide();
-            return defer;
+        /** Fetch messages
+         * @param {Array} domain
+         * @param {Array} context
+         */
+        message_fetch: function (additional_domain, additional_context) {
+            var self = this;
+
+            this.search['domain'] = _.union(this.options.domain, this.search_results.domain);
+            this.search['context'] = _.extend(this.options.context, this.search_results.context);
+            if (additional_domain) var fetch_domain = this.search['domain'].concat(additional_domain);
+            else var fetch_domain = this.search['domain'];
+            if (additional_context) var fetch_context = _.extend(this.search['context'], additional_context);
+            else var fetch_context = this.search['context'];
+
+            // first use: use IDS, otherwise set false
+            var read_defer = this.ds_msg.call('message_read',
+                [false, fetch_domain, this.options.thread_level, fetch_context]
+                ).then(function (records) {
+                    // if (records.length <= self.options.limit) self.display.show_more = false;
+                    // else { self.display.show_more = true; records.pop(); }
+                    // else { self.display.show_more = true; records.splice(0, 1); }
+                    // else { self.display.show_more = true; }
+                    self.display_comments(records);
+                    // TODO: move to customize display
+                    // if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show();
+                    // else  self.$element.find('div.oe_mail_thread_more:last').hide();
+                });
+            return read_defer;
         },
+
+        /* TDE: not necessary as we can read on ids or false */
+        // display_comments_from_parameters: function (records) {
+        //     if (records.length > 0 && records.length < (records[0].child_ids.length+1) ) this.display.show_more = true;
+        //     else this.display.show_more = false;
+        //     var defer = this.display_comments(records);
+        //     // TODO: move to customize display
+        //     if (this.display.show_more == true) $('div.oe_mail_thread_more').eq(-2).show();
+        //     else $('div.oe_mail_thread_more').eq(-2).hide();
+        //     return defer;
+        // },
+
+        /** Display comments
+         * @param {Array} records tree structure of records
+         */
+        // display_comments: function (records) {
+        //     console.log(records);
+        //     // debugger
+        //     var self = this;
+        //     var _expendable = false;
+        //     _(records).each(function (root_record) {
+        //         /* expandable type: add a 'Show more button' */
+        //         if (root_record.type == 'expandable') {
+        //             _expendable = true;
+        //             self.update_fetch_more(true);
+        //             self.fetch_more_domain = root_record.domain;
+        //             self.fetch_more_context = root_record.context;
+        //         }
+        //         // display classic root record
+        //         else {
+        //             var render_res = session.web.qweb.render('mail.wall_thread_container', {});
+        //             $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads'));
+        //             var thread = new mail.Thread(self, {
+        //                 'res_model': root_record.model, 'res_id': root_record.res_id,
+        //                 'uid': self.session.uid, 'records': [root_record],
+        //                 'parent_id': false, 'thread_level': self.options.thread_level,
+        //                 'show_hide': true, 'is_wall': true
+        //                 }
+        //             );
+        //             self.thread_list.push(thread);
+        //             thread.appendTo(self.$element.find('li.oe_mail_wall_thread:last'));
+        //         }
+        //     });
+        //     if (! _expendable) {
+        //         self.update_fetch_more(false);
+        //     }
+        // },
         
+
+
         display_comments: function (records) {
             var self = this;
             // sort the records
@@ -525,7 +600,10 @@ openerp.mail = function(session) {
             }
             _(records).each(function (record) {
                 var sub_msgs = [];
-                if ((record.parent_id == undefined || record.parent_id == false || record.parent_id[0] == self.options.parent_id) && self.options.thread_level > 0 ) {
+                if (record.type == 'expandable') {
+                    // TDE: do something :)
+                }
+                else if ((record.parent_id == undefined || record.parent_id == false || record.parent_id[0] == self.options.parent_id) && self.options.thread_level > 0 ) {
                     // var sub_list = self.comments_structure['tree_struct'][record.id]['direct_childs'];
                     // _(records).each(function (record) {
                     //     //if (record.parent_id == false || record.parent_id[0] == self.params.parent_id) return;
@@ -576,6 +654,23 @@ openerp.mail = function(session) {
                 });
         },
 
+
+        /** Display 'show more' button */
+        update_fetch_more: function (new_value) {
+            if (new_value) {
+                    this.$element.find('div.oe_mail_wall_more:last').show();
+            } else {
+                    this.$element.find('div.oe_mail_wall_more:last').hide();
+            }
+        },
+        
+        /** Action: 'shows more' to fetch new messages */
+        do_fetch_more: function () {
+            return this.message_fetch(this.fetch_more_domain, this.fetch_more_context);
+        },
+
+
+
         display_current_user: function () {
             var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.options.uid);
             return this.$element.find('img.oe_mail_icon').attr('src', avatar);
@@ -589,41 +684,42 @@ openerp.mail = function(session) {
                 this.proxy('init_comments'));
         },
         
-        /**
-         * Create a domain to fetch new comments according to
-         * comment already present in comments_structure
-         * @param {Object} comments_structure (see chatter utils)
-         * @returns {Array} fetch_domain (OpenERP domain style)
-         */
-        get_fetch_domain: function (comments_structure) {
-            var domain = [];
-            var ids = comments_structure.root_ids.slice();
-            var ids2 = [];
-            // must be child of current parent
-            if (this.options.parent_id) { domain.push(['id', 'child_of', this.options.parent_id]); }
-            _(comments_structure.root_ids).each(function (id) { // each record
-                ids.push(id);
-                ids2.push(id);
-            });
-            if (this.options.parent_id != false) {
-                ids2.push(this.options.parent_id);
-            }
-            // must not be children of already fetched messages
-            if (ids.length > 0) {
-                domain.push('&');
-                domain.push('!');
-                domain.push(['id', 'child_of', ids]);
-            }
-            if (ids2.length > 0) {
-                domain.push(['id', 'not in', ids2]);
-            }
-            return domain;
-        },
+        // TDE: not necessary, rewritten above
+        // /**
+        //  * Create a domain to fetch new comments according to
+        //  * comment already present in comments_structure
+        //  * @param {Object} comments_structure (see chatter utils)
+        //  * @returns {Array} fetch_domain (OpenERP domain style)
+        //  */
+        // get_fetch_domain: function (comments_structure) {
+        //     var domain = [];
+        //     var ids = comments_structure.root_ids.slice();
+        //     var ids2 = [];
+        //     // must be child of current parent
+        //     if (this.options.parent_id) { domain.push(['id', 'child_of', this.options.parent_id]); }
+        //     _(comments_structure.root_ids).each(function (id) { // each record
+        //         ids.push(id);
+        //         ids2.push(id);
+        //     });
+        //     if (this.options.parent_id != false) {
+        //         ids2.push(this.options.parent_id);
+        //     }
+        //     // must not be children of already fetched messages
+        //     if (ids.length > 0) {
+        //         domain.push('&');
+        //         domain.push('!');
+        //         domain.push(['id', 'child_of', ids]);
+        //     }
+        //     if (ids2.length > 0) {
+        //         domain.push(['id', 'not in', ids2]);
+        //     }
+        //     return domain;
+        // },
         
-        do_more: function () {
-            domain = this.get_fetch_domain(this.comments_structure);
-            return this.fetch_comments(domain);
-        },
+        // do_more: function () {
+        //     domain = this.get_fetch_domain(this.comments_structure);
+        //     return this.fetch_comments(domain);
+        // },
     });
 
 
@@ -643,7 +739,7 @@ openerp.mail = function(session) {
         // QWeb template to use when rendering the object
         template: 'mail.record_thread',
 
-       init: function() {
+        init: function() {
             this._super.apply(this, arguments);
             this.params = this.options || {};
             this.params.thread_level = this.params.thread_level || 0;
@@ -661,10 +757,6 @@ openerp.mail = function(session) {
             this.$element.toggle(this.view.get("actual_mode") !== "create");
         },
         
-        destroy: function () {
-            this._super.apply(this, arguments);
-        },
-        
         set_value: function() {
             this._super.apply(this, arguments);
             if (! this.view.datarecord.id ||
@@ -672,7 +764,6 @@ openerp.mail = function(session) {
                 this.$element.find('.oe_mail_thread').hide();
                 return;
             }
-            // debugger
             // create and render Thread widget
             this.$element.find('div.oe_mail_recthread_main').empty();
             if (this.thread) this.thread.destroy();
@@ -710,8 +801,10 @@ openerp.mail = function(session) {
             this.options = options || {};
             this.options.domain = options.domain || [];
             this.options.context = options.context || {};
-            this.options.context.res_model = options.res_model || 'mail.thread';
-            this.options.context.res_id = options.res_id || false;
+            // TDE: default values in thread
+            // this.options.context.res_model = options.res_model || 'mail.thread';
+            // this.options.context.parent_id = options.parent_id || false;
+            // this.options.context.res_id = options.res_id || false;
             this.options.thread_level = options.thread_level || 1;
             this.thread_list = [];
             this.ds_msg = new session.web.DataSet(this, 'mail.message');
@@ -722,14 +815,16 @@ openerp.mail = function(session) {
 
         start: function () {
             this._super.apply(this, arguments);
-            this.bind_events();
+            // this.bind_events();
             // load mail.message search view
             var search_view_ready = this.load_search_view({}, false);
             // load composition form
-            var compose_done = this.instantiate_composition_form();
+            // var compose_done = this.instantiate_composition_form();
             // fetch first threads
-            var messages_fetched = this.message_fetch();
-            return (search_view_ready && compose_done && messages_fetched);
+            // var messages_fetched = this.message_fetch();
+            var thread_displayed = this.display_thread();
+            // return (search_view_ready && compose_done && messages_fetched);
+            return (search_view_ready && thread_displayed);
         },
 
         destroy: function () {
@@ -740,18 +835,19 @@ openerp.mail = function(session) {
 
         },
 
-        instantiate_composition_form: function(mode, msg_id) {
-            if (this.compose_message_widget) {
-                this.compose_message_widget.destroy();
-            }
-            this.compose_message_widget = new mail.ComposeMessage(this, {
-                'extended_mode': false, 'uid': this.session.uid, 'res_model': this.options.res_model,
-                'res_id': this.options.res_id, 'mode': mode || 'comment', 'msg_id': msg_id });
-            var composition_node = this.$element.find('div.oe_mail_wall_action');
-            composition_node.empty();
-            var compose_done = this.compose_message_widget.appendTo(composition_node);
-            return compose_done;
-        },
+        // TDE: move to thread
+        // instantiate_composition_form: function(mode, msg_id) {
+        //     if (this.compose_message_widget) {
+        //         this.compose_message_widget.destroy();
+        //     }
+        //     this.compose_message_widget = new mail.ComposeMessage(this, {
+        //         'extended_mode': false, 'uid': this.session.uid, 'res_model': this.options.res_model,
+        //         'res_id': this.options.res_id, 'mode': mode || 'comment', 'msg_id': msg_id });
+        //     var composition_node = this.$element.find('div.oe_mail_wall_action');
+        //     composition_node.empty();
+        //     var compose_done = this.compose_message_widget.appendTo(composition_node);
+        //     return compose_done;
+        // },
 
         /**
          * Override-hack of do_action: automatically reload the chatter.
@@ -765,14 +861,15 @@ openerp.mail = function(session) {
             return this._super(action, on_close);
         },
 
-        /** Bind events */
-        bind_events: function () {
-            var self = this;
-            // Click on 'show more'
-            this.$element.find('button.oe_mail_wall_button_more').click(function () {
-                return self.do_fetch_more(); 
-            });
-        },
+        // TDE: move to thread
+        // /** Bind events */
+        // bind_events: function () {
+        //     var self = this;
+        //     // Click on 'show more'
+        //     this.$element.find('button.oe_mail_wall_button_more').click(function () {
+        //         return self.do_fetch_more(); 
+        //     });
+        // },
 
         /**
          * Load the mail.message search view
@@ -806,7 +903,7 @@ openerp.mail = function(session) {
                 self.search_results['domain'] = results.domain;
                 self.search_results['groupby'] = results.group_by;
                 self.message_clean();
-                return self.message_fetch();
+                return self.display_thread();
             });
         },
 
@@ -815,70 +912,90 @@ openerp.mail = function(session) {
             this.$element.find('ul.oe_mail_wall_threads').empty();
         },
 
-        /** Fetch messages
-         * @param {Array} domain
-         * @param {Array} context
-         */
-        message_fetch: function (additional_domain, additional_context) {
-            this.search['domain'] = _.union(this.options.domain, this.search_results.domain);
-            this.search['context'] = _.extend(this.options.context, this.search_results.context);
-            if (additional_domain) var fetch_domain = this.search['domain'].concat(additional_domain);
-            else var fetch_domain = this.search['domain'];
-            if (additional_context) var fetch_context = _.extend(this.search['context'], additional_context);
-            else var fetch_context = this.search['context'];
-            return this.ds_msg.call('message_read',
-                [false, fetch_domain, this.options.thread_level, fetch_context]
-                ).then(this.proxy('display_comments'));
-        },
+        // TDE: move to thread
+        // /** Fetch messages
+        //  * @param {Array} domain
+        //  * @param {Array} context
+        //  */
+        // message_fetch: function (additional_domain, additional_context) {
+        //     this.search['domain'] = _.union(this.options.domain, this.search_results.domain);
+        //     this.search['context'] = _.extend(this.options.context, this.search_results.context);
+        //     if (additional_domain) var fetch_domain = this.search['domain'].concat(additional_domain);
+        //     else var fetch_domain = this.search['domain'];
+        //     if (additional_context) var fetch_context = _.extend(this.search['context'], additional_context);
+        //     else var fetch_context = this.search['context'];
+        //     return this.ds_msg.call('message_read',
+        //         [false, fetch_domain, this.options.thread_level, fetch_context]
+        //         ).then(this.proxy('display_comments'));
+        // },
 
         /** Display comments
          * @param {Array} records tree structure of records
          */
-        display_comments: function (records) {
-            console.log(records);
-            // debugger
-            var self = this;
-            var _expendable = false;
-            _(records).each(function (root_record) {
-                /* expandable type: add a 'Show more button' */
-                if (root_record.type == 'expandable') {
-                    _expendable = true;
-                    self.update_fetch_more(true);
-                    self.fetch_more_domain = root_record.domain;
-                    self.fetch_more_context = root_record.context;
+        display_thread: function () {
+            var render_res = session.web.qweb.render('mail.wall_thread_container', {});
+            $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(this.$element.find('ul.oe_mail_wall_threads'));
+            var thread = new mail.Thread(self, {
+                'domain': this.options.domain, 'context': this.options.context,
+                'uid': this.session.uid, 'thread_level': this.options.thread_level,
+                // display options
+                'show_hide': true, 'show_delete': false,
                 }
-                // display classic root record
-                else {
-                    var render_res = session.web.qweb.render('mail.wall_thread_container', {});
-                    $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads'));
-                    var thread = new mail.Thread(self, {
-                        'res_model': root_record.model, 'res_id': root_record.res_id,
-                        'uid': self.session.uid, 'records': [root_record],
-                        'parent_id': false, 'thread_level': self.options.thread_level,
-                        'show_hide': true, 'is_wall': true
-                        }
-                    );
-                    self.thread_list.push(thread);
-                    thread.appendTo(self.$element.find('li.oe_mail_wall_thread:last'));
-                }
-            });
-            if (! _expendable) {
-                self.update_fetch_more(false);
-            }
+            );
+            thread.appendTo(this.$element.find('li.oe_mail_wall_thread:last'));
+            this.thread_list.push(thread);
         },
+
+        // TDE: move to thread
+        // /** Display comments
+        //  * @param {Array} records tree structure of records
+        //  */
+        // display_comments: function (records) {
+        //     console.log(records);
+        //     // debugger
+        //     var self = this;
+        //     var _expendable = false;
+        //     _(records).each(function (root_record) {
+        //         /* expandable type: add a 'Show more button' */
+        //         if (root_record.type == 'expandable') {
+        //             _expendable = true;
+        //             self.update_fetch_more(true);
+        //             self.fetch_more_domain = root_record.domain;
+        //             self.fetch_more_context = root_record.context;
+        //         }
+        //         // display classic root record
+        //         else {
+        //             var render_res = session.web.qweb.render('mail.wall_thread_container', {});
+        //             $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads'));
+        //             var thread = new mail.Thread(self, {
+        //                 'res_model': root_record.model, 'res_id': root_record.res_id,
+        //                 'uid': self.session.uid, 'records': [root_record],
+        //                 'parent_id': false, 'thread_level': self.options.thread_level,
+        //                 'show_hide': true, 'is_wall': true
+        //                 }
+        //             );
+        //             self.thread_list.push(thread);
+        //             thread.appendTo(self.$element.find('li.oe_mail_wall_thread:last'));
+        //         }
+        //     });
+        //     if (! _expendable) {
+        //         self.update_fetch_more(false);
+        //     }
+        // },
         
-        /** Display 'show more' button */
-        update_fetch_more: function (new_value) {
-            if (new_value) {
-                    this.$element.find('div.oe_mail_wall_more:last').show();
-            } else {
-                    this.$element.find('div.oe_mail_wall_more:last').hide();
-            }
-        },
+        // TDE: move to thread
+        // /** Display 'show more' button */
+        // update_fetch_more: function (new_value) {
+        //     if (new_value) {
+        //             this.$element.find('div.oe_mail_wall_more:last').show();
+        //     } else {
+        //             this.$element.find('div.oe_mail_wall_more:last').hide();
+        //     }
+        // },
         
-        /** Action: 'shows more' to fetch new messages */
-        do_fetch_more: function () {
-            return this.message_fetch(this.fetch_more_domain, this.fetch_more_context);
-        },
+        // /** Action: 'shows more' to fetch new messages */
+        // do_fetch_more: function () {
+        //     return this.message_fetch(this.fetch_more_domain, this.fetch_more_context);
+        // },
     });
 };
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 8ed3925d8e8..b81eebb3d73 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -28,17 +28,19 @@
           </tbody>
         </table>
         <div class="oe_mail_wall_main">
-            <div class="oe_mail_wall_action">
+            <!-- TDe: delegated to thread -->
+            <!-- <div class="oe_mail_wall_action"> -->
                 <!-- call the composition form -->
-                <t t-call ="mail.compose_message"/>
+<!--                 <t t-call ="mail.compose_message"/>
             </div>
-            <div class="oe_clear"/>
+            <div class="oe_clear"/> -->
             <ul class="oe_mail_wall_threads">
                 <!-- contains threads -->
             </ul>
-            <div class="oe_mail_wall_more">
+            <!-- TDE: delegated to thread -->
+<!--             <div class="oe_mail_wall_more">
                 <button class="oe_mail_wall_button_more" type="button">See more...</button>
-            </div>
+            </div> -->
         </div>
         <div class="oe_mail_wall_aside">
                 <!-- contains currently nothing -->

From 6d33e3a93607137058cec76d800539bbd93f5570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 12:42:48 +0200
Subject: [PATCH 427/999] [FIX] mail.followers widget: res_users -> res_partner
 for image.

bzr revid: tde@openerp.com-20120821104248-1vu7q03sn6efyiwp
---
 addons/mail/static/src/js/mail_followers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 87d68a228a9..1e420fbcbb9 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -93,7 +93,7 @@ openerp_mail_followers = function(session, mail) {
             this.$element.find('div.oe_mail_recthread_followers h4').html(this.params.title + ' (' + records.length + ')');
             _(records).each(function (record) {
                 if (record.id == self.session.uid) { self.is_follower = true; }
-                record.avatar_url = mail.ChatterUtils.get_image(self.session.prefix, self.session.session_id, 'res.users', 'image_small', record.id);
+                record.avatar_url = mail.ChatterUtils.get_image(self.session.prefix, self.session.session_id, 'res.partner', 'image_small', record.id);
                 $(session.web.qweb.render('mail.followers.partner', {'record': record})).appendTo(user_list);
             });
             if (this.is_follower) {

From 5872ed6bd33c7d41c1be40cdc568660706aa5568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 12:43:45 +0200
Subject: [PATCH 428/999] [WIP] [CLEAN] mail.js: continuing the cleaning and
 refactoring. Wall and recordthread seems to basically work (not the 'fetch
 more' feature). Cleaned function name, duplicate code, ...

bzr revid: tde@openerp.com-20120821104345-1ithukovq0a1tv76
---
 addons/mail/mail_message.py         |   5 +-
 addons/mail/mail_thread.py          |  12 +-
 addons/mail/static/src/js/mail.js   | 236 +++++++++++++---------------
 addons/mail/static/src/xml/mail.xml |   2 +-
 4 files changed, 125 insertions(+), 130 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 0a059d59f61..f56da844e06 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -131,7 +131,9 @@ class mail_message(osv.Model):
     _limit = 3
     def _message_dict_get(self, cr, uid, msg, context={}):
         attachs = self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)
-        author = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id,], context=context)[0]
+        author = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0]
+        # TDE: need user to show 'delete' link -> necessary ?
+        author_user = self.pool.get('res.users').name_get(cr, uid, [x.id for x in msg.author_id.user_ids], context=context)[0]
         partner_ids = self.pool.get('res.partner').name_get(cr, uid, [x.id for x in msg.partner_ids], context=context)
         return {
             'id': msg.id,
@@ -144,6 +146,7 @@ class mail_message(osv.Model):
             'subject': msg.subject,
             'date': msg.date,
             'author_id': author,
+            'author_user_id': author_user,
             'partner_ids': partner_ids,
             'child_ids': []
         }
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index d9dfc4a474e..de7dc954f31 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -539,8 +539,15 @@ class mail_thread(osv.Model):
         self.message_post(cr, uid, id, message, context=context)
 
     def message_post(self, cr, uid, res_id, body, subject=False,
-            mtype='notification', attachments=None, context=None, **kwargs):
-
+            mtype='notification', parent_id=False, attachments=None, context=None, **kwargs):
+        print res_id
+        print body
+        print subject
+        print mtype
+        print parent_id
+        print attachments
+        print context
+        print kwargs
         context = context or {}
         attachments = attachments or {}
         if type(res_id) in (list, tuple):
@@ -565,6 +572,7 @@ class mail_thread(osv.Model):
             'body': body,
             'subject': subject,
             'type': mtype,
+            'parent_id': parent_id,
             'attachment_ids': to_attach
         })
         return self.pool.get('mail.message').create(cr, uid, value, context=context)
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 576800431fc..ba5230ea3e5 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -353,16 +353,17 @@ openerp.mail = function(session) {
             this.options.context.parent_id = options.context.parent_id || false;
             this.options.thread_level = options.thread_level || 0;
             this.options.fetch_limit = options.fetch_limit || 100;
+            this.options.composer = options.composer || false;
             // TDE: not sure, here for testing / compatibility
             this.options.records = options.records || null;
             this.options.ids = options.ids || null;
             // datasets and internal vars
-            // this.ds = new session.web.DataSetSearch(this, this.options.res_model);
+            this.ds_post = new session.web.DataSetSearch(this, this.options.context.res_model);
             this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
             // display customization vars
             this.display = {};
             this.display.truncate_limit = options.truncate_limit || 250;
-            this.display.show_header_compose = options.show_header_compose || true;
+            this.display.show_header_compose = options.show_header_compose === undefined ? true : options.show_header_compose
             this.display.show_reply = options.show_reply || true;
             this.display.show_delete = options.show_delete || true;
             this.display.show_hide = options.show_hide || true;
@@ -372,62 +373,34 @@ openerp.mail = function(session) {
             this.search = {'domain': [], 'context': {}, 'groupby': {}}
             this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
             // debug
-            console.group('New Thread: model', this.options.context.res_model, 'id', this.options.context.res_id, 'thread level', this.options.thread_level);
+            console.groupCollapsed('New Thread: model', this.options.context.res_model, 'id', this.options.context.res_id, 'parent_id', this.options.context.parent_id, 'thread level', this.options.thread_level);
             console.log('records:', this.options.records, 'ids:', this.options.ids);
             console.log('options:', this.options);
+            console.log('options:', options);
             console.log('display:', this.display);
             console.groupEnd();
         },
         
         start: function() {
             this._super.apply(this, arguments);
-            // bind events
             this.bind_events();
-            // display user, fetch comments
-            this.display_current_user();
-
-            // if (this.options.records) var display_done = this.display_comments_from_parameters(this.options.records);
-            if (this.options.records) var display_done = this.display_comments(this.options.records);
-
-            else var display_done = this.init_comments();
-
+            // display messages: either given by parent, either fetch new ones
+            if (this.options.records) var display_done = this.message_display(this.options.records);
+            else var display_done = this.message_fetch();
             // customize display
-            $.when(display_done).then(this.proxy('do_customize_display'));            
+            this.display_user_avatar();
+            $.when(display_done).then(this.proxy('do_customize_display'));
             // add message composition form view
-            if (this.display.show_header_compose) {
+            if (this.display.show_header_compose && this.options.composer) {
                 var compose_done = this.instantiate_composition_form();
             }
             return display_done && compose_done;
         },
 
-        /**
-         * Override-hack of do_action: automatically reload the chatter.
-         * Normally it should be called only when clicking on 'Post/Send'
-         * in the composition form. */
-        do_action: function(action, on_close) {
-            this.init_comments();
-            if (this.compose_message_widget) {
-                this.compose_message_widget.reinit(); }
-            return this._super(action, on_close);
-        },
-
-        instantiate_composition_form: function(mode, email_mode, formatting, msg_id, context) {
-            if (this.compose_message_widget) {
-                this.compose_message_widget.destroy();
-            }
-            this.compose_message_widget = new mail.ComposeMessage(this, {
-                'extended_mode': false, 'uid': this.options.uid, 'res_model': this.options.res_model,
-                'res_id': this.options.res_id, 'mode': mode || 'comment', 'msg_id': msg_id,
-                'email_mode': email_mode || false, 'formatting': formatting || false,
-                'context': context || false } );
-            var composition_node = this.$element.find('div.oe_mail_thread_action');
-            composition_node.empty();
-            var compose_done = this.compose_message_widget.appendTo(composition_node);
-            return compose_done;
-        },
-
+        /** Customize the display
+         * - show_header_compose: show the composition form in the header */
         do_customize_display: function() {
-            if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_action').eq(0).show(); }
+            if (this.display.show_header_compose) { this.$element.find('div.oe_mail_thread_action').eq(0).show(); }
         },
 
         /**
@@ -437,13 +410,13 @@ openerp.mail = function(session) {
             var self = this;
             // event: click on 'more' at bottom of thread
             this.$element.find('button.oe_mail_button_more').click(function () {
-                self.do_more();
+                self.do_message_fetch();
             });
             // event: writing in basic textarea of composition form (quick reply)
             this.$element.find('textarea.oe_mail_compose_textarea').keyup(function (event) {
                 var charCode = (event.which) ? event.which : window.event.keyCode;
                 if (event.shiftKey && charCode == 13) { this.value = this.value+"\n"; }
-                else if (charCode == 13) { return self.do_comment(); }
+                else if (charCode == 13) { return self.do_message_post(); }
             });
             // event: click on 'Reply' in msg
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply', 'click', function (event) {
@@ -483,7 +456,7 @@ openerp.mail = function(session) {
                 event.preventDefault();
                 return call_defer;
             });
-            // event: click on "Reply" in msg side menu (email style)
+            // event: click on "Reply by email" in msg side menu (email style)
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply_by_email', 'click', function (event) {
                 var msg_id = event.srcElement.dataset.msg_id;
                 var email_mode = (event.srcElement.dataset.type == 'email');
@@ -493,25 +466,47 @@ openerp.mail = function(session) {
                 event.preventDefault();
             });
         },
-        
-        init_comments: function() {
-            var self = this;
-            // TDE: not necessary
-            // this.params.offset = 0;
-            // this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
 
-            this.$element.find('div.oe_mail_thread_display').empty();
-            // var domain = this.get_fetch_domain(this.comments_structure);
-            return this.message_fetch(this.options.domain || []).then();
+        /**
+         * Override-hack of do_action: automatically reload the chatter.
+         * Normally it should be called only when clicking on 'Post/Send'
+         * in the composition form. */
+        do_action: function(action, on_close) {
+            console.log('thread do_action');
+            this.init_comments();
+            if (this.compose_message_widget) {
+                this.compose_message_widget.reinit(); }
+            return this._super(action, on_close);
+        },
+
+        /** Instantiate the composition form, with paramteres coming from thread parameters */
+        instantiate_composition_form: function(mode, email_mode, formatting, msg_id, context) {
+            if (this.compose_message_widget) {
+                this.compose_message_widget.destroy();
+            }
+            this.compose_message_widget = new mail.ComposeMessage(this, {
+                'extended_mode': false, 'uid': this.options.uid, 'res_model': this.options.context.res_model,
+                'res_id': this.options.context.res_id, 'mode': mode || 'comment', 'msg_id': msg_id,
+                'email_mode': email_mode || false, 'formatting': formatting || false,
+                'context': context || false } );
+            var composition_node = this.$element.find('div.oe_mail_thread_action');
+            composition_node.empty();
+            var compose_done = this.compose_message_widget.appendTo(composition_node);
+            return compose_done;
+        },
+
+        /** Clean the thread */
+        message_clean: function() {
+            this.$el.find('div.oe_mail_thread_display').empty();
         },
 
         /** Fetch messages
-         * @param {Array} domain
-         * @param {Array} context
+         * @param {Array} additional_domain
+         * @param {Object} additional_context
          */
         message_fetch: function (additional_domain, additional_context) {
             var self = this;
-
+            // Update the domain and context
             this.search['domain'] = _.union(this.options.domain, this.search_results.domain);
             this.search['context'] = _.extend(this.options.context, this.search_results.context);
             if (additional_domain) var fetch_domain = this.search['domain'].concat(additional_domain);
@@ -519,19 +514,21 @@ openerp.mail = function(session) {
             if (additional_context) var fetch_context = _.extend(this.search['context'], additional_context);
             else var fetch_context = this.search['context'];
 
-            // first use: use IDS, otherwise set false
+            // TODO first use: use IDS, otherwise set false
+
             var read_defer = this.ds_msg.call('message_read',
                 [false, fetch_domain, this.options.thread_level, fetch_context]
-                ).then(function (records) {
+                ).then(this.proxy('message_display'));
+                // function (records) {
                     // if (records.length <= self.options.limit) self.display.show_more = false;
                     // else { self.display.show_more = true; records.pop(); }
                     // else { self.display.show_more = true; records.splice(0, 1); }
                     // else { self.display.show_more = true; }
-                    self.display_comments(records);
+                    // self.display_comments(records);
                     // TODO: move to customize display
                     // if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show();
                     // else  self.$element.find('div.oe_mail_thread_more:last').hide();
-                });
+                // });
             return read_defer;
         },
 
@@ -581,68 +578,53 @@ openerp.mail = function(session) {
         //         self.update_fetch_more(false);
         //     }
         // },
-        
 
-
-        display_comments: function (records) {
+        /* Display a list of records
+         * - */
+        message_display: function (records) {
             var self = this;
-            // sort the records
-            // mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, this.params.parent_id);
-            //build attachments download urls and compute time-relative from dates
-            for (var k in records) {
-                records[k].timerelative = $.timeago(records[k].date);
-                if (records[k].attachments) {
-                    for (var l in records[k].attachments) {
-                        var url = self.session.origin + '/web/binary/saveas?session_id=' + self.session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id='+records[k].attachments[l].id;
-                        records[k].attachments[l].url = url;
-                    }
-                }
-            }
             _(records).each(function (record) {
-                var sub_msgs = [];
                 if (record.type == 'expandable') {
                     // TDE: do something :)
                 }
-                else if ((record.parent_id == undefined || record.parent_id == false || record.parent_id[0] == self.options.parent_id) && self.options.thread_level > 0 ) {
-                    // var sub_list = self.comments_structure['tree_struct'][record.id]['direct_childs'];
-                    // _(records).each(function (record) {
-                    //     //if (record.parent_id == false || record.parent_id[0] == self.params.parent_id) return;
-                    //     if (_.indexOf(sub_list, record.id) != -1) {
-                    //         sub_msgs.push(record);
-                    //     }
-                    // });
-                    self.display_comment(record);
-                    self.thread = new mail.Thread(self, {'res_model': self.options.res_model, 'res_id': self.options.res_id, 'uid': self.options.uid,
-                                                            'records': record.child_ids, 'thread_level': (self.options.thread_level-1), 'parent_id': record.id,
-                                                            'is_wall': self.options.is_wall});
+                else {
+                    self.display_record(record);
+                    self.thread = new mail.Thread(self, {
+                        'context': { 'res_model': record.model, 'res_id': record.res_id, 'parent_id': record.id},
+                        'show_header_compose': false,
+                        'uid': self.options.uid, 'records': record.child_ids, 'thread_level': (self.options.thread_level-1),
+                    });
                     self.$element.find('li.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');
                     self.thread.appendTo(self.$element.find('div.oe_mail_thread_subthread:last'));
                 }
-                else if (self.options.thread_level == 0) {
-                    self.display_comment(record);
-                }
             });
-            // mail.ChatterUtils.records_struct_update_after_display(this.comments_structure);
-            // update offset for "More" buttons
-            if (this.options.thread_level == 0) this.options.offset += records.length;
         },
 
-        /** Displays a record, performs text/link formatting */
-        display_comment: function (record) {
-            // if (record.type == 'email' && record.state == 'received') {
-            if (record.type == 'email') {
-                record.mini_url = ('/mail/static/src/img/email_icon.png');
-            } else {
-                record.mini_url = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.partner', 'image_small', record.author_id[0]);
-            }
-            // record.body = mail.ChatterUtils.do_replace_expressions(record.body);
-            // format date according to the user timezone
+        /** Displays a record and performs some formatting on the record :
+         * - record.date: formatting according to the user timezone
+         * - record.timerelative: relative time givein by timeago lib
+         * - record.avatar: image url
+         * - record.attachments[].url: url of each attachment
+         * - record.is_author: is the current user the author of the record */
+        display_record: function (record) {
+            // formatting and additional fields
             record.date = session.web.format_value(record.date, {type:"datetime"});
-            // is the user the author ?
-            record.is_author = mail.ChatterUtils.is_author(this, record.author_id[0]);
-            // render
+            record.timerelative = $.timeago(record.date);
+            if (record.type == 'email') {
+                record.avatar = ('/mail/static/src/img/email_icon.png');
+            } else {
+                record.avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.partner', 'image_small', record.author_id[0]);
+            }
+            //TDE: FIX
+            if (record.attachments) {
+                for (var l in record.attachments) {
+                    var url = self.session.origin + '/web/binary/saveas?session_id=' + self.session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id='+records[k].attachments[l].id;
+                    record.attachments[l].url = url;
+                }
+            }
+            record.is_author = mail.ChatterUtils.is_author(this, record.author_user_id[0]);
+            // render, add the expand feature
             var rendered = session.web.qweb.render('mail.thread.message', {'record': record, 'thread': this, 'params': this.options, 'display': this.display});
-            // expand feature
             $(rendered).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
             this.$element.find('div.oe_mail_msg_record_body').expander({
                 slicePoint: this.options.msg_more_limit,
@@ -663,27 +645,28 @@ openerp.mail = function(session) {
                     this.$element.find('div.oe_mail_wall_more:last').hide();
             }
         },
-        
-        /** Action: 'shows more' to fetch new messages */
-        do_fetch_more: function () {
-            return this.message_fetch(this.fetch_more_domain, this.fetch_more_context);
-        },
 
-
-
-        display_current_user: function () {
+        display_user_avatar: function () {
             var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.options.uid);
             return this.$element.find('img.oe_mail_icon').attr('src', avatar);
         },
         
-        do_comment: function () {
-            var comment_node = this.$element.find('textarea');
-            var body = comment_node.val();
-            comment_node.val('');
-            return this.ds.call('message_post', [[this.options.res_id], body], {parent_id: this.options.parent_id, mtype: 'comment'}).then(
-                this.proxy('init_comments'));
+        message_post: function (body) {
+            if (! body) {
+                var comment_node = this.$element.find('textarea');
+                var body = comment_node.val();
+                comment_node.val('');
+            }
+            return this.ds_post.call('message_post', [
+                [this.options.context.res_id], body, false, 'comment', this.options.context.parent_id]
+                ).then(this.proxy('init_comments'));
         },
-        
+
+        /** Action: 'shows more' to fetch new messages */
+        do_message_fetch: function () {
+            return this.message_fetch(this.fetch_more_domain, this.fetch_more_context);
+        },
+
         // TDE: not necessary, rewritten above
         // /**
         //  * Create a domain to fetch new comments according to
@@ -936,10 +919,11 @@ openerp.mail = function(session) {
             var render_res = session.web.qweb.render('mail.wall_thread_container', {});
             $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(this.$element.find('ul.oe_mail_wall_threads'));
             var thread = new mail.Thread(self, {
-                'domain': this.options.domain, 'context': this.options.context,
-                'uid': this.session.uid, 'thread_level': this.options.thread_level,
+                'domain': this.options.domain, 'context': this.options.context, 'uid': this.session.uid,
+                'thread_level': this.options.thread_level, 'composer': true,
                 // display options
-                'show_hide': true, 'show_delete': false,
+                'show_header_compose': true,  'show_reply': this.options.thread_level > 0,
+                'show_hide': true, 'show_reply_by_email': true,
                 }
             );
             thread.appendTo(this.$element.find('li.oe_mail_wall_thread:last'));
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b81eebb3d73..cb07cf23d7e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -107,7 +107,7 @@
     <!-- default layout -->
     <li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
-            <img class="oe_mail_icon oe_left" t-att-src="record.mini_url"/>
+            <img class="oe_mail_icon oe_left" t-att-src="record.avatar"/>
             <div class="oe_mail_msg_content">
                 <!-- dropdown menu with message options and actions -->
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">

From c277a22f4d07df12b4900e12dd3d2b30b4b0bda6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 13:41:28 +0200
Subject: [PATCH 429/999] [CLEAN] mail.js: cleaned Wall and RecordThread.
 Deleted code in wall related to message_fetch, display and fetch more.
 Deleted dead XML and CSS.

bzr revid: tde@openerp.com-20120821114128-mwu6av0n52r2tbww
---
 addons/mail/static/src/css/mail.css |  35 +------
 addons/mail/static/src/js/mail.js   | 156 ++++++----------------------
 addons/mail/static/src/xml/mail.xml |  10 --
 3 files changed, 34 insertions(+), 167 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 6125b3bf39b..7a3d0e29710 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -19,30 +19,6 @@
     margin: 8px;
 }
 
-.openerp div.oe_mail_wall_action {
-    padding: 8px;
-    background: #eee;
-    border: 1px solid #ccc;
-}
-
-.openerp div.oe_mail_wall_action:after {
-    content: "";
-    display: block;
-    clear: both; 
-}
-
-.openerp div.oe_mail_wall_action .oe_mail_msg_content {
-    width: 484px;
-}
-
-.openerp div.oe_mail_wall_action textarea.oe_mail_compose_textarea,
-.openerp div.oe_mail_wall_action div.oe_mail_compose_message_body textarea {
-    width: 474px;
-    height: 60px;
-    padding: 4px;
-    margin-bottom: 2px;
-}
-
 .openerp ul.oe_mail_wall_threads {
     margin-top: 8px;
 }
@@ -79,11 +55,6 @@
     width: 440px;
 }
 
-.openerp div.oe_mail_wall_more {
-    text-align: center;
-    /*display: none;*/
-}
-
 
 /* ------------------------------------------------------------ */
 /* RecordThread
@@ -152,7 +123,7 @@
 /* ------------------------------------------------------------ */
 
 .openerp div.oe_mail_thread_action {
-    /*display: none;*/
+    display: none;
     white-space: normal;
     padding: 8px;
     background: #eee;
@@ -198,7 +169,7 @@
 }
 
 .openerp div.oe_mail_thread_more {
-    /*display: none;*/
+    display: none;
     border-bottom: 1px solid #D2D9E7;
 }
 
@@ -391,7 +362,7 @@
 
 /* Attachments list */
 .openerp ul.oe_mail_msg_attachments {
-    /*display: none;*/
+    display: none;
     width: 100%;
     border-top: 1px solid #CCC;
     margin: .5em 0 0 0;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ba5230ea3e5..61f0992171c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -724,43 +724,54 @@ openerp.mail = function(session) {
 
         init: function() {
             this._super.apply(this, arguments);
-            this.params = this.options || {};
-            this.params.thread_level = this.params.thread_level || 0;
-            this.thread = null;
+            this.options.domain = this.options.domain || [];
+            this.options.context = {'res_model': 'mail.thread', 'res_id': false, 'parent_id': false};
+            this.options.thread_level = this.options.thread_level || 0;
+            this.thread_list = [];
         },
         
         start: function() {
+            // this._super.apply(this, arguments);
             // NB: all the widget should be modified to check the actual_mode property on view, not use
             // any other method to know if the view is in create mode anymore
             this.view.on("change:actual_mode", this, this._check_visibility);
             this._check_visibility();
         },
-        
+
         _check_visibility: function() {
             this.$element.toggle(this.view.get("actual_mode") !== "create");
         },
-        
+
+        destroy: function() {
+            for (var i in this.thread_list) { this.thread_list[i].destroy(); }
+            this._super.apply(this, arguments);
+        },
+
         set_value: function() {
             this._super.apply(this, arguments);
-            if (! this.view.datarecord.id ||
-                session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
-                this.$element.find('.oe_mail_thread').hide();
+            if (! this.view.datarecord.id || session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
+                this.$el.find('oe_mail_thread').hide();
                 return;
             }
+            // update context
+            this.options.context['res_id'] = this.view.datarecord.id;
+            this.options.context['res_model'] = this.view.model;
             // create and render Thread widget
             this.$element.find('div.oe_mail_recthread_main').empty();
-            if (this.thread) this.thread.destroy();
-            this.thread = new mail.Thread(this, {'res_model': this.view.model, 'res_id': this.view.datarecord.id, 'uid': this.session.uid,
-                                                'thread_level': this.params.thread_level, 'show_post_comment': true, 'limit': 15});
-            var thread_done = this.thread.appendTo(this.$element.find('div.oe_mail_recthread_main'));
-            return thread_done;
+            for (var i in this.thread_list) { this.thread_list[i].destroy(); }
+            var thread = new mail.Thread(this, {
+                'context': this.options.context, 'uid': this.session.uid,
+                'thread_level': this.options.thread_level, 'show_header_compose': true,
+                'show_delete': true, 'composer': true });
+            this.thread_list.push(thread);
+            return thread.appendTo(this.$element.find('div.oe_mail_recthread_main'));
         },
     });
 
 
     /** 
      * ------------------------------------------------------------
-     * WallView Widget
+     * Wall Widget
      * ------------------------------------------------------------
      *
      * This widget handles the display of the Chatter on the Wall.
@@ -775,19 +786,16 @@ openerp.mail = function(session) {
 
         /**
          * @param {Object} parent parent
-         * @param {Object} [params]
-         * @param {Number} [params.limit=20] number of messages to show and fetch
-         * @var {Array} comments_structure (see chatter utils)
+         * @param {Object} [options]
+         * @param {Number} [options.domain] domain on the Wall, is an array.
+         * @param {Number} [options.domain] context, is an object. It should
+         *      contain res_model, res_id, parent_id, to give it to the threads.
          */
         init: function (parent, options) {
             this._super(parent);
             this.options = options || {};
             this.options.domain = options.domain || [];
             this.options.context = options.context || {};
-            // TDE: default values in thread
-            // this.options.context.res_model = options.res_model || 'mail.thread';
-            // this.options.context.parent_id = options.parent_id || false;
-            // this.options.context.res_id = options.res_id || false;
             this.options.thread_level = options.thread_level || 1;
             this.thread_list = [];
             this.ds_msg = new session.web.DataSet(this, 'mail.message');
@@ -798,44 +806,21 @@ openerp.mail = function(session) {
 
         start: function () {
             this._super.apply(this, arguments);
-            // this.bind_events();
-            // load mail.message search view
             var search_view_ready = this.load_search_view({}, false);
-            // load composition form
-            // var compose_done = this.instantiate_composition_form();
-            // fetch first threads
-            // var messages_fetched = this.message_fetch();
             var thread_displayed = this.display_thread();
-            // return (search_view_ready && compose_done && messages_fetched);
             return (search_view_ready && thread_displayed);
         },
 
         destroy: function () {
+            for (var i in this.thrad_list) { this.thread_list[i].destroy(); }
             this._super.apply(this, arguments);
-            if (this.thread_list) {
-                // #TODO: destroy threads
-            }
-
         },
 
-        // TDE: move to thread
-        // instantiate_composition_form: function(mode, msg_id) {
-        //     if (this.compose_message_widget) {
-        //         this.compose_message_widget.destroy();
-        //     }
-        //     this.compose_message_widget = new mail.ComposeMessage(this, {
-        //         'extended_mode': false, 'uid': this.session.uid, 'res_model': this.options.res_model,
-        //         'res_id': this.options.res_id, 'mode': mode || 'comment', 'msg_id': msg_id });
-        //     var composition_node = this.$element.find('div.oe_mail_wall_action');
-        //     composition_node.empty();
-        //     var compose_done = this.compose_message_widget.appendTo(composition_node);
-        //     return compose_done;
-        // },
-
         /**
          * Override-hack of do_action: automatically reload the chatter.
          * Normally it should be called only when clicking on 'Post/Send'
          * in the composition form. */
+        //TDE: still useful ? TO CHECK
         do_action: function(action, on_close) {
             if (this.compose_message_widget) {
                 this.compose_message_widget.reinit(); }
@@ -844,16 +829,6 @@ openerp.mail = function(session) {
             return this._super(action, on_close);
         },
 
-        // TDE: move to thread
-        // /** Bind events */
-        // bind_events: function () {
-        //     var self = this;
-        //     // Click on 'show more'
-        //     this.$element.find('button.oe_mail_wall_button_more').click(function () {
-        //         return self.do_fetch_more(); 
-        //     });
-        // },
-
         /**
          * Load the mail.message search view
          * @param {Object} defaults ??
@@ -895,23 +870,6 @@ openerp.mail = function(session) {
             this.$element.find('ul.oe_mail_wall_threads').empty();
         },
 
-        // TDE: move to thread
-        // /** Fetch messages
-        //  * @param {Array} domain
-        //  * @param {Array} context
-        //  */
-        // message_fetch: function (additional_domain, additional_context) {
-        //     this.search['domain'] = _.union(this.options.domain, this.search_results.domain);
-        //     this.search['context'] = _.extend(this.options.context, this.search_results.context);
-        //     if (additional_domain) var fetch_domain = this.search['domain'].concat(additional_domain);
-        //     else var fetch_domain = this.search['domain'];
-        //     if (additional_context) var fetch_context = _.extend(this.search['context'], additional_context);
-        //     else var fetch_context = this.search['context'];
-        //     return this.ds_msg.call('message_read',
-        //         [false, fetch_domain, this.options.thread_level, fetch_context]
-        //         ).then(this.proxy('display_comments'));
-        // },
-
         /** Display comments
          * @param {Array} records tree structure of records
          */
@@ -929,57 +887,5 @@ openerp.mail = function(session) {
             thread.appendTo(this.$element.find('li.oe_mail_wall_thread:last'));
             this.thread_list.push(thread);
         },
-
-        // TDE: move to thread
-        // /** Display comments
-        //  * @param {Array} records tree structure of records
-        //  */
-        // display_comments: function (records) {
-        //     console.log(records);
-        //     // debugger
-        //     var self = this;
-        //     var _expendable = false;
-        //     _(records).each(function (root_record) {
-        //         /* expandable type: add a 'Show more button' */
-        //         if (root_record.type == 'expandable') {
-        //             _expendable = true;
-        //             self.update_fetch_more(true);
-        //             self.fetch_more_domain = root_record.domain;
-        //             self.fetch_more_context = root_record.context;
-        //         }
-        //         // display classic root record
-        //         else {
-        //             var render_res = session.web.qweb.render('mail.wall_thread_container', {});
-        //             $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads'));
-        //             var thread = new mail.Thread(self, {
-        //                 'res_model': root_record.model, 'res_id': root_record.res_id,
-        //                 'uid': self.session.uid, 'records': [root_record],
-        //                 'parent_id': false, 'thread_level': self.options.thread_level,
-        //                 'show_hide': true, 'is_wall': true
-        //                 }
-        //             );
-        //             self.thread_list.push(thread);
-        //             thread.appendTo(self.$element.find('li.oe_mail_wall_thread:last'));
-        //         }
-        //     });
-        //     if (! _expendable) {
-        //         self.update_fetch_more(false);
-        //     }
-        // },
-        
-        // TDE: move to thread
-        // /** Display 'show more' button */
-        // update_fetch_more: function (new_value) {
-        //     if (new_value) {
-        //             this.$element.find('div.oe_mail_wall_more:last').show();
-        //     } else {
-        //             this.$element.find('div.oe_mail_wall_more:last').hide();
-        //     }
-        // },
-        
-        // /** Action: 'shows more' to fetch new messages */
-        // do_fetch_more: function () {
-        //     return this.message_fetch(this.fetch_more_domain, this.fetch_more_context);
-        // },
     });
 };
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index cb07cf23d7e..3f547ae2e5d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -28,19 +28,9 @@
           </tbody>
         </table>
         <div class="oe_mail_wall_main">
-            <!-- TDe: delegated to thread -->
-            <!-- <div class="oe_mail_wall_action"> -->
-                <!-- call the composition form -->
-<!--                 <t t-call ="mail.compose_message"/>
-            </div>
-            <div class="oe_clear"/> -->
             <ul class="oe_mail_wall_threads">
                 <!-- contains threads -->
             </ul>
-            <!-- TDE: delegated to thread -->
-<!--             <div class="oe_mail_wall_more">
-                <button class="oe_mail_wall_button_more" type="button">See more...</button>
-            </div> -->
         </div>
         <div class="oe_mail_wall_aside">
                 <!-- contains currently nothing -->

From d2ba338de82587c41538740a2115ac4436a42be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 14:00:46 +0200
Subject: [PATCH 430/999] [FIX] portal: fixed demo data.

bzr revid: tde@openerp.com-20120821120046-b8gu96wj2sbh58bw
---
 addons/portal/portal_demo.xml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index ab2cf22ffb7..0271f2de471 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -23,8 +23,7 @@
             <field name="subject">Our first company's blogpost !</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Hello, and welcome to our company's portal !
+            <field name="body"><![CDATA[Hello, and welcome to our company's portal !
 
 Lorem ipsum <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus.
 Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi.
@@ -33,27 +32,25 @@ Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Sed
 
 Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]></field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
 
         <record id="message_company_news0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Great first blogpost !  (first comment)]]></field>
+            <field name="body"><![CDATA[Great first blogpost !  (first comment)]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_demo"/>
+            <field name="author_id" ref="base.res_partner_1"/>
         </record>
 
         <record id="message_company_news0_comment1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Thanks !  (second comment)]]></field>
+            <field name="body"><![CDATA[Thanks !  (second comment)]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
 
     </data>

From 00eed0590e8fff5696e50ecd6b176f50ecc84b80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 14:10:30 +0200
Subject: [PATCH 431/999] [CLEAN] mail.js: continuing cleaning. Removed
 commented code, now not necessary.

bzr revid: tde@openerp.com-20120821121030-7qbr54wra11oeen2
---
 addons/mail/mail_message.py       |  1 +
 addons/mail/static/src/js/mail.js | 82 ++++++-------------------------
 2 files changed, 15 insertions(+), 68 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index f56da844e06..bc2fe238fee 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -114,6 +114,7 @@ class mail_message(osv.Model):
         'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
         'body': fields.html('Content', required=True),
     }
+
     def _get_default_author(self, cr, uid, context={}):
         return self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
 
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 61f0992171c..706a744b20f 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -376,7 +376,6 @@ openerp.mail = function(session) {
             console.groupCollapsed('New Thread: model', this.options.context.res_model, 'id', this.options.context.res_id, 'parent_id', this.options.context.parent_id, 'thread level', this.options.thread_level);
             console.log('records:', this.options.records, 'ids:', this.options.ids);
             console.log('options:', this.options);
-            console.log('options:', options);
             console.log('display:', this.display);
             console.groupEnd();
         },
@@ -519,73 +518,23 @@ openerp.mail = function(session) {
             var read_defer = this.ds_msg.call('message_read',
                 [false, fetch_domain, this.options.thread_level, fetch_context]
                 ).then(this.proxy('message_display'));
-                // function (records) {
-                    // if (records.length <= self.options.limit) self.display.show_more = false;
-                    // else { self.display.show_more = true; records.pop(); }
-                    // else { self.display.show_more = true; records.splice(0, 1); }
-                    // else { self.display.show_more = true; }
-                    // self.display_comments(records);
-                    // TODO: move to customize display
-                    // if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show();
-                    // else  self.$element.find('div.oe_mail_thread_more:last').hide();
-                // });
             return read_defer;
         },
 
-        /* TDE: not necessary as we can read on ids or false */
-        // display_comments_from_parameters: function (records) {
-        //     if (records.length > 0 && records.length < (records[0].child_ids.length+1) ) this.display.show_more = true;
-        //     else this.display.show_more = false;
-        //     var defer = this.display_comments(records);
-        //     // TODO: move to customize display
-        //     if (this.display.show_more == true) $('div.oe_mail_thread_more').eq(-2).show();
-        //     else $('div.oe_mail_thread_more').eq(-2).hide();
-        //     return defer;
-        // },
-
-        /** Display comments
-         * @param {Array} records tree structure of records
-         */
-        // display_comments: function (records) {
-        //     console.log(records);
-        //     // debugger
-        //     var self = this;
-        //     var _expendable = false;
-        //     _(records).each(function (root_record) {
-        //         /* expandable type: add a 'Show more button' */
-        //         if (root_record.type == 'expandable') {
-        //             _expendable = true;
-        //             self.update_fetch_more(true);
-        //             self.fetch_more_domain = root_record.domain;
-        //             self.fetch_more_context = root_record.context;
-        //         }
-        //         // display classic root record
-        //         else {
-        //             var render_res = session.web.qweb.render('mail.wall_thread_container', {});
-        //             $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads'));
-        //             var thread = new mail.Thread(self, {
-        //                 'res_model': root_record.model, 'res_id': root_record.res_id,
-        //                 'uid': self.session.uid, 'records': [root_record],
-        //                 'parent_id': false, 'thread_level': self.options.thread_level,
-        //                 'show_hide': true, 'is_wall': true
-        //                 }
-        //             );
-        //             self.thread_list.push(thread);
-        //             thread.appendTo(self.$element.find('li.oe_mail_wall_thread:last'));
-        //         }
-        //     });
-        //     if (! _expendable) {
-        //         self.update_fetch_more(false);
-        //     }
-        // },
-
         /* Display a list of records
          * - */
         message_display: function (records) {
             var self = this;
+            var _expendable = false;
+            console.groupCollapsed('message_display');
+            console.log('records', records)
+            console.groupEnd();
             _(records).each(function (record) {
                 if (record.type == 'expandable') {
-                    // TDE: do something :)
+                    _expendable = true;
+                    self.update_fetch_more(true);
+                    self.fetch_more_domain = record.domain;
+                    self.fetch_more_context = record.context;
                 }
                 else {
                     self.display_record(record);
@@ -598,6 +547,9 @@ openerp.mail = function(session) {
                     self.thread.appendTo(self.$element.find('div.oe_mail_thread_subthread:last'));
                 }
             });
+            if (! _expendable) {
+                this.update_fetch_more(false);
+            }
         },
 
         /** Displays a record and performs some formatting on the record :
@@ -636,13 +588,12 @@ openerp.mail = function(session) {
                 });
         },
 
-
         /** Display 'show more' button */
         update_fetch_more: function (new_value) {
             if (new_value) {
-                    this.$element.find('div.oe_mail_wall_more:last').show();
+                    this.$element.find('div.oe_mail_thread_more:last').show();
             } else {
-                    this.$element.find('div.oe_mail_wall_more:last').hide();
+                    this.$element.find('div.oe_mail_thread_more:last').hide();
             }
         },
 
@@ -667,7 +618,7 @@ openerp.mail = function(session) {
             return this.message_fetch(this.fetch_more_domain, this.fetch_more_context);
         },
 
-        // TDE: not necessary, rewritten above
+        // TDE: keep currently because need something similar
         // /**
         //  * Create a domain to fetch new comments according to
         //  * comment already present in comments_structure
@@ -698,11 +649,6 @@ openerp.mail = function(session) {
         //     }
         //     return domain;
         // },
-        
-        // do_more: function () {
-        //     domain = this.get_fetch_domain(this.comments_structure);
-        //     return this.fetch_comments(domain);
-        // },
     });
 
 

From 5bfb8bb498a27ec9d36b009759ea011361bac040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 14:31:28 +0200
Subject: [PATCH 432/999] [IMP] mail.js: Thread: updated and cleaned event
 bindings (use on instead of delegate, handle propagation).

bzr revid: tde@openerp.com-20120821123128-29njlixe14eu8rmg
---
 addons/mail/static/src/js/mail.js | 33 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 706a744b20f..d102bccab69 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -418,51 +418,50 @@ openerp.mail = function(session) {
                 else if (charCode == 13) { return self.do_message_post(); }
             });
             // event: click on 'Reply' in msg
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply', 'click', function (event) {
-                var act_dom = $(this).parents('div.oe_mail_thread_display').find('div.oe_mail_thread_action:first');
+            this.$element.on('click', 'a.oe_mail_msg_reply', function (event) {
+                var act_dom = $(this).parents('li.oe_mail_thread_msg').eq(0).find('div.oe_mail_thread_action:first');
                 act_dom.toggle();
                 event.preventDefault();
+                event.stopPropagation();
             });
             // event: click on 'attachment(s)' in msg
-            this.$element.delegate('a.oe_mail_msg_view_attachments', 'click', function (event) {
+            this.$element.on('click', 'a.oe_mail_msg_view_attachments', function (event) {
                 var act_dom = $(this).parent().parent().parent().find('.oe_mail_msg_attachments');
                 act_dom.toggle();
                 event.preventDefault();
+                event.stopPropagation();
             });
             // event: click on 'Delete' in msg side menu
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_delete', 'click', function (event) {
+            this.$element.on('click', 'a.oe_mail_msg_delete', function (event) {
+                event.preventDefault();
+                event.stopPropagation();
                 if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
                 var msg_id = event.srcElement.dataset.id;
                 if (! msg_id) return false;
                 var call_defer = self.ds_msg.unlink([parseInt(msg_id)]);
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
-                if (self.params.thread_level > 0) {
-                    $(event.srcElement).parents('.oe_mail_thread').eq(0).hide();
-                }
-                event.preventDefault();
+                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
                 return call_defer;
             });
             // event: click on 'Hide' in msg side menu
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide', 'click', function (event) {
+            this.$element.on('click', 'a.oe_mail_msg_hide', function (event) {
+                event.preventDefault();
+                event.stopPropagation();
                 if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; }
                 var msg_id = event.srcElement.dataset.id;
                 if (! msg_id) return false;
                 var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]);
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
-                if (self.params.thread_level > 0) {
-                    $(event.srcElement).parents('.oe_mail_thread').eq(0).hide();
-                }
-                event.preventDefault();
+                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
                 return call_defer;
             });
             // event: click on "Reply by email" in msg side menu (email style)
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply_by_email', 'click', function (event) {
+            this.$element.on('click', 'a.oe_mail_msg_reply_by_email', function (event) {
+                event.preventDefault();
+                event.stopPropagation();
                 var msg_id = event.srcElement.dataset.msg_id;
                 var email_mode = (event.srcElement.dataset.type == 'email');
                 var formatting = (event.srcElement.dataset.formatting == 'html');
                 if (! msg_id) return false;
                 self.instantiate_composition_form('reply', email_mode, formatting, msg_id);
-                event.preventDefault();
             });
         },
 

From 1490c5e60cd587009c44434f1d3fda5513703952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 14:37:48 +0200
Subject: [PATCH 433/999] [IMP] mail.js: Thread: updated default options.

bzr revid: tde@openerp.com-20120821123748-bq6k9kj42gtyzb56
---
 addons/mail/static/src/js/mail.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index d102bccab69..994bdfe1d28 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -363,12 +363,12 @@ openerp.mail = function(session) {
             // display customization vars
             this.display = {};
             this.display.truncate_limit = options.truncate_limit || 250;
-            this.display.show_header_compose = options.show_header_compose === undefined ? true : options.show_header_compose
-            this.display.show_reply = options.show_reply || true;
-            this.display.show_delete = options.show_delete || true;
-            this.display.show_hide = options.show_hide || true;
-            this.display.show_reply_by_email = options.show_reply_by_email || true;
-            this.display.show_more = options.show_more || true;
+            this.display.show_header_compose = options.show_header_compose || false;
+            this.display.show_reply = options.show_reply || false;
+            this.display.show_delete = options.show_delete || false;
+            this.display.show_hide = options.show_hide || false;
+            this.display.show_reply_by_email = options.show_reply_by_email || false;
+            this.display.show_more = options.show_more || false;
             // for search view
             this.search = {'domain': [], 'context': {}, 'groupby': {}}
             this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
@@ -539,7 +539,8 @@ openerp.mail = function(session) {
                     self.display_record(record);
                     self.thread = new mail.Thread(self, {
                         'context': { 'res_model': record.model, 'res_id': record.res_id, 'parent_id': record.id},
-                        'show_header_compose': false,
+                        'show_header_compose': false, 'show_reply': self.options.thread_level > 1,
+                        'show_hide': self.display.show_hide, 'show_delete': self.display.show_delete,
                         'uid': self.options.uid, 'records': record.child_ids, 'thread_level': (self.options.thread_level-1),
                     });
                     self.$element.find('li.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');

From 4ac5de0d505f4d93ff2ad578068750554f0cc83d Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 21 Aug 2012 15:29:15 +0200
Subject: [PATCH 434/999] [IMP] demo data

bzr revid: abo@openerp.com-20120821132915-2fi83q3wsw29exzf
---
 addons/note/note_demo.xml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/note/note_demo.xml b/addons/note/note_demo.xml
index 76f525b88ca..e322f362ef5 100644
--- a/addons/note/note_demo.xml
+++ b/addons/note/note_demo.xml
@@ -12,7 +12,7 @@
       </field>
       <field name="note_pad"></field>
       <field name="stage_id" ref="note_stage_01"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="user_id" ref="base.user_root"/>
       <field name="color">2</field>
     </record>
     <record id="note_2" model="note.note">
@@ -24,8 +24,8 @@
     ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_02"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="stage_id" ref="note_stage_01"/>
+      <field name="user_id" ref="base.user_root"/>
     </record>
 
     <record id="note_3" model="note.note">
@@ -53,18 +53,18 @@
       </field>
       <field name="note_pad"></field>
       <field name="stage_id" ref="note_stage_01"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="user_id" ref="base.user_root"/>
     </record>
 
     <record id="note_4" model="note.note">
-      <field name="note"><![CDATA[Read those books
+      <field name="note"><![CDATA[Read some documentation about OpenERP before diving into the code
       * Open ERP Version 6: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
       <field name="stage_id" ref="note_stage_02"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="user_id" ref="base.user_root"/>
     </record>
 
     <record id="note_5" model="note.note">
@@ -87,7 +87,7 @@
       </field>
       <field name="note_pad"></field>
       <field name="stage_id" ref="note_stage_02"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="user_id" ref="base.user_root"/>
       <field name="color">3</field>
     </record>
 
@@ -99,18 +99,18 @@
       </field>
       <field name="note_pad"></field>
       <field name="stage_id" ref="note_stage_02"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="user_id" ref="base.user_root"/>
     </record>
 
     <record id="note_7" model="note.note">
-      <field name="note"><![CDATA[Read those books
+      <field name="note"><![CDATA[Read some documentation about OpenERP before diving into the code
       * Open ERP Version 6: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_02"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="stage_id" ref="note_stage_03"/>
+      <field name="user_id" ref="base.user_root"/>
     </record>
 
     <record id="note_8" model="note.note">
@@ -120,20 +120,21 @@
       ]]>
       </field>
       <field name="note_pad"></field>
-      <field name="stage_id" ref="note_stage_02"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="stage_id" ref="note_stage_03"/>
+      <field name="user_id" ref="base.user_root"/>
       <field name="color">5</field>
     </record>
 
     <record id="note_9" model="note.note">
-      <field name="note"><![CDATA[Read those books
+      <field name="note"><![CDATA[Read some documentation about OpenERP before diving into the code
       * Open ERP Version 6: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
       <field name="stage_id" ref="note_stage_03"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
+      <field name="user_id" ref="base.user_root"/>
+      <field name="color">7</field>
     </record>
 
     <record id="note_10" model="note.note">
@@ -144,8 +145,7 @@
       </field>
       <field name="note_pad"></field>
       <field name="stage_id" ref="note_stage_03"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
-      <field name="color">7</field>
+      <field name="user_id" ref="base.user_root"/>
     </record>
 
   </data>

From 169c8055bac85851992c9fb24bcc385f253e2391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 16:27:47 +0200
Subject: [PATCH 435/999] [REF] mail.compose.message: removed extended mode,
 because not really usefull. Removed reference to that mode in addons (crm
 lead, crm claim, crm helpdesk, hr evaluation, hr recruitement, project
 issue). Completely removed the wizard directory in hr_evaluation:
 mail_compose_message will become a button (TODO), and other files were not
 called anymore in init/openerp files.

bzr revid: tde@openerp.com-20120821142747-q9drv71749opusr1
---
 addons/crm/crm_lead.py                        |   1 -
 addons/crm_claim/crm_claim.py                 |   2 +-
 addons/crm_helpdesk/crm_helpdesk.py           |   2 +-
 .../wizard/mail_compose_message_view.xml      |   2 +-
 addons/hr_evaluation/__openerp__.py           |   1 -
 addons/hr_evaluation/wizard/__init__.py       |  25 ---
 .../wizard/hr_evaluation_mail.py              |  42 -----
 .../wizard/hr_evaluation_mail_view.xml        |  34 ----
 .../wizard/mail_compose_message.py            |  54 ------
 addons/hr_recruitment/hr_recruitment.py       |   1 -
 addons/mail/mail_message.py                   |   2 +-
 addons/mail/static/src/js/mail.js             |  55 ++----
 addons/mail/wizard/mail_compose_message.py    | 177 +++++++-----------
 .../mail/wizard/mail_compose_message_view.xml |  42 +++--
 addons/project_issue/project_issue.py         |   1 -
 15 files changed, 110 insertions(+), 331 deletions(-)
 delete mode 100644 addons/hr_evaluation/wizard/__init__.py
 delete mode 100644 addons/hr_evaluation/wizard/hr_evaluation_mail.py
 delete mode 100644 addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
 delete mode 100644 addons/hr_evaluation/wizard/mail_compose_message.py

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index bc29fa449a6..b1335fd91d4 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -40,7 +40,6 @@ class crm_lead(base_stage, osv.osv):
     _description = "Lead/Opportunity"
     _order = "priority,date_action,id desc"
     _inherit = ['ir.needaction_mixin', 'mail.thread']
-    _mail_compose_message = True
 
     def _get_default_section_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 39347f8b26a..535f6d20367 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -72,7 +72,7 @@ class crm_claim(base_stage, osv.osv):
     _description = "Claim"
     _order = "priority,date desc"
     _inherit = ['mail.thread']
-    _mail_compose_message = True
+
     _columns = {
         'id': fields.integer('ID', readonly=True),
         'name': fields.char('Claim Subject', size=128, required=True),
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index d80bd555811..612537bdb77 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -38,7 +38,7 @@ class crm_helpdesk(base_state, osv.osv):
     _description = "Helpdesk"
     _order = "id desc"
     _inherit = ['mail.thread']
-    _mail_compose_message = True
+
     _columns = {
             'id': fields.integer('ID', readonly=True),
             'name': fields.char('Name', size=128, required=True),
diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index 0d4362d350e..d0e842fa950 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -38,7 +38,7 @@
                             attrs="{'invisible':[('use_template','=',False)]}"
                             on_change="on_change_template(use_template, template_id, False, False, context)"/>
                     </xpath>
-                    <xpath expr="//a[@class='oe_mail_compose_message_checklist']" position="before">
+                    <xpath expr="//button[@class='oe_mail_compose_message_attachment']" position="before">
                         <button icon="/email_template/static/src/img/email_template.png"
                             type="object" name="template_toggle" string=""
                             help="Use a message template"/>
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index bb1322bccf3..f5cbe60ac6b 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -42,7 +42,6 @@ the employees can be viewed in the form of pdf file.
     "data": [
         "security/ir.model.access.csv",
         "security/hr_evaluation_security.xml",
-#        "wizard/hr_evaluation_mail_view.xml",
         "hr_evaluation_view.xml",
         "report/hr_evaluation_report_view.xml",
         "board_hr_evaluation_view.xml",
diff --git a/addons/hr_evaluation/wizard/__init__.py b/addons/hr_evaluation/wizard/__init__.py
deleted file mode 100644
index 64406ac6b1e..00000000000
--- a/addons/hr_evaluation/wizard/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    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 hr_evaluation_mail
-import mail_compose_message
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail.py b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
deleted file mode 100644
index 35c54a4cca3..00000000000
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail.py
+++ /dev/null
@@ -1,42 +0,0 @@
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 osv import fields, osv
-import tools
-
-class hr_evaluation_reminder(osv.osv_memory):
-    _name = "hr.evaluation.reminder"
-    _description = "Sends Reminders to employees to fill the evaluations"
-    _columns = {
-        'evaluation_id': fields.many2one('hr.evaluation.interview', 'Interview', required=True)
-    }
-
-    def send_mail(self, cr, uid, ids, context=None):
-        mail_message = self.pool.get('mail.message')
-        hr_evaluation_interview_obj = self.pool.get('hr.evaluation.interview')
-        evaluation_data = self.read(cr, uid, ids, context=context)[0]
-        current_interview = hr_evaluation_interview_obj.browse(cr, uid, evaluation_data.get('evaluation_id'))
-        if current_interview.state == "waiting_answer" and current_interview.user_to_review_id.work_email :
-            msg = " Hello %s, \n\n Kindly post your response for '%s' survey interview. \n\n Thanks,"  %(current_interview.user_to_review_id.name, current_interview.survey_id.title)
-            mail_message.schedule_with_attach(cr, uid, tools.config['email_from'], [current_interview.user_to_review_id.work_email],\
-                                          'Reminder to fill up Survey', msg, context=context)
-        return {'type': 'ir.actions.act_window_close'}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
deleted file mode 100644
index 89ae99bb6c3..00000000000
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    <record id="view_hr_evaluation_send_mail" model="ir.ui.view">
-        <field name="name">hr.evaluation.send.mail</field>
-        <field name="model">hr.evaluation.reminder</field>
-        <field name="arch" type="xml">
-            <form string="Evaluation Reminders" version="7.0">
-                <group string="Send Evaluation Reminder">
-                    <field name="evaluation_id"/>
-                </group>
-                <footer>
-                    <button name="send_mail" string="Send Mail" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </footer>
-             </form>
-        </field>
-    </record>
-
-    <record id="action_hr_evaluation_send_mail" model="ir.actions.act_window">
-        <field name="name">Evaluation Send Mail</field>
-        <field name="res_model">hr.evaluation.reminder</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="view_hr_evaluation_send_mail"/>
-        <field name="context">{'record_id':active_id}</field>
-        <field name="target">new</field>
-    </record>
-
-     </data>
-</openerp>
diff --git a/addons/hr_evaluation/wizard/mail_compose_message.py b/addons/hr_evaluation/wizard/mail_compose_message.py
deleted file mode 100644
index c02480cf2c5..00000000000
--- a/addons/hr_evaluation/wizard/mail_compose_message.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-##############################################################################
-
-from osv import osv
-from osv import fields
-import tools
-from tools.translate import _
-
-class mail_compose_message(osv.osv_memory):
-    _inherit = 'mail.compose.message'
-
-    def get_value(self, cr, uid, model, resource_id, context=None):
-        '''
-        To get values of the resource_id for the model
-        @param model: Object
-        @param resource_id: id of a record for which values to be read
-
-        @return: Returns a dictionary
-        '''
-        if context is None:
-            context = {}
-        result = super(mail_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
-        if model == 'hr.evaluation.interview' and resource_id:
-            model_pool = self.pool.get(model)
-            record_data = model_pool.browse(cr, uid, resource_id, context)
-            if record_data.state == "waiting_answer":
-                msg = _("Hello %s, \n\n Kindly post your response for '%s' survey interview. \n\n Thanks,")  %(record_data.user_to_review_id.name, record_data.survey_id.title)
-                result.update({
-                        'email_to': record_data.user_to_review_id.work_email or False,
-                        'subject': _("Reminder to fill up Survey"),
-                        'body': msg,
-                    })
-        return result
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index f63a16011ab..a12cf868436 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -96,7 +96,6 @@ class hr_applicant(base_stage, osv.Model):
     _description = "Applicant"
     _order = "id desc"
     _inherit = ['ir.needaction_mixin', 'mail.thread']
-    _mail_compose_message = True
 
     def _get_default_department_id(self, cr, uid, context=None):
         """ Gives default department by checking if present in the context """
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index bc2fe238fee..01086b57bb0 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -91,7 +91,7 @@ class mail_message(osv.Model):
 
         'author_id': fields.many2one('res.partner', 'Author', required=True),
         'partner_ids': fields.many2many('res.partner',
-            'mail_notification', 'message_id', 'partner_id', 
+            'mail_notification', 'message_id', 'partner_id',
             'Recipients'),
 
         'attachment_ids': fields.one2many('ir.attachment', 'res_id',
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 994bdfe1d28..e0cdec54299 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -225,73 +225,48 @@ openerp.mail = function(session) {
             });
             // event: click on 'Send an Email' link that toggles the form for
             // sending an email (partner_ids)
-            this.$element.find('a.oe_mail_compose_message_email').click(function (event) {
+            this.$element.on('click', 'button.oe_mail_compose_message_email', function (event) {
                 event.preventDefault();
-                self.toggle_email_mode();
+                event.stopPropagation();
+                self.toggle_email_mode(event);
             });
             // event: click on 'Formatting' icon-link that toggles the advanced
             // formatting options for writing a message (subject, body_html)
-            this.$element.find('a.oe_mail_compose_message_formatting').click(function (event) {
+            this.$element.on('click', 'button.oe_mail_compose_message_formatting', function (event) {
                 event.preventDefault();
-                self.toggle_formatting_mode();
+                event.stopPropagation();
+                self.toggle_formatting_mode(event);
             });
             // event: click on 'Attachment' icon-link that opens the dialog to
             // add an attachment.
-            this.$element.find('a.oe_mail_compose_message_attachment').click(function (event) {
-                event.preventDefault();
-                // not yet implemented
-                self.set_body_value('attachment', 'attachment');
-            });
-            // event: click on 'Checklist' icon-link that toggles the options
-            // for adding checklist.
-            this.$element.find('a.oe_mail_compose_message_checklist').click(function (event) {
-                event.preventDefault();
-                // not yet implemented
-                self.set_body_value('checklist', 'checklist');
+            this.$element.on('click', 'button.oe_mail_compose_message_attachment', function (event) {
+                event.stopImmediatePropagation();
             });
         },
 
         /**
          * Toggle the formatting mode. */
-        toggle_formatting_mode: function() {
-            var self = this;
+        toggle_formatting_mode: function(event) {
             this.formatting = ! this.formatting;
-            // calls onchange
-            var call_defer = this.ds_compose.call('onchange_formatting', [[], this.formatting, this.options.res_model, this.options.res_id]).then(
-                function (result) {
-                    self.form_view.on_processed_onchange(result, []);
-                });
             // update context of datasetsearch
             this.ds_compose.context.formatting = this.formatting;
-            // toggle display
-            this.$element.find('span.oe_mail_compose_message_subject').toggleClass('oe_mail_compose_message_invisible');
-            this.$element.find('div.oe_mail_compose_message_body').toggleClass('oe_mail_compose_message_invisible');
-            this.$element.find('div.oe_mail_compose_message_body_html').toggleClass('oe_mail_compose_message_invisible');
         },
 
         /**
          * Toggle the email mode. */
-        toggle_email_mode: function() {
-            var self = this;
+        toggle_email_mode: function(event) {
             this.email_mode = ! this.email_mode;
-            // calls onchange
-            var call_defer = this.ds_compose.call('onchange_email_mode', [[], this.email_mode, this.options.res_model, this.options.res_id]).then(
-                function (result) {
-                    self.form_view.on_processed_onchange(result, []);
-                });
             // update context of datasetsearch
             this.ds_compose.context.email_mode = this.email_mode;
             // update 'Post' button -> 'Send'
             // update 'Send an Email' link -> 'Post a comment'
             if (this.email_mode) {
                 this.$element.find('button.oe_mail_compose_message_button_send').html('<span>Send</span>');
-                this.$element.find('a.oe_mail_compose_message_email').html('Comment');
+                this.$element.find('button.oe_mail_compose_message_email_mode').html('<span>Comment</span>');
             } else {
                 this.$element.find('button.oe_mail_compose_message_button_send').html('<span>Post</span>');
-                this.$element.find('a.oe_mail_compose_message_email').html('Send an Email');
+                this.$element.find('button.oe_mail_compose_message_email_mode').html('<span>Send an Email</span>');
             }
-            // toggle display
-            this.$element.find('div.oe_mail_compose_message_partner_ids').toggleClass('oe_mail_compose_message_invisible');
         },
 
         /**
@@ -350,9 +325,9 @@ openerp.mail = function(session) {
             // check in parents, should not define multiple times
             this.options.context.res_model = options.context.res_model || 'mail.thread';
             this.options.context.res_id = options.context.res_id || false;
-            this.options.context.parent_id = options.context.parent_id || false;
+            // this.options.context.parent_id = options.context.parent_id || false;
             this.options.thread_level = options.thread_level || 0;
-            this.options.fetch_limit = options.fetch_limit || 100;
+            // this.options.fetch_limit = options.fetch_limit || 100;
             this.options.composer = options.composer || false;
             // TDE: not sure, here for testing / compatibility
             this.options.records = options.records || null;
@@ -363,7 +338,7 @@ openerp.mail = function(session) {
             // display customization vars
             this.display = {};
             this.display.truncate_limit = options.truncate_limit || 250;
-            this.display.show_header_compose = options.show_header_compose || false;
+            // this.display.show_header_compose = options.show_header_compose || false;
             this.display.show_reply = options.show_reply || false;
             this.display.show_delete = options.show_delete || false;
             this.display.show_hide = options.show_hide || false;
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index a27bb884d7f..3000d2a2cdc 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -38,26 +38,28 @@ def mail_tools_to_email(text):
 EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
 
 class mail_compose_message(osv.TransientModel):
-    """Generic Email composition wizard. This wizard is meant to be inherited
-       at model and view level to provide specific wizard features.
+    """ Generic Email composition wizard. This wizard is meant to be inherited
+        at model and view levels to provide specific wizard features.
 
-       The behavior of the wizard can be modified through the use of context
-       parameters, among which are:
-
-         * mail.compose.message.mode: if set to 'reply', the wizard is in 
-            reply to a previous message mode and pre-populated with the original
-            quote. If set to 'comment', it means you are writing a new message to
-            be attached to a document. If set to 'mass_mail', the wizard is in
-            mass mailing where the mail details can contain template placeholders
-            that will be merged with actual data before being sent to each
-            recipient.
-         * active_model: model name of the document to which the mail being
-                        composed is related
-         * active_id: id of the document to which the mail being composed is
-                      related, or id of the message to which user is replying,
-                      in case ``mail.compose.message.mode == 'reply'``
-         * active_ids: ids of the documents to which the mail being composed is
-                      related, in case ``mail.compose.message.mode == 'mass_mail'``.
+        The behavior of the wizard can be modified through the use of context
+        parameters, among which are:
+        - mail.compose.message.mode:
+            - if set to 'reply', the wizard is a reply to a previous message.
+                It is pre-populated with the original quote
+            - if set to 'comment', it means you are writing a new message to
+                be attached to a document. It is pre-populated with values
+                coming from ``get_value``, related to the document, and that
+                can be overridden to add specific model-related behavior.
+            - if set to 'mass_mail', the wizard is in mass mailing mode where
+                the mail details can contain template placeholders that will be
+                merged with actual data before being sent to each recipient.
+        - active_model: model name of the document to which the mail being
+            composed is related
+        - active_id: id of the document to which the mail being composed is
+            related, or id of the message to which user is replying, in case
+            ``mail.compose.message.mode == 'reply'``
+        - active_ids: ids of the documents to which the mail being composed is
+            related, in case ``mail.compose.message.mode == 'mass_mail'``.
     """
     _name = 'mail.compose.message'
     _inherit = 'mail.message'
@@ -69,14 +71,14 @@ class mail_compose_message(osv.TransientModel):
 
             Composition mode
             - comment: default mode; active_model, active_id = model and ID of a
-            document we are commenting,
-            - reply: active_id = ID of a mail.message to which we are replying.
-            From this message we can find the related model and res_id,
+                document we are commenting,
             - mass_mailing mode: active_model, active_id  = model and ID of a
-            document we are commenting,
+                document we are commenting,
+            - reply: active_id = ID of a mail.message to which we are replying.
+                From this message we can find the related model and res_id,
 
            :param dict context: several context values will modify the behavior
-                                of the wizard, cfr. the class description.
+                of the wizard, cfr. the class description.
         """
         if context is None:
             context = {}
@@ -104,26 +106,29 @@ class mail_compose_message(osv.TransientModel):
 
     _columns = {
         'dest_partner_ids': fields.many2many('res.partner',
-            'email_message_send_partner_rel',
+            'mail_compose_message_res_partner_rel',
             'wizard_id', 'partner_id', 'Destination partners',
             help="When sending emails through the social network composition wizard"\
                  "you may choose to send a copy of the mail to partners."),
-        'attachment_ids': fields.many2many('ir.attachment','email_message_send_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
+        'attachment_ids': fields.many2many('ir.attachment','mail_compose_message_ir_attachments_rel',
+            'wizard_id', 'attachment_id', 'Attachments'),
         'auto_delete': fields.boolean('Auto Delete', help="Permanently delete emails after sending"),
         'filter_id': fields.many2one('ir.filters', 'Filters'),
         'body_html': fields.html('HTML Editor Body'),
-        'content_subtype': fields.char('Message content subtype', size=32,
-            oldname="subtype", readonly=1,
+        'content_subtype': fields.char('Message content subtype', size=32, readonly=1,
             help="Type of message, usually 'html' or 'plain', used to select "\
                   "plain-text or rich-text contents accordingly"),
+        # boolean fields to control
+        'formatting': fields.boolean('Toggle advanced formatting mode'),
     }
+
     _defaults = {
         'content_subtype': lambda self,cr, uid, context={}: 'plain',
         'body_html': lambda self,cr, uid, context={}: '',
-        'body': lambda self,cr, uid, context={}: ''
+        'body': lambda self,cr, uid, context={}: '',
+        'formatting': False,
     }
 
-
     def get_value(self, cr, uid, model, res_id, context=None):
         """ Returns a defaults-like dict with initial values for the composition
             wizard when sending an email related to the document record
@@ -150,20 +155,14 @@ class mail_compose_message(osv.TransientModel):
         })
         return result
 
-    def onchange_email_mode(self, cr, uid, ids, value, model, res_id, context=None):
-        """ email_mode (values: True or False). This onchange on the email mode
-            allows to have some specific behavior when going in email mode, or
-            when going out of email mode.
-            Basically, dest_partner_ids is reset when going out of email
-            mode.
-            This method can be overridden for models that want to have their
-            specific behavior.
-            Note that currently, this onchange is used in mail.js and called
-            manually on the form instantiated in the Chatter.
-        """
-        if not value:
-            return {'value': {'dest_partner_ids': []}}
-        return {'value': {}}
+    def toggle_formatting(self, cr, uid, ids, context=None):
+        """ hit toggle formatting mode button: calls onchange_formatting to 
+            emulate an on_change, then writes the value to update the form. """
+        for record in self.browse(cr, uid, ids, context=context):
+            onchange_res = self.onchange_formatting(cr, uid, ids, not record.formatting, record.model, record.res_id, context=context)
+            self.write(cr, uid, [record.id], onchange_res['value'], context=context)
+        return False
+
 
     def onchange_formatting(self, cr, uid, ids, value, model, res_id, context=None):
         """ onchange_formatting (values: True or False). This onchange on the
@@ -176,8 +175,29 @@ class mail_compose_message(osv.TransientModel):
             manually on the form instantiated in the Chatter.
         """
         if not value:
-            return {'value': {'subject': False}}
-        return {'value': {}}
+            return {'value': {'subject': False, 'formatting': value}}
+        return {'value': {'formatting': value}}
+
+    def onchange_dest_partner_ids(self, cr, uid, ids, value, context=None):
+        """ onchange_dest_partner_ids (value format: [[6, False, [3, 4]]]). The
+            basic purpose of this method is to check that destination partners
+            effectively have email addresses. Otherwise a warning is thrown.
+        """
+        partner_ids = value[0][2]
+        partner_wo_email_lst = []
+        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
+            if not partner.email:
+                partner_wo_email_lst.append(partner)
+        if not partner_wo_email_lst:
+            return {'value': {}}
+        warning_msg = _('The following partners chosen as recipients for the email have no email address linked :')
+        for partner in partner_wo_email_lst:
+            warning_msg += '\n- %s' % (partner.name)
+        warning = {
+            'title': _('Partners email addresses not found'),
+            'message': warning_msg,
+        }
+        return {'warning': warning, 'value': {}}
 
     def get_message_data(self, cr, uid, message_id, context=None):
         """ Returns a defaults-like dict with initial values for the composition
@@ -243,7 +263,6 @@ class mail_compose_message(osv.TransientModel):
         if context is None:
             context = {}
 
-        email_mode = context.get('email_mode')
         formatting = context.get('formatting')
         mass_mail_mode = context.get('mail.compose.message.mode') == 'mass_mail'
 
@@ -299,66 +318,8 @@ class mail_compose_message(osv.TransientModel):
             return tools.ustr(result)
         return template and EXPRESSION_PATTERN.sub(merge, template)
 
+    def dummy(self, cr, uid, ids, context=None):
+        return False
 
-class mail_compose_message_extended(osv.TransientModel):
-    """ Extension of 'mail.compose.message' to support default field values related
-        to CRM-like models that follow the following conventions:
 
-        1. The model object must have an attribute '_mail_compose_message' equal to True.
-
-        2. The model should define the following fields:
-            - 'name' as subject of the message (required);
-            - 'email_from' as destination email address (required);
-            - 'email_cc' as cc email addresses (required);
-            - 'section_id.reply_to' as reply-to address (optional).
-    """
-    _inherit = 'mail.compose.message'
-
-    def get_value(self, cr, uid, model, res_id, context=None):
-        return {}
-
-    def onchange_email_mode(self, cr, uid, ids, value, model, res_id, context=None):
-        """ Overrides the default implementation to provide default values for
-            dest_partner_ids. This method checks that a partner maching the
-            ``email_from`` of the record exists. It it does not exist, it
-            creates a new partner. The found or created partner is then added
-            in dest_partner_ids.
-            Partner check/creation valid inly if the value is True, and if 
-            the model has the ``_mail_compose_message`` attribute.
-        """
-        result = super(mail_compose_message_extended, self).onchange_email_mode(cr, uid, ids, value, model, res_id, context=context)
-        model_obj = self.pool.get(model)
-        if not value or not (getattr(model_obj, '_mail_compose_message', False) and res_id):
-            return result
-        data = model_obj.browse(cr, uid , res_id, context=context)
-        partner_obj = self.pool.get('res.partner')
-        partner_ids = partner_obj.search(cr, uid, [('email', '=', data.email_from)], context=context)
-        if partner_ids:
-            partner_id = partner_ids[0]
-        else:
-            partner_id = partner_obj.name_create(cr, uid, data.email_from, context=context)[0]
-        result['value'].update({
-            'dest_partner_ids': [partner_id],
-            'email_cc': tools.ustr(data.email_cc or ''),
-        })
-        if hasattr(data, 'section_id'):
-            result['value']['reply_to'] = data.section_id and data.section_id.reply_to or False
-        return result
-
-    def onchange_formatting(self, cr, uid, ids, value, model, res_id, context=None):
-        """ Overrides the default implementation to provide default values for
-            the subject.
-            Subject re-creation valid only if the value is True, and if the
-            model has the ``_mail_compose_message`` attribute.
-        """
-        result = super(mail_compose_message_extended, self).onchange_formatting(cr, uid, ids, value, model, res_id, context=context)
-        model_obj = self.pool.get(model)
-        if not value or not (getattr(model_obj, '_mail_compose_message', False) and res_id):
-            return result
-        data = model_obj.browse(cr, uid , res_id, context=context)
-        result['value'].update({
-            'subject': data.name or False,
-        })
-        return result
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+#FIXME: check for models defining '_mail_compose_message'
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index d5ff9a7d10f..d1f2f535e8a 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -38,36 +38,38 @@
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0" >
                     <group>
+                        <!-- truly invisible fields for control and options -->
+                        <field name="email_mode" colspan="2" nolabel="1" invisible="1"/>
+                        <field name="formatting" colspan="2" nolabel="1" invisible="1"/>
                         <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
                                 class="oe_mail_compose_message_subject oe_mail_compose_message_invisible"/>
                         <field name="body" colspan="2" nolabel="1" placeholder="What are you working on ?"
                                 class="oe_mail_compose_message_body"/>
                         <field name="body_html" colspan="2" nolabel="1" placeholder="What are you working on HTML ?"
-                                class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible"/>
-                        <field name="dest_partner_ids" colspan="2" nolabel="1" widget="many2many_tags"
-                                placeholder="Add contacts to notify..."
-                                class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
+                                class="oe_mail_compose_message_body_html" widget="text_html"
+                                attrs="{'invisible':[('formatting', '=', False)]}"/>
+                        <field name="dest_partner_ids" colspan="2" nolabel="1" widget="many2many_tags" placeholder="Add contacts to notify..."
+                                on_change="onchange_dest_partner_ids(dest_partner_ids)"
+                                class="oe_mail_compose_message_partner_ids"
+                                attrs="{'invisible':[('email_mode', '=', False)]}"/>
+                        <field name="attachment_ids" colspan="2" nolabel="1" widget="many2many_tags"
+                                placeholder="Add attachments..." invisible="1"
+                                class="oe_mail_compose_message_attachment_ids"/>
+                        <!-- void div to display attachments, Chatter-controlled -->
+                        <div colspan="2" class="oe_mail_compose_message_attachments"/>
+                        <!-- buttons, mostly Chatter-controlled -->
                         <div>
                             <button name="send_mail" string="Post" type="object"
                                 class="oe_mail_compose_message_button_send"/>
-                            or <a href="#" class="oe_mail_compose_message_email">Send an Email</a>
                         </div>
                         <div class='oe_mail_compose_message_icons'>
-<!--                             <button icon="../../../../../mail/static/src/img/checklist"
-                                type="object" name="checklist" string=""
-                                help="Add a checklist"/> -->
-                            <a href="#" class="oe_mail_compose_message_checklist">
-                                <img src='/mail/static/src/img/checklist.png/' alt='Checklist'
-                                    title='Add a checklist'/>
-                            </a>
-                            <a href="#" class="oe_mail_compose_message_attachment">
-                                <img src='/mail/static/src/img/attachment.png/' alt='Attachment'
-                                    title='Add an attachment'/>
-                            </a>
-                            <a href="#" class="oe_mail_compose_message_formatting">
-                                <img src='/mail/static/src/img/formatting.png/' alt='Formatting'
-                                    title='Switch to advanced formatting mode'/>
-                            </a>
+                            <button icon="/mail/static/src/img/attachment.png" name="dummy"
+                                class="oe_mail_compose_message_attachment" string=""
+                                help="Add an attachment"/>
+                            <button icon="/mail/static/src/img/formatting.png"
+                                class="oe_mail_compose_message_formatting" string=""
+                                type="object" name="toggle_formatting"
+                                help="Toggle advanced formatting mode"/>
                         </div>
                     </group>
                 </form>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 106ea195571..3b0311d8f45 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -47,7 +47,6 @@ class project_issue(base_stage, osv.osv):
     _description = "Project Issue"
     _order = "priority, create_date desc"
     _inherit = ['ir.needaction_mixin', 'mail.thread']
-    _mail_compose_message = True
 
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default project by checking if present in the context """

From b1d80c734b9cad97d958424099cc0f8132096851 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 21 Aug 2012 16:36:43 +0200
Subject: [PATCH 436/999] fix

bzr revid: fp@tinyerp.com-20120821143643-npc5a84ajzfcsl14
---
 addons/mail/TODO.txt              | 21 ---------------------
 addons/mail/static/src/js/mail.js |  1 -
 2 files changed, 22 deletions(-)
 delete mode 100644 addons/mail/TODO.txt

diff --git a/addons/mail/TODO.txt b/addons/mail/TODO.txt
deleted file mode 100644
index eb6d0ccd761..00000000000
--- a/addons/mail/TODO.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Backend:
-* I propose to move message_read in mail.message and rename to message_fetch
-
-* remove _message_find_user_id and use _message_find_partners
-    - it requires to change the route code
-
-Web Stuff to Do:
-* replace comments_structure by a real tree structure, provided by message_read directly
-* rewrite completly records_struct_add_records, merge existing messages with those coming from another message_read
-     -> false records with domain message_read
-* remove records_struct_update_after_display
-* remove all is_wall stuff and pass real arguments
-* remove init_and_fetch_comments
-* rename fetch_comments into message_read
-Not Sure:
-    * implement display_current_user --> check why it's present two times
-
-To Check:
-* check if addons modules rely on some stuff changed in the aboce backend section
-
-
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e0cdec54299..f9d91e3acd6 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -30,7 +30,6 @@ openerp.mail = function(session) {
         },
     });
 
-
     /**
      * ------------------------------------------------------------
      * ChatterUtils

From 24651a903b4ec977b191d94b85c4548391fbe3e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 16:49:30 +0200
Subject: [PATCH 437/999] [IMP] mail.compose.message: added body_text filed,
 for plain-text; updated composer accordlingly, removed some dead code/css
 classes.

bzr revid: tde@openerp.com-20120821144930-ucgmx8rwasamhpgp
---
 addons/mail/mail_message.py                   |  2 +-
 .../static/src/css/mail_compose_message.css   |  4 ---
 addons/mail/static/src/js/mail.js             |  5 ++--
 addons/mail/wizard/mail_compose_message.py    | 28 ++++++++-----------
 .../mail/wizard/mail_compose_message_view.xml | 18 ++++++------
 5 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 01086b57bb0..4cbcbea127f 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -112,7 +112,7 @@ class mail_message(osv.Model):
         'subject': fields.char('Subject', size=128),
         'date': fields.datetime('Date'),
         'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
-        'body': fields.html('Content', required=True),
+        'body': fields.html('Content'),
     }
 
     def _get_default_author(self, cr, uid, context={}):
diff --git a/addons/mail/static/src/css/mail_compose_message.css b/addons/mail/static/src/css/mail_compose_message.css
index 4cd1339ded4..ba7ed36a695 100644
--- a/addons/mail/static/src/css/mail_compose_message.css
+++ b/addons/mail/static/src/css/mail_compose_message.css
@@ -2,10 +2,6 @@
 /* Compose Message Wizard Form */
 /* ------------------------------ */
 
-.openerp tr td .oe_form_field.oe_mail_compose_message_invisible {
-    display: none;
-}
-
 .openerp .oe_mail_compose_message_icons {
     text-align: right;
 }
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index f9d91e3acd6..90b3655a208 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -324,9 +324,8 @@ openerp.mail = function(session) {
             // check in parents, should not define multiple times
             this.options.context.res_model = options.context.res_model || 'mail.thread';
             this.options.context.res_id = options.context.res_id || false;
-            // this.options.context.parent_id = options.context.parent_id || false;
+            this.options.context.parent_id = options.context.parent_id || false;
             this.options.thread_level = options.thread_level || 0;
-            // this.options.fetch_limit = options.fetch_limit || 100;
             this.options.composer = options.composer || false;
             // TDE: not sure, here for testing / compatibility
             this.options.records = options.records || null;
@@ -337,7 +336,7 @@ openerp.mail = function(session) {
             // display customization vars
             this.display = {};
             this.display.truncate_limit = options.truncate_limit || 250;
-            // this.display.show_header_compose = options.show_header_compose || false;
+            this.display.show_header_compose = options.show_header_compose || false;
             this.display.show_reply = options.show_reply || false;
             this.display.show_delete = options.show_delete || false;
             this.display.show_hide = options.show_hide || false;
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 3000d2a2cdc..5da8d7c8e80 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -114,19 +114,16 @@ class mail_compose_message(osv.TransientModel):
             'wizard_id', 'attachment_id', 'Attachments'),
         'auto_delete': fields.boolean('Auto Delete', help="Permanently delete emails after sending"),
         'filter_id': fields.many2one('ir.filters', 'Filters'),
-        'body_html': fields.html('HTML Editor Body'),
+        'body_text': fields.text('Plain-text editor body'),
         'content_subtype': fields.char('Message content subtype', size=32, readonly=1,
             help="Type of message, usually 'html' or 'plain', used to select "\
                   "plain-text or rich-text contents accordingly"),
-        # boolean fields to control
-        'formatting': fields.boolean('Toggle advanced formatting mode'),
     }
 
     _defaults = {
         'content_subtype': lambda self,cr, uid, context={}: 'plain',
-        'body_html': lambda self,cr, uid, context={}: '',
+        'body_text': lambda self,cr, uid, context={}: '',
         'body': lambda self,cr, uid, context={}: '',
-        'formatting': False,
     }
 
     def get_value(self, cr, uid, model, res_id, context=None):
@@ -159,24 +156,23 @@ class mail_compose_message(osv.TransientModel):
         """ hit toggle formatting mode button: calls onchange_formatting to 
             emulate an on_change, then writes the value to update the form. """
         for record in self.browse(cr, uid, ids, context=context):
-            onchange_res = self.onchange_formatting(cr, uid, ids, not record.formatting, record.model, record.res_id, context=context)
+            content_st_new_value = 'plain' if record.content_subtype == 'html' else 'html'
+            onchange_res = self.onchange_content_subtype(cr, uid, ids, content_st_new_value, record.model, record.res_id, context=context)
             self.write(cr, uid, [record.id], onchange_res['value'], context=context)
         return False
 
 
-    def onchange_formatting(self, cr, uid, ids, value, model, res_id, context=None):
-        """ onchange_formatting (values: True or False). This onchange on the
-            formatting allows to have some specific behavior when going in 
-            formatting mode, or when going out of formatting.
-            Basically, subject is reset when going out of formatting mode.
+    def onchange_content_subtype(self, cr, uid, ids, value, model, res_id, context=None):
+        """ onchange_content_subtype (values: 'plain' or 'html'). This onchange
+            on the subtype allows to have some specific behavior when switching
+            between text or html mode.
+            Basically, subject is reset when going out of html mode.
             This method can be overridden for models that want to have their
             specific behavior.
-            Note that currently, this onchange is used in mail.js and called
-            manually on the form instantiated in the Chatter.
         """
-        if not value:
-            return {'value': {'subject': False, 'formatting': value}}
-        return {'value': {'formatting': value}}
+        if value == 'plain':
+            return {'value': {'subject': False, 'content_subtype': value}}
+        return {'value': {'content_subtype': value}}
 
     def onchange_dest_partner_ids(self, cr, uid, ids, value, context=None):
         """ onchange_dest_partner_ids (value format: [[6, False, [3, 4]]]). The
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index d1f2f535e8a..82c96f9eb80 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -39,19 +39,19 @@
                 <form string="Compose Email" version="7.0" >
                     <group>
                         <!-- truly invisible fields for control and options -->
-                        <field name="email_mode" colspan="2" nolabel="1" invisible="1"/>
-                        <field name="formatting" colspan="2" nolabel="1" invisible="1"/>
+                        <field name="content_subtype" colspan="2" nolabel="1" invisible="1"/>
                         <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
-                                class="oe_mail_compose_message_subject oe_mail_compose_message_invisible"/>
+                                class="oe_mail_compose_message_subject"
+                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
+                        <field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
+                                class="oe_mail_compose_message_body"
+                                attrs="{'invisible':[('content_subtype', '=', 'html')]}"/>
                         <field name="body" colspan="2" nolabel="1" placeholder="What are you working on ?"
-                                class="oe_mail_compose_message_body"/>
-                        <field name="body_html" colspan="2" nolabel="1" placeholder="What are you working on HTML ?"
-                                class="oe_mail_compose_message_body_html" widget="text_html"
-                                attrs="{'invisible':[('formatting', '=', False)]}"/>
+                                class="oe_mail_compose_message_body_html"
+                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
                         <field name="dest_partner_ids" colspan="2" nolabel="1" widget="many2many_tags" placeholder="Add contacts to notify..."
                                 on_change="onchange_dest_partner_ids(dest_partner_ids)"
-                                class="oe_mail_compose_message_partner_ids"
-                                attrs="{'invisible':[('email_mode', '=', False)]}"/>
+                                class="oe_mail_compose_message_partner_ids"/>
                         <field name="attachment_ids" colspan="2" nolabel="1" widget="many2many_tags"
                                 placeholder="Add attachments..." invisible="1"
                                 class="oe_mail_compose_message_attachment_ids"/>

From b919782ad91643603bc31ccb02916cb4ded93f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 16:55:27 +0200
Subject: [PATCH 438/999] [REM] mail.js: removed references to 'email_mode' of
 composer, now deleted.

bzr revid: tde@openerp.com-20120821145527-vdvu00doz77mzx7n
---
 addons/mail/static/src/js/mail.js | 44 +++++--------------------------
 1 file changed, 6 insertions(+), 38 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 90b3655a208..3ff80a20b41 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -104,8 +104,6 @@ openerp.mail = function(session) {
          * @param {Object} [options]
          * @param {String} [options.res_model] res_model of document [REQUIRED]
          * @param {Number} [options.res_id] res_id of record [REQUIRED]
-         * @param {Number} [options.email_mode] true/false, tells whether
-         *      we are in email sending mode
          * @param {Number} [options.formatting] true/false, tells whether
          *      we are in advance formatting mode
          * @param {String} [options.model] mail.compose.message.mode (see
@@ -119,7 +117,6 @@ openerp.mail = function(session) {
             // options
             this.options = options || {};
             this.options.context = options.context || {};
-            this.options.email_mode = options.email_mode || false;
             this.options.formatting = options.formatting || false;
             this.options.mode = options.mode || 'comment';
             this.options.form_xml_id = options.form_xml_id || 'email_compose_message_wizard_form_chatter';
@@ -129,7 +126,6 @@ openerp.mail = function(session) {
             } else {
                 this.options.active_id = this.options.res_id;
             }
-            this.email_mode = false;
             this.formatting = false;
             // debug
             console.groupCollapsed('New ComposeMessage: model', this.options.res_model, ', id', this.options.res_id);
@@ -144,7 +140,7 @@ openerp.mail = function(session) {
         reinit: function() {
             var self = this;
             if (! this.form_view) return;
-            var call_defer = this.ds_compose.call('default_get', [['subject', 'body', 'body_html', 'dest_partner_ids'], this.ds_compose.get_context()]).then(
+            var call_defer = this.ds_compose.call('default_get', [['subject', 'body_text', 'body', 'attachment_ids', 'dest_partner_ids'], this.ds_compose.get_context()]).then(
                 function (result) {
                     self.form_view.on_processed_onchange({'value': result}, []);
                 });
@@ -165,8 +161,7 @@ openerp.mail = function(session) {
             var self = this;
             this._super.apply(this, arguments);
             // customize display: add avatar, clean previous content
-            var user_avatar = mail.ChatterUtils.get_image(this.session.prefix,
-                this.session.session_id, 'res.users', 'image_small', this.session.uid);
+            var user_avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.session.uid);
             this.$element.find('img.oe_mail_icon').attr('src', user_avatar);
             this.$element.find('div.oe_mail_msg_content').empty();
             // create a context for the default_get of the compose form
@@ -179,7 +174,7 @@ openerp.mail = function(session) {
             this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
             // find the id of the view to display in the chatter form
             var data_ds = new session.web.DataSetSearch(this, 'ir.model.data');
-            var deferred_form_id =data_ds.call('get_object_reference', ['mail', this.options.form_xml_id]).then( function (result) {
+            var deferred_form_id = data_ds.call('get_object_reference', ['mail', this.options.form_xml_id]).then( function (result) {
                 if (result) {
                     self.options.form_view_id = result[1];
                 }
@@ -205,7 +200,6 @@ openerp.mail = function(session) {
             return $.when(this.form_view.appendTo(msg_node)).pipe(function() {
                 self.bind_events();
                 self.form_view.do_show();
-                if (self.options.email_mode) { self.toggle_email_mode(); }
                 if (self.options.formatting) { self.toggle_formatting_mode(); }
             });
         },
@@ -222,13 +216,6 @@ openerp.mail = function(session) {
             this.$element.find('button.oe_form_button').click(function (event) {
                 event.preventDefault();
             });
-            // event: click on 'Send an Email' link that toggles the form for
-            // sending an email (partner_ids)
-            this.$element.on('click', 'button.oe_mail_compose_message_email', function (event) {
-                event.preventDefault();
-                event.stopPropagation();
-                self.toggle_email_mode(event);
-            });
             // event: click on 'Formatting' icon-link that toggles the advanced
             // formatting options for writing a message (subject, body_html)
             this.$element.on('click', 'button.oe_mail_compose_message_formatting', function (event) {
@@ -251,23 +238,6 @@ openerp.mail = function(session) {
             this.ds_compose.context.formatting = this.formatting;
         },
 
-        /**
-         * Toggle the email mode. */
-        toggle_email_mode: function(event) {
-            this.email_mode = ! this.email_mode;
-            // update context of datasetsearch
-            this.ds_compose.context.email_mode = this.email_mode;
-            // update 'Post' button -> 'Send'
-            // update 'Send an Email' link -> 'Post a comment'
-            if (this.email_mode) {
-                this.$element.find('button.oe_mail_compose_message_button_send').html('<span>Send</span>');
-                this.$element.find('button.oe_mail_compose_message_email_mode').html('<span>Comment</span>');
-            } else {
-                this.$element.find('button.oe_mail_compose_message_button_send').html('<span>Post</span>');
-                this.$element.find('button.oe_mail_compose_message_email_mode').html('<span>Send an Email</span>');
-            }
-        },
-
         /**
          * Update the values of the composition form; with possible different
          * values for body and body_html. */
@@ -431,10 +401,9 @@ openerp.mail = function(session) {
                 event.preventDefault();
                 event.stopPropagation();
                 var msg_id = event.srcElement.dataset.msg_id;
-                var email_mode = (event.srcElement.dataset.type == 'email');
                 var formatting = (event.srcElement.dataset.formatting == 'html');
                 if (! msg_id) return false;
-                self.instantiate_composition_form('reply', email_mode, formatting, msg_id);
+                self.instantiate_composition_form('reply', formatting, msg_id);
             });
         },
 
@@ -451,15 +420,14 @@ openerp.mail = function(session) {
         },
 
         /** Instantiate the composition form, with paramteres coming from thread parameters */
-        instantiate_composition_form: function(mode, email_mode, formatting, msg_id, context) {
+        instantiate_composition_form: function(mode, formatting, msg_id, context) {
             if (this.compose_message_widget) {
                 this.compose_message_widget.destroy();
             }
             this.compose_message_widget = new mail.ComposeMessage(this, {
                 'extended_mode': false, 'uid': this.options.uid, 'res_model': this.options.context.res_model,
                 'res_id': this.options.context.res_id, 'mode': mode || 'comment', 'msg_id': msg_id,
-                'email_mode': email_mode || false, 'formatting': formatting || false,
-                'context': context || false } );
+                'formatting': formatting || false, 'context': context || false } );
             var composition_node = this.$element.find('div.oe_mail_thread_action');
             composition_node.empty();
             var compose_done = this.compose_message_widget.appendTo(composition_node);

From 392ac848b9c718469c93f1ac9034d2ba1e509571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 17:06:22 +0200
Subject: [PATCH 439/999] [FIX] Wall: css fix in composer.

bzr revid: tde@openerp.com-20120821150622-2h13mgtwk3h0uh3g
---
 addons/mail/static/src/css/mail.css | 2 +-
 addons/mail/static/src/js/mail.js   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 7a3d0e29710..b19e9abbe0a 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -26,7 +26,7 @@
 /* Specific display of threads in the wall */
 /* ------------------------------------------------------------ */
 
-.openerp ul.oe_mail_wall_threads .oe_mail_msg_content textarea {
+.openerp ul.oe_mail_wall_threads .oe_mail_msg_content textarea.oe_mail_compose_textarea {
     width: 434px;
     height: 30px;
     padding: 4px;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 3ff80a20b41..864900bb729 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -413,7 +413,8 @@ openerp.mail = function(session) {
          * in the composition form. */
         do_action: function(action, on_close) {
             console.log('thread do_action');
-            this.init_comments();
+            this.message_clean();
+            this.message_fetch();
             if (this.compose_message_widget) {
                 this.compose_message_widget.reinit(); }
             return this._super(action, on_close);
@@ -709,6 +710,7 @@ openerp.mail = function(session) {
          * in the composition form. */
         //TDE: still useful ? TO CHECK
         do_action: function(action, on_close) {
+            console.log('wall do_action');
             if (this.compose_message_widget) {
                 this.compose_message_widget.reinit(); }
             this.message_clean();

From b772da168f7e8e6e6539ac4e867dc1a2e25b7a82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 17:14:13 +0200
Subject: [PATCH 440/999] [FIX] tools: emails_split -> email-split.

bzr revid: tde@openerp.com-20120821151413-9hxmsyp51q3ny32f
---
 openerp/tools/misc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 7f2dade30d8..8ca90e32f07 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -1113,7 +1113,7 @@ class unquote(str):
     def __repr__(self):
         return self
 
-def emails_split(text):
+def email_split(text):
     """Return a list of the email addresses found in ``text``"""
     if not text: return []
     return re.findall(r'([^ ,<@]+@[^> ,]+)', text)

From 3ae87708d4a36b500a4eda6f423c22c315571788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 17:20:09 +0200
Subject: [PATCH 441/999] [CLEAN] mail_thread: removed print statements.

bzr revid: tde@openerp.com-20120821152009-y50ju4q9u1catn2f
---
 addons/mail/mail_thread.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index de7dc954f31..71f03e87f8f 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -540,14 +540,6 @@ class mail_thread(osv.Model):
 
     def message_post(self, cr, uid, res_id, body, subject=False,
             mtype='notification', parent_id=False, attachments=None, context=None, **kwargs):
-        print res_id
-        print body
-        print subject
-        print mtype
-        print parent_id
-        print attachments
-        print context
-        print kwargs
         context = context or {}
         attachments = attachments or {}
         if type(res_id) in (list, tuple):

From 98f41b176b3dce481330b91d3f22e5083e281fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 17:35:42 +0200
Subject: [PATCH 442/999] [FIX] mail_thread: parse_message was on mail.message,
 but now on mail.thread.

bzr revid: tde@openerp.com-20120821153542-87i32quupsmr1t2y
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 71f03e87f8f..0f6fc0ee9f3 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -311,7 +311,7 @@ class mail_thread(osv.Model):
         routes = self.message_route(cr, uid, msg_txt, model,
                                     thread_id, custom_values,
                                     context=context)
-        msg = self.pool.get('mail.message').parse_message(msg_txt, save_original=save_original, context=context)
+        msg = self.parse_message(msg_txt, save_original=save_original, context=context)
         msg['state'] = 'received'
         if strip_attachments and 'attachments' in msg:
             del msg['attachments']

From d876320e12b80a229bc97b3d2df35858f6812521 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 21 Aug 2012 17:45:55 +0200
Subject: [PATCH 443/999] [FIX] allows using uid in domains of params

bzr revid: fp@tinyerp.com-20120821154555-gjsw2pr5ykbl0ed5
---
 openerp/addons/base/ir/ir_actions.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index a5d04d7f1bc..28a309f427a 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -860,11 +860,10 @@ class act_client(osv.osv):
     _order = 'name'
 
     def _get_params(self, cr, uid, ids, field_name, arg, context):
-        return dict([
-            ((record.id, ast.literal_eval(record.params_store))
-             if record.params_store else (record.id, False))
-            for record in self.browse(cr, uid, ids, context=context)
-        ])
+        result = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            result[record.id] = record.params_store and eval(record.params_store, {'uid': uid}) or False
+        return result
 
     def _set_params(self, cr, uid, id, field_name, field_value, arg, context):
         if isinstance(field_value, dict):

From 5fe1c4382826795d065eec721edaf4f472c54876 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 21 Aug 2012 17:46:21 +0200
Subject: [PATCH 444/999] [FIX] clean domains

bzr revid: fp@tinyerp.com-20120821154621-r7datjbrnzjoeg36
---
 addons/mail/mail_message_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 38181033a51..853326249ec 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -217,13 +217,13 @@
         <record id="action_mail_all_feeds" model="ir.actions.client">
             <field name="name">News Feed</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid])] }"/>
+            <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid])] }&quot;"/>
         </record>
 
         <record id="action_mail_my_feeds" model="ir.actions.client">
             <field name="name">My Feeds</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="{'domain':[('partner_id.user_ids', 'in', [uid])]}"/>
+            <field name="params" eval="&quot;{'domain': [('author_id.user_ids', 'in', [uid])]}&quot;"/>
         </record>
     </data>
 </openerp>

From a7531c4814e731fc163af48ffc80d184a61e418c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 17:52:57 +0200
Subject: [PATCH 445/999] [FIX] mail_thread: pass cr arg to parse_message,
 because it is necessary for sub-calls.

bzr revid: tde@openerp.com-20120821155257-0paa85fs6gla5slr
---
 addons/mail/mail_thread.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 0f6fc0ee9f3..78dfa4bb46a 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -311,7 +311,7 @@ class mail_thread(osv.Model):
         routes = self.message_route(cr, uid, msg_txt, model,
                                     thread_id, custom_values,
                                     context=context)
-        msg = self.parse_message(msg_txt, save_original=save_original, context=context)
+        msg = self.parse_message(cr, msg_txt, save_original=save_original, context=context)
         msg['state'] = 'received'
         if strip_attachments and 'attachments' in msg:
             del msg['attachments']
@@ -385,7 +385,7 @@ class mail_thread(osv.Model):
             self.write(cr, uid, ids, update_vals, context=context)
         return True
 
-    def parse_message(self, message, save_original=False, context=None):
+    def parse_message(self, cr, message, save_original=False, context=None):
         """Parses a string or email.message.Message representing an
            RFC-2822 email, and returns a generic dict holding the
            message details.

From be208572cf75a5da802991acc367d69e2c9cce93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 18:00:36 +0200
Subject: [PATCH 446/999] [FIX] mail.js: fixed some function names /
 mail_followers: fixed an email_to.

bzr revid: tde@openerp.com-20120821160036-jruwclg54d67a21y
---
 addons/mail/mail_followers.py     | 10 ++++------
 addons/mail/static/src/js/mail.js |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index d9dab750ecd..b94e03efd93 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -77,7 +77,7 @@ class mail_notification(osv.Model):
         msg = msg_obj.browse(cr, uid, msg_id, context=context)
 
         towrite = {
-            'email_to': '',
+            'email_to': [],
             'subject': msg.subject
         }
         for partner in partner_obj.browse(cr, uid, partner_ids, context=context):
@@ -92,16 +92,14 @@ class mail_notification(osv.Model):
                 continue
 
             towrite['state'] = 'outgoing'
-            if not towrite.get('email_to', False):
-                towrite['email_to'] = email_to
-            else:
-                if email_to not in towrite['email_to']:
-                    towrite['email_to'] = towrite['email_to'] + ', ' + email_to
+            if partner.email not in towrite['email_to']:
+                towrite['email_to'].append(partner.email)
 
         if towrite.get('state', False) and not context.get('noemail', False):
             if towrite.get('subject', False):
                 towrite['subject'] = msg.name_get(cr, uid, [msg.id], context=context)[0][1]
             towrite['message_id'] = msg.id
+            towrite['email_to'] = ', '.join(towrite['email_to'])
             mail_message_obj = self.pool.get('mail.mail')
             newid = mail_message_obj.create(cr, uid, towrite, context=context)
             mail_message_obj.send(cr, uid, [newid], context=context)
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 569ecde7200..e29988389df 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -358,7 +358,7 @@ openerp.mail = function(session) {
             this.$element.find('textarea.oe_mail_compose_textarea').keyup(function (event) {
                 var charCode = (event.which) ? event.which : window.event.keyCode;
                 if (event.shiftKey && charCode == 13) { this.value = this.value+"\n"; }
-                else if (charCode == 13) { return self.do_message_post(); }
+                else if (charCode == 13) { return self.message_post(); }
             });
             // event: click on 'Reply' in msg
             this.$element.on('click', 'a.oe_mail_msg_reply', function (event) {
@@ -437,7 +437,7 @@ openerp.mail = function(session) {
 
         /** Clean the thread */
         message_clean: function() {
-            this.$el.find('div.oe_mail_thread_display').empty();
+            this.$element.find('div.oe_mail_thread_display').empty();
         },
 
         /** Fetch messages
@@ -552,7 +552,7 @@ openerp.mail = function(session) {
             }
             return this.ds_post.call('message_post', [
                 [this.options.context.res_id], body, false, 'comment', this.options.context.parent_id]
-                ).then(this.proxy('init_comments'));
+                ).then(this.proxy('message_fetch'));
         },
 
         /** Action: 'shows more' to fetch new messages */

From 38acf7c1041e4a613d95f108d4c905e6342a84d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Aug 2012 18:05:48 +0200
Subject: [PATCH 447/999] [REM] base_calendar: removed ir_attachment override,
 that was added to be able to manage virtual_ids for attachments (i.e., adding
 attachments to reccuring meetings). As this fix was causing issues, not
 having attachments on recurrent meetings seems more acceptable than having an
 ugly fix + other bigs.

bzr revid: tde@openerp.com-20120821160548-qq0sjku3yf3c0ogq
---
 addons/base_calendar/base_calendar.py | 30 ---------------------------
 1 file changed, 30 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index d1b8709e1e9..d560eaacd66 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1616,36 +1616,6 @@ class calendar_todo(osv.osv):
 
 calendar_todo()
 
-#class ir_attachment(osv.osv):
-#    _name = 'ir.attachment'
-#    _inherit = 'ir.attachment'
-#
-#    def search_count(self, cr, user, args, context=None):
-#        new_args = []
-#        for domain_item in args:
-#            if isinstance(domain_item, (list, tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_id':
-#                new_args.append((domain_item[0], domain_item[1], base_calendar_id2real_id(domain_item[2])))
-#            else:
-#                new_args.append(domain_item)
-#        return super(ir_attachment, self).search_count(cr, user, new_args, context)
-#
-#    def create(self, cr, uid, vals, context=None):
-#        if context:
-#            id = context.get('default_res_id', False)
-#            context.update({'default_res_id' : base_calendar_id2real_id(id)})
-#        return super(ir_attachment, self).create(cr, uid, vals, context=context)
-#
-#    def search(self, cr, uid, args, offset=0, limit=None, order=None,
-#            context=None, count=False):
-#        new_args = []
-#        for domain_item in args:
-#            if isinstance(domain_item, (list, tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_id':
-#                new_args.append((domain_item[0], domain_item[1], base_calendar_id2real_id(domain_item[2])))
-#            else:
-#                new_args.append(domain_item)
-#        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset,
-#                            limit=limit, order=order, context=context, count=False)
-#ir_attachment()
 
 class ir_values(osv.osv):
     _inherit = 'ir.values'

From e88e21bb569d9ce086bf03285aa4141dc28f0c58 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 21 Aug 2012 19:24:14 +0200
Subject: [PATCH 448/999] fix

bzr revid: fp@tinyerp.com-20120821172414-7kz7qcibjile1dfl
---
 openerp/addons/base/res/res_partner_view.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 43a37d1a79c..6e2e8fac178 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -186,13 +186,10 @@
                                                                     <td class="oe_kanban_title1" align="left" valign="middle">
                                                                         <h4><a type="edit"><field name="name"/></a></h4>
                                                                         <i><div t-if="record.function.raw_value">
-                                                                            <field name="function"/><br/></div></i>
-                                                                    </td>
-                                                                    <td valign="top" align="right">
-                                                                        <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
-                                                                            <img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
-                                                                        </a>
-
+                                                                            <field name="function"/></div></i>
+                                                                        <div><a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value">
+                                                                            <field name="email"/>
+                                                                        </a></div>
                                                                     </td>
                                                                 </tr>
                                                             </table>

From 20748495c61fa3cc6e8e07cf25c94cb0dca2a49f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 21 Aug 2012 20:03:51 +0200
Subject: [PATCH 449/999] [IMP] force email when quick create

bzr revid: fp@tinyerp.com-20120821180351-t28m9svpdj8ois0k
---
 addons/mail/wizard/mail_compose_message_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 82c96f9eb80..a10dc6ccc86 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -50,6 +50,7 @@
                                 class="oe_mail_compose_message_body_html"
                                 attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
                         <field name="dest_partner_ids" colspan="2" nolabel="1" widget="many2many_tags" placeholder="Add contacts to notify..."
+                                context="{'force_create':True}"
                                 on_change="onchange_dest_partner_ids(dest_partner_ids)"
                                 class="oe_mail_compose_message_partner_ids"/>
                         <field name="attachment_ids" colspan="2" nolabel="1" widget="many2many_tags"

From 4215827f24fa8909777387b8be55ff90755b5e40 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 21 Aug 2012 20:04:09 +0200
Subject: [PATCH 450/999] [IMP] better implementation of name_create

bzr revid: fp@tinyerp.com-20120821180409-gk2c3odfve53epdp
---
 openerp/addons/base/res/res_partner.py | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index d9ae1d8595e..30255d93ec3 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -366,22 +366,14 @@ class res_partner(osv.osv):
             - ([\w\s.\\-]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8})[\>]:
               Raoul Grosbedon, raoul@grosbedon.fr
         """
-        contact_regex = re.compile('([\w\s.\\-]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8})[\>]')
-        email_regex = re.compile('([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8})')
-        contact_regex_res = contact_regex.findall(name)
-        email_regex_res = email_regex.findall(name)
-        if contact_regex_res:
-            name = contact_regex_res[0][0].rstrip(' ') # remove extra spaces on the right
-            email = contact_regex_res[0][1]
-            rec_id = self.create(cr, uid, {self._rec_name: name, 'email': email}, context);
-            return self.name_get(cr, uid, [rec_id], context)[0]
-        elif email_regex_res:
-            email = '%s' % (email_regex_res[0])
-            rec_id = self.create(cr, uid, {self._rec_name: email, 'email': email}, context);
-            return self.name_get(cr, uid, [rec_id], context)[0]
-        else:
-            rec_id = super(res_partner, self).create(cr, uid, {self._rec_name: name}, context)
-            return self.name_get(cr, uid, [rec_id], context)[0]
+        regex = re.compile('^(.*?)(?: ?[\<]?([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8})[\>]?)?$')
+        result = regex.match(name)
+        if not result or (context.get('force_create',False) and result.group(2) is None):
+            raise osv.except_osv(_('Warning'), _("Couldn't create contact without email address !"))
+        name = result.group(1).strip()
+        email = result.group(2)
+        rec_id = self.create(cr, uid, {self._rec_name: name or email, 'email': email or False}, context=context)
+        return self.name_get(cr, uid, [rec_id], context)[0]
 
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
         if not args:

From d3f493de07fb8afda2dabfd889ec93d9a1545edc Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 21 Aug 2012 23:09:53 +0200
Subject: [PATCH 451/999] [FIX] fetchmail: typos

bzr revid: odo@openerp.com-20120821210953-olzgm14wsk7jzcia
---
 addons/fetchmail/fetchmail.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 24c977bba1d..70a05c6bd0e 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -247,7 +247,7 @@ class mail_mail(osv.osv):
         fetchmail_server_id = context.get('fetchmail_server_id')
         if fetchmail_server_id:
             values['fetchmail_server_id'] = fetchmail_server_id
-        res = super(mail_message,self).create(cr, uid, values, context=context)
+        res = super(mail_mail,self).create(cr, uid, values, context=context)
         return res
 
     def write(self, cr, uid, ids, values, context=None):
@@ -256,7 +256,7 @@ class mail_mail(osv.osv):
         fetchmail_server_id = context.get('fetchmail_server_id')
         if fetchmail_server_id:
             values['fetchmail_server_id'] = server_id
-        res = super(mail_message,self).write(cr, uid, ids, values, context=context)
+        res = super(mail_mail,self).write(cr, uid, ids, values, context=context)
         return res
 
 

From 5008e9cc84002797b2b4c8c43d10ab5e720bac8e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 21 Aug 2012 23:15:28 +0200
Subject: [PATCH 452/999] [FIX] mail: fix parse_message calls for new signature
 - cr,uid needed

bzr revid: odo@openerp.com-20120821211528-yyxyq1bqti5g3s5v
---
 addons/mail/mail_thread.py      | 4 ++--
 addons/plugin/plugin_handler.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 78dfa4bb46a..90b686d6693 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -311,7 +311,7 @@ class mail_thread(osv.Model):
         routes = self.message_route(cr, uid, msg_txt, model,
                                     thread_id, custom_values,
                                     context=context)
-        msg = self.parse_message(cr, msg_txt, save_original=save_original, context=context)
+        msg = self.parse_message(cr, uid, msg_txt, save_original=save_original, context=context)
         msg['state'] = 'received'
         if strip_attachments and 'attachments' in msg:
             del msg['attachments']
@@ -385,7 +385,7 @@ class mail_thread(osv.Model):
             self.write(cr, uid, ids, update_vals, context=context)
         return True
 
-    def parse_message(self, cr, message, save_original=False, context=None):
+    def parse_message(self, cr, uid, message, save_original=False, context=None):
         """Parses a string or email.message.Message representing an
            RFC-2822 email, and returns a generic dict holding the
            message details.
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index d493501e1cc..6d6262ddd22 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -44,7 +44,7 @@ class plugin_handler(osv.osv_memory):
         res_id = 0
         url = ""
         name = ""
-        msg = mail_message_obj.parse_message(email)
+        msg = self.pool.get('mail.thread').parse_message(cr, uid, email)
         references = [msg.get('message-id')]
         refs =  msg.get('references',False)
         if refs:
@@ -91,7 +91,7 @@ class plugin_handler(osv.osv_memory):
         """
         mail_message = self.pool.get('mail.message')
         model_obj = self.pool.get(model)
-        msg = mail_message.parse_message(email)
+        msg = self.pool.get('mail.thread').parse_message(cr, uid, email)
         message_id = msg.get('message-id')
         mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
         
@@ -146,7 +146,7 @@ class plugin_handler(osv.osv_memory):
         mail_message = self.pool.get('mail.message')        
         ir_attachment_obj = self.pool.get('ir.attachment')
         attach_ids = []
-        msg = mail_message.parse_message(headers)
+        msg = self.pool.get('mail.thread').parse_message(cr, uid, headers)
         message_id = msg.get('message-id')    
         push_mail = self.push_message(cr, uid, model, headers, res_id)
         res_id = push_mail[1]

From 95b13bdaa45d3bfbb178c679a6661b53b2f00205 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 21 Aug 2012 23:24:19 +0200
Subject: [PATCH 453/999] [FIX] *mail: s/mail_message/mail_mail/ for cases
 where a full mail_mail is necessary

bzr revid: odo@openerp.com-20120821212419-yu2criox6sayf2cv
---
 addons/email_template/email_template.py | 10 +++++-----
 addons/mail/mail_mail.py                |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 84d48e1387a..291ddd6a0ef 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -389,12 +389,12 @@ class email_template(osv.osv):
            :returns: id of the mail.message that was created 
         """
         if context is None: context = {}
-        mail_message = self.pool.get('mail.message')
+        mail_mail = self.pool.get('mail.mail')
         ir_attachment = self.pool.get('ir.attachment')
         values = self.generate_email(cr, uid, template_id, res_id, context=context)
         assert 'email_from' in values, 'email_from is missing or empty after template rendering, send_mail() cannot proceed'
         attachments = values.pop('attachments') or {}
-        msg_id = mail_message.create(cr, uid, values, context=context)
+        msg_id = mail_mail.create(cr, uid, values, context=context)
         # link attachments
         attachment_ids = []
         for fname, fcontent in attachments.iteritems():
@@ -402,15 +402,15 @@ class email_template(osv.osv):
                     'name': fname,
                     'datas_fname': fname,
                     'datas': fcontent,
-                    'res_model': mail_message._name,
+                    'res_model': mail_mail._name,
                     'res_id': msg_id,
             }
             context.pop('default_type', None)
             attachment_ids.append(ir_attachment.create(cr, uid, attachment_data, context=context))
         if attachment_ids:
-            mail_message.write(cr, uid, msg_id, {'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
+            mail_mail.write(cr, uid, msg_id, {'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
         if force_send:
-            mail_message.send(cr, uid, [msg_id], context=context)
+            mail_mail.send(cr, uid, [msg_id], context=context)
         return msg_id
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 3d7c6fa2ec7..89f863ea2f8 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -174,7 +174,7 @@ class mail_mail(osv.Model):
                 if message.state == 'sent':
                     self._postprocess_sent_message(cr, uid, message, context=context)
             except Exception:
-                _logger.exception('failed sending mail.message %s', message.id)
+                _logger.exception('failed sending mail.mail %s', message.id)
                 message.write({'state':'exception'})
 
             if auto_commit == True:

From caec481a351e1ddb939838d1fa51f2d2c08fdcb0 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Aug 2012 03:07:55 +0200
Subject: [PATCH 454/999] [FIX] mail: typos during refactoring

bzr revid: odo@openerp.com-20120822010755-xjc53162ue4kxm2e
---
 addons/mail/mail_thread.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 90b686d6693..8ca2bc6e56c 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -455,12 +455,12 @@ class mail_thread(osv.Model):
         # find author_id
 
         if 'From' in msg_fields:
-            author_ids = self._message_find_partners(cr, uid, msg_text, ['From'], context=context)
+            author_ids = self._message_find_partners(cr, uid, msg_txt, ['From'], context=context)
             #decode(msg_txt.get('From') or msg_txt.get_unixfrom()) )
             if author_ids:
                 msg['author_id'] = author_ids[0]
 
-        partner_ids = self._message_find_partners(cr, uid, msg_text, ['From','To','Delivered-To','CC','Cc'], context=context)
+        partner_ids = self._message_find_partners(cr, uid, msg_txt, ['From','To','Delivered-To','CC','Cc'], context=context)
         msg['partner_ids'] = partner_ids
 
         #if 'To' in msg_fields:

From 0113e9281a70eb034e58f471df3aba598a3eafe7 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Aug 2012 03:09:47 +0200
Subject: [PATCH 455/999] [FIX] mail: more refactoring errors: missing _logger

bzr revid: odo@openerp.com-20120822010947-8avs21hi7ib30ix2
---
 addons/mail/mail_mail.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 89f863ea2f8..07631cec992 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -9,6 +9,8 @@ import datetime
 from osv import osv
 from osv import fields
 
+_logger = logging.getLogger(__name__)
+
 class mail_mail(osv.Model):
     """
     Model holding RFC2822 email messages to send. This model also provides

From 7f5410e2d0d4e3bddf151746a935b45d67233568 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 22 Aug 2012 11:01:56 +0530
Subject: [PATCH 456/999] [IMP] res_company : unwanted space removed

bzr revid: rpr@tinyerp.com-20120822053156-zc2hg6z5updo4ate
---
 openerp/addons/base/res/res_company_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 4c12833a2af..4b063cdacb7 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -53,9 +53,8 @@
                                     </div>
                                    <label for="rml_header1"/>
                                    <div>
-                                            <field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
+                                       <field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
                                    </div>
-
                                     <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                                 </group>
                                 <group>

From 8bf884d2b698dae61f00814768259d6e6fe6a3c7 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Wed, 22 Aug 2012 11:20:23 +0530
Subject: [PATCH 457/999] [FIX] set the menu for base.menu_definitions

bzr revid: nco@tinyerp.com-20120822055023-4y39imx6dhwyjqsi
---
 addons/crm_claim/crm_claim_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 46f8760387a..bb881d62a58 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -50,9 +50,9 @@
             parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
 
         <!-- Claim Stages -->
+        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
         <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
         <menuitem id="menu_claim_stage_view" name="Claim Stages" action="crm_claim_stage_act" parent="base.menu_project_config_project" sequence="20"/>
-        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
 
     </data>
 </openerp>

From b5b3c24e9ffdb3472f4fb8a5a0755bb4157932b5 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 22 Aug 2012 11:35:05 +0530
Subject: [PATCH 458/999] [IMP] res_company : onchange code improved for
 behaviour of boolean field

bzr revid: rpr@tinyerp.com-20120822060505-1bhkjurylx4fh1br
---
 openerp/addons/base/res/res_company.py       |  4 ++--
 openerp/addons/base/res/res_company_view.xml | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 5f9e61545bf..7ed61279149 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -137,10 +137,10 @@ class res_company(osv.osv):
     _sql_constraints = [
         ('name_uniq', 'unique (name)', 'The company name must be unique !')
     ]
-    def on_change_header(self, cr, uid, ids, phone, email, fax, website, vat, reg=False, context=None):
+    def on_change_header(self, cr, uid, ids, customize_footer, phone, email, fax, website, vat, reg=False, context=None):
         val = []
         res_id=self.browse(cr, uid, ids, context=context)[0]
-        if res_id.customize_footer:
+        if customize_footer:
             return {}
         if phone: val.append(_('Phone: ')+phone)
         if fax: val.append(_('Fax: ')+fax)
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 4b063cdacb7..6703d8b7b09 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -55,14 +55,14 @@
                                    <div>
                                        <field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
                                    </div>
-                                    <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
+                                    <field name="website" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry)" widget="url" placeholder="e.g. www.openerp.com"/>
                                 </group>
                                 <group>
-                                    <field name="phone" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
-                                    <field name="fax" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
-                                    <field name="email" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
-                                    <field name="vat" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
-                                    <field name="company_registry" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
+                                    <field name="phone" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry)"/>
+                                    <field name="fax" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry)"/>
+                                    <field name="email" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry)"/>
+                                    <field name="vat" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry)"/>
+                                    <field name="company_registry" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry)"/>
                                 </group>
                             </group>
                             <group string="Bank Accounts">

From bc2bb91a3e54e4b295feee15c00646645a09eb11 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 22 Aug 2012 11:49:32 +0530
Subject: [PATCH 459/999] [IMP] res_company : onchange code commited

bzr revid: rpr@tinyerp.com-20120822061932-y1kifvbtb8va526q
---
 openerp/addons/base/res/res_company.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 7ed61279149..13e21610121 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -139,7 +139,6 @@ class res_company(osv.osv):
     ]
     def on_change_header(self, cr, uid, ids, customize_footer, phone, email, fax, website, vat, reg=False, context=None):
         val = []
-        res_id=self.browse(cr, uid, ids, context=context)[0]
         if customize_footer:
             return {}
         if phone: val.append(_('Phone: ')+phone)

From 86894cca457d03c840a0ce48099978244b96c365 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 22 Aug 2012 12:15:07 +0530
Subject: [PATCH 460/999] [IMP] res_company : help changed for new added
 customize_footer field

bzr revid: rpr@tinyerp.com-20120822064507-dbg6bce7wrkx4eoo
---
 openerp/addons/base/res/res_company.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 13e21610121..e55ea8fdfe0 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -105,7 +105,7 @@ class res_company(osv.osv):
 
     _columns = {
         'name': fields.related('partner_id', 'name', string='Company Name', size=128, required=True, store=True, type='char'),
-        'customize_footer': fields.boolean('Customize Footer', help="Determines if it is true the onchanges on rml_footer text field do not trigger and become editable."),
+        'customize_footer': fields.boolean('Customize Footer', help="If it is true then general information footer will not update automatically."),
         'parent_id': fields.many2one('res.company', 'Parent Company', select=True),
         'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),

From 4d0937e9a642b31183dfbc0cd963b95411d536cb Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (Open ERP)" <jir@tinyerp.com>
Date: Wed, 22 Aug 2012 12:39:28 +0530
Subject: [PATCH 461/999] [FIX] Fixes the problem of Iteration is not allowed
 on browse_record

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

bzr revid: jir@tinyerp.com-20120822070928-hfqz8s9du89ib03d
---
 addons/event/event.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 7f0c77661e4..004b370f48e 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -52,10 +52,13 @@ class event_event(osv.osv):
     _inherit = ['ir.needaction_mixin','mail.thread']
 
     def name_get(self, cr, uid, ids, context=None):
+        event_obj = self.browse(cr, uid, ids, context=context)
         if not ids:
               return []
+        if not isinstance(event_obj,list):
+            event_obj = [event_obj]
         res = []
-        for record in self.browse(cr, uid, ids, context=context):
+        for record in event_obj:
             date = record.date_begin.split(" ")[0]
             date_end = record.date_end.split(" ")[0]
             if date != date_end:

From 1bc63a91adfe37d8c284236f276fd4c0f791ea96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 22 Aug 2012 09:45:45 +0200
Subject: [PATCH 462/999] [FIX] mail_mail: added import of tools, to be able to
 use email_split.

bzr revid: tde@openerp.com-20120822074545-7sx8xnsmf610gnxz
---
 addons/mail/mail_mail.py          | 24 +++++++++++++++++++++++-
 addons/mail/static/src/js/mail.js |  1 +
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 07631cec992..a016586347f 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -1,10 +1,32 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-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/>
+#
+##############################################################################
+
 import ast
 import base64
+import datetime
 import email
 import logging
 import re
 import time
-import datetime
+import tools
 
 from osv import osv
 from osv import fields
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e29988389df..d0c4ff55ee8 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -545,6 +545,7 @@ openerp.mail = function(session) {
         },
         
         message_post: function (body) {
+            var self = this;
             if (! body) {
                 var comment_node = this.$element.find('textarea');
                 var body = comment_node.val();

From 6c109e7d7eb3e3b4f1741e199ace40ded9fc7c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 22 Aug 2012 09:49:24 +0200
Subject: [PATCH 463/999] [REM] project: removed custom 'followers' fields;
 security rule updated to use follower_ids.

bzr revid: tde@openerp.com-20120822074924-bbb5lc1w48dtebeb
---
 addons/project/project.py                    | 19 -------------------
 addons/project/security/project_security.xml |  2 +-
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 7088dccae23..5fe7f31fa57 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -186,23 +186,6 @@ class project(osv.osv):
         """Overriden in project_issue to offer more options"""
         return [('project.task', "Tasks")]
 
-    def _get_followers(self, cr, uid, ids, name, arg, context=None):
-        '''
-        Functional field that computes the users that are 'following' a thread.
-        '''
-        res = {}
-        for project in self.browse(cr, uid, ids, context=context):
-            l = set()
-            for message in project.message_ids:
-                l.add(message.user_id and message.user_id.id or False)
-            res[project.id] = list(filter(None, l))
-        return res
-
-    def _search_followers(self, cr, uid, obj, name, args, context=None):
-        project_obj = self.pool.get('project.project')
-        project_ids = project_obj.search(cr, uid, [('message_ids.user_id.id', 'in', args[0][2])], context=context)
-        return [('id', 'in', project_ids)]
-
     # Lambda indirection method to avoid passing a copy of the overridable method when declaring the field
     _alias_models = lambda self, *args, **kwargs: self._get_alias_models(*args, **kwargs)
 
@@ -246,8 +229,6 @@ 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([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility', required=True),
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
-        'followers': fields.function(_get_followers, method=True, fnct_search=_search_followers,
-                        type='many2many', relation='res.users', string='Followers'),
      }
 
     def dummy(self, cr, uid, ids, context):
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index f867285138a..3afe0f14e7a 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -45,7 +45,7 @@
         <field name="name">public Members</field>
         <field name="model_id" ref="model_project_project"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|','|',('privacy_visibility','in',[False,'public']),('members','in',[user.id]),('followers','in',[user.id])]</field>
+        <field name="domain_force">['|','|',('privacy_visibility','in',[False,'public']),('members','in',[user.id]),('follower_ids','in',[user.partner_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="task_comp_rule">

From 2f9f57cc469a8dcd4149dbe253dbbb8c6149169c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 22 Aug 2012 10:36:08 +0200
Subject: [PATCH 464/999] [IMP] removing some FP Note

bzr revid: fp@tinyerp.com-20120822083608-2q98p1758erm8f7t
---
 addons/mail/mail_group.py                  | 2 --
 addons/mail/mail_message.py                | 6 ------
 addons/mail/mail_thread.py                 | 2 --
 addons/mail/res_users.py                   | 4 ++--
 addons/mail/wizard/mail_compose_message.py | 6 ------
 5 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 145b9c9bdb4..faa4bb1c9b4 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -105,8 +105,6 @@ class mail_group(osv.Model):
         'alias_domain': False, # always hide alias during creation
     }
 
-    # FP Note: code to be improved. Check we have a code for res.users
-    # when we give them a new group.
     def _subscribe_users(self, cr, uid, ids, context=None):
         for mail_group in self.browse(cr, uid, ids, context=context):
             partner_ids = []
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 4cbcbea127f..b74df2f8594 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -19,22 +19,16 @@
 #
 ##############################################################################
 
-# FP Note: can we remove some dependencies ? Use lint
-
-import base64
 import dateutil.parser
 import email
 import logging
 import re
 import time
-import datetime
 from email.header import decode_header
 from email.message import Message
 
 from osv import osv
 from osv import fields
-import pytz
-from tools import DEFAULT_SERVER_DATETIME_FORMAT
 import tools
 
 _logger = logging.getLogger(__name__)
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 8ca2bc6e56c..f0bb90947e9 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -638,8 +638,6 @@ class mail_thread(osv.Model):
     # Thread_state
     #------------------------------------------------------
 
-    # FP Note: this should be a invert function on message_unread field
-    # not sure because if not readonly, it may often write to this field?
     def message_mark_as_unread(self, cr, uid, ids, context=None):
         """ Set as read. """
         notobj = self.pool.get('mail.notification')
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 1ae72246e69..8eacd0580d7 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -137,7 +137,7 @@ class res_users_mail_group(osv.Model):
     _name = 'res.users'
     _inherit = ['res.users']
 
-    # FP Note: to improve
+    # FP Note: to improve, post processing may be better ?
     def write(self, cr, uid, ids, vals, context=None):
         write_res = super(res_users_mail_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('groups_id'):
@@ -158,7 +158,7 @@ class res_groups_mail_group(osv.Model):
     _name = 'res.groups'
     _inherit = 'res.groups'
 
-    # FP Note: to improve
+    # FP Note: to improve, post processeing, after the super may be better
     def write(self, cr, uid, ids, vals, context=None):
         if vals.get('users'):
             # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 5da8d7c8e80..50ffd6e440e 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -28,12 +28,6 @@ from osv import fields
 from tools.safe_eval import safe_eval as eval
 from tools.translate import _
 
-# FP Note: refactor in tools ?
-def mail_tools_to_email(text):
-    """Return a list of the email addresses found in ``text``"""
-    if not text: return []
-    return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
-
 # main mako-like expression pattern
 EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
 

From 26cb67660226fb13120b7546c603dc2b508bd8b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 22 Aug 2012 10:38:13 +0200
Subject: [PATCH 465/999] [FIX] mail_thread: find_partners: fixed
 message_find_partners, message_txt did not always have all headers filled;
 removed some commented code that can be deleted; re-added computation of
 email date; added missing imports.

bzr revid: tde@openerp.com-20120822083813-tt2sjx54iu6sbskt
---
 addons/mail/mail_thread.py | 46 +++++++++++++-------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index f0bb90947e9..80cb7794e54 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -20,19 +20,20 @@
 ##############################################################################
 
 import base64
+import dateutil
 import email
 import logging
-import re
-import time
-import xmlrpclib
 from email.utils import parsedate
 from email.message import Message
-
 from osv import osv, fields
 from mail_message import decode
+import re
+import time
 import tools
 from tools.translate import _
 from tools.safe_eval import safe_eval as eval
+import pytz
+import xmlrpclib
 
 _logger = logging.getLogger(__name__)
 
@@ -163,12 +164,13 @@ class mail_thread(osv.Model):
     # Mail gateway
     #------------------------------------------------------
 
-    def _message_find_partners(self, cr, uid, message, headers=['From'], context=None):
-        s = ', '.join([decode(message.get(h)) for h in headers])
+    def _message_find_partners(self, cr, uid, message, header_fields=['From'], context=None):
+        """ Find partners related to some header fields of the message. """
+        s = ', '.join([decode(message.get(h)) for h in header_fields if message.get(h)])
         mails = tools.email_split(s)
         result = []
-        for m in mails:
-            result += self.pool.get('res.partner').search(cr, uid, [('email','ilike',m)], context=context)
+        for email in mails:
+            result += self.pool.get('res.partner').search(cr, uid, [('email', 'ilike', email)], context=context)
         return result
 
     def _message_find_user_id(self, cr, uid, message, context=None):
@@ -463,28 +465,12 @@ class mail_thread(osv.Model):
         partner_ids = self._message_find_partners(cr, uid, msg_txt, ['From','To','Delivered-To','CC','Cc'], context=context)
         msg['partner_ids'] = partner_ids
 
-        #if 'To' in msg_fields:
-        #    msg['to'] = decode(msg_txt.get('To'))
-
-        #if 'Delivered-To' in msg_fields:
-        #    msg['to'] = decode(msg_txt.get('Delivered-To'))
-
-        #if 'CC' in msg_fields:
-        #    msg['cc'] = decode(msg_txt.get('CC'))
-
-        #if 'Cc' in msg_fields:
-        #    msg['cc'] = decode(msg_txt.get('Cc'))
-
-        #if 'Reply-To' in msg_fields:
-        #    msg['reply'] = decode(msg_txt.get('Reply-To'))
-
-        # FP Note: I propose to store the current datetime rather than the email date
-        #if 'Date' in msg_fields:
-        #    date_hdr = decode(msg_txt.get('Date'))
-        #    # convert from email timezone to server timezone
-        #    date_server_datetime = dateutil.parser.parse(date_hdr).astimezone(pytz.timezone(tools.get_server_timezone()))
-        #    date_server_datetime_str = date_server_datetime.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
-        #    msg['date'] = date_server_datetime_str
+        if 'Date' in msg_fields:
+           date_hdr = decode(msg_txt.get('Date'))
+           # convert from email timezone to server timezone
+           date_server_datetime = dateutil.parser.parse(date_hdr).astimezone(pytz.timezone(tools.get_server_timezone()))
+           date_server_datetime_str = date_server_datetime.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
+           msg['date'] = date_server_datetime_str
 
         #if 'Content-Transfer-Encoding' in msg_fields:
         #    msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')

From a8c52d746c4e776c1bbd8ac02207999991743872 Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Wed, 22 Aug 2012 14:21:49 +0530
Subject: [PATCH 466/999] Give a link to Exit button and less gap between
 buttons.

bzr revid: vba@tinyerp.com-20120822085149-b6zahf1q9lwv6vf3
---
 addons/survey/wizard/survey_answer.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index c43b78fdf3c..3ee5ec0faef 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -370,23 +370,23 @@ class survey_question_wiz(osv.osv_memory):
 
                     etree.SubElement(xml_form, 'separator', {'colspan': '4'})
  
-                    xml_button_group = etree.SubElement(xml_form, 'group', {'col': '8', 'colspan': '1'})
+                    xml_button_group = etree.SubElement(xml_form, 'group', {'col': '8', 'colspan': '1', 'width':"100%"})
 
 
                     if pre_button:
-                        etree.SubElement(xml_button_group, 'button', {'name':"action_previous",'string':"Previous",'type':"object"})
+                        etree.SubElement(xml_button_group, 'button', {'name':"action_previous",'string':"Previous",'type':"object", 'width':"8%"})
                     but_string = "Next"
                     if int(page_number) + 1 == total_pages:
                         but_string = "Done"
                     if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
-                        etree.SubElement(xml_button_group, 'button', {'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context), 'class':"oe_highlight"})
+                        etree.SubElement(xml_button_group, 'button', {'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context), 'class':"oe_highlight", 'width':"7%"})
                     elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
-                        etree.SubElement(xml_button_group, 'button', {'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context), 'class':"oe_highlight"})
+                        etree.SubElement(xml_button_group, 'button', {'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context), 'class':"oe_highlight", 'width':"7%"})
                     elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
-                        etree.SubElement(xml_button_group, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_highlight"})
+                        etree.SubElement(xml_button_group, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_highlight", 'width':"7%"})
                     else:
-                        etree.SubElement(xml_button_group, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_highlight"})
-                    etree.SubElement(xml_button_group, 'button', {'special': "cancel",'string':"Exit"})
+                        etree.SubElement(xml_button_group, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_highlight", 'width':"7%"})
+                    etree.SubElement(xml_button_group, 'button', {'special': "cancel",'string':"Exit",'class':"oe_link"})
                     etree.SubElement(xml_button_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_survey_title_page oe_right"})
 
                     root = xml_form.getroottree()

From 184385fd7ce6fc6c1bff33176d70d061ea337a90 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 22 Aug 2012 15:22:44 +0530
Subject: [PATCH 467/999] [IMP]l10n_in_hr_payroll:improved rule for LTA and HRA

bzr revid: kbh@tinyerp.com-20120822095244-8atrqgov0i3abj0l
---
 addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml | 7 ++++---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py            | 1 +
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml      | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 61a0b4e4352..d64d14f036d 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -34,7 +34,7 @@
         <record id="hr_salary_rule_houserentallowancemetro_nonmetro" model="hr.salary.rule">
             <field name="code">HRAMN</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result=payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.50) or (contract.wage * 0.50) if (contract.city_type=='metro') else payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.40) or (contract.wage * 0.40) if (contract.city_type=='non-metro') else 0.00</field>
+            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * contract.house_rent_allowance_metro_nonmetro / 100) or (contract.wage * contract.house_rent_allowance_metro_nonmetro / 100) if (contract.city_type=='metro') else payslip.company_id.dearness_allowance and ((contract.wage + DA) * contract.house_rent_allowance_metro_nonmetro / 100) or (contract.wage * contract.house_rent_allowance_metro_nonmetro / 100) if (contract.city_type=='non-metro') else 0.00</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance for metro and nonmetro city</field>
             <field name="register_id" ref="hr_houserent_allowance_register"/>
@@ -141,8 +141,9 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="code">LTA</field>
             <field name="name">Leave Travel Allowance</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field name="amount_fix">1666</field>
+            <field name="amount_select">percentage</field>
+            <field name="amount_percentage_base">contract.wage</field>
+            <field name="amount_percentage" eval="8.33"/>
             <field name="sequence" eval="29"/>
             <field name="note">As per Income tax rules of India, if transport bills for LTA are not provided,the amount will be taxed. E.g. If an employee has LTA allowance as Rs 50,000 in his CTC(cost to company),and he provides proofs of Rs 40,000 (boarding pass,air tickets, taxi vouchers) then income tax will be deducted for rest of the Rs 10,000. Does not matter whats the amount of LTA in an employee’s package, income tax laws only permits domestic air tickets only for LTA claim.</field>
         </record>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 16cb12493c6..21bc834a2a4 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -49,6 +49,7 @@ class hr_contract(osv.osv):
             ('metro', 'Metro'),
             ('non-metro', 'Non Metro'),
             ], 'Type of City'),
+        'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance for Metro and Non Metro City', digits_compute=dp.get_precision('Payroll'), help="HRA computed as percentage(%)"),
     }
     _defaults = {
         'city_type': 'non-metro',
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 81491fd8937..e977c21844b 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -14,6 +14,7 @@
                     <separator colspan="2" string="Allowance"/>
                         <field name="driver_salay"/>
                         <field name="city_type"/>
+                        <field name="house_rent_allowance_metro_nonmetro"/>
                  </group>
                  <group col="2" colspan="2" name="left_column">
                     <separator colspan="2" string="Deduction"/>

From 0015c913f5f798bc5a93381774497d973f942f7b Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 22 Aug 2012 15:41:10 +0530
Subject: [PATCH 468/999] [IMP]l10n_in_hr_payroll:register added for all
 deduction

bzr revid: kbh@tinyerp.com-20120822101110-3zv091wj2m7dmvu7
---
 .../data/l10n_in_hr_payroll_data.xml          | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index d64d14f036d..414145d3dc1 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -19,6 +19,45 @@
             <field name="name">Register for Food Coupen</field>
         </record>
 
+        <record id="hr_tds_register" model="hr.contribution.register">
+            <field name="name">Register for TDS</field>
+        </record>
+
+        <record id="hr_nps_contribution_register" model="hr.contribution.register">
+            <field name="name">Register for NPS Contribution</field>
+        </record>
+
+        <record id="hr_vpf_contribution_register" model="hr.contribution.register">
+            <field name="name">Register for Voluntarily Provident Fund</field>
+        </record>
+
+        <record id="hr_company_transport_register" model="hr.contribution.register">
+            <field name="name">Register for Company Provided Transport Deduction</field>
+        </record>
+        
+        <record id="hr_food_coupen_deduction_register" model="hr.contribution.register">
+            <field name="name">Register for Food Coupons Deduction</field>
+        </record>
+        
+        <record id="hr_labour_Welfare_fund_register" model="hr.contribution.register">
+            <field name="name">Register for State Labour Welfare Fund Deduction</field>
+        </record>
+        
+        <record id="hr_group_term_insurance_register" model="hr.contribution.register">
+            <field name="name">Register for Company Provided Group Term Insurance Deduction</field>
+        </record>
+        
+        <record id="hr_leave_availed_register" model="hr.contribution.register">
+            <field name="name">Register for Leave Availed Deduction</field>
+        </record>
+        
+        <record id="hr_medical_insurance_register" model="hr.contribution.register">
+            <field name="name">Register for Company Provided Medical Insurance Deduction</field>
+        </record>
+        
+        <record id="hr_other_deduction_register" model="hr.contribution.register">
+            <field name="name">Register for Other Deduction from Employer</field>
+        </record>
         <!-- Hr Salary Rules for allowance-->
 
         <record id="hr_salary_rule_da" model="hr.salary.rule">
@@ -277,6 +316,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="condition_python">result = bool(contract.tds)</field>
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = -(contract.tds)</field>
+            <field name="register_id" ref="hr_tds_register"/>
             <field name="sequence" eval="140"/>
             <field name="note">As per income tax rules, all payment which are taxable in nature should be done after deduction of taxes at the source itself. Hence employer compute income tax on salary payment and deduct it every month. This TDS is based on employee’s saving/investment declaration at the start of year. If investments for tax saving is not done, large amount may be deducted in last few months.</field>
         </record>
@@ -311,6 +351,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) or - (contract.wage * 0.10)</field>
             <field name="sequence" eval="155"/>
+            <field name="register_id" ref="hr_nps_contribution_register"/>
             <field name="note">Employee can claim deduction even of employer's contribution to NPS.</field>
         </record>
 
@@ -323,6 +364,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * contract.voluntary_provident_fund / 100) or - (contract.wage * contract.voluntary_provident_fund / 100)</field>
             <field name="sequence" eval="160"/>
+            <field name="register_id" ref="hr_vpf_contribution_register"/>
             <field name="note">VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government.This additional amount enjoys all the benefits of PF except that the employer is not liable to contribute any extra amount apart from 12%.An added advantage is that the interest rate is equal to the interest rate of PF and he withdrawal is tax free. Please note that the maximum contribution towards VPF is 100% of your Basic.The highest rate of interest (close to 9%) makes it a very attractive saving scheme. Because of these advantages many employees chose not to close their PF account even after getting employment else where other than India.Employees also get a major tax break on their entire contribution to the fund up to a ceiling of Rs. 70,000/-</field>
         </record>
 
@@ -333,6 +375,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="condition_select">none</field>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
+            <field name="register_id" ref="hr_company_transport_register"/>
             <field name="sequence" eval="165"/>
         </record>
 
@@ -343,6 +386,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="code">FD</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="name">Deduction Towards Food Coupons</field>
+            <field name="register_id" ref="hr_food_coupen_deduction_register"/>
             <field name="sequence" eval="166"/>
          </record>
 
@@ -353,6 +397,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="170"/>
+            <field name="register_id" ref="hr_labour_Welfare_fund_register"/>
             <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>
         </record>
 
@@ -362,6 +407,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
+            <field name="register_id" ref="hr_group_term_insurance_register"/>
             <field name="sequence" eval="175"/>
         </record>
 
@@ -372,6 +418,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="condition_select">none</field>
             <field name="amount_select">fix</field>
             <field eval="0.0" name="amount_fix"/>
+            <field name="register_id" ref="hr_leave_availed_register"/>
             <field name="sequence" eval="180"/>
         </record>
 
@@ -384,6 +431,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = - (contract.medical_insurance)</field>
             <field eval="-50.0" name="amount_fix"/>
+            <field name="register_id" ref="hr_medical_insurance_register"/>
             <field name="sequence" eval="185"/>
         </record>
 
@@ -393,6 +441,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
             <field eval="-200.0" name="amount_fix"/>
+            <field name="register_id" ref="hr_other_deduction_register"/>
             <field name="sequence" eval="187"/>
         </record>
 
@@ -403,6 +452,7 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) or - (contract.wage * 0.10)</field>
             <field name="sequence" eval="190"/>
+            <field name="register_id" ref="hr_nps_contribution_register"/>
             <field name= "note">Any amount contributed by your employer to your NPS account is treated as part of your salary and is included in your income but you can claim deduction under Section 80C for this too.thus, effectively making it exempt from tax within the limit of 10% of your basic salary. This is very useful and tax efficient for you particularly if you fall in the maximum tax.</field>
         </record>
 

From 7867021f80b7716a373e70501ebbaab6b89d1f9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 22 Aug 2012 12:12:51 +0200
Subject: [PATCH 469/999] [CLEAN] mail.followers widget: removed unnecessary
 code about showing/hiding followers (always show); updated calls to
 subscription API, using .._users. Updated widget.params to widget.options.

bzr revid: tde@openerp.com-20120822101251-sdnknsgfexkpljdh
---
 addons/mail/static/src/js/mail_followers.js   | 43 ++++++-------------
 addons/mail/static/src/xml/mail_followers.xml |  7 ++-
 2 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 1e420fbcbb9..d233235cd00 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -24,12 +24,8 @@ openerp_mail_followers = function(session, mail) {
 
         init: function() {
             this._super.apply(this, arguments);
-            this.params = {};
-            this.params.image = this.node.attrs.image || 'image_small';
-            this.params.title = this.node.attrs.title || 'Followers';
-            this.params.display_followers = true;
-            this.params.display_control = this.node.attrs.display_control || false;
-            this.params.display_actions = this.node.attrs.display_actions || false;
+            this.options.image = this.node.attrs.image || 'image_small';
+            this.options.title = this.node.attrs.title || 'Followers';
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
             this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
         },
@@ -40,9 +36,6 @@ openerp_mail_followers = function(session, mail) {
             // any other method to know if the view is in create mode anymore
             this.view.on("change:actual_mode", this, this._check_visibility);
             this._check_visibility();
-            this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); });
-            if (! this.params.display_control) {
-                this.$element.find('button.oe_mail_button_followers').hide(); }
             this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
                 .mouseover(function () { $(this).html('Follow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
                 .mouseleave(function () { $(this).html('Not following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
@@ -61,10 +54,6 @@ openerp_mail_followers = function(session, mail) {
         },
 
         reinit: function() {
-            this.params.display_followers = true;
-            this.params.display_control = this.node.attrs.display_control || false;
-            this.params.display_actions = this.node.attrs.display_actions || false;
-            this.$element.find('button.oe_mail_button_followers').html('Hide followers')
             this.$element.find('button.oe_mail_button_follow').hide();
             this.$element.find('button.oe_mail_button_unfollow').hide();
         },
@@ -76,11 +65,16 @@ openerp_mail_followers = function(session, mail) {
                 this.$element.find('div.oe_mail_recthread_aside').hide();
                 return;
             }
+            if (this.getParent().fields.message_is_follower === undefined) {
+                // TDE: raise a warning
+            }
+            this.message_is_follower = this.getParent().fields.message_is_follower.get_value();
+            console.log(this.message_is_follower);
             return this.fetch_followers(value_);
         },
 
         fetch_followers: function (value_) {
-            return this.ds_follow.call('read', [value_ || this.get_value(), ['name', this.params.image]]).then(this.proxy('display_followers'));
+            return this.ds_follow.call('read', [value_ || this.get_value(), ['name']]).then(this.proxy('display_followers'));
         },
 
         /**
@@ -88,15 +82,13 @@ openerp_mail_followers = function(session, mail) {
          * TODO: replace the is_follower check by fields read */
         display_followers: function (records) {
             var self = this;
-            this.is_follower = false;
-            var user_list = this.$element.find('ul.oe_mail_followers_display').empty();
-            this.$element.find('div.oe_mail_recthread_followers h4').html(this.params.title + ' (' + records.length + ')');
+            var node_user_list = this.$element.find('ul.oe_mail_followers_display').empty();
+            this.$element.find('div.oe_mail_recthread_followers h4').html(this.options.title + ' (' + records.length + ')');
             _(records).each(function (record) {
-                if (record.id == self.session.uid) { self.is_follower = true; }
                 record.avatar_url = mail.ChatterUtils.get_image(self.session.prefix, self.session.session_id, 'res.partner', 'image_small', record.id);
-                $(session.web.qweb.render('mail.followers.partner', {'record': record})).appendTo(user_list);
+                $(session.web.qweb.render('mail.followers.partner', {'record': record})).appendTo(node_user_list);
             });
-            if (this.is_follower) {
+            if (this.message_is_follower) {
                 this.$element.find('button.oe_mail_button_follow').hide();
                 this.$element.find('button.oe_mail_button_unfollow').show(); }
             else {
@@ -105,18 +97,11 @@ openerp_mail_followers = function(session, mail) {
         },
 
         do_follow: function () {
-            return this.ds_model.call('message_subscribe', [[this.view.datarecord.id]]).pipe(this.proxy('set_value'));
+            return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id]]).pipe(this.proxy('set_value'));
         },
 
         do_unfollow: function () {
-            return this.ds_model.call('message_unsubscribe', [[this.view.datarecord.id]]).pipe(this.proxy('set_value'));
-        },
-
-        do_toggle_followers: function () {
-            this.params.see_followers = ! this.params.see_followers;
-            if (this.params.see_followers) { this.$element.find('button.oe_mail_button_followers').html('Hide followers'); }
-            else { this.$element.find('button.oe_mail_button_followers').html('Show followers'); }
-            this.$element.find('div.oe_mail_recthread_followers').toggle();
+            return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id]]).pipe(this.proxy('set_value'));
         },
     });
 };
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 53c899b9569..2776669fa70 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -9,11 +9,10 @@
         <div class="oe_mail_recthread_actions">
             <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
             <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
-            <button type="button" class="oe_mail_button_followers">Show followers</button>
         </div>
         <div class="oe_mail_recthread_followers">
-            <t t-if="widget.params.title">
-                <h4><t t-raw="widget.params.title"/></h4>
+            <t t-if="widget.options.title">
+                <h4><t t-raw="widget.options.title"/></h4>
             </t>
             <ul class="oe_mail_followers_display"></ul>
         </div>
@@ -25,7 +24,7 @@
         -->
     <li t-name="mail.followers.partner">
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
-        <a t-attf-href="#model=res.users&amp;id=#{record.id}"><t t-raw="record.name"/></a>
+        <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
     </li>
 
 </template>

From d572beb36e8827bda4a4501ca62430b75c664a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 22 Aug 2012 12:13:33 +0200
Subject: [PATCH 470/999] [IMP] res_users in mail: use message_subscribe, as we
 already have a browse in create_welcome_message, that I moved to create.

bzr revid: tde@openerp.com-20120822101333-clct0k4o0pu9r2ix
---
 addons/mail/res_users.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 8eacd0580d7..1e638251e40 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -100,15 +100,15 @@ class res_users(osv.Model):
 
         # create user that follows its related partner
         user_id = super(res_users, self).create(cr, uid, data, context=context)
-        self.pool.get('res.partner').message_subscribe_users(cr, uid, [user_id], [user_id], context=context)
+        user = self.browse(cr, uid, user_id, context=context)
+        self.pool.get('res.partner').message_subscribe(cr, uid, [user.partner_id.id], [user.partner_id.id], context=context)
         # alias
         mail_alias.write(cr, SUPERUSER_ID, [alias_id], {"alias_force_thread_id": user_id}, context)
         # create a welcome message
         self._create_welcome_message(cr, uid, user_id, context=context)
         return user_id
 
-    def _create_welcome_message(self, cr, uid, user_id, context=None):
-        user = self.browse(cr, uid, user_id, context=context)
+    def _create_welcome_message(self, cr, uid, user, context=None):
         company_name = user.company_id.name if user.company_id else _('the company')
         body = '''%s has joined %s.''' % (user.name, company_name)
         # TODO change 1 into user.id but catch errors

From 3ce511225cf721dbbe503d8ccf1b836cf9fe9336 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 22 Aug 2012 15:55:09 +0530
Subject: [PATCH 471/999] [IMP] res.company : base data updated

bzr revid: rpr@tinyerp.com-20120822102509-0r7j13paln24zz1g
---
 openerp/addons/base/base_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 440df12596d..ccb25861ae7 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1088,7 +1088,7 @@
             <field name="name">Your Company</field>
             <field name="partner_id" ref="main_partner"/>
             <field name="rml_header1">Your Company Slogan</field>
-            <field name="rml_footer">Web: http://www.yourcompany.com - Tel: +33 1 49 51 23 94 - Bank Accounts... to be configured in menu Settings > Accounting/Invoicing.</field>
+            <field name="rml_footer">Website: www.yourcompany.com | Phone: +33 1 49 51 23 94 </field>
             <field name="currency_id" ref="base.EUR"/>
         </record>
 

From e46c8e43ff588ba4a7b0d902527cdf3011efed9d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 22 Aug 2012 12:37:25 +0200
Subject: [PATCH 472/999] [IMP] Removing a bad practice:   - what happens if
 you overwrite check_read and modules calls check_access_rights ?   - 5
 methods to learn to understand the API insead of one

bzr revid: fp@tinyerp.com-20120822103725-vdubhkzlake2jyvo
---
 openerp/osv/orm.py | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 368a37f455a..e8f59e50cbd 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2346,7 +2346,7 @@ class BaseModel(object):
     def read_string(self, cr, uid, id, langs, fields=None, context=None):
         res = {}
         res2 = {}
-        self.pool.get('ir.translation').check_read(cr, uid)
+        self.pool.get('ir.translation').check_access_rights(cr, uid, 'read')
         if not fields:
             fields = self._columns.keys() + self._inherit_fields.keys()
         #FIXME: collect all calls to _get_source into one SQL call.
@@ -2370,7 +2370,7 @@ class BaseModel(object):
         return res
 
     def write_string(self, cr, uid, id, langs, vals, context=None):
-        self.pool.get('ir.translation').check_write(cr, uid)
+        self.pool.get('ir.translation').check_access_rights(cr, uid, 'write')
         #FIXME: try to only call the translation in one SQL
         for lang in langs:
             for field in vals:
@@ -2518,7 +2518,7 @@ class BaseModel(object):
 
         """
         context = context or {}
-        self.check_read(cr, uid)
+        self.check_access_rights(cr, uid, 'read')
         if not fields:
             fields = self._columns.keys()
 
@@ -3399,8 +3399,7 @@ class BaseModel(object):
         if context is None:
             context = {}
 
-        write_access = self.check_write(cr, user, False) or \
-            self.check_create(cr, user, False)
+        write_access = self.check_access_rights(cr, user, 'write') or self.check_access_rights(cr, user, 'create')
 
         res = {}
 
@@ -3464,7 +3463,7 @@ class BaseModel(object):
 
         if not context:
             context = {}
-        self.check_read(cr, user)
+        self.check_access_rights(cr, user, 'read')
         if not fields:
             fields = list(set(self._columns.keys() + self._inherit_fields.keys()))
         if isinstance(ids, (int, long)):
@@ -3738,18 +3737,6 @@ class BaseModel(object):
            according to the access rights."""
         return self.pool.get('ir.model.access').check(cr, uid, self._name, operation, raise_exception)
 
-    def check_create(self, cr, uid, raise_exception=True):
-        return self.check_access_rights(cr, uid, 'create', raise_exception)
-
-    def check_read(self, cr, uid, raise_exception=True):
-        return self.check_access_rights(cr, uid, 'read', raise_exception)
-
-    def check_unlink(self, cr, uid, raise_exception=True):
-        return self.check_access_rights(cr, uid, 'unlink', raise_exception)
-
-    def check_write(self, cr, uid, raise_exception=True):
-        return self.check_access_rights(cr, uid, 'write', raise_exception)
-
     def check_access_rule(self, cr, uid, ids, operation, context=None):
         """Verifies that the operation given by ``operation`` is allowed for the user
            according to ir.rules.
@@ -3813,7 +3800,7 @@ class BaseModel(object):
 
         self._check_concurrency(cr, ids, context)
 
-        self.check_unlink(cr, uid)
+        self.check_access_rights(cr, uid, 'unlink')
 
         ir_property = self.pool.get('ir.property')
         
@@ -3949,7 +3936,7 @@ class BaseModel(object):
             ids = [ids]
 
         self._check_concurrency(cr, ids, context)
-        self.check_write(cr, user)
+        self.check_access_rights(cr, user, 'write')
 
         result = self._store_get_values(cr, user, ids, vals.keys(), context) or []
 
@@ -4169,7 +4156,7 @@ class BaseModel(object):
         if self.is_transient():
             self._transient_vacuum(cr, user)
 
-        self.check_create(cr, user)
+        self.check_access_rights(cr, user, 'create')
 
         if self._log_access:
             for f in LOG_ACCESS_COLUMNS:
@@ -4661,7 +4648,7 @@ class BaseModel(object):
         """
         if context is None:
             context = {}
-        self.check_read(cr, access_rights_uid or user)
+        self.check_access_rights(cr, access_rights_uid or user, 'read')
 
         # For transient models, restrict acces to the current user, except for the super-user
         if self.is_transient() and self._log_access and user != SUPERUSER_ID:

From 40949f8052bf448ce9d67f73159da4a66baa8b17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 22 Aug 2012 13:00:57 +0200
Subject: [PATCH 473/999] [FIX] mail.js: fixed a wrong var name.

bzr revid: tde@openerp.com-20120822110057-1dqo701k2lmpmoxo
---
 addons/mail/static/src/js/mail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index d0c4ff55ee8..409ff41fcf5 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -639,7 +639,7 @@ openerp.mail = function(session) {
         set_value: function() {
             this._super.apply(this, arguments);
             if (! this.view.datarecord.id || session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
-                this.$el.find('oe_mail_thread').hide();
+                this.$element.find('oe_mail_thread').hide();
                 return;
             }
             // update context

From 49596ebe91b11bfa759782eb6176c6a0a918279a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 22 Aug 2012 13:03:13 +0200
Subject: [PATCH 474/999] [IMP] mail_thread: message_is_follower field is now
 calculated with other functional fields (message_summary and message_read).
 Cleaned message_subscribe and message_unsubscribe. Added deletion of
 followers when unlinking a record. Propagated change in mail_group view.

bzr revid: tde@openerp.com-20120822110313-is3p1h4s2e8c4hbm
---
 addons/mail/mail_group_view.xml             |  10 +-
 addons/mail/mail_thread.py                  | 143 ++++++++++----------
 addons/mail/static/src/js/mail_followers.js |   8 +-
 3 files changed, 80 insertions(+), 81 deletions(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 1aa1e1aa687..c303b1fd40b 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -14,8 +14,8 @@
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <kanban>
-                    <field name="message_follower_ids"/>
                     <field name="message_is_follower"/>
+                    <field name="message_follower_ids"/>
                     <field name="message_summary"/>
                     <templates>
                         <t t-name="kanban-description">
@@ -32,8 +32,8 @@
                                     <h4><a type="edit"><field name="name"/></a></h4>
                                     <ul>
                                         <li><t t-raw="record.message_summary.raw_value"/></li>
-                                        <li t-if="! record.message_is_follower.raw_value"><a name="message_subscribe" string="Join" type="object" class="oe_group_join">Not following</a></li>
-                                        <li t-if="record.message_is_follower.raw_value"><a name="message_unsubscribe" string="Join" type="object" class="oe_group_leave">Following</a></li>
+                                        <li t-if="! record.message_is_follower.raw_value"><a name="message_subscribe_users" string="Join" type="object" class="oe_group_join">Not following</a></li>
+                                        <li t-if="record.message_is_follower.raw_value"><a name="message_unsubscribe_users" string="Leave" type="object" class="oe_group_leave">Following</a></li>
                                     </ul>
                                 </div>
                             </div>
@@ -80,10 +80,10 @@
                         </group>
                     </sheet>
                     <div class="oe_chatter">
+                        <field name="message_is_follower" invisible="1"/>
                         <field name="message_ids" widget="mail_thread"
                                 options='{"thread_level": 1}'/>
-                        <field name="message_follower_ids" widget="mail_followers"
-                                context="{'lapin': 'nouille'}" image="image_small"/>
+                        <field name="message_follower_ids" widget="mail_followers"/>
                     </div>
                 </form>
             </field>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 80cb7794e54..3bc45d3af26 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -69,38 +69,23 @@ class mail_thread(osv.Model):
     _description = 'Email Thread'
     # TODO: may be we should make it _inherit ir.needaction
 
-    def _get_is_follower(self, cr, uid, ids, name, args, context=None):
-        subobj = self.pool.get('mail.followers')
-        subids = subobj.search(cr, uid, [
-            ('res_model','=',self._name),
-            ('res_id', 'in', ids),
-            ('partner_id.user_ids','in',[uid])], context=context)
-        result = dict.fromkeys(ids, False)
-        for sub in subobj.browse(cr, uid, subids, context=context):
-            result[sub.res_id] = True
-        return result
-
     def _get_message_data(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        for id in ids:
-            res[id] = {
-                'message_unread': False,
-                'message_summary': ''
-            }
-        nobj = self.pool.get('mail.notification')
-        nids = nobj.search(cr, uid, [
-            ('partner_id.user_ids','in',[uid]),
-            ('message_id.res_id','in', ids),
-            ('message_id.model','=', self._name),
-            ('read','=',False)
+        res = dict( (id, dict(message_unread=False, message_summary='')) for id in ids)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+
+        notif_obj = self.pool.get('mail.notification')
+        notif_ids = notif_obj.search(cr, uid, [
+            ('partner_id.user_ids', 'in', [uid]),
+            ('message_id.res_id', 'in', ids),
+            ('message_id.model', '=', self._name),
+            ('read', '=', False)
         ], context=context)
-        for notif in nobj.browse(cr, uid, nids, context=context):
+        for notif in notif_obj.browse(cr, uid, notif_ids, context=context):
             res[notif.message_id.res_id]['message_unread'] = True
 
         for thread in self.browse(cr, uid, ids, context=context):
-            message_ids = thread.message_ids
-            follower_ids = thread.message_follower_ids
-            res[id]['message_summary'] = "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(follower_ids)),
+            res[thread.id]['message_summary'] = "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(thread.message_ids), len(thread.message_follower_ids))
+            res[thread.id]['message_is_follower'] = user.partner_id.id in [follower.id for follower in thread.message_follower_ids]
         return res
 
     # FP Note: todo
@@ -108,10 +93,10 @@ class mail_thread(osv.Model):
         return []
 
     _columns = {
-        'message_is_follower': fields.function(_get_is_follower,
-            type='boolean', string='Is a Follower'),
+        'message_is_follower': fields.function(_get_message_data,
+            type='boolean', string='Is a Follower', multi='_get_message_data'),
         'message_follower_ids': fields.many2many('res.partner', 'mail_followers', 'res_id', 'partner_id',
-            # FP Note: implement this domain=lambda self: [('res_model','=',self._name)],
+            domain=lambda self: [('res_model','=',self._name)],
             string='Followers'),
         'message_ids': fields.one2many('mail.message', 'res_id',
             domain=lambda self: [('model','=',self._name)],
@@ -129,26 +114,26 @@ class mail_thread(osv.Model):
     }
 
     #------------------------------------------------------
-    # Automatic subscription when creating/reading
+    # Automatic subscription when creating
     #------------------------------------------------------
 
     def create(self, cr, uid, vals, context=None):
-        """ Override of create to subscribe the current user
-        """
+        """ Override of create to subscribe the current user. """
         thread_id = super(mail_thread, self).create(cr, uid, vals, context=context)
         self.message_subscribe_users(cr, uid, [thread_id], [uid], context=context)
         return thread_id
 
     def unlink(self, cr, uid, ids, context=None):
-        """Override unlink, to automatically delete messages
-           that are linked with res_model and res_id, not through
-           a foreign key with a 'cascade' ondelete attribute.
-           Notifications will be deleted with messages
-        """
+        """ Override unlink to delete messages and followers. This cannot be
+            cascaded, because link is done through (res_model, res_id). """
         msg_obj = self.pool.get('mail.message')
+        fol_obj = self.pool.get('mail.followers')
         # delete messages and notifications
-        msg_to_del_ids = msg_obj.search(cr, uid, [('model', '=', self._name), ('res_id', 'in', ids)], context=context)
-        msg_obj.unlink(cr, uid, msg_to_del_ids, context=context)
+        msg_ids = msg_obj.search(cr, uid, [('model', '=', self._name), ('res_id', 'in', ids)], context=context)
+        msg_obj.unlink(cr, uid, msg_ids, context=context)
+        # delete followers
+        fol_ids = fol_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', ids)], context=context)
+        fol_obj.unlink(cr, uid, fol_ids, context=context)
         return super(mail_thread, self).unlink(cr, uid, ids, context=context)
 
     #------------------------------------------------------
@@ -557,54 +542,66 @@ class mail_thread(osv.Model):
 
 
     #------------------------------------------------------
-    # Subscription mechanism
+    # Followers API
     #------------------------------------------------------
 
     def message_subscribe_users(self, cr, uid, ids, user_ids=None, context=None):
-        if not user_ids: user_ids = [uid]
-        partners = {}
-        for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context):
-            partners[user.partner_id.id] = True
-        return self.message_subscribe(cr, uid, ids, partners.keys(), context=context)
+        """ Wrapper on message_subscribe, using users. If user_ids is not
+            provided, subscribe uid instead. """
+        # isinstance: because using message_subscribe_users called in a view set the context as user_ids
+        if not user_ids or isinstance(user_ids, dict): user_ids = [uid]
+        partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
+        return self.message_subscribe(cr, uid, ids, partner_ids, context=context)
 
     def message_subscribe(self, cr, uid, ids, partner_ids, context=None):
-        """
-            :param partner_ids: a list of user_ids; if not set, subscribe
-                             uid instead
+        """ Add partners to the records followers. This implementation cannot
+            directly use [(4, partner_id)] because of the res_model column of
+            mail.followers. We therefore check access rights and access rules
+            before directly creating a follower record. This way we simulate
+            a write in message_follower_ids, enabling a correct check of access
+            rights.
+
+            :param partner_ids: a list of partner_ids to subscribe
             :param return: new value of followers, for Chatter
         """
-        obj = self.pool.get('mail.followers')
-        objids = obj.search(cr, uid, [
-            ('res_id', 'in', ids),
-            ('res_model', '=', self._name),
-            ('partner_id', 'in', partner_ids),
+        self.check_access_rights(cr, uid, 'write', raise_exception=True)
+        self.check_access_rule(cr, uid, ids, 'write', context=context)
+
+        fol_obj = self.pool.get('mail.followers')
+        fol_ids = fol_obj.search(cr, uid, [
+            ('res_id', 'in', ids), ('res_model', '=', self._name), ('partner_id', 'in', partner_ids)
             ], context=context)
         followers = {}
-        for follow in obj.browse(cr, uid, objids, context=context):
-            followers.setdefault(follow.partner_id.id, {})[follow.res_id] = True
-        create_ids = []
+        for fol in fol_obj.browse(cr, uid, fol_ids, context=context):
+            followers.setdefault(fol.partner_id.id, []).append(fol.res_id)
+
         for res_id in ids:
             for partner_id in partner_ids:
-                if followers.get(partner_id, {}).get(res_id, False):
-                    continue
-                create_ids.append(obj.create(cr, uid, {
-                    'res_model': self._name,
-                    'res_id': res_id, 'partner_id': partner_id
-                }, context=context))
-        return create_ids
+                if not res_id in followers.get(partner_id, []):
+                    fol_obj.create(cr, uid, {
+                        'res_id': res_id, 'partner_id': partner_id, 'res_model': self._name
+                        }, context=context)
+        # TDE: temp, must check followers widget
+        return []
 
-    def message_unsubscribe(self, cr, uid, ids, user_ids = None, context=None):
-        """ Unsubscribe the user (or user_ids) from the current document.
+    def message_unsubscribe_users(self, cr, uid, ids, user_ids=None, context=None):
+        """ Wrapper on message_subscribe, using users. If user_ids is not
+            provided, unsubscribe uid instead. """
+        # isinstance: because using message_subscribe_users called in a view set the context as user_ids
+        if not user_ids or isinstance(user_ids, dict): user_ids = [uid]
+        partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
+        return self.message_unsubscribe(cr, uid, ids, partner_ids, context=context)
 
-            :param user_ids: a list of user_ids; if not set, subscribe
-                             uid instead
+    def message_unsubscribe(self, cr, uid, ids, partner_ids, context=None):
+        """ Remove partners from the records followers.
+
+            :param partner_ids: a list of partner_ids to unsubscribe
             :param return: new value of followers, for Chatter
         """
-        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
-        self.write(cr, uid, ids, [(3, partner_id)], context=context)
-
-        # FP Note: do we need this ?
-        return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
+        self.write(cr, uid, ids, {'message_follower_ids': [(3, pid) for pid in partner_ids]}, context=context)
+        # return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
+        # TDE: temp, must check followers widget
+        return []
 
     #------------------------------------------------------
     # Notification API
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index d233235cd00..7b6723489ed 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -66,10 +66,12 @@ openerp_mail_followers = function(session, mail) {
                 return;
             }
             if (this.getParent().fields.message_is_follower === undefined) {
-                // TDE: raise a warning
+                // TDE: TMP, need to change all form views
+                this.message_is_follower = false;
+            }
+            else {
+                this.message_is_follower = this.getParent().fields.message_is_follower.get_value();
             }
-            this.message_is_follower = this.getParent().fields.message_is_follower.get_value();
-            console.log(this.message_is_follower);
             return this.fetch_followers(value_);
         },
 

From 9871b2dd370c61052844ed79bc3de20a12c03adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 22 Aug 2012 13:16:13 +0200
Subject: [PATCH 475/999] [FIX] Fixed last commit, about removing
 check_read/write/unlink/create: those methods were used, propagated the
 changes :) .

bzr revid: tde@openerp.com-20120822111613-305j77rs4fphkjts
---
 openerp/addons/base/ir/ir_sequence.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py
index e3136b92b6e..8b03cd3f3b3 100644
--- a/openerp/addons/base/ir/ir_sequence.py
+++ b/openerp/addons/base/ir/ir_sequence.py
@@ -210,7 +210,7 @@ class ir_sequence(openerp.osv.osv.osv):
 
     def next_by_id(self, cr, uid, sequence_id, context=None):
         """ Draw an interpolated string using the specified sequence."""
-        self.check_read(cr, uid)
+        self.check_access_rights(cr, uid, 'read')
         company_ids = self.pool.get('res.company').search(cr, uid, [], order='company_id', context=context) + [False]
         ids = self.search(cr, uid, ['&',('id','=', sequence_id),('company_id','in',company_ids)])
         return self._next(cr, uid, ids, context)
@@ -227,7 +227,7 @@ class ir_sequence(openerp.osv.osv.osv):
                 sequence selection. A matching sequence for that
                 specific company will get higher priority. 
         """
-        self.check_read(cr, uid)
+        self.check_access_rights(cr, uid, 'read')
         company_ids = self.pool.get('res.company').search(cr, uid, [], order='company_id', context=context) + [False]
         ids = self.search(cr, uid, ['&',('code','=', sequence_code),('company_id','in',company_ids)])
         return self._next(cr, uid, ids, context)

From 83ec6f517bc9fdd288fb631c89aa6b7d021c2dc9 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 22 Aug 2012 16:51:53 +0530
Subject: [PATCH 476/999] [IMP/REM]l10n_in_hr_payroll:removed gratuity rules
 and all calculations for that rule,improved performance,bonus and
 supplementary rules

bzr revid: kbh@tinyerp.com-20120822112153-l3zlveq0afuu40mx
---
 .../data/l10n_in_hr_payroll_data.xml          | 51 ++++++++++++-------
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 46 +----------------
 .../l10n_in_hr_payroll_demo.xml               |  2 +-
 .../l10n_in_hr_payroll_view.xml               | 16 +-----
 4 files changed, 35 insertions(+), 80 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 414145d3dc1..a3082ef1a39 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -93,8 +93,10 @@
             <field name="code">SA</field>
             <field name="name">Grade/Special/Management/Supplementary Allowance</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.supplementary_allowance)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = contract.supplementary_allowance</field>
             <field name="sequence" eval="20"/>
             <field name="note">This allowance is normally given as an additional benefit to employees and is fully taxable.</field>
         </record>
@@ -163,19 +165,6 @@ One would need to compute income tax on the arrears if it would have been receiv
 Now difference of income tax between payment year and actual year would be allowed for deduction.</field>
         </record>
 
-        <record id="hr_salary_rule_gratuity" model="hr.salary.rule">
-            <field name="code">GRA</field>
-            <field name="name">Gratuity</field>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="condition_select">none</field>
-            <field name="amount_select">code</field>
-             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * 15 * employee.number_of_year / worked_days.WORK100.number_of_days) or (contract.wage * 15 * employee.number_of_year / worked_days.WORK100.number_of_days)</field>
-            <field name="sequence" eval="57"/>
-            <field name="note">Covered under the Payment of Gratuity Act, 1971:
-(Last drawn monthly basic salary + dearness allowance)/26 x 15 days x
-number of years of service (date of joining – date of retirement/leaving job)</field>
-        </record>
-
         <record id="hr_salary_rule_lta" model="hr.salary.rule">
             <field name="code">LTA</field>
             <field name="name">Leave Travel Allowance</field>
@@ -202,16 +191,27 @@ number of years of service (date of joining – date of retirement/leaving job)<
     4.Rs. 3 Lakh</field>
         </record>
 
-        <record id="hr_salary_rule_bonus" model="hr.salary.rule">
+        <record id="hr_salary_rule_performance" model="hr.salary.rule">
             <field name="code">PI</field>
-            <field name="name">Performance Incentive/Bonus</field>
+            <field name="name">Performance Incentive</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.PERF.amount</field>
             <field name="sequence" eval="31"/>
             <field name="note">This would be fully taxable based on incentive.</field>
         </record>
 
+        <record id="hr_salary_rule_bonus" model="hr.salary.rule">
+            <field name="code">BONUS</field>
+            <field name="name">Bonus</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.BNS.amount</field>
+            <field name="sequence" eval="41"/>
+            <field name="note">This would be fully taxable based on Bonus.</field>
+        </record>
+
+
         <record id="hr_salary_rule_medical" model="hr.salary.rule">
             <field name="code">MEDA</field>
             <field name="name">Medical Reimbursement</field>
@@ -467,5 +467,18 @@ number of years of service (date of joining – date of retirement/leaving job)<
             <field name="note">Both the employees and employer contribute to the fund at the rate of 12% of the basic wages, dearness allowance and retaining allowance, if any, payable to employees per month.</field>
         </record>
 
+        <!-- Rule Inputs -->
+
+        <record id="hr_rule_input_performance" model="hr.rule.input">
+            <field name="code">PERF</field>
+            <field name="name">Performance of Employee</field>
+            <field name="input_id" ref="hr_salary_rule_performance"/>
+        </record>
+
+        <record id="hr_rule_input_bonus" model="hr.rule.input">
+            <field name="code">BNS</field>
+            <field name="name">Bonus</field>
+            <field name="input_id" ref="hr_salary_rule_bonus"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 21bc834a2a4..185b8237f28 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -50,6 +50,7 @@ class hr_contract(osv.osv):
             ('non-metro', 'Non Metro'),
             ], 'Type of City'),
         'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance for Metro and Non Metro City', digits_compute=dp.get_precision('Payroll'), help="HRA computed as percentage(%)"),
+        'supplementary_allowance': fields.float('Supplementary Allowance', digits_compute=dp.get_precision('Payroll')),
     }
     _defaults = {
         'city_type': 'non-metro',
@@ -57,51 +58,6 @@ class hr_contract(osv.osv):
 
 hr_contract()
 
-class hr_employee(osv.osv):
-    '''
-    Employee's Join date allows to compute total working
-    experience of Employee and it is used to calculate Gratuity rule.
-    '''
-
-    _inherit = 'hr.employee'
-    _description = 'Employee'
-
-    def _compute_year(self, cr, uid, ids, fields, args, context=None):
-        """
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of employee’s IDs
-        @return: No. of years of experience.
-        @param context: A standard dictionary for contextual values
-        """
-        res = {}
-        c_date = time.strftime(DATETIME_FORMAT)
-        current_date = datetime.strptime(c_date, DATETIME_FORMAT)
-        for employee in self.browse(cr, uid, ids, context=context):
-            if employee.join_date:
-                date_start = datetime.strptime(employee.join_date, DATETIME_FORMAT)
-                diffyears = current_date.year - date_start.year
-                difference = current_date - date_start.replace(current_date.year)
-                days_in_year = isleap(current_date.year) and 366 or 365
-                difference_in_years = diffyears + (difference.days + difference.seconds / 86400.0) / days_in_year
-                total_years = relativedelta(current_date, date_start).years
-                total_months = relativedelta(current_date, date_start).months
-                if total_months < 10:
-                    year_month = float(total_months) / 10 + total_years
-                else:
-                    year_month = float(total_months) / 100 + total_years
-                res[employee.id] = year_month
-            else:
-                res[employee.id] = 0.0
-        return res
-
-    _columns = {
-        'join_date': fields.date('Join Date', help="Joining date of employee"),
-        'number_of_year': fields.function(_compute_year, string='No. of Years of Service', type="float", store=True, help="Total years of work experience"),
-        }
-
-hr_employee()
-
 class payroll_advice(osv.osv):
     '''
     Bank Advice
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
index 6aaef2c9069..bcb168467a9 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
@@ -7,7 +7,7 @@
         <record id="hr_payroll_salary_structure_ind_emp" model="hr.payroll.structure">
             <field name="code">NE</field>
             <field name="name">Non-Executive Employee</field>
-            <field eval="[(6, 0, [ref('hr_salary_rule_medical'), ref('hr_salary_rule_da'), ref('hr_salary_rule_lta'), ref('hr_salary_rule_telephone'), ref('hr_salary_rule_internet'), ref('hr_payroll_rule_child1'), ref('hr_salary_rule_gratuity')])]" name="rule_ids"/>
+            <field eval="[(6, 0, [ref('hr_salary_rule_medical'), ref('hr_salary_rule_da'), ref('hr_salary_rule_lta'), ref('hr_salary_rule_telephone'), ref('hr_salary_rule_internet'), ref('hr_payroll_rule_child1')])]" name="rule_ids"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="parent_id" ref="hr_payroll.structure_base"/>
         </record>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index e977c21844b..1ea2faed60e 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -15,6 +15,7 @@
                         <field name="driver_salay"/>
                         <field name="city_type"/>
                         <field name="house_rent_allowance_metro_nonmetro"/>
+                        <field name="supplementary_allowance"/>
                  </group>
                  <group col="2" colspan="2" name="left_column">
                     <separator colspan="2" string="Deduction"/>
@@ -27,21 +28,6 @@
             </field>
         </record>
 
-        <record id="hr_employee_form_in_inherit" model="ir.ui.view">
-            <field name="name">hr.employee.form.inherit</field>
-            <field name="model">hr.employee</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-            <data>
-                 <xpath expr="//field[@name='active']" position="before">
-                    <field name="join_date"/>
-                    <field name="number_of_year"/>
-                 </xpath>
-            </data>
-            </field>
-        </record>
-
         <record id="hr_payslip_run_form_inherit" model="ir.ui.view">
             <field name="name">hr.payslip.run.form.inherit</field>
             <field name="model">hr.payslip.run</field>

From 406e58399fd1444cd5b83862d6493f59fcb08790 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Aug 2012 13:34:39 +0200
Subject: [PATCH 477/999] [FIX] mail: unify message_post calls, fix typos,
 various lint cleanup

bzr revid: odo@openerp.com-20120822113439-aoy7v4njs6o34tu5
---
 addons/account/account_bank_statement.py   |  2 +-
 addons/account/account_invoice.py          | 17 +++---
 addons/base_calendar/crm_meeting.py        |  4 +-
 addons/base_status/base_stage.py           |  2 +-
 addons/base_status/base_state.py           |  8 +--
 addons/crm/crm_action_rule.py              |  4 +-
 addons/crm/crm_lead.py                     |  3 +-
 addons/crm/crm_meeting.py                  |  2 +-
 addons/event/event.py                      | 14 ++---
 addons/hr/hr.py                            |  2 +-
 addons/hr_holidays/hr_holidays.py          |  4 +-
 addons/mail/mail_mail.py                   |  1 -
 addons/mail/mail_thread.py                 | 67 +++++++++++++---------
 addons/mail/res_users.py                   |  6 +-
 addons/mail/wizard/mail_compose_message.py |  5 +-
 addons/plugin/plugin_handler.py            |  6 +-
 addons/procurement/procurement.py          |  2 +-
 addons/project_issue/project_issue.py      | 12 ++--
 addons/sale/sale.py                        |  4 +-
 19 files changed, 87 insertions(+), 78 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 911086a83e4..095d461ff3b 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -430,7 +430,7 @@ class account_bank_statement(osv.osv):
                     'name': st_number,
                     'balance_end_real': st.balance_end
             }, context=context)
-            self.message_post(cr, uid, [st.id], body=_('Statement %s is confirmed, journal items are created.') % (st_number,), context=context)
+            self.message_post(cr, uid, [st.id], body=_('Statement %s confirmed, journal items were created.') % (st_number,), context=context)
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index bca1530abae..8b86429ea1b 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1288,24 +1288,25 @@ class account_invoice(osv.osv):
 
     def _get_document_type(self, type):
         type_dict = {
-                'out_invoice': 'Customer invoice',
-                'in_invoice': 'Supplier invoice',
-                'out_refund': 'Customer Refund',
-                'in_refund': 'Supplier Refund',
+                # Translation markers will have no effect at runtime, only used to properly flag export
+                'out_invoice': _('Customer invoice'),
+                'in_invoice': _('Supplier invoice'),
+                'out_refund': _('Customer Refund'),
+                'in_refund': _('Supplier Refund'),
         }
         return type_dict.get(type, 'Invoice')
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id],body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>created</b>.") % (_(self._get_document_type(obj.type))), context=context)
 
     def confirm_paid_send_note(self, cr, uid, ids, context=None):
-         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("%s <b>paid</b>.") % (self._get_document_type(obj.type)), context=context)
+        for obj in self.browse(cr, uid, ids, context=context):
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>paid</b>.") % (_(self._get_document_type(obj.type))), context=context)
 
     def invoice_cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("%s <b>cancelled</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>cancelled</b>.") % (_(self._get_document_type(obj.type))), context=context)
 
 account_invoice()
 
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 4bf922a2797..5f58877a8a6 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -78,9 +78,9 @@ class crm_meeting(base_state, osv.Model):
         return 'Meeting'
 
     def case_open_send_note(self, cr, uid, ids, context=None):
-        return self.message_post(cr, uid, ids, body=_("Meeting has been <b>confirmed</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Meeting <b>confirmed</b>."), context=context)
 
     def case_close_send_note(self, cr, uid, ids, context=None):
-        return self.message_post(cr, uid, ids, body=_("Meeting has been <b>done</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Meeting <b>completed</b>."), context=context)
 
 
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 6b834399dd9..26afe548217 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -428,5 +428,5 @@ class base_stage(object):
                 msg = '%s has been <b>escalated</b> to <b>%s</b>.' % (self.case_get_note_msg_prefix(cr, uid, id, context=context), new_section.name)
             else:
                 msg = '%s has been <b>escalated</b>.' % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_post(cr, uid, [id], 'System Notification', msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
diff --git a/addons/base_status/base_state.py b/addons/base_status/base_state.py
index 098e09210f9..cebf5537485 100644
--- a/addons/base_status/base_state.py
+++ b/addons/base_status/base_state.py
@@ -179,9 +179,9 @@ class base_state(object):
     # Notifications
     # ******************************
     
-	def case_get_note_msg_prefix(self, cr, uid, id, context=None):
-		return ''
-	
+    def case_get_note_msg_prefix(self, cr, uid, id, context=None):
+        return ''
+
     def case_open_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>opened</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
@@ -194,7 +194,7 @@ class base_state(object):
                 msg = '%s has been <b>escalated</b> to <b>%s</b>.' % (self.case_get_note_msg_prefix(cr, uid, id, context=context), new_section.name)
             else:
                 msg = '%s has been <b>escalated</b>.' % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_post(cr, uid, [id], 'System Notification', msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_close_send_note(self, cr, uid, ids, context=None):
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 6753484dae0..36700b5b6c2 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -105,8 +105,8 @@ class base_action_rule(osv.osv):
                 write['email_cc'] = obj.act_email_cc
 
         # Put state change by rule in communication history
-        if hasattr(obj, 'state') and hasattr(obj, 'message_append') and action.act_state:
-            model_obj.message_post(cr, uid, [obj], _(action.act_state))
+        if hasattr(obj, 'state') and hasattr(obj, 'message_post') and action.act_state:
+            model_obj.message_post(cr, uid, [obj], _(action.act_state), context=context)
 
         model_obj.write(cr, uid, [obj.id], write, context)
         super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context)
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index b1335fd91d4..39ad56e007d 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import binascii
 from base_status.base_stage import base_stage
 import crm
 from datetime import datetime
@@ -476,7 +475,7 @@ class crm_lead(base_stage, osv.osv):
 
         subject = subject[0] + ", ".join(subject[1:])
         details = "\n\n".join(details)
-        return self.message_post(cr, uid, [opportunity_id], subject=subject, body=details)
+        return self.message_post(cr, uid, [opportunity_id], body=details, subject=subject, context=context)
 
     def _merge_opportunity_history(self, cr, uid, opportunity_id, opportunities, context=None):
         message = self.pool.get('mail.message')
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index de54d8e40ac..62fc53364ee 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -53,7 +53,7 @@ class crm_meeting(osv.Model):
             if meeting.opportunity_id: # meeting can be create from phonecalls or opportunities, therefore checking for the parent
                 lead = meeting.opportunity_id
                 message = _("Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (lead.name, meeting_date_tz)
-                lead.message_post(_('System Notification'), message)
+                lead.message_post(body=message)
             elif meeting.phonecall_id:
                 phonecall = meeting.phonecall_id
                 message = _("Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (phonecall.name, meeting_date_tz)
diff --git a/addons/event/event.py b/addons/event/event.py
index a057fe80ac4..d347c1547d8 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -19,10 +19,8 @@
 #
 ##############################################################################
 
-import time
 from osv import fields, osv
 from tools.translate import _
-import decimal_precision as dp
 from openerp import SUPERUSER_ID
 
 class event_type(osv.osv):
@@ -53,7 +51,7 @@ class event_event(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
-              return []
+            return []
         res = []
         for record in self.browse(cr, uid, ids, context=context):
             date = record.date_begin.split(" ")[0]
@@ -99,7 +97,6 @@ class event_event(osv.osv):
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
     def check_registration_limits(self, cr, uid, ids, context=None):
-        register_pool = self.pool.get('event.registration')
         for self.event in self.browse(cr, uid, ids, context=context):
             total_confirmed = self.event.register_current
             if total_confirmed < self.event.register_min or total_confirmed > self.event.register_max and self.event.register_max!=0:
@@ -109,7 +106,7 @@ class event_event(osv.osv):
         for event in self.browse(cr, uid, ids, context=context):
             available_seats = event.register_avail
             if available_seats and no_of_registration > available_seats:
-                 raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
+                raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
             elif available_seats == 0:
                 raise osv.except_osv(_('Warning!'),_("No Tickets Available!"))
 
@@ -139,7 +136,6 @@ class event_event(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: Dictionary of function fields value.
         """
-        register_pool = self.pool.get('event.registration')
         res = {}
         for event in self.browse(cr, uid, ids, context=context):
             res[event.id] = {}
@@ -334,7 +330,7 @@ class event_registration(osv.osv):
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
     def confirm_registration(self, cr, uid, ids, context=None):
-        self.message_post(cr, uid, ids, body=_('State set to open'))
+        self.message_post(cr, uid, ids, body=_('State set to open'), context=context)
         return self.write(cr, uid, ids, {'state': 'open'}, context=context)
 
     def create(self, cr, uid, vals, context=None):
@@ -364,13 +360,13 @@ class event_registration(osv.osv):
             if today >= registration.event_id.date_begin:
                 values = {'state': 'done', 'date_closed': today}
                 self.write(cr, uid, ids, values)
-                self.message_post(cr, uid, ids, body=_('State set to Done'))
+                self.message_post(cr, uid, ids, body=_('State set to Done'), context=context)
             else:
                 raise osv.except_osv(_('Error!'),_("You must wait for the starting day of the event to do this action.") )
         return True
 
     def button_reg_cancel(self, cr, uid, ids, context=None, *args):
-        self.message_post(cr, uid, ids,body = _('State set to Cancel'))
+        self.message_post(cr, uid, ids, body=_('State set to Cancel'), context=context)
         return self.write(cr, uid, ids, {'state': 'cancel'})
 
     def mail_user(self, cr, uid, ids, context=None):
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 54560863dd0..3c307b9fee8 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -212,7 +212,7 @@ class hr_employee(osv.osv):
         try:
             (model, mail_group_id) = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'group_all_employees')
             employee = self.browse(cr, uid, employee_id, context=context)
-            self.pool.get('mail.group').message_post(cr, uid, [mail_group_id], body='Welcome to %s! Please help him make its first steps in OpenERP!' % (employee.name), context=context)
+            self.pool.get('mail.group').message_post(cr, uid, [mail_group_id], body='Welcome to %s! Please help them take the first steps with OpenERP!' % (employee.name), context=context)
         except:
             pass # group deleted: do not push a message
         return employee_id
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 5748da37c1e..2e26e72bcdc 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -367,14 +367,14 @@ class hr_holidays(osv.osv):
     def create_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             self.message_post(cr, uid, ids, 
-                        _("The %s request has been <b>created</b> and is waiting confirmation.")
+                        _("The %s request has been <b>created</b> and is waiting for confirmation.")
                         % ('leave' if obj.type == 'remove' else 'allocation',), context=context)
         return True
     
     def holidays_confirm_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids):
             self.message_post(cr, uid, [obj.id], _("The %s request has been <b>confirmed</b> and is waiting for validation by the manager.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',))
+                    % ('leave' if obj.type == 'remove' else 'allocation',), context=context)
     
     def holidays_validate_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids):
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index a016586347f..bd0bfbf33c0 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -45,7 +45,6 @@ class mail_mail(osv.Model):
     _columns = {
         'mail_message_id': fields.many2one('mail.message', 'Message', required=True, ondelete='cascade'),
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
-        'subject': fields.char('Subject', size=128),
         'state': fields.selection([
             ('outgoing', 'Outgoing'),
             ('sent', 'Sent'),
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 3bc45d3af26..5795fa8b824 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import base64
 import dateutil
 import email
 import logging
@@ -27,7 +26,6 @@ from email.utils import parsedate
 from email.message import Message
 from osv import osv, fields
 from mail_message import decode
-import re
 import time
 import tools
 from tools.translate import _
@@ -313,7 +311,7 @@ class mail_thread(osv.Model):
                 model_pool.message_update(cr, user_id, [thread_id], msg, context=context)
             else:
                 thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
-            self.message_post(cr, uid, thread_id, context=context, **msg)
+            self.message_post(cr, uid, [thread_id], msg_txt['body'], context=context, **msg)
         return True
 
     def message_new(self, cr, uid, msg_dict, custom_values=None, context=None):
@@ -421,7 +419,7 @@ class mail_thread(osv.Model):
         if save_original:
             msg_original = message.as_string() if isinstance(message, Message) \
                                                   else message
-            attachments.append(('email.eml', msg_original))
+            attachments.append(('original_email.eml', msg_original))
 
         if not message_id:
             # Very unusual situation, be we should be fault-tolerant here
@@ -451,11 +449,11 @@ class mail_thread(osv.Model):
         msg['partner_ids'] = partner_ids
 
         if 'Date' in msg_fields:
-           date_hdr = decode(msg_txt.get('Date'))
-           # convert from email timezone to server timezone
-           date_server_datetime = dateutil.parser.parse(date_hdr).astimezone(pytz.timezone(tools.get_server_timezone()))
-           date_server_datetime_str = date_server_datetime.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
-           msg['date'] = date_server_datetime_str
+            date_hdr = decode(msg_txt.get('Date'))
+            # convert from email timezone to server timezone
+            date_server_datetime = dateutil.parser.parse(date_hdr).astimezone(pytz.timezone(tools.get_server_timezone()))
+            date_server_datetime_str = date_server_datetime.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            msg['date'] = date_server_datetime_str
 
         #if 'Content-Transfer-Encoding' in msg_fields:
         #    msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
@@ -507,38 +505,53 @@ class mail_thread(osv.Model):
                         module instead of by the res.log mechanism. Please \
                         use the mail.thread OpenChatter API instead of the \
                         now deprecated res.log.")
-        self.message_post(cr, uid, id, message, context=context)
+        self.message_post(cr, uid, [id], message, context=context)
 
-    def message_post(self, cr, uid, res_id, body, subject=False,
-            mtype='notification', parent_id=False, attachments=None, context=None, **kwargs):
+    def message_post(self, cr, uid, thread_id, body, subject=False,
+            msg_type='notification', parent_id=False, attachments=None, context=None, **kwargs):
+        """Post a new message in an existing message thread, returning the new mail.message ID.
+           Extra keyword arguments will be used as default column values for the new
+           mail.message record.
+
+           :param int thread_id: thread ID to post into, or list with one ID
+           :param str body: body of the message, usually raw HTML
+           :param str subject: optional subject
+           :param str msg_type: message type, out of the possible values for mail_message.type,
+               currently one of ``email, 'comment', 'notification'``.
+           :param int parent_id: optional ID of parent message in this thread
+           :param tuple(str,str) attachments: list of attachment tuples in the form ``(name,content)``
+           :return: ID of newly created mail.message 
+        """
         context = context or {}
         attachments = attachments or {}
-        if type(res_id) in (list, tuple):
-            res_id = res_id and res_id[0] or False
+        assert (not thread_id) or isinstance(thread_id, (int,long)) or \
+            (isinstance(thread_id, (list, tuple)) and len(thread_id) == 1), "Invalid thread_id" 
+        if isinstance(thread_id, (list, tuple)):
+            thread_id = thread_id and thread_id[0]
 
         to_attach = []
-        for fname, fcontent in attachments:
-            if isinstance(fcontent, unicode):
-                fcontent = fcontent.encode('utf-8')
+        for name, content in attachments:
+            if isinstance(content, unicode):
+                content = content.encode('utf-8')
             data_attach = {
-                'name': fname,
-                'datas': fcontent,
-                'datas_fname': fname,
-                'description': _('email attachment'),
+                'name': name,
+                'datas': content,
+                'datas_fname': name,
+                'description': name,
             }
             to_attach.append((0,0, data_attach))
 
-        value = kwargs
-        value.update( {
-            'model': res_id and self._name or False,
-            'res_id': res_id,
+        values = kwargs
+        values.update( {
+            'model': thread_id and self._name or False,
+            'thread_id': thread_id or False,
             'body': body,
             'subject': subject,
-            'type': mtype,
+            'type': msg_type,
             'parent_id': parent_id,
             'attachment_ids': to_attach
         })
-        return self.pool.get('mail.message').create(cr, uid, value, context=context)
+        return self.pool.get('mail.message').create(cr, uid, values, context=context)
 
 
     #------------------------------------------------------
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 1e638251e40..d863719db77 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -110,9 +110,9 @@ class res_users(osv.Model):
 
     def _create_welcome_message(self, cr, uid, user, context=None):
         company_name = user.company_id.name if user.company_id else _('the company')
-        body = '''%s has joined %s.''' % (user.name, company_name)
-        # TODO change 1 into user.id but catch errors
-        return self.pool.get('res.partner').message_post(cr, 1, [user.partner_id.id],
+        body = _('%s has joined %s.') % (user.name, company_name)
+        # TODO change SUPERUSER_ID into user.id but catch errors
+        return self.pool.get('res.partner').message_post(cr, SUPERUSER_ID, [user.partner_id.id],
             body=body, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 50ffd6e440e..19faaad9578 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -254,9 +254,9 @@ class mail_compose_message(osv.TransientModel):
             context = {}
 
         formatting = context.get('formatting')
+        # FIXME TODO: mass_mail_mode unused?
         mass_mail_mode = context.get('mail.compose.message.mode') == 'mass_mail'
 
-        mail_message_obj = self.pool.get('mail.message')
         for mail_wiz in self.browse(cr, uid, ids, context=context):
             attachment = {}
             for attach in mail_wiz.attachment_ids:
@@ -264,6 +264,7 @@ class mail_compose_message(osv.TransientModel):
 
             # default values, according to the wizard options
             subject = mail_wiz.subject if formatting else False
+            # FIXME TODO: partner_ids not used??
             partner_ids = [partner.id for partner in mail_wiz.dest_partner_ids]
             body = mail_wiz.body_html if mail_wiz.content_subtype == 'html' else mail_wiz.body
 
@@ -274,7 +275,7 @@ class mail_compose_message(osv.TransientModel):
                 active_model_pool = self.pool.get(active_model)
                 subject = self.render_template(cr, uid, subject, active_model, active_id)
                 body = self.render_template(cr, uid, mail_wiz.body_html, active_model, active_id)
-            active_model_pool.message_post(cr, uid, active_id, body, subject, 'comment', 
+            active_model_pool.message_post(cr, uid, [active_id], body=body, subject=subject, msg_type='comment', 
                 attachments=attachment, context=context)
 
         return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index 6d6262ddd22..9c582a8e3bf 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -101,15 +101,15 @@ class plugin_handler(osv.osv_memory):
             notify = "Email already pushed"
         elif res_id == 0:
             if model == 'res.partner':
-                notify = 'User the button Partner to create a new partner'
+                notify = 'User the Partner button to create a new partner'
             else:
                 res_id = model_obj.message_new(cr, uid, msg)
-                notify = "Mail succefully pushed, a new %s has been created " % model
+                notify = "Mail succesfully pushed, a new %s has been created " % model
         else:
             if model == 'res.partner':
                 model_obj = self.pool.get('mail.thread')
             model_obj.message_post(cr, uid, [res_id], body=msg)
-            notify = "Mail succefully pushed"
+            notify = "Mail succesfully pushed"
             
         url = self._make_url(cr, uid, res_id, model)
         return (model, res_id, url, notify)
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 8efd09a1efc..db50ebd94fd 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -389,7 +389,7 @@ class procurement_order(osv.osv):
                 ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
                 order_point_id = self.pool.get('stock.warehouse.orderpoint').search(cr, uid, [('product_id', '=', procurement.product_id.id)], context=context)
                 if not order_point_id and not ok:
-                     message = _("Not enough stock and no minimum orderpoint rule defined.")
+                    message = _("Not enough stock and no minimum orderpoint rule defined.")
                 elif not order_point_id:
                     message = _("No minimum orderpoint rule defined.")
                 elif not ok:
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 3b0311d8f45..93040b20af5 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -507,21 +507,21 @@ class project_issue(base_stage, osv.osv):
         return 'Project issue'
 
     def convert_to_task_send_note(self, cr, uid, ids, context=None):
-        message = _("Project issue has been <b>converted</b> into task.")
+        message = _("Project issue <b>converted</b> to task.")
         return self.message_post(cr, uid, ids, body=message, context=context)
 
     def create_send_note(self, cr, uid, ids, context=None):
-        message = _("Project issue has been <b>created</b>.")
+        message = _("Project issue <b>created</b>.")
         return self.message_post(cr, uid, ids, body=message, context=context)
 
     def case_escalate_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.project_id:
-                message = _("has been <b>escalated</b> to <em>'%s'</em>.") % (obj.project_id.name)
-                obj.message_post(body=message, context=context)
+                message = _("<b>escalated</b> to <em>'%s'</em>.") % (obj.project_id.name)
+                obj.message_post(body=message)
             else:
-                message = _("has been <b>escalated</b>.")
-                obj.message_post(body=message, context=context)
+                message = _("<b>escalated</b>.")
+                obj.message_post(body=message)
         return True
 
 project_issue()
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 476ee6458f0..521d7dc504f 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1027,7 +1027,7 @@ class sale_order(osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> <b>created</b>.") % (obj.partner_id.name), context=context)
 
     def confirm_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
@@ -1058,7 +1058,7 @@ class sale_order(osv.osv):
                 self.message_post(cr, uid, [order.id], body=_("Draft Invoice of %s %s <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
 
     def action_cancel_draft_send_note(self, cr, uid, ids, context=None):
-        return self.message_post(cr, uid, ids, body='Sale order has been set in draft.', context=context)
+        return self.message_post(cr, uid, ids, body=_('Sale order set to draft.'), context=context)
 
 
 sale_order()

From bbaea3e020c876d9627d0e355e3d44cd9b90847d Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Wed, 22 Aug 2012 17:42:31 +0530
Subject: [PATCH 478/999] [IMP] Improve footer problame.

bzr revid: vba@tinyerp.com-20120822121231-90qvm19zg6h9mwyk
---
 addons/survey/wizard/survey_answer.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 3ee5ec0faef..b3bcc14d015 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -152,8 +152,6 @@ class survey_question_wiz(osv.osv_memory):
 
                     etree.SubElement(xml_header_title, 'label', {'string': tools.ustr(pag_rec.title) ,'colspan': '2' ,'class' : 'oe_survey_title'})
                     xml_header_group = etree.SubElement(xml_header_title, 'group', {'col': '4', 'colspan': '1'})
-
-# Button and page
                     if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
                         etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
                         context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer})
@@ -405,20 +403,21 @@ class survey_question_wiz(osv.osv_memory):
                     if sur_rec.send_response:
                         survey_data = survey_obj.browse(cr, uid, survey_id)
                         response_id = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))['response']
-
                         report = self.create_report(cr, uid, [survey_id], 'report.survey.browse.response', survey_data.title,context)
                         attachments = {}
-                        file = open(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")
-                        file_data = ""
-                        while 1:
-                            line = file.readline()
-                            file_data += line
-                            if not line:
-                                break
+                        pdf_filename = addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf" 
+                        if os.path.exists(pdf_filename):
+                            file = open(pdf_filename)
+                            file_data = ""
+                            while 1:
+                                line = file.readline()
+                                file_data += line
+                                if not line:
+                                    break
 
-                        attachments[survey_data.title + ".pdf"] = file_data
-                        file.close()
-                        os.remove(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")
+                            attachments[survey_data.title + ".pdf"] = file_data
+                            file.close()
+                            os.remove(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")
                         context.update({'response_id':response_id})
                         user_email = user_obj.browse(cr, uid, uid, context).email
                         resp_email = survey_data.responsible_id and survey_data.responsible_id.email or False
@@ -471,7 +470,6 @@ class survey_question_wiz(osv.osv_memory):
 
         except Exception,e:
             return (False, str(e))
-
         return (True, ret_file_name)
 
     def default_get(self, cr, uid, fields_list, context=None):

From f958f6f06420946d6bc2f8f7b76196e6b3804c22 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 22 Aug 2012 18:02:23 +0530
Subject: [PATCH 479/999] [IMP/ADD]l10n_in_hr_payroll:improved salary rules and
 added inputs of salary rules

bzr revid: kbh@tinyerp.com-20120822123223-zlx1lhd06lnluqnz
---
 .../data/l10n_in_hr_payroll_data.xml          | 108 +++++++++++++-----
 1 file changed, 81 insertions(+), 27 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index a3082ef1a39..e29ba4c5acd 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -157,7 +157,8 @@
             <field name="code">ARRE</field>
             <field name="name">Arrears</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.ARS.amount</field>
             <field eval="0.0" name="amount_fix"/>
             <field name="sequence" eval="28"/>
             <field name="note">Generally arrears are fully taxable, but employee may claim exemption u/s 89(1).
@@ -181,8 +182,8 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="name">Leave Encashment</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="condition_select">none</field>
-            <field name="amount_select">fix</field>
-            <field name="amount_fix">0.0</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.LE.amount</field>
             <field name="sequence" eval="30"/>
             <field name="note">Payment by way of leave encashment received by Central and State Govt.employees at the time of retirement in respect of the period of earned leave at credit is fully exempt. In case of other employees, the exemption is to be limited to minimum of all below:
     1.The actual amount received
@@ -217,15 +218,15 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="name">Medical Reimbursement</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
-            <field eval="1200.0" name="amount_fix"/>
+            <field eval="1250.0" name="amount_fix"/>
             <field name="sequence" eval="32"/>
             <field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
         </record>
 
          <record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
             <field name="amount_select">fix</field>
-            <field eval="20" name="amount_fix"/>
-            <field name="quantity">worked_days.WORK100.number_of_days</field>
+            <field eval="50" name="amount_fix"/>
+            <field name="quantity">22</field>
             <field name="code">FC</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">Food Coupons Allowance</field>
@@ -237,28 +238,38 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="code">PERJ</field>
             <field name="name">Periodical Journals</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.PJ.amount</field>
             <field name="sequence" eval="34"/>
             <field name="note">Some employers may provide component for buying magazines, journals and books as a part of knowledge enhancement for business growth.This part would become non taxable on providing original bills.</field>
         </record>
 
-        <record id="hr_salary_rule_uniform" model="hr.salary.rule">
-            <field name="code">UNIF</field>
-            <field name="name">Uniform/Dress Allowance</field>
+        <record id="hr_salary_rule_uniform_senior" model="hr.salary.rule">
+            <field name="code">UNIFS</field>
+            <field name="name">Uniform/Dress Allowance for Senior Employees</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
+            <field eval="500" name="amount_fix"/>
             <field name="sequence" eval="35"/>
             <field name="note">Some sections of employees mat get allowance for purchase of office dress/uniform.In such case, the component would become non-taxable.</field>
         </record>
 
+        <record id="hr_salary_rule_uniform_junior" model="hr.salary.rule">
+            <field name="code">UNIFJ</field>
+            <field name="name">Uniform/Dress Allowance for Junior Employee</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="400" name="amount_fix"/>
+            <field name="sequence" eval="42"/>
+            <field name="note">Some sections of employees mat get allowance for purchase of office dress/uniform.In such case, the component would become non-taxable.</field>
+        </record>
+
         <record id="hr_salary_rule_telephone" model="hr.salary.rule">
             <field name="code">TELR</field>
             <field name="name">Telephone Reimbursement</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field name="amount_fix">1500</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.TR.amount</field>
             <field name="sequence" eval="36"/>
             <field name="note">In some of the cases, companies may provide a component for telephone bills.Employees may provide actual phone usage bills to reimburse this component and make it non-taxable.
             </field>
@@ -277,8 +288,8 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="code">CAR</field>
             <field name="name">Car Expenses Reimbursement</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field name="amount_fix">1800</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.CEI.amount</field>
             <field name="sequence" eval="38"/>
             <field name="note">In case company provides component for this and employee use self owned car for official and personal purposes, Rs 1800 per month would be non-taxable on showing bills for fuel or can maintenance. This amount would be Rs 2400 in case car is more capacity than 1600cc.</field>
         </record>
@@ -287,8 +298,8 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="code">INT</field>
             <field name="name">Internet Expense</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.IE.amount</field>
             <field name="sequence" eval="39"/>
             <field name="note">Employer may also provide reimbursement of internet expenses and thus this would become non taxable.</field>
         </record>
@@ -338,7 +349,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="name">Employee's PF Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 8.33 / 100) or - (contract.wage * 8.33 / 100)</field>
+            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) or - (contract.wage * 0.12)</field>
             <field name= "note">Employer contribution does not become part of employee’s income and hence income tax is not payable on this part.</field>
             <field name="register_id" ref="hr_register_provident_fund"/>
             <field name="sequence" eval="150"/>
@@ -374,15 +385,16 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="condition_select">none</field>
             <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
+            <field eval="1500.0" name="amount_fix"/>
             <field name="register_id" ref="hr_company_transport_register"/>
             <field name="sequence" eval="165"/>
+            <field name="note">Company provided transport amount is based on company.</field>
         </record>
 
          <record id="hr_salary_rule_food_coupon_ded" model="hr.salary.rule">
             <field name="amount_select">fix</field>
-            <field eval="-20" name="amount_fix"/>
-            <field name="quantity">worked_days.WORK100.number_of_days</field>
+            <field eval="-50" name="amount_fix"/>
+            <field name="quantity">22</field>
             <field name="code">FD</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="name">Deduction Towards Food Coupons</field>
@@ -395,7 +407,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="name">Deduction Towards State Labour Welfare Fund</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
+            <field eval="3.0" name="amount_fix"/>
             <field name="sequence" eval="170"/>
             <field name="register_id" ref="hr_labour_Welfare_fund_register"/>
             <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>
@@ -406,7 +418,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="name">Deduction Towards Company Provided Group Term Insurance</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
+            <field eval="1000.0" name="amount_fix"/>
             <field name="register_id" ref="hr_group_term_insurance_register"/>
             <field name="sequence" eval="175"/>
         </record>
@@ -416,8 +428,8 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="name">Deduction Towards Leave Availed</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="condition_select">none</field>
-            <field name="amount_select">fix</field>
-            <field eval="0.0" name="amount_fix"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.LAI.amount</field>
             <field name="register_id" ref="hr_leave_availed_register"/>
             <field name="sequence" eval="180"/>
         </record>
@@ -477,8 +489,50 @@ Now difference of income tax between payment year and actual year would be allow
 
         <record id="hr_rule_input_bonus" model="hr.rule.input">
             <field name="code">BNS</field>
-            <field name="name">Bonus</field>
+            <field name="name">Bonus of Employee</field>
             <field name="input_id" ref="hr_salary_rule_bonus"/>
         </record>
+
+        <record id="hr_rule_input_arrears" model="hr.rule.input">
+            <field name="code">ARS</field>
+            <field name="name">Arrears Input</field>
+            <field name="input_id" ref="hr_salary_rule_arrears"/>
+        </record>
+
+        <record id="hr_rule_input_le" model="hr.rule.input">
+            <field name="code">LE</field>
+            <field name="name">Leave Encashment Input</field>
+            <field name="input_id" ref="hr_salary_rule_le"/>
+        </record>
+
+        <record id="hr_rule_input_journals" model="hr.rule.input">
+            <field name="code">PJ</field>
+            <field name="name">Periodical Journals Input</field>
+            <field name="input_id" ref="hr_salary_rule_journals"/>
+        </record>
+
+        <record id="hr_rule_input_telephone" model="hr.rule.input">
+            <field name="code">TR</field>
+            <field name="name">Telephone Reimbursement Input</field>
+            <field name="input_id" ref="hr_salary_rule_telephone"/>
+        </record>
+
+        <record id="hr_rule_input_car" model="hr.rule.input">
+            <field name="code">CEI</field>
+            <field name="name">Car Expenses Input</field>
+            <field name="input_id" ref="hr_payroll_rule_car"/>
+        </record>
+
+        <record id="hr_rule_input_internet" model="hr.rule.input">
+            <field name="code">IE</field>
+            <field name="name">Internet Expence Input</field>
+            <field name="input_id" ref="hr_salary_rule_internet"/>
+        </record>
+
+        <record id="hr_rule_input_leave_avail" model="hr.rule.input">
+            <field name="code">LAI</field>
+            <field name="name">Leave Availed Input</field>
+            <field name="input_id" ref="hr_payslip_rule_dla"/>
+        </record>
     </data>
 </openerp>

From 8b7812721078b0331c90081c77fdcd6f7d4d187e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Aug 2012 14:38:58 +0200
Subject: [PATCH 480/999] [FIX] mail: typo

bzr revid: odo@openerp.com-20120822123858-e3alagahniwbdpgz
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 5795fa8b824..61c8f611b18 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -311,7 +311,7 @@ class mail_thread(osv.Model):
                 model_pool.message_update(cr, user_id, [thread_id], msg, context=context)
             else:
                 thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
-            self.message_post(cr, uid, [thread_id], msg_txt['body'], context=context, **msg)
+            self.message_post(cr, uid, [thread_id], context=context, **msg)
         return True
 
     def message_new(self, cr, uid, msg_dict, custom_values=None, context=None):

From b873d36b9098ad2e06b6b14db691871ddc8c1371 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Aug 2012 14:43:07 +0200
Subject: [PATCH 481/999] [FIX] mail: more typos

bzr revid: odo@openerp.com-20120822124307-qnwx6nk66msz01jx
---
 addons/mail/res_users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index d863719db77..86fd048479c 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -105,7 +105,7 @@ class res_users(osv.Model):
         # alias
         mail_alias.write(cr, SUPERUSER_ID, [alias_id], {"alias_force_thread_id": user_id}, context)
         # create a welcome message
-        self._create_welcome_message(cr, uid, user_id, context=context)
+        self._create_welcome_message(cr, uid, user, context=context)
         return user_id
 
     def _create_welcome_message(self, cr, uid, user, context=None):

From a001d892431b8efabef6118e67e828aa1849c2da Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Aug 2012 14:49:43 +0200
Subject: [PATCH 482/999] [FIX] mail: more typos

bzr revid: odo@openerp.com-20120822124943-2ixd2vbbug38tfb2
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 61c8f611b18..c8e5ba3ffa1 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -544,7 +544,7 @@ class mail_thread(osv.Model):
         values = kwargs
         values.update( {
             'model': thread_id and self._name or False,
-            'thread_id': thread_id or False,
+            'res_id': thread_id or False,
             'body': body,
             'subject': subject,
             'type': msg_type,

From 13485fd6b04037106426eefc0ea0c1b7a25a3302 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 22 Aug 2012 18:29:33 +0530
Subject: [PATCH 483/999] [IMP]l10n_in_hr_payroll:HRA rule improved,removed
 field.

bzr revid: kbh@tinyerp.com-20120822125933-bsiky3e4ttawry7a
---
 .../data/l10n_in_hr_payroll_data.xml               | 14 +++++++-------
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py    |  7 -------
 .../l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml |  1 -
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index e29ba4c5acd..8e49698459d 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -34,27 +34,27 @@
         <record id="hr_company_transport_register" model="hr.contribution.register">
             <field name="name">Register for Company Provided Transport Deduction</field>
         </record>
-        
+
         <record id="hr_food_coupen_deduction_register" model="hr.contribution.register">
             <field name="name">Register for Food Coupons Deduction</field>
         </record>
-        
+
         <record id="hr_labour_Welfare_fund_register" model="hr.contribution.register">
             <field name="name">Register for State Labour Welfare Fund Deduction</field>
         </record>
-        
+
         <record id="hr_group_term_insurance_register" model="hr.contribution.register">
             <field name="name">Register for Company Provided Group Term Insurance Deduction</field>
         </record>
-        
+
         <record id="hr_leave_availed_register" model="hr.contribution.register">
             <field name="name">Register for Leave Availed Deduction</field>
         </record>
-        
+
         <record id="hr_medical_insurance_register" model="hr.contribution.register">
             <field name="name">Register for Company Provided Medical Insurance Deduction</field>
         </record>
-        
+
         <record id="hr_other_deduction_register" model="hr.contribution.register">
             <field name="name">Register for Other Deduction from Employer</field>
         </record>
@@ -73,7 +73,7 @@
         <record id="hr_salary_rule_houserentallowancemetro_nonmetro" model="hr.salary.rule">
             <field name="code">HRAMN</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * contract.house_rent_allowance_metro_nonmetro / 100) or (contract.wage * contract.house_rent_allowance_metro_nonmetro / 100) if (contract.city_type=='metro') else payslip.company_id.dearness_allowance and ((contract.wage + DA) * contract.house_rent_allowance_metro_nonmetro / 100) or (contract.wage * contract.house_rent_allowance_metro_nonmetro / 100) if (contract.city_type=='non-metro') else 0.00</field>
+            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * contract.house_rent_allowance_metro_nonmetro / 100) or (contract.wage * contract.house_rent_allowance_metro_nonmetro / 100)</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance for metro and nonmetro city</field>
             <field name="register_id" ref="hr_houserent_allowance_register"/>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 185b8237f28..f3537a25cd7 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -45,16 +45,9 @@ class hr_contract(osv.osv):
         'driver_salay': fields.boolean('Driver Salary', help="Check this box if you provide allowance for driver"),
         'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance"),
         'voluntary_provident_fund': fields.float('Voluntary Provident Fund', digits_compute=dp.get_precision('Payroll'), help="VPF computed as percentage(%)"),
-        'city_type': fields.selection([
-            ('metro', 'Metro'),
-            ('non-metro', 'Non Metro'),
-            ], 'Type of City'),
         'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance for Metro and Non Metro City', digits_compute=dp.get_precision('Payroll'), help="HRA computed as percentage(%)"),
         'supplementary_allowance': fields.float('Supplementary Allowance', digits_compute=dp.get_precision('Payroll')),
     }
-    _defaults = {
-        'city_type': 'non-metro',
-    }
 
 hr_contract()
 
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 1ea2faed60e..949693d0f1a 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -13,7 +13,6 @@
                  <group col="2" colspan="2" name="right_column">
                     <separator colspan="2" string="Allowance"/>
                         <field name="driver_salay"/>
-                        <field name="city_type"/>
                         <field name="house_rent_allowance_metro_nonmetro"/>
                         <field name="supplementary_allowance"/>
                  </group>

From 55ec89f7ee11ab98526724ec65f2a7ddf44e34e5 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 22 Aug 2012 18:39:45 +0530
Subject: [PATCH 484/999] [IMP]l10n_in_hr_payroll:added rule for labour walfare
 fund.

bzr revid: kbh@tinyerp.com-20120822130945-xvwjnpf86eba0j1b
---
 .../data/l10n_in_hr_payroll_data.xml            | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 8e49698459d..f4d375383c4 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -402,9 +402,9 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="sequence" eval="166"/>
          </record>
 
-        <record id="hr_payslip_rule_lwf" model="hr.salary.rule">
-            <field name="code">LWF</field>
-            <field name="name">Deduction Towards State Labour Welfare Fund</field>
+        <record id="hr_payslip_rule_lwf_employee" model="hr.salary.rule">
+            <field name="code">LWFE</field>
+            <field name="name">Employee's Deduction Towards State Labour Welfare Fund</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
             <field eval="3.0" name="amount_fix"/>
@@ -413,6 +413,17 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>
         </record>
 
+        <record id="hr_payslip_rule_lwf_employer" model="hr.salary.rule">
+            <field name="code">LWF</field>
+            <field name="name">Employer's Deduction Towards State Labour Welfare Fund </field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="6.0" name="amount_fix"/>
+            <field name="sequence" eval="171"/>
+            <field name="register_id" ref="hr_labour_Welfare_fund_register"/>
+            <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>
+        </record>
+
         <record id="hr_payslip_rule_cgti" model="hr.salary.rule">
             <field name="code">CGTI</field>
             <field name="name">Deduction Towards Company Provided Group Term Insurance</field>

From 8ad4dd41c81a611d1a2374ab96e51cdc6150cd86 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 22 Aug 2012 18:52:29 +0530
Subject: [PATCH 485/999] [IMP]l10n_in_hr_payroll:note added

bzr revid: kbh@tinyerp.com-20120822132229-abjrha00701xbyd3
---
 addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index f4d375383c4..500f7e83424 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -432,6 +432,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field eval="1000.0" name="amount_fix"/>
             <field name="register_id" ref="hr_group_term_insurance_register"/>
             <field name="sequence" eval="175"/>
+            <field name="note">Group term insurance provides a solid foundation to a comprehensive employee benifit program,backed up by government asistance in the form of valuable tax incentives to both employees and employers.</field>
         </record>
 
         <record id="hr_payslip_rule_dla" model="hr.salary.rule">

From 786419565ab19523233856a0fcce26de58db3b3c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Aug 2012 15:30:28 +0200
Subject: [PATCH 486/999] [FIX] mail: make basic mail tests pass again, remove
 useless/dead test code

bzr revid: odo@openerp.com-20120822133028-hms3xfhibhn1j38l
---
 addons/mail/mail_thread.py      |  3 +-
 addons/mail/tests/test_mail.py  | 15 ++++---
 addons/mail/tests/write_test.py | 79 ---------------------------------
 3 files changed, 9 insertions(+), 88 deletions(-)
 delete mode 100644 addons/mail/tests/write_test.py

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c8e5ba3ffa1..1be8dfdbf0c 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -297,7 +297,6 @@ class mail_thread(osv.Model):
                                     thread_id, custom_values,
                                     context=context)
         msg = self.parse_message(cr, uid, msg_txt, save_original=save_original, context=context)
-        msg['state'] = 'received'
         if strip_attachments and 'attachments' in msg:
             del msg['attachments']
         for model, thread_id, custom_values, user_id in routes:
@@ -543,7 +542,7 @@ class mail_thread(osv.Model):
 
         values = kwargs
         values.update( {
-            'model': thread_id and self._name or False,
+            'model': thread_id and context.get('thread_model', self._name) or False,
             'res_id': thread_id or False,
             'body': body,
             'subject': subject,
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 0940d72c490..a9da19e90fa 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -82,26 +82,27 @@ class test_mail(common.TransactionCase):
         self.group_tech_id = self.mail_group.create(self.cr, self.uid, {'name': 'tech'})
 
     def test_message_process(self):
+        cr, uid = self.cr, self.uid
         # Incoming mail creates a new mail_group "frogs"
-        self.assertEqual(self.mail_group.search(self.cr, self.uid, [('name','=','frogs')]), [])
+        self.assertEqual(self.mail_group.search(cr, uid, [('name','=','frogs')]), [])
         mail_frogs = MAIL_TEMPLATE.format(to='groups@example.com, other@gmail.com', subject='frogs', extra='')
-        self.mail_thread.message_process(self.cr, self.uid, None, mail_frogs)
-        frog_groups = self.mail_group.search(self.cr, self.uid, [('name','=','frogs')])
+        self.mail_thread.message_process(cr, uid, None, mail_frogs)
+        frog_groups = self.mail_group.search(cr, uid, [('name','=','frogs')])
         self.assertTrue(len(frog_groups) == 1)
 
         # Previously-created group can be emailed now - it should have an implicit alias group+frogs@...
-        frog_group = self.mail_group.browse(self.cr, self.uid, frog_groups[0])
+        frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         group_messages = frog_group.message_ids
         self.assertTrue(len(group_messages) == 1, 'New group should only have the original message')
         mail_frog_news = MAIL_TEMPLATE.format(to='Friendly Frogs <group+frogs@example.com>', subject='news', extra='')
-        self.mail_thread.message_process(self.cr, self.uid, None, mail_frog_news)
+        self.mail_thread.message_process(cr, uid, None, mail_frog_news)
         frog_group.refresh()
         self.assertTrue(len(frog_group.message_ids) == 2, 'Group should contain 2 messages now')
 
         # Even with a wrong destination, a reply should end up in the correct thread
         mail_reply = MAIL_TEMPLATE.format(to='erroneous@example.com>', subject='Re: news',
                                           extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n'%frog_group.id)
-        self.mail_thread.message_process(self.cr, self.uid, None, mail_reply)
+        self.mail_thread.message_process(cr, uid, None, mail_reply)
         frog_group.refresh()
         self.assertTrue(len(frog_group.message_ids) == 3, 'Group should contain 3 messages now')
         
@@ -109,4 +110,4 @@ class test_mail(common.TransactionCase):
         mail_spam = MAIL_TEMPLATE.format(to='noone@example.com', subject='spam', extra='')
         self.assertRaises(Exception,
                           self.mail_thread.message_process,
-                          self.cr, self.uid, None, mail_spam)
+                          cr, uid, None, mail_spam)
diff --git a/addons/mail/tests/write_test.py b/addons/mail/tests/write_test.py
deleted file mode 100644
index 920fbb92dbe..00000000000
--- a/addons/mail/tests/write_test.py
+++ /dev/null
@@ -1,79 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#                    Fabien Pinckaers <fp@tiny.Be>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-#
-# This module test all RPC methods
-#
-
-import xmlrpclib
-
-uid = 1
-passwd='admin'
-server = 'localhost'
-db = 'trunk'
-
-sock = xmlrpclib.ServerProxy('http://'+server+':8069/xmlrpc/object')
-
-def _print_data(data, level=0):
-    for d in data:
-        print '    '*level, d['id']
-        _print_data(d['child_ids'], level+1)
-
-print 'With Domain', [('model','=','mail.group')], 'thread_level'
-data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', False, [('model','=','mail.group')], 1)
-_print_data(data)
-
-print 'With Domain', [('model','=','mail.group')], 'no thread_level'
-data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', False, [('model','=','mail.group')], 0)
-_print_data(data)
-
-
-print 'With Domain', [('model','=','mail.group'), ('parent_id','=',False)], 'thread_level=0'
-data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', False, [('model','=','mail.group'), ('parent_id','=',False)], 0)
-_print_data(data)
-
-print 'With Domain', [('model','=','mail.group'), ('parent_id','=',False)], 'thread_level=2'
-data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', False, [('model','=','mail.group'), ('parent_id','=',False)], 2)
-_print_data(data)
-
-print 'Fixed IDS', [2,3,41,43], 'thread_level'
-data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', [2,3,41,43], [], 1)
-_print_data(data)
-
-print 'Fixed IDS', [2,43], 'no thread_level'
-data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', [2,43], [], 0)
-_print_data(data)
-
-print 'Fixed IDS', [2,43], 'thread_level'
-data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', [2,43], [], 1)
-_print_data(data)
-
-print 'domain [id in 3,41]', 'thread_level'
-data = sock.execute(db, uid, passwd, 'mail.message', 'message_read', False, [('id','in',[3,41])], 1)
-_print_data(data)
-

From 0f63b4a1fb8a41971d1fd6a9810a75a7af5de759 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 22 Aug 2012 15:34:06 +0200
Subject: [PATCH 487/999] [IMP] need action

bzr revid: fp@tinyerp.com-20120822133406-9ayg228mxfeg16dg
---
 openerp/addons/base/ir/ir_actions.py | 4 +++-
 openerp/addons/base/ir/ir_ui_menu.py | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 28a309f427a..b70a9d89c06 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -43,7 +43,6 @@ class actions(osv.osv):
     _table = 'ir_actions'
     _order = 'name'
     _columns = {
-        'name': fields.char('Action Name', required=True, size=64),
         'type': fields.char('Action Type', required=True, size=32,readonly=True),
         'usage': fields.char('Action Usage', size=32),
     }
@@ -872,10 +871,13 @@ class act_client(osv.osv):
             self.write(cr, uid, id, {'params_store': field_value}, context=context)
 
     _columns = {
+        'name': fields.char('Action Name', required=True, size=64, translate=True),
         'tag': fields.char('Client action tag', size=64, required=True,
                            help="An arbitrary string, interpreted by the client"
                                 " according to its own needs and wishes. There "
                                 "is no central tag repository across clients."),
+        'res_model': fields.char('Destination Model', size=64, 
+            help="Optional model, mostly used for needactions."),
         'params': fields.function(_get_params, fnct_inv=_set_params,
                                   type='binary', 
                                   string="Supplementary arguments",
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index f5e4ee2ba05..bc743d34fc0 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -264,12 +264,10 @@ class ir_ui_menu(osv.osv):
             res[menu.id]['needaction_enabled'] = False
             res[menu.id]['needaction_counter'] = False
             res[menu.id] = {}
-            if menu.action and menu.action.type == 'ir.actions.act_window' and menu.action.res_model:
+            if menu.action and menu.action.type in ('ir.actions.act_window','ir.actions.client') and menu.action.res_model:
                 obj = self.pool.get(menu.action.res_model)
                 if obj._needaction:
                     res[menu.id]['needaction_enabled'] = obj._needaction
-                    # check domain and context: should we evaluate the domain ?
-                    # and add context of the action ?
                     res[menu.id]['needaction_counter'] = obj._needaction_count(cr, uid, menu.action.domain, context=context)
         return res
 

From 4fdb70d12ab10728034e8077e9bba12d4b8a3a8a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 22 Aug 2012 15:37:23 +0200
Subject: [PATCH 488/999] fix

bzr revid: fp@tinyerp.com-20120822133723-k5r76cty7dej5kjh
---
 addons/mail/mail_group.py   | 3 +--
 addons/mail/mail_message.py | 7 +++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index faa4bb1c9b4..1824f59e0b9 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -132,8 +132,7 @@ class mail_group(osv.Model):
             params = {
                 'search_view_id': search_ref and search_ref[1] or False,
                 'domain': [('model','=','mail.group'),('res_id','=',mail_group_id)],
-                'res_model': 'mail.group',
-                'res_id': mail_group_id,
+                'res_model': 'mail.message',
                 'thread_level': 2
             }
             cobj = self.pool.get('ir.actions.client')
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index b74df2f8594..b9cb0723a4f 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -109,6 +109,13 @@ class mail_message(osv.Model):
         'body': fields.html('Content'),
     }
 
+    def _needaction_domain_get(self, cr, uid, context={}):
+        if self._needaction:
+            partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+            return [('notification_ids.partner_id','=',partner_id),('notification_ids.read','=',False)]
+        return []
+
+
     def _get_default_author(self, cr, uid, context={}):
         return self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
 

From 9d6ee746eb4e29ea7dca76ef8c836d71374d6186 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 22 Aug 2012 15:41:09 +0200
Subject: [PATCH 489/999] fix

bzr revid: fp@tinyerp.com-20120822134109-97lbhcllylbe15ce
---
 openerp/addons/base/ir/ir_actions.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index b70a9d89c06..cf67e6fcf88 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -43,6 +43,7 @@ class actions(osv.osv):
     _table = 'ir_actions'
     _order = 'name'
     _columns = {
+        'name': fields.char('Name', size=64, required=True),
         'type': fields.char('Action Type', required=True, size=32,readonly=True),
         'usage': fields.char('Action Usage', size=32),
     }

From b531d9cff1054165bf8cc5cfe37304187d0924e6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 22 Aug 2012 17:31:45 +0200
Subject: [PATCH 490/999] [IMP] needaction after mail.thread

bzr revid: fp@tinyerp.com-20120822153145-g7xopqq7oje7y60c
---
 addons/base_calendar/crm_meeting.py                 | 2 +-
 addons/crm/crm_lead.py                              | 2 +-
 addons/event/event.py                               | 2 +-
 addons/hr_holidays/hr_holidays.py                   | 2 +-
 addons/hr_recruitment/hr_recruitment.py             | 2 +-
 addons/mrp/mrp.py                                   | 2 +-
 addons/project/project.py                           | 4 ++--
 addons/project_issue/project_issue.py               | 2 +-
 addons/purchase/purchase.py                         | 2 +-
 addons/purchase_requisition/purchase_requisition.py | 2 +-
 addons/sale/sale.py                                 | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 5f58877a8a6..e1c66148ae7 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -43,7 +43,7 @@ class crm_meeting(base_state, osv.Model):
     _name = 'crm.meeting'
     _description = "Meeting"
     _order = "id desc"
-    _inherit = ["calendar.event", 'ir.needaction_mixin', "mail.thread"]
+    _inherit = ["calendar.event", "mail.thread", 'ir.needaction_mixin']
     _columns = {
         # base_state required fields
         'create_date': fields.datetime('Creation Date', readonly=True),
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 39ad56e007d..83ffb379950 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -38,7 +38,7 @@ class crm_lead(base_stage, osv.osv):
     _name = "crm.lead"
     _description = "Lead/Opportunity"
     _order = "priority,date_action,id desc"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread','ir.needaction_mixin']
 
     def _get_default_section_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
diff --git a/addons/event/event.py b/addons/event/event.py
index d347c1547d8..763aa423378 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -47,7 +47,7 @@ class event_event(osv.osv):
     _name = 'event.event'
     _description = __doc__
     _order = 'date_begin'
-    _inherit = ['ir.needaction_mixin','mail.thread']
+    _inherit = ['mail.thread','ir.needaction_mixin']
 
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 2e26e72bcdc..4bc9dabba71 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -94,7 +94,7 @@ class hr_holidays(osv.osv):
     _name = "hr.holidays"
     _description = "Leave"
     _order = "type desc, date_from asc"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = [ 'mail.thread','ir.needaction_mixin']
 
     def _employee_get(self, cr, uid, context=None):
         ids = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 910c4b89dd2..db5fd57b0a9 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -95,7 +95,7 @@ class hr_applicant(base_stage, osv.Model):
     _name = "hr.applicant"
     _description = "Applicant"
     _order = "id desc"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def _get_default_department_id(self, cr, uid, context=None):
         """ Gives default department by checking if present in the context """
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 76f7c7b9f34..c667daadbec 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -407,7 +407,7 @@ class mrp_production(osv.osv):
     _name = 'mrp.production'
     _description = 'Manufacturing Order'
     _date_name  = 'date_planned'
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def _production_calc(self, cr, uid, ids, prop, unknow_none, context=None):
         """ Calculates total hours and total no. of cycles for a production order.
diff --git a/addons/project/project.py b/addons/project/project.py
index 5fe7f31fa57..c998cd368d0 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -66,7 +66,7 @@ class project(osv.osv):
     _description = "Project"
     _inherits = {'account.analytic.account': "analytic_account_id",
                  "mail.alias": "alias_id"}
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         if user == 1:
@@ -544,7 +544,7 @@ class task(base_stage, osv.osv):
     _name = "project.task"
     _description = "Task"
     _date_name = "date_start"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 93040b20af5..49d62ae9ba7 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -46,7 +46,7 @@ class project_issue(base_stage, osv.osv):
     _name = "project.issue"
     _description = "Project Issue"
     _order = "priority, create_date desc"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default project by checking if present in the context """
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 0697ccb339a..b1a5631e59e 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -220,7 +220,7 @@ class purchase_order(osv.osv):
         ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique per Company!'),
     ]
     _name = "purchase.order"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
     _description = "Purchase Order"
     _order = "name desc"
 
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index bbd011a53a8..f8d7741822e 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -31,7 +31,7 @@ import decimal_precision as dp
 class purchase_requisition(osv.osv):
     _name = "purchase.requisition"
     _description="Purchase Requisition"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
     _columns = {
         'name': fields.char('Requisition Reference', size=32,required=True),
         'origin': fields.char('Source', size=32),
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 521d7dc504f..6a6678d6163 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -48,7 +48,7 @@ sale_shop()
 
 class sale_order(osv.osv):
     _name = "sale.order"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
     _description = "Sales Order"
 
 

From f6b6fb4debcd02918c8a4b172227e6331d38fdc5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 22 Aug 2012 17:59:54 +0200
Subject: [PATCH 491/999] [FIX] needaction ok for crm

bzr revid: fp@tinyerp.com-20120822155954-8ix4op6hj5e5hzi5
---
 addons/mail/mail_thread.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 1be8dfdbf0c..f7078348f08 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -87,8 +87,18 @@ class mail_thread(osv.Model):
         return res
 
     # FP Note: todo
-    def _search_unread(self, tobj, cr, uid, obj=None, name=None, domain=None, context=None):
-        return []
+    def _search_unread(self, cr, uid, obj=None, name=None, domain=None, context=None):
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        res = {}
+        notif_obj = self.pool.get('mail.notification')
+        notif_ids = notif_obj.search(cr, uid, [
+            ('partner_id', '=', partner_id),
+            ('message_id.model', '=', self._name),
+            ('read', '=', False)
+        ], context=context)
+        for notif in notif_obj.browse(cr, uid, notif_ids, context=context):
+            res[notif.message_id.res_id] = True
+        return [('id','in',res.keys())]
 
     _columns = {
         'message_is_follower': fields.function(_get_message_data,

From 9c3e45579958d2dcfd02990d6cc6858c46f1bc1b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 22 Aug 2012 18:13:15 +0200
Subject: [PATCH 492/999] [FIX]

bzr revid: fp@tinyerp.com-20120822161315-n1uwcxevdo18elkb
---
 addons/mail/mail_thread.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index f7078348f08..6867c0e08b1 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -86,7 +86,6 @@ class mail_thread(osv.Model):
             res[thread.id]['message_is_follower'] = user.partner_id.id in [follower.id for follower in thread.message_follower_ids]
         return res
 
-    # FP Note: todo
     def _search_unread(self, cr, uid, obj=None, name=None, domain=None, context=None):
         partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         res = {}
@@ -103,8 +102,8 @@ class mail_thread(osv.Model):
     _columns = {
         'message_is_follower': fields.function(_get_message_data,
             type='boolean', string='Is a Follower', multi='_get_message_data'),
+        # missing domain on model
         'message_follower_ids': fields.many2many('res.partner', 'mail_followers', 'res_id', 'partner_id',
-            domain=lambda self: [('res_model','=',self._name)],
             string='Followers'),
         'message_ids': fields.one2many('mail.message', 'res_id',
             domain=lambda self: [('model','=',self._name)],
@@ -112,6 +111,7 @@ class mail_thread(osv.Model):
             help="All messages related to the current document."),
         'message_unread': fields.function(_get_message_data, fnct_search=_search_unread, 
             string='Has Unread Messages',
+            type='boolean',
             help="When checked, new messages require your attention.",
             multi="_get_message_data"),
         'message_summary': fields.function(_get_message_data, method=True,

From 552705494c11c53d81671766e608f830e773df96 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 22 Aug 2012 18:14:07 +0200
Subject: [PATCH 493/999] [IMP] needaction

bzr revid: fp@tinyerp.com-20120822161407-aucl1m2jsa3pe6sv
---
 openerp/addons/base/ir/ir_needaction.py | 3 ++-
 openerp/addons/base/ir/ir_ui_menu.py    | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index caf099c18cd..1e59a6fbb8e 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -63,5 +63,6 @@ class ir_needaction_mixin(osv.Model):
         dom = self._needaction_domain_get(cr, uid, context=context)
         if dom is False:
             return 0
-        return self.search(cr, uid, (domain or []) +dom, context=context, count=True)
+        result = self.search(cr, uid, (domain or []) +dom, context=context, count=True)
+        return result
 
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index bc743d34fc0..eefa8ea4a50 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -24,6 +24,8 @@ import base64
 import re
 import threading
 
+from tools.safe_eval import safe_eval as eval
+
 import tools
 import openerp.modules
 from osv import fields, osv
@@ -268,7 +270,7 @@ class ir_ui_menu(osv.osv):
                 obj = self.pool.get(menu.action.res_model)
                 if obj._needaction:
                     res[menu.id]['needaction_enabled'] = obj._needaction
-                    res[menu.id]['needaction_counter'] = obj._needaction_count(cr, uid, menu.action.domain, context=context)
+                    res[menu.id]['needaction_counter'] = obj._needaction_count(cr, uid, menu.action.domain and eval(menu.action.domain), context=context)
         return res
 
     _columns = {

From 4e6e86fab535e217bbe548ee932bdcca1346e9f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 22 Aug 2012 18:21:51 +0200
Subject: [PATCH 494/999] [IMP] [CLEAN] [WIP] composer: cleaning of the
 server-side code. It now relies less on context keys and values; some fields
 have been added to manage the composition mode, model, res_id and message_id
 as a classic form. Updated form view, with invisible fields, to have those
 value accessible and modifiable through onchange or through JS. Updated
 JS-part of the composer to handle the new composer; less options, less logic
 client-side ! Still not finished, short in time today (have to check
 mass_mail, templates).

bzr revid: tde@openerp.com-20120822162151-n9o23ik0v45h7v6j
---
 addons/mail/static/src/js/mail.js             | 157 +++++-----
 addons/mail/static/src/xml/mail.xml           |   8 +-
 addons/mail/wizard/mail_compose_message.py    | 275 ++++++++----------
 .../mail/wizard/mail_compose_message_view.xml |  11 +-
 4 files changed, 201 insertions(+), 250 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 409ff41fcf5..fb788e305cd 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -104,87 +104,60 @@ openerp.mail = function(session) {
          * @param {Object} [options]
          * @param {String} [options.res_model] res_model of document [REQUIRED]
          * @param {Number} [options.res_id] res_id of record [REQUIRED]
-         * @param {Number} [options.formatting] true/false, tells whether
-         *      we are in advance formatting mode
-         * @param {String} [options.model] mail.compose.message.mode (see
-         *      composition wizard)
+         * @param {String} [options.composition_mode] mail.compose.message.mode
+         *      (see composition wizard)
          * @param {Number} [options.msg_id] id of a message in case we are in
          *      reply mode
          */
-        init: function(parent, options) {
+        init: function (parent, options) {
             var self = this;
             this._super(parent);
             // options
             this.options = options || {};
-            this.options.context = options.context || {};
-            this.options.formatting = options.formatting || false;
-            this.options.mode = options.mode || 'comment';
+            this.options.composition_mode = options.composition_mode || 'comment';
             this.options.form_xml_id = options.form_xml_id || 'email_compose_message_wizard_form_chatter';
-            this.options.form_view_id = false;
-            if (this.options.mode == 'reply') {
-                this.options.active_id = this.options.msg_id;
-            } else {
-                this.options.active_id = this.options.res_id;
-            }
-            this.formatting = false;
+            this.options.form_view_id = options.form_view_id || false;
+            this.options.context = options.context || {};
             // debug
             console.groupCollapsed('New ComposeMessage: model', this.options.res_model, ', id', this.options.res_id);
             console.log('context:', this.options.context);
             console.groupEnd();
         },
 
-        /**
-         * Reinitialize the widget field values to the default values. The
-         * purpose is to avoid to destroy and re-build a form view. Default
-         * values are therefore given as for an onchange. */
-        reinit: function() {
-            var self = this;
-            if (! this.form_view) return;
-            var call_defer = this.ds_compose.call('default_get', [['subject', 'body_text', 'body', 'attachment_ids', 'dest_partner_ids'], this.ds_compose.get_context()]).then(
-                function (result) {
-                    self.form_view.on_processed_onchange({'value': result}, []);
-                });
-            return call_defer;
-        },
-
-        /**
-         * Override-hack of do_action: clean the form */
-        do_action: function(action, on_close) {
-            // this.init_comments();
-            return this._super(action, on_close);
-        },
-
-        /**
-         * Widget start function
-         * - builds and initializes the form view */
-        start: function() {
-            var self = this;
+        start: function () {
             this._super.apply(this, arguments);
             // customize display: add avatar, clean previous content
             var user_avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.session.uid);
             this.$element.find('img.oe_mail_icon').attr('src', user_avatar);
             this.$element.find('div.oe_mail_msg_content').empty();
-            // create a context for the default_get of the compose form
-            var widget_context = {
-                'active_model': this.options.res_model,
-                'active_id': this.options.active_id,
-                'mail.compose.message.mode': this.options.mode,
-            };
-            var context = _.extend({}, this.options.context, widget_context);
+            // create a context for the dataset and default_get of the wizard
+            var context = this._update_context({});
+            console.log(context);
+            // debugger
             this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
             // find the id of the view to display in the chatter form
             var data_ds = new session.web.DataSetSearch(this, 'ir.model.data');
-            var deferred_form_id = data_ds.call('get_object_reference', ['mail', this.options.form_xml_id]).then( function (result) {
-                if (result) {
-                    self.options.form_view_id = result[1];
-                }
-            }).pipe(this.proxy('create_form_view'));
-            return deferred_form_id;
+            return data_ds.call('get_object_reference', ['mail', this.options.form_xml_id]).pipe(this.proxy('create_form_view'));
         },
 
-        /**
-         * Create a FormView, then append it to the to widget DOM. */
-        create_form_view: function () {
+        /** Update the context of the compose wizard */
+        _update_context: function (dest_context) {
+            _.extend(dest_context, this.options.context, {
+                'default_model': this.options.res_model,
+                'mail.compose.message.mode': this.options.composition_mode
+            });
+            if (this.options.composition_mode == 'comment') {
+                _.extend(dest_context, {'default_res_id': this.options.res_id});
+            }
+            else if (this.options.composition_mode == 'reply') {
+                _.extend(dest_context, {'active_id': this.options.msg_id});
+            }
+            return dest_context
+        },
+
+        /** Create a FormView, then append it to the to widget DOM. */
+        create_form_view: function (form_view_id) {
+            this.options.form_view_id = form_view_id[1] || false;
             var self = this;
             // destroy previous form_view if any
             if (this.form_view) { this.form_view.destroy(); }
@@ -200,12 +173,31 @@ openerp.mail = function(session) {
             return $.when(this.form_view.appendTo(msg_node)).pipe(function() {
                 self.bind_events();
                 self.form_view.do_show();
-                if (self.options.formatting) { self.toggle_formatting_mode(); }
             });
         },
 
-        destroy: function() {
-            this._super.apply(this, arguments);
+        /**
+         * Reinitialize the widget field values to the default values. The
+         * purpose is to avoid to destroy and re-build a form view. Default
+         * values are therefore given as for an on_change. */
+        refresh: function (options_update_values) {
+            var self = this;
+            // debugger
+            this.options = _.extend(this.options, options_update_values);
+            if (! this.form_view) return;
+            this.ds_compose.context = this._update_context(this.ds_compose.context);
+            return this.ds_compose.call('default_get', [
+                ['subject', 'body_text', 'body', 'attachment_ids', 'partner_ids', 'composition_mode',
+                    'res_model', 'res_id', 'parent_id', 'content_subtype'],
+                this.ds_compose.get_context(),
+            ]).then( function (result) { self.form_view.on_processed_onchange({'value': result}, []); });
+        },
+
+        /**
+         * Override-hack of do_action: clean the form */
+        do_action: function(action, on_close) {
+            console.log('compose_message do_action', action, on_close);
+            return this._super(action, on_close);
         },
 
         /**
@@ -213,38 +205,23 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            this.$element.find('button.oe_form_button').click(function (event) {
-                event.preventDefault();
-            });
+            // this.$element.find('button.oe_form_button').click(function (event) {
+            //     event.preventDefault();
+            //     event.stopPropagation();
+            // });
             // event: click on 'Formatting' icon-link that toggles the advanced
             // formatting options for writing a message (subject, body_html)
-            this.$element.on('click', 'button.oe_mail_compose_message_formatting', function (event) {
-                event.preventDefault();
-                event.stopPropagation();
-                self.toggle_formatting_mode(event);
-            });
+            // this.$element.on('click', 'button.oe_mail_compose_message_formatting', function (event) {
+            //     event.preventDefault();
+            //     event.stopPropagation();
+            //     self.toggle_formatting_mode(event);
+            // });
             // event: click on 'Attachment' icon-link that opens the dialog to
             // add an attachment.
             this.$element.on('click', 'button.oe_mail_compose_message_attachment', function (event) {
                 event.stopImmediatePropagation();
             });
         },
-
-        /**
-         * Toggle the formatting mode. */
-        toggle_formatting_mode: function(event) {
-            this.formatting = ! this.formatting;
-            // update context of datasetsearch
-            this.ds_compose.context.formatting = this.formatting;
-        },
-
-        /**
-         * Update the values of the composition form; with possible different
-         * values for body and body_html. */
-        set_body_value: function(body, body_html) {
-            this.form_view.fields.body.set_value(body);
-            this.form_view.fields.body_html.set_value(body_html);
-        },
     }),
 
     /** 
@@ -398,12 +375,15 @@ openerp.mail = function(session) {
             });
             // event: click on "Reply by email" in msg side menu (email style)
             this.$element.on('click', 'a.oe_mail_msg_reply_by_email', function (event) {
+                console.log('cacaprout');
                 event.preventDefault();
                 event.stopPropagation();
                 var msg_id = event.srcElement.dataset.msg_id;
                 var formatting = (event.srcElement.dataset.formatting == 'html');
                 if (! msg_id) return false;
-                self.instantiate_composition_form('reply', formatting, msg_id);
+                // self.instantiate_composition_form('reply', formatting, msg_id);
+                console.log('cacaprout2');
+                self.compose_message_widget.refresh({'composition_mode': 'reply', 'msg_id': parseInt(msg_id)});
             });
         },
 
@@ -420,15 +400,14 @@ openerp.mail = function(session) {
             return this._super(action, on_close);
         },
 
-        /** Instantiate the composition form, with paramteres coming from thread parameters */
+        /** Instantiate the composition form, with parameters coming from thread parameters */
         instantiate_composition_form: function(mode, formatting, msg_id, context) {
             if (this.compose_message_widget) {
                 this.compose_message_widget.destroy();
             }
             this.compose_message_widget = new mail.ComposeMessage(this, {
-                'extended_mode': false, 'uid': this.options.uid, 'res_model': this.options.context.res_model,
-                'res_id': this.options.context.res_id, 'mode': mode || 'comment', 'msg_id': msg_id,
-                'formatting': formatting || false, 'context': context || false } );
+                'res_model': this.options.context.res_model, 'res_id': this.options.context.res_id,
+                'composition_mode': mode || 'comment', 'msg_id': msg_id, 'context': context || false } );
             var composition_node = this.$element.find('div.oe_mail_thread_action');
             composition_node.empty();
             var compose_done = this.compose_message_widget.appendTo(composition_node);
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 9a6d8b92a3c..d0ae83316e7 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -102,15 +102,15 @@
                 <!-- dropdown menu with message options and actions -->
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">
                     <ul class="oe_dropdown_menu">
-                        <t t-if="display['show_delete']">
-                                <li t-if="record.is_author"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
+                        <t t-if="record.is_author">
+                            <li t-if="display['show_delete']"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                         </t>
-                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Hide</a></li>
+                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</a></li>
 <!--                    Uncomment when adding subtype hiding
                         <li t-if="display['show_hide']">
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
                         </li> -->
-                        <li><a href="#" t-attf-data-msg_id="{record.id}" t-attf-data-type="{record.type}" t-attf-data-formatting="{record.content_subtype}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
+                        <li><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Quote and reply</a></li>
                         <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
                     </ul>
                 </span>
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 19faaad9578..140773981e5 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -32,81 +32,75 @@ from tools.translate import _
 EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
 
 class mail_compose_message(osv.TransientModel):
-    """ Generic Email composition wizard. This wizard is meant to be inherited
-        at model and view levels to provide specific wizard features.
+    """ Generic message composition wizard. You may inherit from this wizard
+        at model and view levels to provide specific features.
 
-        The behavior of the wizard can be modified through the use of context
-        parameters, among which are:
-        - mail.compose.message.mode:
-            - if set to 'reply', the wizard is a reply to a previous message.
-                It is pre-populated with the original quote
-            - if set to 'comment', it means you are writing a new message to
-                be attached to a document. It is pre-populated with values
-                coming from ``get_value``, related to the document, and that
-                can be overridden to add specific model-related behavior.
-            - if set to 'mass_mail', the wizard is in mass mailing mode where
-                the mail details can contain template placeholders that will be
-                merged with actual data before being sent to each recipient.
-        - active_model: model name of the document to which the mail being
-            composed is related
-        - active_id: id of the document to which the mail being composed is
-            related, or id of the message to which user is replying, in case
-            ``mail.compose.message.mode == 'reply'``
-        - active_ids: ids of the documents to which the mail being composed is
-            related, in case ``mail.compose.message.mode == 'mass_mail'``.
+        The behavior of the wizard can be modified through the context key 
+        mail.compose.message.mode:
+        - 'reply': reply to a previous message. The wizard is pre-populated 
+            via ``get_message_data``.
+        - 'comment': new post on a record. The wizard is pre-populated via
+            ``get_record_data``
+        - 'mass_mail': wizard in mass mailing mode where the mail details can
+            contain template placeholders that will be merged with actual data
+            before being sent to each recipient.
     """
     _name = 'mail.compose.message'
     _inherit = 'mail.message'
     _description = 'Email composition wizard'
 
     def default_get(self, cr, uid, fields, context=None):
-        """ Overridden to provide specific defaults depending on the context
-            parameters.
-
-            Composition mode
-            - comment: default mode; active_model, active_id = model and ID of a
-                document we are commenting,
-            - mass_mailing mode: active_model, active_id  = model and ID of a
-                document we are commenting,
-            - reply: active_id = ID of a mail.message to which we are replying.
-                From this message we can find the related model and res_id,
-
-           :param dict context: several context values will modify the behavior
-                of the wizard, cfr. the class description.
+        """ Handle composition mode. Some details about context keys:
+            - comment: default mode, model and ID of a record the user comments
+                - default_model or active_model
+                - default_res_id or active_id
+            - reply: active_id of a message the user replies to
+                - active_id: ID of a mail.message to which we are replying
+                - message.res_model or default_model
+                - message.res_id or default_res_id
+            - mass_mailing mode: model and IDs of records the user mass-mails
+                - active_ids: record IDs
+                - default_model or active_model
         """
+        # get some important values from context
         if context is None:
             context = {}
-        compose_mode = context.get('mail.compose.message.mode', 'comment')
-        active_model = context.get('active_model')
-        active_id = context.get('active_id')
         result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
 
+        # get some important values from context
+        composition_mode = context.get('mail.compose.message.mode')
+        model = context.get('default_model', context.get('active_model'))
+        res_id = context.get('default_res_id', context.get('active_id'))
+        active_id = context.get('active_id')
+        active_ids = context.get('active_ids')
+
         # get default values according to the composition mode
-        vals = {}
-        if compose_mode in ['reply']:
-            vals = self.get_message_data(cr, uid, int(context['active_id']), context=context)
-        elif compose_mode in ['comment', 'mass_mail'] and active_model and active_id:
-            vals = self.get_value(cr, uid, active_model, active_id, context)
+        if composition_mode in ['reply']:
+            vals = self.get_message_data(cr, uid, active_id, context=context)
+        elif composition_mode in ['comment', 'mass_mail'] and model and res_id:
+            vals = self.get_record_data(cr, uid, model, res_id, context=context)
+        else:
+            vals = {'model': model, 'res_id': res_id}
+        if composition_mode:
+            vals['composition_mode'] = composition_mode
+
         for field in vals:
             if field in fields:
                 result[field] = vals[field]
-
-        # link to model and record if not done yet
-        if not result.get('model') and active_model:
-            result['model'] = active_model
-        if not result.get('res_id') and active_id:
-            result['res_id'] = active_id
         return result
 
     _columns = {
-        'dest_partner_ids': fields.many2many('res.partner',
+        'composition_mode': fields.selection([
+            ('comment', 'Comment a document'),
+            ('reply', 'Reply to a message'),
+            ('mass_mail', 'Mass mailing')
+            ], string='Composition mode'),
+        'partner_ids': fields.many2many('res.partner',
             'mail_compose_message_res_partner_rel',
-            'wizard_id', 'partner_id', 'Destination partners',
-            help="When sending emails through the social network composition wizard"\
-                 "you may choose to send a copy of the mail to partners."),
-        'attachment_ids': fields.many2many('ir.attachment','mail_compose_message_ir_attachments_rel',
+            'wizard_id', 'partner_id', 'Additional contacts'),
+        'attachment_ids': fields.many2many('ir.attachment',
+            'mail_compose_message_ir_attachments_rel',
             'wizard_id', 'attachment_id', 'Attachments'),
-        'auto_delete': fields.boolean('Auto Delete', help="Permanently delete emails after sending"),
         'filter_id': fields.many2one('ir.filters', 'Filters'),
         'body_text': fields.text('Plain-text editor body'),
         'content_subtype': fields.char('Message content subtype', size=32, readonly=1,
@@ -115,46 +109,75 @@ class mail_compose_message(osv.TransientModel):
     }
 
     _defaults = {
+        'composition_mode': 'comment',
         'content_subtype': lambda self,cr, uid, context={}: 'plain',
-        'body_text': lambda self,cr, uid, context={}: '',
+        'body_text': lambda self,cr, uid, context={}: False,
         'body': lambda self,cr, uid, context={}: '',
+        'subject': lambda self,cr, uid, context={}: False,
+        'partner_ids': [],
     }
 
-    def get_value(self, cr, uid, model, res_id, context=None):
+    def get_record_data(self, cr, uid, model, res_id, context=None):
         """ Returns a defaults-like dict with initial values for the composition
             wizard when sending an email related to the document record
             identified by ``model`` and ``res_id``.
 
-            The default implementation returns an empty dictionary, and is meant
-            to be overridden by subclasses.
-
             :param str model: model name of the document record this mail is
                 related to.
-            :param int res_id: id of the document record this mail is related to.
-            :param dict context: several context values will modify the behavior
-                of the wizard, cfr. the class description.
+            :param int res_id: id of the document record this mail is related to
         """
+        return {'model': model, 'res_id': res_id}
+
+    def get_message_data(self, cr, uid, message_id, context=None):
+        """ Returns a defaults-like dict with initial values for the composition
+            wizard when replying to the given message (e.g. including the quote
+            of the initial message, and the correct recipients).
+
+            :param int message_id: id of the mail.message to which the user
+                is replying.
+        """
+        if context is None:
+            context = {}
         result = {}
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if not message_id:
+            return result
+
+        current_user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        message_data = self.pool.get('mail.message').browse(cr, uid, message_id, context=context)
+
+        # create subject
+        re_prefix = _("Re:")
+        reply_subject = tools.ustr(message_data.subject or '')
+        if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)):
+            reply_subject = "%s %s" % (re_prefix, reply_subject)
+        # create the reply in the body
+        reply_header = _('On %(date)s, %(sender_name)s wrote:') % {
+            'date': message_data.date if message_data.date else '',
+            'sender_name': message_data.author_id.name }
+        reply_body = '<div>%s<blockquote>%s</blockquote></div>%s' % (reply_header, message_data.body, current_user.signature)
+        # get partner_ids from original message
+        partner_ids = [partner.id for partner in message_data.partner_ids] if message_data.partner_ids else []
+
+        # update the result
         result.update({
-            'model': model,
-            'res_id': res_id,
-            'email_from': user.email or tools.config.get('email_from', False),
-            'body': False,
-            'subject': False,
-            'dest_partner_ids': [],
+            'model': message_data.model,
+            'res_id': message_data.res_id,
+            'parent_id': message_data.id,
+            'body': reply_body,
+            'subject': reply_subject,
+            'partner_ids': partner_ids,
+            'content_subtype': 'html',
         })
         return result
 
-    def toggle_formatting(self, cr, uid, ids, context=None):
+    def toggle_content_subtype(self, cr, uid, ids, context=None):
         """ hit toggle formatting mode button: calls onchange_formatting to 
             emulate an on_change, then writes the value to update the form. """
         for record in self.browse(cr, uid, ids, context=context):
             content_st_new_value = 'plain' if record.content_subtype == 'html' else 'html'
             onchange_res = self.onchange_content_subtype(cr, uid, ids, content_st_new_value, record.model, record.res_id, context=context)
             self.write(cr, uid, [record.id], onchange_res['value'], context=context)
-        return False
-
+        return True
 
     def onchange_content_subtype(self, cr, uid, ids, value, model, res_id, context=None):
         """ onchange_content_subtype (values: 'plain' or 'html'). This onchange
@@ -164,12 +187,10 @@ class mail_compose_message(osv.TransientModel):
             This method can be overridden for models that want to have their
             specific behavior.
         """
-        if value == 'plain':
-            return {'value': {'subject': False, 'content_subtype': value}}
         return {'value': {'content_subtype': value}}
 
-    def onchange_dest_partner_ids(self, cr, uid, ids, value, context=None):
-        """ onchange_dest_partner_ids (value format: [[6, False, [3, 4]]]). The
+    def onchange_partner_ids(self, cr, uid, ids, value, context=None):
+        """ onchange_partner_ids (value format: [[6, False, [3, 4]]]). The
             basic purpose of this method is to check that destination partners
             effectively have email addresses. Otherwise a warning is thrown.
         """
@@ -189,94 +210,40 @@ class mail_compose_message(osv.TransientModel):
         }
         return {'warning': warning, 'value': {}}
 
-    def get_message_data(self, cr, uid, message_id, context=None):
-        """ Returns a defaults-like dict with initial values for the composition
-            wizard when replying to the given message (e.g. including the quote
-            of the initial message, and the correct recipient). It should not be
-            called unless ``context['mail.compose.message.mode'] == 'reply'``.
-
-            :param int message_id: id of the mail.message to which the user
-                is replying.
-            :param dict context: several context values will modify the behavior
-                of the wizard, cfr. the class description.
-        """
-        if context is None:
-            context = {}
-        result = {}
-        if not message_id:
-            return result
-
-        current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
-        message_data = self.pool.get('mail.message').browse(cr, uid, message_id, context)
-        # Form the subject
-        re_prefix = _("Re:")
-        reply_subject = tools.ustr(message_data.subject or '')
-        if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)):
-            reply_subject = "%s %s" % (re_prefix, reply_subject)
-
-        # Form the bodies (text and html). We use the plain text version of the
-        # original mail, by default, as it is easier to quote than the HTML
-        # version. TODO: make it possible to switch to HTML on the fly
-
-        sent_date = _('On %(date)s, ') % {'date': message_data.date} if message_data.date else ''
-        sender = _('%(sender_name)s wrote:') % {'sender_name': tools.ustr(message_data.email_from or _('You'))}
-
-        body = message_data.body or ''
-        quoted_body = '<blockquote>%s</blockquote>' % (tools.ustr(body)),
-        reply_body = '<br /><br />%s%s<br />%s<br />%s' % (sent_date, sender, quoted_body, current_user.signature)
-
-        # form dest_partner_ids
-        dest_partner_ids = [partner.id for partner in message_data.partner_ids]
-
-        # update the result
-        result.update({
-            'body': reply_body,
-            'subject': reply_subject,
-            'dest_partner_ids': dest_partner_ids,
-            'model': message_data.model or False,
-            'res_id': message_data.res_id or False,
-        })
-        return result
-
     def send_mail(self, cr, uid, ids, context=None):
-        '''Process the wizard contents and proceed with sending the corresponding
-           email(s), rendering any template patterns on the fly if needed.
-           If the wizard is in mass-mail mode (context['mail.compose.message.mode'] is
-           set to ``'mass_mail'``), the resulting email(s) are scheduled for being
-           sent the next time the mail.message scheduler runs, or the next time
-           ``mail.message.process_email_queue`` is called.
-           Otherwise the new message is sent immediately.
-
-           :param dict context: several context values will modify the behavior
-                                of the wizard, cfr. the class description.
-        '''
+        """ Process the wizard content and proceed with sending the related
+            email(s), rendering any template patterns on the fly if needed. """
         if context is None:
             context = {}
 
-        formatting = context.get('formatting')
-        # FIXME TODO: mass_mail_mode unused?
-        mass_mail_mode = context.get('mail.compose.message.mode') == 'mass_mail'
+        for wizard in self.browse(cr, uid, ids, context=context):
+            mass_mail_mode = wizard.composition_mode == 'mass_mail'
 
-        for mail_wiz in self.browse(cr, uid, ids, context=context):
             attachment = {}
-            for attach in mail_wiz.attachment_ids:
+            for attach in wizard.attachment_ids:
                 attachment[attach.datas_fname] = attach.datas and attach.datas or False
 
             # default values, according to the wizard options
-            subject = mail_wiz.subject if formatting else False
-            # FIXME TODO: partner_ids not used??
-            partner_ids = [partner.id for partner in mail_wiz.dest_partner_ids]
-            body = mail_wiz.body_html if mail_wiz.content_subtype == 'html' else mail_wiz.body
+            subject = wizard.subject if wizard.content_subtype == 'html' else False
+            partner_ids = [partner.id for partner in wizard.partner_ids]
+            body = wizard.body if wizard.content_subtype == 'html' else wizard.body_text
 
-            active_model_pool = self.pool.get('mail.thread')
-            active_id = context.get('default_res_id', False)
+            active_model_pool = self.pool.get(wizard.model if wizard.model else 'mail.thread')
+            
+            #TODO: TDE: WIP: have to check for mass mail and templates - no time anymore today
             if context.get('mail.compose.message.mode') == 'mass_mail' and context.get('default_model', False) and context.get('default_res_id', False):
                 active_model = context.get('default_model', False)
                 active_model_pool = self.pool.get(active_model)
                 subject = self.render_template(cr, uid, subject, active_model, active_id)
-                body = self.render_template(cr, uid, mail_wiz.body_html, active_model, active_id)
-            active_model_pool.message_post(cr, uid, [active_id], body=body, subject=subject, msg_type='comment', 
-                attachments=attachment, context=context)
+                body = self.render_template(cr, uid, wizard.body_html, active_model, active_id)
+
+            # determine the ids we are commenting
+            if mass_mail_mode:
+                res_ids = context.get('active_ids', [])
+            else:
+                res_ids = [wizard.res_id]
+            active_model_pool.message_post(cr, uid, res_ids, body=body, subject=subject, msg_type='comment', 
+                attachments=attachment, context=context, partner_ids=partner_ids)
 
         return {'type': 'ir.actions.act_window_close'}
 
@@ -310,7 +277,7 @@ class mail_compose_message(osv.TransientModel):
         return template and EXPRESSION_PATTERN.sub(merge, template)
 
     def dummy(self, cr, uid, ids, context=None):
-        return False
-
-
-#FIXME: check for models defining '_mail_compose_message'
+        """ TDE: defined to have buttons that do basically nothing. It is
+            currently impossible to have buttons that do nothing special
+            in views (if type not specified, considered as 'object'). """
+        return True
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index a10dc6ccc86..8bf8df24f59 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -38,8 +38,13 @@
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0" >
                     <group>
+                        <field name="composition_mode" colspan="2" nolabel="1" invisible="1"/>
+                        <field name="model" colspan="2" nolabel="1" invisible="1"/>
+                        <field name="res_id" colspan="2" nolabel="1" invisible="1"/>
+                        <field name="parent_id" colspan="2" nolabel="1" invisible="1"/>
                         <!-- truly invisible fields for control and options -->
                         <field name="content_subtype" colspan="2" nolabel="1" invisible="1"/>
+                        <!-- visible wizard -->
                         <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
                                 class="oe_mail_compose_message_subject"
                                 attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
@@ -49,9 +54,9 @@
                         <field name="body" colspan="2" nolabel="1" placeholder="What are you working on ?"
                                 class="oe_mail_compose_message_body_html"
                                 attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
-                        <field name="dest_partner_ids" colspan="2" nolabel="1" widget="many2many_tags" placeholder="Add contacts to notify..."
+                        <field name="partner_ids" colspan="2" nolabel="1" widget="many2many_tags" placeholder="Add contacts to notify..."
                                 context="{'force_create':True}"
-                                on_change="onchange_dest_partner_ids(dest_partner_ids)"
+                                on_change="onchange_partner_ids(partner_ids)"
                                 class="oe_mail_compose_message_partner_ids"/>
                         <field name="attachment_ids" colspan="2" nolabel="1" widget="many2many_tags"
                                 placeholder="Add attachments..." invisible="1"
@@ -69,7 +74,7 @@
                                 help="Add an attachment"/>
                             <button icon="/mail/static/src/img/formatting.png"
                                 class="oe_mail_compose_message_formatting" string=""
-                                type="object" name="toggle_formatting"
+                                type="object" name="toggle_content_subtype"
                                 help="Toggle advanced formatting mode"/>
                         </div>
                     </group>

From c8851c2967c404174b89b8e229e59001ccc511e4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 22 Aug 2012 18:38:24 +0200
Subject: [PATCH 495/999] [IMP] fixed size

bzr revid: fp@tinyerp.com-20120822163824-t3lj4rjt2mvnp74v
---
 addons/mail/mail_message.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index b9cb0723a4f..7a544b1ee1a 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -56,7 +56,10 @@ class mail_message(osv.Model):
         for message in self.browse(cr, uid, ids, context=context):
             if not message.model or not message.res_id:
                 continue
-            result[message.id] = self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1]
+            doc = self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1]
+            if len(doc)>18:
+                doc=doc[:18]+'...'
+            result[message.id] = doc
         return result
 
     def name_get(self, cr, uid, ids, context=None):

From 4de99bff8d1fafbd5d2b0093ef22f7643cadd31e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 22 Aug 2012 19:23:46 +0200
Subject: [PATCH 496/999] [IMP] mail.js: Hide in wall now sets the notification
 as read. Added server code to handle the client-side link. Also fixed
 composer, when replying to an email. Began to propagate the use of context
 for some values instead of everything in options, in js code.

bzr revid: tde@openerp.com-20120822172346-zih62h6wgrev22cd
---
 addons/mail/mail_followers.py     |  8 ++--
 addons/mail/mail_message.py       |  5 ++
 addons/mail/static/src/js/mail.js | 76 ++++++++++++-------------------
 3 files changed, 40 insertions(+), 49 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index b94e03efd93..7734f8a0ec8 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -47,18 +47,20 @@ class mail_followers(osv.Model):
 
 
 class mail_notification(osv.Model):
+    """ Class holding notifications pushed to partners. Followers and partners
+        added in 'contacts to notify' receive notifications. Hiding notifications
+        in the wall consists in setting them as 'read'. """
     _name = 'mail.notification'
     _rec_name = 'partner_id'
     _log_access = False
     _description = 'Notifications'
+
     _columns = {
         'partner_id': fields.many2one('res.partner', string='Contact',
                         ondelete='cascade', required=True, select=1),
         'read': fields.boolean('Read'),
-        # this will be added in mail_message.py
-        #'message_id': fields.many2one('mail.message', string='Message',
-        #                ondelete='cascade', required=True, select=1),
     }
+
     _defaults = {
         'read': False,
     }
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 7a544b1ee1a..d8dbdcb5f49 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -300,4 +300,9 @@ class mail_notification(osv.Model):
                         ondelete='cascade', required=True, select=1),
     }
 
+    def set_message_read(self, cr, uid, msg_id, context=None):
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        notif_ids = self.search(cr, uid, [('partner_id', '=', partner_id), ('message_id', '=', msg_id)], context=context)
+        return self.write(cr, uid, notif_ids, {'read': True})
+
 
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index fb788e305cd..14183f13b1c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -17,6 +17,7 @@ openerp.mail = function(session) {
      */
 
     session.web.FormView = session.web.FormView.extend({
+        // #FIXME TODO: CHECK WITH NEW BRANCH
         do_action: function(action, on_close) {
             if (action.res_model == 'mail.compose.message' && this.fields && this.fields.message_ids && this.fields.message_ids.view.get("actual_mode") != 'create') {
                 var record_thread = this.fields.message_ids;
@@ -101,12 +102,13 @@ openerp.mail = function(session) {
         
         /**
          * @param {Object} parent parent
-         * @param {Object} [options]
-         * @param {String} [options.res_model] res_model of document [REQUIRED]
-         * @param {Number} [options.res_id] res_id of record [REQUIRED]
-         * @param {String} [options.composition_mode] mail.compose.message.mode
+         * @param {Object} [options] 
+         * @param {Object} [options.context] context
+         * @param {String} [context.res_model] res_model of document [REQUIRED]
+         * @param {Number} [context.res_id] res_id of record [REQUIRED]
+         * @param {String} [context.composition_mode] mail.compose.message.mode
          *      (see composition wizard)
-         * @param {Number} [options.msg_id] id of a message in case we are in
+         * @param {Number} [context.msg_id] id of a message in case we are in
          *      reply mode
          */
         init: function (parent, options) {
@@ -114,12 +116,11 @@ openerp.mail = function(session) {
             this._super(parent);
             // options
             this.options = options || {};
-            this.options.composition_mode = options.composition_mode || 'comment';
+            this.options.context = options.context || {};
             this.options.form_xml_id = options.form_xml_id || 'email_compose_message_wizard_form_chatter';
             this.options.form_view_id = options.form_view_id || false;
-            this.options.context = options.context || {};
             // debug
-            console.groupCollapsed('New ComposeMessage: model', this.options.res_model, ', id', this.options.res_id);
+            console.groupCollapsed('New ComposeMessage: model', this.options.context.default_res_model, ', id', this.options.context.default_res_id);
             console.log('context:', this.options.context);
             console.groupEnd();
         },
@@ -133,7 +134,6 @@ openerp.mail = function(session) {
             // create a context for the dataset and default_get of the wizard
             var context = this._update_context({});
             console.log(context);
-            // debugger
             this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
             // find the id of the view to display in the chatter form
             var data_ds = new session.web.DataSetSearch(this, 'ir.model.data');
@@ -142,15 +142,15 @@ openerp.mail = function(session) {
 
         /** Update the context of the compose wizard */
         _update_context: function (dest_context) {
+            // TDE TOCHECK: after posting, back to reply mode !
             _.extend(dest_context, this.options.context, {
-                'default_model': this.options.res_model,
-                'mail.compose.message.mode': this.options.composition_mode
+                'mail.compose.message.mode': this.options.context.composition_mode,
             });
-            if (this.options.composition_mode == 'comment') {
-                _.extend(dest_context, {'default_res_id': this.options.res_id});
+            if (this.options.context.composition_mode == 'comment') {
+                // _.extend(dest_context, {'default_res_id': this.options.res_id});
             }
-            else if (this.options.composition_mode == 'reply') {
-                _.extend(dest_context, {'active_id': this.options.msg_id});
+            else if (this.options.context.composition_mode == 'reply') {
+                _.extend(dest_context, {'active_id': this.options.context.msg_id});
             }
             return dest_context
         },
@@ -182,13 +182,12 @@ openerp.mail = function(session) {
          * values are therefore given as for an on_change. */
         refresh: function (options_update_values) {
             var self = this;
-            // debugger
-            this.options = _.extend(this.options, options_update_values);
+            this.options.context = _.extend(this.options.context, options_update_values || {});
             if (! this.form_view) return;
             this.ds_compose.context = this._update_context(this.ds_compose.context);
             return this.ds_compose.call('default_get', [
                 ['subject', 'body_text', 'body', 'attachment_ids', 'partner_ids', 'composition_mode',
-                    'res_model', 'res_id', 'parent_id', 'content_subtype'],
+                    'model', 'res_id', 'parent_id', 'content_subtype'],
                 this.ds_compose.get_context(),
             ]).then( function (result) { self.form_view.on_processed_onchange({'value': result}, []); });
         },
@@ -205,17 +204,6 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            // this.$element.find('button.oe_form_button').click(function (event) {
-            //     event.preventDefault();
-            //     event.stopPropagation();
-            // });
-            // event: click on 'Formatting' icon-link that toggles the advanced
-            // formatting options for writing a message (subject, body_html)
-            // this.$element.on('click', 'button.oe_mail_compose_message_formatting', function (event) {
-            //     event.preventDefault();
-            //     event.stopPropagation();
-            //     self.toggle_formatting_mode(event);
-            // });
             // event: click on 'Attachment' icon-link that opens the dialog to
             // add an attachment.
             this.$element.on('click', 'button.oe_mail_compose_message_attachment', function (event) {
@@ -279,6 +267,7 @@ openerp.mail = function(session) {
             this.options.ids = options.ids || null;
             // datasets and internal vars
             this.ds_post = new session.web.DataSetSearch(this, this.options.context.res_model);
+            this.ds_notif = new session.web.DataSetSearch(this, 'mail.notification');
             this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
             // display customization vars
             this.display = {};
@@ -339,17 +328,17 @@ openerp.mail = function(session) {
             });
             // event: click on 'Reply' in msg
             this.$element.on('click', 'a.oe_mail_msg_reply', function (event) {
-                var act_dom = $(this).parents('li.oe_mail_thread_msg').eq(0).find('div.oe_mail_thread_action:first');
-                act_dom.toggle();
                 event.preventDefault();
                 event.stopPropagation();
+                var act_dom = $(this).parents('li.oe_mail_thread_msg').eq(0).find('div.oe_mail_thread_action:first');
+                act_dom.toggle();
             });
             // event: click on 'attachment(s)' in msg
             this.$element.on('click', 'a.oe_mail_msg_view_attachments', function (event) {
-                var act_dom = $(this).parent().parent().parent().find('.oe_mail_msg_attachments');
-                act_dom.toggle();
                 event.preventDefault();
                 event.stopPropagation();
+                var act_dom = $(this).parent().parent().parent().find('.oe_mail_msg_attachments');
+                act_dom.toggle();
             });
             // event: click on 'Delete' in msg side menu
             this.$element.on('click', 'a.oe_mail_msg_delete', function (event) {
@@ -358,31 +347,24 @@ openerp.mail = function(session) {
                 if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
                 var msg_id = event.srcElement.dataset.id;
                 if (! msg_id) return false;
-                var call_defer = self.ds_msg.unlink([parseInt(msg_id)]);
                 $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
-                return call_defer;
+                return self.ds_msg.unlink([parseInt(msg_id)]);
             });
             // event: click on 'Hide' in msg side menu
             this.$element.on('click', 'a.oe_mail_msg_hide', function (event) {
                 event.preventDefault();
                 event.stopPropagation();
-                if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; }
                 var msg_id = event.srcElement.dataset.id;
                 if (! msg_id) return false;
-                var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]);
                 $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
-                return call_defer;
+                return self.ds_notif.call('set_message_read', [parseInt(msg_id)]);
             });
             // event: click on "Reply by email" in msg side menu (email style)
             this.$element.on('click', 'a.oe_mail_msg_reply_by_email', function (event) {
-                console.log('cacaprout');
                 event.preventDefault();
                 event.stopPropagation();
                 var msg_id = event.srcElement.dataset.msg_id;
-                var formatting = (event.srcElement.dataset.formatting == 'html');
                 if (! msg_id) return false;
-                // self.instantiate_composition_form('reply', formatting, msg_id);
-                console.log('cacaprout2');
                 self.compose_message_widget.refresh({'composition_mode': 'reply', 'msg_id': parseInt(msg_id)});
             });
         },
@@ -396,7 +378,7 @@ openerp.mail = function(session) {
             this.message_clean();
             this.message_fetch();
             if (this.compose_message_widget) {
-                this.compose_message_widget.reinit(); }
+                this.compose_message_widget.refresh(); }
             return this._super(action, on_close);
         },
 
@@ -406,8 +388,10 @@ openerp.mail = function(session) {
                 this.compose_message_widget.destroy();
             }
             this.compose_message_widget = new mail.ComposeMessage(this, {
-                'res_model': this.options.context.res_model, 'res_id': this.options.context.res_id,
-                'composition_mode': mode || 'comment', 'msg_id': msg_id, 'context': context || false } );
+                'context': {
+                    'default_model': this.options.context.res_model, 'default_res_id': this.options.context.res_id,
+                    'composition_mode': mode || 'comment', 'msg_id': msg_id }
+                });
             var composition_node = this.$element.find('div.oe_mail_thread_action');
             composition_node.empty();
             var compose_done = this.compose_message_widget.appendTo(composition_node);
@@ -692,7 +676,7 @@ openerp.mail = function(session) {
         do_action: function(action, on_close) {
             console.log('wall do_action');
             if (this.compose_message_widget) {
-                this.compose_message_widget.reinit(); }
+                this.compose_message_widget.refresh(); }
             this.message_clean();
             this.message_fetch();
             return this._super(action, on_close);

From 2b14337518c006729c5d97f242b086f085b0c9c9 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Aug 2012 20:48:56 +0200
Subject: [PATCH 497/999] [FIX] email_template: fix invalid _rec_name

bzr revid: odo@openerp.com-20120822184856-ye5ff2wzvte0qgwr
---
 addons/email_template/wizard/email_template_preview.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py
index a28eb2487cb..2c1866a53c4 100644
--- a/addons/email_template/wizard/email_template_preview.py
+++ b/addons/email_template/wizard/email_template_preview.py
@@ -26,7 +26,6 @@ class email_template_preview(osv.osv_memory):
     _inherit = "email.template"
     _name = "email_template.preview"
     _description = "Email Template Preview"
-    _rec_name = "subject"
 
     def _get_records(self, cr, uid, context=None):
         """

From 7dd0bfa76686d255813b14f0667ba444b2ec6b00 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Aug 2012 21:16:30 +0200
Subject: [PATCH 498/999] [FIX] mail.thread make body an optional keywarg, so
 it can be passed via **args - should always be explicitly specified

bzr revid: odo@openerp.com-20120822191630-55anhcuu0l1j0ioq
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 6867c0e08b1..8e5222f6d04 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -516,7 +516,7 @@ class mail_thread(osv.Model):
                         now deprecated res.log.")
         self.message_post(cr, uid, [id], message, context=context)
 
-    def message_post(self, cr, uid, thread_id, body, subject=False,
+    def message_post(self, cr, uid, thread_id, body='', subject=False,
             msg_type='notification', parent_id=False, attachments=None, context=None, **kwargs):
         """Post a new message in an existing message thread, returning the new mail.message ID.
            Extra keyword arguments will be used as default column values for the new

From 155d788ca521425855838ac77c2e052d13b4d719 Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Thu, 23 Aug 2012 10:17:48 +0530
Subject: [PATCH 499/999] [IMP] Add footer and put button in the footer.

bzr revid: vba@tinyerp.com-20120823044748-nvcc33svhs830agp
---
 addons/survey/wizard/survey_answer.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index b3bcc14d015..d75d473452c 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -368,24 +368,30 @@ class survey_question_wiz(osv.osv_memory):
 
                     etree.SubElement(xml_form, 'separator', {'colspan': '4'})
  
-                    xml_button_group = etree.SubElement(xml_form, 'group', {'col': '8', 'colspan': '1', 'width':"100%"})
+                    xml_footer = etree.SubElement(xml_form, 'footer', {'col': '8', 'colspan': '1', 'width':"100%"})
 
 
                     if pre_button:
-                        etree.SubElement(xml_button_group, 'button', {'name':"action_previous",'string':"Previous",'type':"object", 'width':"8%"})
+                        etree.SubElement(xml_footer, 'label', {'string': ""})
+                        etree.SubElement(xml_footer, 'button', {'name':"action_previous",'string':"Previous",'type':"object"})
                     but_string = "Next"
                     if int(page_number) + 1 == total_pages:
                         but_string = "Done"
                     if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
-                        etree.SubElement(xml_button_group, 'button', {'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context), 'class':"oe_highlight", 'width':"7%"})
+                        etree.SubElement(xml_footer, 'label', {'string': ""})
+                        etree.SubElement(xml_footer, 'button', {'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context), 'class':"oe_highlight"})
                     elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
-                        etree.SubElement(xml_button_group, 'button', {'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context), 'class':"oe_highlight", 'width':"7%"})
+                        etree.SubElement(xml_footer, 'label', {'string': ""})
+                        etree.SubElement(xml_footer, 'button', {'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context), 'class':"oe_highlight"})
                     elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
-                        etree.SubElement(xml_button_group, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_highlight", 'width':"7%"})
+                        etree.SubElement(xml_footer, 'label', {'string': ""})
+                        etree.SubElement(xml_footer, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_highlight"})
                     else:
-                        etree.SubElement(xml_button_group, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_highlight", 'width':"7%"})
-                    etree.SubElement(xml_button_group, 'button', {'special': "cancel",'string':"Exit",'class':"oe_link"})
-                    etree.SubElement(xml_button_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_survey_title_page oe_right"})
+                        etree.SubElement(xml_footer, 'label', {'string': ""})
+                        etree.SubElement(xml_footer, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_highlight"})
+                    etree.SubElement(xml_footer, 'label', {'string': "or"})
+                    etree.SubElement(xml_footer, 'button', {'special': "cancel",'string':"Exit",'class':"oe_link"})
+                    etree.SubElement(xml_footer, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_survey_title_page oe_right"})
 
                     root = xml_form.getroottree()
                     result['arch'] = etree.tostring(root)
@@ -405,7 +411,7 @@ class survey_question_wiz(osv.osv_memory):
                         response_id = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))['response']
                         report = self.create_report(cr, uid, [survey_id], 'report.survey.browse.response', survey_data.title,context)
                         attachments = {}
-                        pdf_filename = addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf" 
+                        pdf_filename = addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf"
                         if os.path.exists(pdf_filename):
                             file = open(pdf_filename)
                             file_data = ""

From fe359ed90c75f95ed94ce4e66d686434929fad4c Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 23 Aug 2012 10:32:53 +0530
Subject: [PATCH 500/999] [FIX] remove unnecessary code.

bzr revid: tpa@tinyerp.com-20120823050253-ng0muqz77h5cgv14
---
 openerp/addons/base/res/res_partner_view.xml | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 92a264f0089..018be644d75 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -426,25 +426,6 @@
             <field name="filter" eval="True"/>
         </record>
 
-        <record id="view_payterm_form" model="ir.ui.view">
-            <field name="name">res.payterm</field>
-            <field name="model">res.payterm</field>
-            <field name="arch" type="xml">
-                <form string="Payment Term" version="7.0">
-                    <group>
-                        <field name="name"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-        <record id="action_payterm_form" model="ir.actions.act_window">
-            <field name="name">Payment term</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.payterm</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_payterm_form"/>
-        </record>
-
         <!-- Categories -->
         <record id="view_partner_category_form" model="ir.ui.view">
             <field name="name">Partner Categories</field>

From 05005a5ff3b3904401741bd2c71460a8bbee43d9 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 23 Aug 2012 10:34:04 +0530
Subject: [PATCH 501/999] [IMP] Typo

bzr revid: mra@tinyerp.com-20120823050404-yc5pbt3ezv0gu3li
---
 addons/l10n_in_hr_payroll/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 616996bbe05..8fbf6f1a9de 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -28,7 +28,7 @@
     'version': '1.0',
     'description': """
 Indian Payroll Salary Rules.
-=======================
+============================
 
     -Configuration of hr_payroll for India localization
     -All main contributions rules for India payslip.

From abbfcc6634792758210413a2af3e2607cc19fc4d Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 23 Aug 2012 11:51:20 +0530
Subject: [PATCH 502/999] [FIX]l10n_in_hr_payroll:left-right indent added and
 table width changed in report

bzr revid: kbh@tinyerp.com-20120823062120-p8mu9p3wat1xzdf8
---
 .../report/report_hr_yearly_salary_detail.rml               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
index e1fcf7251f6..ffd6ab5a559 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
@@ -239,7 +239,7 @@
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Footer" fontName="Helvetica"/>
     <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -392,7 +392,7 @@
         <font color="white"> </font>
       </para>
       <section>
-        <blockTable colWidths="785.0" style="Table7">
+        <blockTable colWidths="803.0" style="Table7">
           <tr>
             <td>
               <para style="terp_tblheader_Details">Allowances with Basic: </para>
@@ -472,7 +472,7 @@
             </tr>
           </blockTable>
         </section>
-        <blockTable colWidths="785.0" style="Table10">
+        <blockTable colWidths="803.0" style="Table10">
           <tr>
             <td>
               <para style="terp_tblheader_Details">Deductions: </para>

From 5f8de6a93d3a61706e9c8c8fc965d10ba4e9413b Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 23 Aug 2012 12:46:56 +0530
Subject: [PATCH 503/999] [FIX]l10n_in_hr_payroll:basic,gross and net are bold

bzr revid: kbh@tinyerp.com-20120823071656-jedj3au7gyv829mq
---
 .../report/report_hr_yearly_salary_detail.rml               | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
index ffd6ab5a559..5adb86a7292 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
@@ -404,7 +404,8 @@
           <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table6">
             <tr>
               <td>
-                <para style="terp_default_9">[[ e1[0] ]]</para>
+                <para style="terp_default_9"><b>[[ e1[0] in ["Basic","Gross"] and e1[0] ]]</b> </para>
+                <para style="terp_default_9">[[ e1[0] not in ["Basic","Gross"] and e1[0] ]]</para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
@@ -484,7 +485,8 @@
           <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table8">
             <tr>
               <td>
-                <para style="terp_default_9">[[ e2[0] ]]</para>
+                <para style="terp_default_9"><b>[[ e2[0] in ["Net"] and e2[0] ]]</b> </para>
+                <para style="terp_default_9">[[ e2[0] not in ["Net"] and e2[0] ]]</para>
               </td>
               <td>
                 <para style="terp_default_Right_8">

From e2e266e9add069640deaccbaa1c7e01d4825f49f Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 23 Aug 2012 14:44:32 +0530
Subject: [PATCH 504/999] [FIX]l10n_in_hr_payroll:basic,gross and net with
 amount are bold,removed header

bzr revid: kbh@tinyerp.com-20120823091432-irrs4yxn9xir0fz2
---
 .../report/report_hr_yearly_salary_detail.rml | 76 ++++++++++++-------
 1 file changed, 49 insertions(+), 27 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
index 5adb86a7292..7fa127b0bd3 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
@@ -247,7 +247,6 @@
     <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -262,8 +261,7 @@
     <blockTable colWidths="785.0" style="Table12">
       <tr>
         <td>
-          <para style="terp_header_Centre">Employees Salary Details </para>
-          <para style="terp_default_Centre_9">From [[ formatLang(data['form']['date_from'], date=True) ]] To [[ formatLang(data['form']['date_to'], date=True) ]]</para>
+          <para style="terp_default_Centre_9">From <u>[[ formatLang(data['form']['date_from'], date=True) ]]</u> To <u>[[ formatLang(data['form']['date_to'], date=True) ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -409,62 +407,74 @@
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
@@ -490,62 +500,74 @@
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>
                 <para style="terp_default_Right_8">
-                  <font face="Helvetica" size="7.0">[[ (e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
                 </para>
               </td>
               <td>

From e7a5fcd896c84d5b93f9ac463335690d75780e2f Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 23 Aug 2012 15:11:11 +0530
Subject: [PATCH 505/999] [FIX] Improved code to encode accented char.

bzr revid: tpa@tinyerp.com-20120823094111-vph3jpaxb29hoqqm
---
 addons/stock/report/stock_graph.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py
index b5d08f93d3f..d92de2805b5 100644
--- a/addons/stock/report/stock_graph.py
+++ b/addons/stock/report/stock_graph.py
@@ -22,7 +22,7 @@ from pychart import *
 import pychart.legend
 import time
 from report.misc import choice_colors
-import base64
+import tools
 
 #
 # Draw a graph for stocks
@@ -42,7 +42,7 @@ class stock_graph(object):
             product_name=product_name.replace('/', '//')
         if product_id not in self._datas:
             self._datas[product_id] = {}
-        self._names[product_id] = product_name.decode('utf-8')
+        self._names[product_id] = tools.ustr(product_name)
         for (dt,stock) in datas:
             if not dt in self._datas[product_id]:
                 self._datas[product_id][dt]=0

From 7fa945142870f782402d66a851366a5063ed31dc Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Thu, 23 Aug 2012 15:21:41 +0530
Subject: [PATCH 506/999] [IMP] Added onchange on company to fetch currency
 related to it

bzr revid: pso@tinyerp.com-20120823095141-oc840e23y1sk1mjs
---
 addons/account/account.py       |  6 +++
 addons/account/account_view.xml |  2 +-
 addons/account/res_config.py    | 75 +++++++++++++++++----------------
 3 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index c10935a38fc..d318fbc06f5 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3004,6 +3004,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'purchase_tax_rate': fields.float('Purchase Tax(%)'),
         'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'),
     }
+    
+    def onchange_company_id(self, cr, uid, ids, company_id, context=None):
+        currency_id = False        
+        if company_id:
+            currency_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.id
+        return {'value': {'currency_id': currency_id}}
 
     def onchange_tax_rate(self, cr, uid, ids, rate=False, context=None):
         return {'value': {'purchase_tax_rate': rate or False}}
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ca032808716..8eeb9f0a5e0 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2370,7 +2370,7 @@
                     <field name="complete_tax_set" invisible="1"/>
                     <div groups="base.group_multi_company">
                         <label for="company_id"/>
-                        <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+                        <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                     </div>
                     <label for="currency_id"/>
                     <field name="currency_id" />
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 658f87962ff..9674cd0e65c 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -145,42 +145,45 @@ class account_config_settings(osv.osv_memory):
 
     def onchange_company_id(self, cr, uid, ids, company_id):
         # update related fields
-        company = self.pool.get('res.company').browse(cr, uid, company_id)
-        has_chart_of_accounts = company_id not in self.pool.get('account.installer').get_unconfigured_cmp(cr, uid)
-        fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
-            [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
-             ('company_id', '=', company_id)])
-        values = {
-            'expects_chart_of_accounts': company.expects_chart_of_accounts,
-            'currency_id': company.currency_id.id,
-            'paypal_account': company.paypal_account,
-            'company_footer': company.rml_footer2,
-            'has_chart_of_accounts': has_chart_of_accounts,
-            'has_fiscal_year': bool(fiscalyear_count),
-            'chart_template_id': False,
-            'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
-        }
-        # update journals and sequences
-        for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
-            for suffix in ('_journal_id', '_sequence_prefix', '_sequence_next'):
-                values[journal_type + suffix] = False
-        journal_obj = self.pool.get('account.journal')
-        journal_ids = journal_obj.search(cr, uid, [('company_id', '=', company_id)])
-        for journal in journal_obj.browse(cr, uid, journal_ids):
-            if journal.type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
-                values.update({
-                    journal.type + '_journal_id': journal.id,
-                    journal.type + '_sequence_prefix': journal.sequence_id.prefix,
-                    journal.type + '_sequence_next': journal.sequence_id.number_next,
-                })
-        # update taxes
-        ir_values = self.pool.get('ir.values')
-        taxes_id = ir_values.get_default(cr, uid, 'product.product', 'taxes_id', company_id=company_id)
-        supplier_taxes_id = ir_values.get_default(cr, uid, 'product.product', 'supplier_taxes_id', company_id=company_id)
-        values.update({
-            'default_sale_tax': isinstance(taxes_id, list) and taxes_id[0] or taxes_id,
-            'default_purchase_tax': isinstance(supplier_taxes_id, list) and supplier_taxes_id[0] or supplier_taxes_id,
-        })
+        values = {}
+        values['currency_id'] = False
+        if company_id:
+            company = self.pool.get('res.company').browse(cr, uid, company_id)
+            has_chart_of_accounts = company_id not in self.pool.get('account.installer').get_unconfigured_cmp(cr, uid)
+            fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
+                [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
+                 ('company_id', '=', company_id)])
+            values = {
+                'expects_chart_of_accounts': company.expects_chart_of_accounts,
+                'currency_id': company.currency_id.id,
+                'paypal_account': company.paypal_account,
+                'company_footer': company.rml_footer2,
+                'has_chart_of_accounts': has_chart_of_accounts,
+                'has_fiscal_year': bool(fiscalyear_count),
+                'chart_template_id': False,
+                'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
+            }
+            # update journals and sequences
+            for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
+                for suffix in ('_journal_id', '_sequence_prefix', '_sequence_next'):
+                    values[journal_type + suffix] = False
+            journal_obj = self.pool.get('account.journal')
+            journal_ids = journal_obj.search(cr, uid, [('company_id', '=', company_id)])
+            for journal in journal_obj.browse(cr, uid, journal_ids):
+                if journal.type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
+                    values.update({
+                        journal.type + '_journal_id': journal.id,
+                        journal.type + '_sequence_prefix': journal.sequence_id.prefix,
+                        journal.type + '_sequence_next': journal.sequence_id.number_next,
+                    })
+            # update taxes
+            ir_values = self.pool.get('ir.values')
+            taxes_id = ir_values.get_default(cr, uid, 'product.product', 'taxes_id', company_id=company_id)
+            supplier_taxes_id = ir_values.get_default(cr, uid, 'product.product', 'supplier_taxes_id', company_id=company_id)
+            values.update({
+                'default_sale_tax': isinstance(taxes_id, list) and taxes_id[0] or taxes_id,
+                'default_purchase_tax': isinstance(supplier_taxes_id, list) and supplier_taxes_id[0] or supplier_taxes_id,
+            })
         return {'value': values}
 
     def onchange_chart_template_id(self, cr, uid, ids, chart_template_id, context=None):

From ef860e197e7480a3dbef9fb2fa7d4bc9a81f62f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 23 Aug 2012 11:59:20 +0200
Subject: [PATCH 507/999] [REV] mail_thread: many2many_reference is back for
 message_follower_ids. Tests will come to test this field effectively works as
 required.

bzr revid: tde@openerp.com-20120823095920-n7k7aarl14fvw1j9
---
 addons/mail/mail_thread.py | 67 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 8e5222f6d04..9f43087cd6a 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -38,6 +38,67 @@ _logger = logging.getLogger(__name__)
 def decode_header(message, header, separator=' '):
     return separator.join(map(decode,message.get_all(header, [])))
 
+class many2many_reference(fields.many2many):
+    """ many2many_reference is an override of fields.many2many. It manages
+        many2many-like table where one id is given by two fields, res_model
+        and res_id.
+    """
+    
+    def _get_query_and_where_params(self, cr, model, ids, values, where_params):
+        """ Add in where:
+            - ``mail_followers``.res_model = 'crm.lead'
+        """
+        # reference column name: given by attribute or res_model
+        ref_col_name = self.ref_col_name if self.ref_col_name else 'res_model'
+        values.update({'ref_col_name': ref_col_name, 'ref_col_value': model._name})
+
+        query = 'SELECT %(rel)s.%(id2)s, %(rel)s.%(id1)s \
+                    FROM %(rel)s, %(from_c)s \
+                    WHERE %(rel)s.%(id1)s IN %%s \
+                    AND %(rel)s.%(id2)s = %(tbl)s.id \
+                    AND %(rel)s.%(ref_col_name)s = \'%(ref_col_value)s\' \
+                    %(where_c)s  \
+                    %(order_by)s \
+                    %(limit)s \
+                    OFFSET %(offset)d' \
+                % values
+        return query, where_params
+
+    def set(self, cr, model, id, name, values, user=None, context=None):
+        """ Override to add the res_model field in queries. """
+        if not values: return
+        rel, id1, id2 = self._sql_names(model)
+        obj = model.pool.get(self._obj)
+        # reference column name: given by attribute or res_model
+        ref_col_name = self.ref_col_name if self.ref_col_name else 'res_model'
+        for act in values:
+            if not (isinstance(act, list) or isinstance(act, tuple)) or not act:
+                continue
+            if act[0] == 0:
+                idnew = obj.create(cr, user, act[2], context=context)
+                cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+','+ref_col_name+') VALUES (%s,%s,%s)', (id, idnew, model._name))
+            elif act[0] == 3:
+                cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND '+ref_col_name+'=%s', (id, act[1], model._name))
+            elif act[0] == 4:
+                # following queries are in the same transaction - so should be relatively safe
+                cr.execute('SELECT 1 FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND '+ref_col_name+'=%s', (id, act[1], model._name))
+                if not cr.fetchone():
+                    cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+','+ref_col_name+') VALUES (%s,%s,%s)', (id, act[1], model._name))
+            elif act[0] == 5:
+                cr.execute('delete from '+rel+' where '+id1+' = %s AND '+ref_col_name+'=%s', (id, model._name))
+            elif act[0] == 6:
+                d1, d2,tables = obj.pool.get('ir.rule').domain_get(cr, user, obj._name, context=context)
+                if d1:
+                    d1 = ' and ' + ' and '.join(d1)
+                else:
+                    d1 = ''
+                cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND '+ref_col_name+'=%s AND '+id2+' IN (SELECT '+rel+'.'+id2+' FROM '+rel+', '+','.join(tables)+' WHERE '+rel+'.'+id1+'=%s AND '+rel+'.'+id2+' = '+obj._table+'.id '+ d1 +')', [id, model._name, id]+d2)
+                for act_nbr in act[2]:
+                    cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+','+ref_col_name+') VALUES (%s,%s,%s)', (id, act_nbr, model._name))
+            # cases 1, 2: performs write and unlink -> default implementation is ok
+            else:
+                return super(many2many_reference, self).set(cr, model, id, name, values, user, context)
+
 class mail_thread(osv.Model):
     '''Mixin model, meant to be inherited by any model that needs to
        act as a discussion topic on which messages can be attached.
@@ -102,9 +163,9 @@ class mail_thread(osv.Model):
     _columns = {
         'message_is_follower': fields.function(_get_message_data,
             type='boolean', string='Is a Follower', multi='_get_message_data'),
-        # missing domain on model
-        'message_follower_ids': fields.many2many('res.partner', 'mail_followers', 'res_id', 'partner_id',
-            string='Followers'),
+        'message_follower_ids': many2many_reference('res.partner',
+            'mail_followers', 'res_id', 'partner_id',
+            ref_col_name='res_model', string='Followers'),
         'message_ids': fields.one2many('mail.message', 'res_id',
             domain=lambda self: [('model','=',self._name)],
             string='Related Messages', 

From 2c0602e737c06ba29657443b380b64a9a1e308fb Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Thu, 23 Aug 2012 16:18:53 +0530
Subject: [PATCH 508/999] [IMP] Put a ok button on  footer in complete survey
 form.

bzr revid: vba@tinyerp.com-20120823104853-srnbph0zryj9zh4h
---
 addons/survey/wizard/survey_answer.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index d75d473452c..d4b73187907 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -370,7 +370,6 @@ class survey_question_wiz(osv.osv_memory):
  
                     xml_footer = etree.SubElement(xml_form, 'footer', {'col': '8', 'colspan': '1', 'width':"100%"})
 
-
                     if pre_button:
                         etree.SubElement(xml_footer, 'label', {'string': ""})
                         etree.SubElement(xml_footer, 'button', {'name':"action_previous",'string':"Previous",'type':"object"})
@@ -434,12 +433,12 @@ class survey_question_wiz(osv.osv_memory):
                             mail_message.schedule_with_attach(cr, uid, user_email, [resp_email], "Survey Answer Of " + str(user_name) , mail, attachments=attachments, context=context)
 
                     xml_form = etree.Element('form', {'string': _('Complete Survey Answer')})
-                    xml_header = etree.SubElement(xml_form, 'header', {'col': '6', 'colspan': '4' ,'class': 'oe_survey_title_height'})
+                    xml_footer = etree.SubElement(xml_form, 'footer', {'col': '6', 'colspan': '4' ,'class': 'oe_survey_title_height'})
 
                     etree.SubElement(xml_form, 'separator', {'string': 'Complete Survey', 'colspan': "4"})
                     etree.SubElement(xml_form, 'label', {'string': 'Thanks for your Answer'})
                     etree.SubElement(xml_form, 'newline')
-                    etree.SubElement(xml_header, 'button', {'special':"cancel",'string':"OK",'colspan':"2",'class':'oe_highlight'})
+                    etree.SubElement(xml_footer, 'button', {'special':"cancel",'string':"OK",'colspan':"2",'class':'oe_highlight'})
                     root = xml_form.getroottree()
                     result['arch'] = etree.tostring(root)
                     result['fields'] = {}

From ec67f4444772c18872d72f975259caf71f84a706 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 23 Aug 2012 17:01:15 +0530
Subject: [PATCH 509/999] [FIX] The trash can icons (on the right of lines)
 should be hidden when delete=false in the corresponding tree view

bzr revid: jam@tinyerp.com-20120823113115-7rc1skcdy6pekqq3
---
 addons/web/static/src/xml/base.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 05d921bc679..fe02ee5ff93 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -657,7 +657,7 @@
                     <t t-if="column.tag !== 'button'"><t t-esc="column.string"/></t>
                 </th>
             </t>
-            <th t-if="options.deletable" width="13px"/>
+            <th t-if="options.deletable and _is_action_enabled('delete')" width="13px"/>
         </tr>
     </thead>
     <tfoot>
@@ -666,7 +666,7 @@
             <td t-foreach="aggregate_columns" t-as="column" class="oe_list_footer oe_number"
                 t-att-data-field="column.id" t-att-title="column.label">
             </td>
-            <td t-if="options.deletable"/>
+            <td t-if="options.deletable and _is_action_enabled('delete')"/>
         </tr>
     </tfoot>
 </table>
@@ -713,7 +713,7 @@
             t-att-data-field="column.id"
             ><t t-raw="render_cell(record, column)"/></td>
     </t>
-    <td t-if="options.deletable" class='oe_list_record_delete' width="13px">
+    <td t-if="options.deletable and view._is_action_enabled('delete')" class='oe_list_record_delete' width="13px">
         <button type="button" name="delete" class="oe_i">d</button>
     </td>
 </tr>

From 51df98c72ad95edb466cc3a773c59dfc9155071b Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 23 Aug 2012 17:15:57 +0530
Subject: [PATCH 510/999] [FIX] the link 'Add a row' should be hidden when
 create='false' in the corresponding tree view

bzr revid: jam@tinyerp.com-20120823114557-ibid3ob03k864o06
---
 addons/web/static/src/js/view_form.js | 60 ++++++++++++++-------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 069c1840611..97e4b976c04 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3578,36 +3578,38 @@ instance.web.form.One2ManyList = instance.web.ListView.List.extend({
         }).length;
         if (this.options.selectable) { columns++; }
         if (this.options.deletable) { columns++; }
-        var $cell = $('<td>', {
-            colspan: columns,
-            'class': 'oe_form_field_one2many_list_row_add'
-        }).append(
-            $('<a>', {href: '#'}).text(_t("Add a row"))
-                .mousedown(function () {
-                    // FIXME: needs to be an official API somehow
-                    if (self.view.editor.is_editing()) {
-                        self.view.__ignore_blur = true;
-                    }
-                })
-                .click(function (e) {
-                    e.preventDefault();
-                    e.stopPropagation();
-                    // FIXME: there should also be an API for that one
-                    if (self.view.editor.form.__blur_timeout) {
-                        clearTimeout(self.view.editor.form.__blur_timeout);
-                        self.view.editor.form.__blur_timeout = false;
-                    }
-                    self.view.ensure_saved().then(function () {
-                        self.view.do_add_record();
-                    });
-                }));
+        if (this.view._is_action_enabled('create')){
+            var $cell = $('<td>', {
+                colspan: columns,
+                'class': 'oe_form_field_one2many_list_row_add'
+            }).append(
+                $('<a>', {href: '#'}).text(_t("Add a row"))
+                    .mousedown(function () {
+                        // FIXME: needs to be an official API somehow
+                        if (self.view.editor.is_editing()) {
+                            self.view.__ignore_blur = true;
+                        }
+                    })
+                    .click(function (e) {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        // FIXME: there should also be an API for that one
+                        if (self.view.editor.form.__blur_timeout) {
+                            clearTimeout(self.view.editor.form.__blur_timeout);
+                            self.view.editor.form.__blur_timeout = false;
+                        }
+                        self.view.ensure_saved().then(function () {
+                            self.view.do_add_record();
+                        });
+                    }));
 
-        var $padding = this.$current.find('tr:not([data-id]):first');
-        var $newrow = $('<tr>').append($cell);
-        if ($padding.length) {
-            $padding.before($newrow);
-        } else {
-            this.$current.append($newrow)
+            var $padding = this.$current.find('tr:not([data-id]):first');
+            var $newrow = $('<tr>').append($cell);
+            if ($padding.length) {
+                $padding.before($newrow);
+            } else {
+                this.$current.append($newrow)
+            }
         }
     }
 });

From 61a45e9268d149120e7d1e46a75fecafc8953005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 23 Aug 2012 14:24:26 +0200
Subject: [PATCH 511/999] [IMP] mail_thread: message_follower_ids: simplified
 message_subscribe code, now that we use the many2many modified field.
 Subscrubing is now a simple write on the field.

bzr revid: tde@openerp.com-20120823122426-o08nh8gxx93kizjl
---
 addons/mail/mail_thread.py | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 9f43087cd6a..d21aae67c87 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -637,35 +637,15 @@ class mail_thread(osv.Model):
         return self.message_subscribe(cr, uid, ids, partner_ids, context=context)
 
     def message_subscribe(self, cr, uid, ids, partner_ids, context=None):
-        """ Add partners to the records followers. This implementation cannot
-            directly use [(4, partner_id)] because of the res_model column of
-            mail.followers. We therefore check access rights and access rules
-            before directly creating a follower record. This way we simulate
-            a write in message_follower_ids, enabling a correct check of access
-            rights.
+        """ Add partners to the records followers.
 
             :param partner_ids: a list of partner_ids to subscribe
             :param return: new value of followers, for Chatter
         """
-        self.check_access_rights(cr, uid, 'write', raise_exception=True)
-        self.check_access_rule(cr, uid, ids, 'write', context=context)
-
-        fol_obj = self.pool.get('mail.followers')
-        fol_ids = fol_obj.search(cr, uid, [
-            ('res_id', 'in', ids), ('res_model', '=', self._name), ('partner_id', 'in', partner_ids)
-            ], context=context)
-        followers = {}
-        for fol in fol_obj.browse(cr, uid, fol_ids, context=context):
-            followers.setdefault(fol.partner_id.id, []).append(fol.res_id)
-
-        for res_id in ids:
-            for partner_id in partner_ids:
-                if not res_id in followers.get(partner_id, []):
-                    fol_obj.create(cr, uid, {
-                        'res_id': res_id, 'partner_id': partner_id, 'res_model': self._name
-                        }, context=context)
+        self.write(cr, uid, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
         # TDE: temp, must check followers widget
         return []
+        # return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
 
     def message_unsubscribe_users(self, cr, uid, ids, user_ids=None, context=None):
         """ Wrapper on message_subscribe, using users. If user_ids is not
@@ -682,9 +662,9 @@ class mail_thread(osv.Model):
             :param return: new value of followers, for Chatter
         """
         self.write(cr, uid, ids, {'message_follower_ids': [(3, pid) for pid in partner_ids]}, context=context)
-        # return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
         # TDE: temp, must check followers widget
         return []
+        # return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
 
     #------------------------------------------------------
     # Notification API

From 690bc2ece98516c1ef756b2e3e9f5435db422c07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 23 Aug 2012 14:25:37 +0200
Subject: [PATCH 512/999] [TEST] mail: added tests for the many2many modified
 field used for follower_ids. Added tests for the subscriber API.

bzr revid: tde@openerp.com-20120823122537-g0m5jtkq67jhuone
---
 addons/mail/tests/test_mail.py | 122 ++++++++++++++++++++++++++++++++-
 1 file changed, 119 insertions(+), 3 deletions(-)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index a9da19e90fa..a1249994ebd 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -71,17 +71,20 @@ class test_mail(common.TransactionCase):
         self.mail_alias = self.registry('mail.alias')
         self.mail_thread = self.registry('mail.thread')
         self.mail_group = self.registry('mail.group')
+        self.mail_notification = self.registry('mail.notification')
+        self.mail_followers = self.registry('mail.followers')
         self.res_users = self.registry('res.users')
+        self.res_partner = self.registry('res.partner')
 
         # groups@.. will cause the creation of new mail groups
         self.mail_group_model_id = self.ir_model.search(self.cr, self.uid, [('model','=', 'mail.group')])[0]
         self.mail_alias.create(self.cr, self.uid, {'alias_name': 'groups',
                                                    'alias_model_id': self.mail_group_model_id})
         
-        # tech@... will append new messages to the 'tech' group 
-        self.group_tech_id = self.mail_group.create(self.cr, self.uid, {'name': 'tech'})
+        # create a 'pigs' group that will be used through the various tests
+        self.group_pigs_id = self.mail_group.create(self.cr, self.uid, {'name': 'pigs'})
 
-    def test_message_process(self):
+    def test_00_message_process(self):
         cr, uid = self.cr, self.uid
         # Incoming mail creates a new mail_group "frogs"
         self.assertEqual(self.mail_group.search(cr, uid, [('name','=','frogs')]), [])
@@ -111,3 +114,116 @@ class test_mail(common.TransactionCase):
         self.assertRaises(Exception,
                           self.mail_thread.message_process,
                           cr, uid, None, mail_spam)
+
+    def test_01_many2many_reference_field(self):
+        """ Tests designed for the many2many_reference field (follower_ids).
+            We will test to perform write using the many2many commands 0, 3, 4,
+            5 and 6. """
+        cr, uid = self.cr, self.uid
+        user_admin = self.res_users.browse(cr, uid, uid)
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+
+        # Create partner Bert Poilu partner
+        partner_bert_id = self.res_partner.create(cr, uid, {'name': 'Bert Poilu'})
+
+        # Create 'disturbing' values in mail.followers: same res_id, other res_model; same res_model, other res_id
+        group_dummy_id = self.mail_group.create(cr, uid,
+            {'name': 'Dummy group'})
+        self.mail_followers.create(cr, uid,
+            {'res_model': 'mail.thread', 'res_id': self.group_pigs_id, 'partner_id': partner_bert_id})
+        self.mail_followers.create(cr, uid,
+            {'res_model': 'mail.group', 'res_id': group_dummy_id, 'partner_id': partner_bert_id})
+
+        # Pigs just created: should be only Admin as follower
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertTrue(len(follower_ids) == 1,
+            'Newly created group should have only 1 follower')
+        self.assertTrue(user_admin.partner_id.id in follower_ids,
+            'Admin should be the only Pigs group follower')
+
+        # Subscribe Bert through a '4' command
+        group_pigs.write({'message_follower_ids': [(4, partner_bert_id)]})
+        group_pigs.refresh()
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertTrue(len(follower_ids) == 2,
+            'Pigs group should have 2 followers after linking Bert')
+        self.assertTrue(all(id in follower_ids for id in [partner_bert_id, user_admin.partner_id.id]),
+            'Bert and Admin should be the 2 Pigs group followers')
+
+        # Unsubscribe Bert through a '3' command
+        group_pigs.write({'message_follower_ids': [(3, partner_bert_id)]})
+        group_pigs.refresh()
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertTrue(len(follower_ids) == 1,
+            'Pigs group should have 1 follower after unlinking Bert')
+        self.assertTrue(all(id in follower_ids for id in [user_admin.partner_id.id]),
+            'Admin should be the only Pigs group follower')
+
+        # Set followers through a '6' command
+        group_pigs.write({'message_follower_ids': [(6, 0, [partner_bert_id])]})
+        group_pigs.refresh()
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertTrue(len(follower_ids) == 1,
+            'Pigs group should have 1 follower after replacing followers')
+        self.assertTrue(follower_ids == [partner_bert_id],
+            'Bert should be the only Pigs group follower')
+
+        # Add a follower created on the fly through a '0' command
+        group_pigs.write({'message_follower_ids': [(0, 0, {'name': 'Patrick Fiori'})]})
+        partner_patrick_id = self.res_partner.search(cr, uid, [('name', '=', 'Patrick Fiori')])[0]
+        group_pigs.refresh()
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertTrue(len(follower_ids) == 2,
+            'Pigs group should have 2 followers after linking to new partner')
+        self.assertTrue(all(id in follower_ids for id in [partner_bert_id, partner_patrick_id]),
+            'Bert and Patrick should be Pigs group followers')
+
+        # Finally, unlink through a '5' command
+        group_pigs.write({'message_follower_ids': [(5, 0)]})
+        group_pigs.refresh()
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertTrue(len(follower_ids) == 0,
+            'Pigs group should not have followers anymore')
+
+        # Test dummy data has not been altered
+        fol_obj_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.thread'), ('res_id', '=', self.group_pigs_id)])
+        follower_ids = [follower.partner_id.id for follower in self.mail_followers.browse(cr, uid, fol_obj_ids)]
+        self.assertTrue(len(follower_ids) == 1,
+            'mail.thread dummy data should have 1 follower')
+        self.assertTrue(follower_ids[0] == partner_bert_id,
+            'Bert should be the follower of dummy mail.thread data')
+        fol_obj_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', group_dummy_id)])
+        follower_ids = [follower.partner_id.id for follower in self.mail_followers.browse(cr, uid, fol_obj_ids)]
+        self.assertTrue(len(follower_ids) == 2,
+            'mail.group dummy data should have 2 followers')
+        self.assertTrue(all(id in follower_ids for id in [partner_bert_id, user_admin.partner_id.id]),
+            'Bert and Admin should be the followers of dummy mail.group data')
+
+    def test_02_message_followers(self):
+        """ Tests designed for the subscriber API. """
+        cr, uid = self.cr, self.uid
+        user_admin = self.res_users.browse(cr, uid, uid)
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+
+        # Create user Raoul
+        user_raoul_id = self.res_users.create(cr, uid, {'name': 'Raoul Grosbedon', 'login': 'raoul'})
+        user_raoul = self.res_users.browse(cr, uid, user_raoul_id)
+
+        # Subscribe Raoul twice (niak niak) through message_subscribe_users
+        group_pigs.message_subscribe_users([user_raoul_id, user_raoul_id])
+        group_pigs.refresh()
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertTrue(len(follower_ids) == 2,
+            'Pigs group should have 2 followers after having subscribed Raoul. Subscribing twice '\
+            'the same user should create only one follower.')
+        self.assertTrue(all(id in follower_ids for id in [user_raoul.partner_id.id, user_admin.partner_id.id]),
+            'Admin and Raoul should be the 2 Pigs group followers')
+
+        # Unsubscribe Raoul twice through message_unsubscribe_users
+        group_pigs.message_unsubscribe_users([user_raoul_id, user_raoul_id])
+        group_pigs.refresh()
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertTrue(len(follower_ids) == 1,
+            'Pigs group should have 1 follower after unsubscribing Raoul')
+        self.assertTrue(all(id in follower_ids for id in [user_admin.partner_id.id]),
+            'Admin the only Pigs group followers')

From 86fa2842115a5101718acb1cd7216a1fe431243f Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Thu, 23 Aug 2012 18:06:36 +0530
Subject: [PATCH 513/999] [IMP] res_company : new method added to store
 readonly field

bzr revid: rpr@tinyerp.com-20120823123636-mplz3vmt8zlosl6w
---
 openerp/addons/base/res/res_company.py       | 6 +++++-
 openerp/addons/base/res/res_company_view.xml | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index e55ea8fdfe0..fca1f6d1dd4 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -137,6 +137,8 @@ class res_company(osv.osv):
     _sql_constraints = [
         ('name_uniq', 'unique (name)', 'The company name must be unique !')
     ]
+    def _set_rml_footer(self, cr, uid, ids, footer=False, context=None):
+        return self.write(cr, uid, ids, {'rml_footer': footer}, context)
     def on_change_header(self, cr, uid, ids, customize_footer, phone, email, fax, website, vat, reg=False, context=None):
         val = []
         if customize_footer:
@@ -147,7 +149,9 @@ class res_company(osv.osv):
         if website: val.append(_('Website: ')+website)
         if vat: val.append(_('TIN: ')+vat)
         if reg: val.append(_('Reg: ')+reg)
-        return {'value': {'rml_footer':' | '.join(val)}}
+        footer = ' | '.join(val)
+        self._set_rml_footer(cr, uid, ids, footer, context=context)
+        return {'value': {'rml_footer': footer}}
 
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 6703d8b7b09..16f2813075f 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -71,7 +71,7 @@
                                 <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
                                 <label for="rml_footer"/>
                                 <div name="bank_acc">
-                                    <field name="rml_footer"/>
+                                    <field name="rml_footer" attrs="{'readonly': [('customize_footer','=', False)]}"/>
                                     <!--<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward" class="oe_inline"/>-->
                                 </div>
                             </group>

From 49e7c4c02ce97cdf3445fcce3172b61e38e47874 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Thu, 23 Aug 2012 18:11:49 +0530
Subject: [PATCH 514/999] [IMP] res_company : space placed

bzr revid: rpr@tinyerp.com-20120823124149-24knmbko0gkv56x0
---
 openerp/addons/base/res/res_company.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index fca1f6d1dd4..afd34e38b0c 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -137,8 +137,10 @@ class res_company(osv.osv):
     _sql_constraints = [
         ('name_uniq', 'unique (name)', 'The company name must be unique !')
     ]
+
     def _set_rml_footer(self, cr, uid, ids, footer=False, context=None):
-        return self.write(cr, uid, ids, {'rml_footer': footer}, context)
+        return self.write(cr, uid, ids, {'rml_footer': footer}, context=context)
+
     def on_change_header(self, cr, uid, ids, customize_footer, phone, email, fax, website, vat, reg=False, context=None):
         val = []
         if customize_footer:

From f3b43da73bebb93c04fb00d6800c6ef376a05a22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 23 Aug 2012 15:11:44 +0200
Subject: [PATCH 515/999] [CLEAN] mail: res_partner: removed dead code. Also
 fixe da typo in mail tests.

bzr revid: tde@openerp.com-20120823131144-xbryqdesfw5ix8y9
---
 addons/mail/res_partner.py     | 14 +++-----------
 addons/mail/tests/test_mail.py |  2 +-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 6f1808c1612..c8b1e9c9240 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -22,20 +22,10 @@
 from osv import osv, fields
 
 class res_partner_mail(osv.Model):
-    """ Inherits partner and adds CRM information in the partner form """
+    """ Update partner to add a field about notification preferences """
     _name = "res.partner"
     _inherit = ['res.partner', 'mail.thread']
 
-    def message_search_get_domain(self, cr, uid, ids, context=None):
-        """ Override of message_search_get_domain for partner discussion page.
-            The purpose is to add messages directly sent to the partner. It also
-            adds messages pushed to the related user, if any, using @login.
-        """
-        if self._name != 'res.partner':
-            return super(res_partner_mail, self).message_search_get_domain(cr, uid, ids, context=context)
-        # add message linked to the partner
-        return [('partner_ids', 'in', ids)]
-
     _columns = {
         'notification_email_pref': fields.selection([
             ('all', 'All feeds'),
@@ -45,8 +35,10 @@ class res_partner_mail(osv.Model):
             help="Choose in which case you want to receive an email when you "\
                   "receive new feeds."),
     }
+
     _defaults = {
         'notification_email_pref': lambda *args: 'comment'
     }
 
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index a1249994ebd..a424a408067 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -117,7 +117,7 @@ class test_mail(common.TransactionCase):
 
     def test_01_many2many_reference_field(self):
         """ Tests designed for the many2many_reference field (follower_ids).
-            We will test to perform write using the many2many commands 0, 3, 4,
+            We will test to perform writes using the many2many commands 0, 3, 4,
             5 and 6. """
         cr, uid = self.cr, self.uid
         user_admin = self.res_users.browse(cr, uid, uid)

From c7c93bf42f7a6fea1195d4120be69cab98a820d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 23 Aug 2012 15:45:08 +0200
Subject: [PATCH 516/999] [CLEAN] mail_group: small cleaning in comments; write
 before subscribing.

bzr revid: tde@openerp.com-20120823134508-3d1yawov0lv87jx5
---
 addons/mail/res_users.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 86fd048479c..babf2213bd5 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -129,10 +129,9 @@ class res_users(osv.Model):
         return res
 
 class res_users_mail_group(osv.Model):
-    """ Update of res.groups class
-        - if adding/removing users from a group, check mail.groups linked to
-          this user group, and subscribe / unsubscribe them from the discussion
-          group. This is done by overriding the write method.
+    """ Update of res.users class
+        - if adding groups to an user, check mail.groups linked to this user
+          group, and the user. This is done by overriding the write method.
     """
     _name = 'res.users'
     _inherit = ['res.users']
@@ -151,15 +150,15 @@ class res_users_mail_group(osv.Model):
 
 class res_groups_mail_group(osv.Model):
     """ Update of res.groups class
-        - if adding/removing users from a group, check mail.groups linked to
-          this user group, and subscribe / unsubscribe them from the discussion
-          group. This is done by overriding the write method.
+        - if adding users from a group, check mail.groups linked to this user
+          group and subscribe them. This is done by overriding the write method.
     """
     _name = 'res.groups'
     _inherit = 'res.groups'
 
     # FP Note: to improve, post processeing, after the super may be better
     def write(self, cr, uid, ids, vals, context=None):
+        write_res = super(res_groups_mail_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('users'):
             # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
             user_ids = [command[1] for command in vals['users'] if command[0] == 4]
@@ -167,5 +166,4 @@ class res_groups_mail_group(osv.Model):
             mail_group_obj = self.pool.get('mail.group')
             mail_group_ids = mail_group_obj.search(cr, uid, [('group_ids', 'in', ids)], context=context)
             mail_group_obj.message_subscribe_users(cr, uid, mail_group_ids, user_ids, context=context)
-        return super(res_groups_mail_group, self).write(cr, uid, ids, vals, context=context)
-
+        return write_res

From 08f22c7411f3b9efa9fd29c1d0ecf9e0e72728c9 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 23 Aug 2012 16:26:22 +0200
Subject: [PATCH 517/999] fix

bzr revid: fp@tinyerp.com-20120823142622-8dsevh9eqarj1nht
---
 addons/mail/mail_group_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index c303b1fd40b..8d7e229eccf 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -5,6 +5,7 @@
         <record id="action_mail_group_feeds" model="ir.actions.client">
             <field name="name">Discussion Group</field>
             <field name="tag">mail.wall</field>
+            <field name="res_model">mail.message</field>
         </record>
 
         <!-- Group Kanban View  !-->

From 84625969c0a724e0374f21f527ce9a04339ebbee Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 23 Aug 2012 16:35:25 +0200
Subject: [PATCH 518/999] [FIX] needaction on mail.groups

bzr revid: fp@tinyerp.com-20120823143525-28mnbgd015jd8yyd
---
 openerp/addons/base/ir/ir_actions.py | 3 +++
 openerp/addons/base/ir/ir_ui_menu.py | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index cf67e6fcf88..6f906f5c416 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -879,6 +879,8 @@ class act_client(osv.osv):
                                 "is no central tag repository across clients."),
         'res_model': fields.char('Destination Model', size=64, 
             help="Optional model, mostly used for needactions."),
+        'context': fields.char('Context Value', size=250, required=True,
+            help="Context dictionary as Python expression, empty by default (Default: {})"),
         'params': fields.function(_get_params, fnct_inv=_set_params,
                                   type='binary', 
                                   string="Supplementary arguments",
@@ -888,6 +890,7 @@ class act_client(osv.osv):
     }
     _defaults = {
         'type': 'ir.actions.client',
+        'context': '{}',
 
     }
 act_client()
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index eefa8ea4a50..05523faa550 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -269,8 +269,13 @@ class ir_ui_menu(osv.osv):
             if menu.action and menu.action.type in ('ir.actions.act_window','ir.actions.client') and menu.action.res_model:
                 obj = self.pool.get(menu.action.res_model)
                 if obj._needaction:
+                    dom = []
+                    if menu.action.type=='ir.actions.act_window':
+                        dom = menu.action.domain and eval(menu.action.domain, {'uid': uid}) or []
+                    else:
+                        dom = eval(menu.action.params_store or '{}', {'uid': uid}).get('domain')
                     res[menu.id]['needaction_enabled'] = obj._needaction
-                    res[menu.id]['needaction_counter'] = obj._needaction_count(cr, uid, menu.action.domain and eval(menu.action.domain), context=context)
+                    res[menu.id]['needaction_counter'] = obj._needaction_count(cr, uid, dom, context=context)
         return res
 
     _columns = {

From d0d14766fc5bda5eede3a3402f52b4e6ae11e01b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 23 Aug 2012 17:02:29 +0200
Subject: [PATCH 519/999] [FIX] mail.js: fixed do_action of Wall.

bzr revid: tde@openerp.com-20120823150229-7vp9hbfb80bo29xf
---
 addons/mail/static/src/js/mail.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 14183f13b1c..a3e53a9d948 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -251,6 +251,7 @@ openerp.mail = function(session) {
          * @param {Number} [options.records=null] records to show instead of fetching messages
          */
         init: function(parent, options) {
+            console.log(parent);
             this._super(parent);
             // options
             this.options = options || {};
@@ -374,7 +375,7 @@ openerp.mail = function(session) {
          * Normally it should be called only when clicking on 'Post/Send'
          * in the composition form. */
         do_action: function(action, on_close) {
-            console.log('thread do_action');
+            console.log('thread do_action', action, on_close, this);
             this.message_clean();
             this.message_fetch();
             if (this.compose_message_widget) {
@@ -600,6 +601,7 @@ openerp.mail = function(session) {
         },
 
         set_value: function() {
+            var self = this;
             this._super.apply(this, arguments);
             if (! this.view.datarecord.id || session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
                 this.$element.find('oe_mail_thread').hide();
@@ -611,7 +613,8 @@ openerp.mail = function(session) {
             // create and render Thread widget
             this.$element.find('div.oe_mail_recthread_main').empty();
             for (var i in this.thread_list) { this.thread_list[i].destroy(); }
-            var thread = new mail.Thread(this, {
+            console.log(this);
+            var thread = new mail.Thread(self, {
                 'context': this.options.context, 'uid': this.session.uid,
                 'thread_level': this.options.thread_level, 'show_header_compose': true,
                 'show_delete': true, 'composer': true });
@@ -678,7 +681,7 @@ openerp.mail = function(session) {
             if (this.compose_message_widget) {
                 this.compose_message_widget.refresh(); }
             this.message_clean();
-            this.message_fetch();
+            this.display_thread();
             return this._super(action, on_close);
         },
 
@@ -729,7 +732,7 @@ openerp.mail = function(session) {
         display_thread: function () {
             var render_res = session.web.qweb.render('mail.wall_thread_container', {});
             $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(this.$element.find('ul.oe_mail_wall_threads'));
-            var thread = new mail.Thread(self, {
+            var thread = new mail.Thread(this, {
                 'domain': this.options.domain, 'context': this.options.context, 'uid': this.session.uid,
                 'thread_level': this.options.thread_level, 'composer': true,
                 // display options

From 462fc03987b9678d4bd1adb16a63ecb4cae9a3ed Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 23 Aug 2012 17:57:47 +0200
Subject: [PATCH 520/999] fix

bzr revid: fp@tinyerp.com-20120823155747-0ysezcil7hcy1sv0
---
 addons/mail/mail_followers.py | 2 ++
 addons/mail/mail_message.py   | 3 +--
 addons/mail/mail_thread.py    | 6 +++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 7734f8a0ec8..e6ce4af6592 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -83,6 +83,8 @@ class mail_notification(osv.Model):
             'subject': msg.subject
         }
         for partner in partner_obj.browse(cr, uid, partner_ids, context=context):
+            if partner.user_id.id == uid:
+                continue
             notification_obj.create(cr, uid, {
                 'partner_id': partner.id,
                 'message_id': msg_id
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index d8dbdcb5f49..79ecfdc9383 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -264,8 +264,7 @@ class mail_message(osv.Model):
             modobj = self.pool.get(values.get('model'))
             follower_notify = []
             for follower in modobj.browse(cr, uid, values.get('res_id'), context=context).message_follower_ids:
-                if follower.id <> uid:
-                    follower_notify.append(follower.id)
+                follower_notify.append(follower.id)
             self.pool.get('mail.notification').notify(cr, uid, follower_notify, newid, context=context)
         return newid
 
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index d21aae67c87..6a8f225234a 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -143,7 +143,7 @@ class mail_thread(osv.Model):
             res[notif.message_id.res_id]['message_unread'] = True
 
         for thread in self.browse(cr, uid, ids, context=context):
-            res[thread.id]['message_summary'] = "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(thread.message_ids), len(thread.message_follower_ids))
+            res[thread.id]['message_summary'] = "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(thread.message_comment_ids), len(thread.message_follower_ids))
             res[thread.id]['message_is_follower'] = user.partner_id.id in [follower.id for follower in thread.message_follower_ids]
         return res
 
@@ -166,6 +166,10 @@ class mail_thread(osv.Model):
         'message_follower_ids': many2many_reference('res.partner',
             'mail_followers', 'res_id', 'partner_id',
             ref_col_name='res_model', string='Followers'),
+        'message_comment_ids': fields.one2many('mail.message', 'res_id',
+            domain=lambda self: [('model','=',self._name),('type','in',('comment','email'))],
+            string='Related Messages', 
+            help="All messages related to the current document."),
         'message_ids': fields.one2many('mail.message', 'res_id',
             domain=lambda self: [('model','=',self._name)],
             string='Related Messages', 

From 2c29bd58f0b57587f5e67cf674f12a14e43587e3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 23 Aug 2012 18:04:16 +0200
Subject: [PATCH 521/999] [IMP] blue color on unread messages

bzr revid: fp@tinyerp.com-20120823160416-23a11k1ivu2md34v
---
 addons/crm/crm_lead_view.xml | 1 -
 addons/mail/mail_thread.py   | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 77aaf95deb8..63de20b42cd 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -341,7 +341,6 @@
                                         <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
-                                        <t t-if="record.message_unread.raw_value"><span class="oe_kanban_mail_new">New</span></t>
                                         <t t-raw="record.message_summary.raw_value"/>
                                     </div>
                                 </div>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 6a8f225234a..4493b226b18 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -143,7 +143,8 @@ class mail_thread(osv.Model):
             res[notif.message_id.res_id]['message_unread'] = True
 
         for thread in self.browse(cr, uid, ids, context=context):
-            res[thread.id]['message_summary'] = "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(thread.message_comment_ids), len(thread.message_follower_ids))
+            cls = res[thread.id]['message_unread'] and ' class="oe_kanban_mail_new"' or ''
+            res[thread.id]['message_summary'] = "<span%s><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (cls, len(thread.message_comment_ids), len(thread.message_follower_ids))
             res[thread.id]['message_is_follower'] = user.partner_id.id in [follower.id for follower in thread.message_follower_ids]
         return res
 

From d808f69390c8dff7ade2dacaeb1325144003c532 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 23 Aug 2012 18:16:55 +0200
Subject: [PATCH 522/999] imp_demo

bzr revid: fp@tinyerp.com-20120823161655-z823jx02ymg4kmky
---
 addons/mail/data/mail_demo.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index f69fd1b5820..ed30d38b8d3 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -3,7 +3,6 @@
     <data noupdate="1">
 
         <record id="message_blogpost0" model="mail.message">
-            <field name="subject">Internal company announce</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
             <field name="body"><![CDATA[Your monthly meal vouchers arrived. You can get them at Christine's office.

From 95a66586d9622c9c1f8a953f375db12088446a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 23 Aug 2012 20:06:48 +0200
Subject: [PATCH 523/999] [REF] [TEST] mail: cleaned the way followers are
 added to a message partner_ids (done in notify in mail.message) and the way
 emails are send (done in notify in mail.followers). Composition wizard
 override mail_message.notify to avoid having partners and sending emails.
 Also added tests that helped finding some bugs, that will be cleaned
 tomorrow.

bzr revid: tde@openerp.com-20120823180648-8xpu8qyf7qr6azc2
---
 addons/mail/mail_followers.py              | 18 ++++----
 addons/mail/mail_message.py                | 29 +++++++++----
 addons/mail/tests/test_mail.py             | 48 +++++++++++++++++++++-
 addons/mail/wizard/mail_compose_message.py |  7 +++-
 4 files changed, 81 insertions(+), 21 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index e6ce4af6592..671e2405b49 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -68,30 +68,27 @@ class mail_notification(osv.Model):
     # a message we can not read.
     # def create(self, ...)
 
-
-    # Create notification in the wall of each user
-    # Send by email the notification depending on the user preferences
     def notify(self, cr, uid, partner_ids, msg_id, context=None):
+        """ Send by email the notification depending on the user preferences """
         context = context or {}
         partner_obj = self.pool.get('res.partner')
-        msg_obj = self.pool.get('mail.message')
         notification_obj = self.pool.get('mail.notification')
+        msg_obj = self.pool.get('mail.message')
         msg = msg_obj.browse(cr, uid, msg_id, context=context)
 
         towrite = {
             'email_to': [],
             'subject': msg.subject
         }
+
         for partner in partner_obj.browse(cr, uid, partner_ids, context=context):
+            # Do not send an email to the writer
             if partner.user_id.id == uid:
                 continue
-            notification_obj.create(cr, uid, {
-                'partner_id': partner.id,
-                'message_id': msg_id
-            }, context=context)
+            # Partner does not want to receive any emails
             if partner.notification_email_pref=='none' or not partner.email:
                 continue
-
+            # Partners want to receive only emails and comments
             if partner.notification_email_pref=='comment' and msg.type in ('email','comment'):
                 continue
 
@@ -101,10 +98,11 @@ class mail_notification(osv.Model):
 
         if towrite.get('state', False) and not context.get('noemail', False):
             if towrite.get('subject', False):
-                towrite['subject'] = msg.name_get(cr, uid, [msg.id], context=context)[0][1]
+                towrite['subject'] = msg.name_get()[0][1]
             towrite['message_id'] = msg.id
             towrite['email_to'] = ', '.join(towrite['email_to'])
             mail_message_obj = self.pool.get('mail.mail')
             newid = mail_message_obj.create(cr, uid, towrite, context=context)
             mail_message_obj.send(cr, uid, [newid], context=context)
+
         return True
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 79ecfdc9383..46bfd25e1be 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -257,17 +257,28 @@ class mail_message(osv.Model):
     def create(self, cr, uid, values, context=None):
         newid = super(mail_message, self).create(cr, uid, values, context)
         self.check(cr, uid, [newid], mode='create', context=context)
-
-        # notify all followers
-        if values.get('model') and values.get('res_id'):
-            notification_obj = self.pool.get('mail.notification')
-            modobj = self.pool.get(values.get('model'))
-            follower_notify = []
-            for follower in modobj.browse(cr, uid, values.get('res_id'), context=context).message_follower_ids:
-                follower_notify.append(follower.id)
-            self.pool.get('mail.notification').notify(cr, uid, follower_notify, newid, context=context)
+        self.notify(cr, uid, newid, context=context)
         return newid
 
+    def notify(self, cr, uid, newid, context=None):
+        """ Add the related record followers to the destination partner_ids.
+            Call mail_notification.notify to manage the email sending
+        """
+        message = self.browse(cr, uid, newid, context=context)
+        partners_to_notify = []
+        # add all partner_ids of the message
+        if message.partner_ids:
+            for partner in message.partner_ids:
+                if partner.id not in partners_to_notify:
+                    partners_to_notify.append(partner.id)
+        # add all followers and set them as partner_ids
+        if message.model and message.res_id:
+            modobj = self.pool.get(message.model)
+            for follower in modobj.browse(cr, uid, message.res_id, context=context).message_follower_ids:
+                partners_to_notify.append(follower.id)
+                self.write(cr, uid, [newid], {'partner_ids': [(4, follower.id)]}, context=context)
+        self.pool.get('mail.notification').notify(cr, uid, partners_to_notify, newid, context=context)
+
     def read(self, cr, uid, ids, fields_to_read=None, context=None, load='_classic_read'):
         self.check(cr, uid, ids, 'read', context=context)
         return super(mail_message, self).read(cr, uid, ids, fields_to_read, context, load)
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index a424a408067..83c9f363c7f 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -71,6 +71,8 @@ class test_mail(common.TransactionCase):
         self.mail_alias = self.registry('mail.alias')
         self.mail_thread = self.registry('mail.thread')
         self.mail_group = self.registry('mail.group')
+        self.mail_mail = self.registry('mail.mail')
+        self.mail_message = self.registry('mail.message')
         self.mail_notification = self.registry('mail.notification')
         self.mail_followers = self.registry('mail.followers')
         self.res_users = self.registry('res.users')
@@ -123,7 +125,7 @@ class test_mail(common.TransactionCase):
         user_admin = self.res_users.browse(cr, uid, uid)
         group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
 
-        # Create partner Bert Poilu partner
+        # Create partner Bert Poilu
         partner_bert_id = self.res_partner.create(cr, uid, {'name': 'Bert Poilu'})
 
         # Create 'disturbing' values in mail.followers: same res_id, other res_model; same res_model, other res_id
@@ -227,3 +229,47 @@ class test_mail(common.TransactionCase):
             'Pigs group should have 1 follower after unsubscribing Raoul')
         self.assertTrue(all(id in follower_ids for id in [user_admin.partner_id.id]),
             'Admin the only Pigs group followers')
+
+    def test_10_mail_composer(self):
+        """ Tests designed for the mail.compose.message wizard. """
+        cr, uid = self.cr, self.uid
+        mail_compose = self.registry('mail.compose.message')
+        user_admin = self.res_users.browse(cr, uid, uid)
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        # print 'pigs message_ids: %s' % group_pigs.message_ids
+        # print 'pigs follower_ids: %s' % group_pigs.message_follower_ids
+
+        # Create partner Bert Poilu
+        partner_bert_id = self.res_partner.create(cr, uid, {'name': 'Bert Poilu', 'email': 'bert@poil.poil'})
+        partner_raoul_id = self.res_partner.create(cr, uid, {'name': 'Raoul Grosbedon'})
+
+        # Create a new comment on group_pigs
+        compose_id = mail_compose.create(cr, uid,
+            {'subject': 'Pigs', 'body_text': 'Pigs rules', 'partner_ids': [(4, partner_bert_id), (4, partner_raoul_id)]},
+            {'mail.compose.message': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_pigs_id})
+        # print 'wizard id: %s' % compose_id
+        compose = mail_compose.browse(cr, uid, compose_id)
+        # print 'wizard partner_ids: %s' % compose.partner_ids
+        self.assertTrue(compose.model == 'mail.group' and compose.res_id == self.group_pigs_id)
+
+        # Send the comment
+        mail_compose.send_mail(cr, uid, [compose_id])
+
+        group_pigs.refresh()
+        # print 'pigs message_ids: %s' % group_pigs.message_ids[0]
+        new_message = group_pigs.message_ids[0]
+        new_partner_ids = [partner.id for partner in new_message.partner_ids]
+
+        # print 'pigs new_message subject: %s' %  new_message.subject
+        # print 'pigs new_message body: %s' %  new_message.body
+        # print 'pigs new_message partner_ids: %s' %  new_message.partner_ids
+
+        notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', new_message.id)])
+        # print notif_ids
+
+        # Message partners = notified people = writer + partner_ids
+        self.assertTrue(len(new_partner_ids) == 3, 'There should be 3 partners linked to the newly posted comment.')
+        self.assertTrue(len(notif_ids) == 3, 'There should be only 3 entries in mail_notification')
+        self.assertTrue(all(id in [user_admin.partner_id.id, partner_bert_id, partner_raoul_id] for id in new_partner_ids),
+            'Admin, Bert and Roaul should be the 3 partners of the newly created message')
+        
\ No newline at end of file
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 140773981e5..46ef8a4786f 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -117,6 +117,11 @@ class mail_compose_message(osv.TransientModel):
         'partner_ids': [],
     }
 
+    def notify(self, cr, uid, newid, context=None):
+        """ Override specific notify method of mail.message, because we do
+            not want that feature in the wizard. """
+        return
+
     def get_record_data(self, cr, uid, model, res_id, context=None):
         """ Returns a defaults-like dict with initial values for the composition
             wizard when sending an email related to the document record
@@ -225,7 +230,7 @@ class mail_compose_message(osv.TransientModel):
 
             # default values, according to the wizard options
             subject = wizard.subject if wizard.content_subtype == 'html' else False
-            partner_ids = [partner.id for partner in wizard.partner_ids]
+            partner_ids = [(4, partner.id) for partner in wizard.partner_ids]
             body = wizard.body if wizard.content_subtype == 'html' else wizard.body_text
 
             active_model_pool = self.pool.get(wizard.model if wizard.model else 'mail.thread')

From 2c4ed841b915cef42fe1f65d27427b7d86d659cd Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 23 Aug 2012 20:54:43 +0200
Subject: [PATCH 524/999] [FIX] mail: make message_process/parse work, restore
 attachment_ids m2m on mail.message, various lint cleanup

bzr revid: odo@openerp.com-20120823185443-zsnm6g14r6e42y3i
---
 addons/hr_recruitment/hr_recruitment.py |   2 -
 addons/mail/mail_message.py             |  33 +---
 addons/mail/mail_thread.py              | 196 ++++++++++++------------
 3 files changed, 103 insertions(+), 128 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index db5fd57b0a9..321aff950ad 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -165,13 +165,11 @@ class hr_applicant(base_stage, osv.Model):
                         date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
                         date_open = datetime.strptime(issue.date_open, "%Y-%m-%d %H:%M:%S")
                         ans = date_open - date_create
-                        date_until = issue.date_open
 
                 elif field in ['day_close']:
                     if issue.date_closed:
                         date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
                         date_close = datetime.strptime(issue.date_closed, "%Y-%m-%d %H:%M:%S")
-                        date_until = issue.date_closed
                         ans = date_close - date_create
                 if ans:
                     duration = float(ans.days)
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 46bfd25e1be..79e7eb81456 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -19,16 +19,10 @@
 #
 ##############################################################################
 
-import dateutil.parser
-import email
 import logging
-import re
-import time
 from email.header import decode_header
-from email.message import Message
 
-from osv import osv
-from osv import fields
+from osv import osv, fields
 import tools
 
 _logger = logging.getLogger(__name__)
@@ -84,31 +78,22 @@ class mail_message(osv.Model):
                         ('notification', 'System notification'),
                         ], 'Type',
             help="Message type: email for email message, notification for system "\
-                  "message, comment for other messages such as user replies"),
-
+                 "message, comment for other messages such as user replies"),
         'author_id': fields.many2one('res.partner', 'Author', required=True),
-        'partner_ids': fields.many2many('res.partner',
-            'mail_notification', 'message_id', 'partner_id',
-            'Recipients'),
-
-        'attachment_ids': fields.one2many('ir.attachment', 'res_id',
-            'Attachments', domain=[('res_model','=','mail.message')]),
-
-        'parent_id': fields.many2one('mail.message', 'Parent Message',
-            select=True, ondelete='set null',
-            help="Initial thread message."),
+        'partner_ids': fields.many2many('res.partner', 'mail_notification', 'message_id', 'partner_id', 'Recipients'),
+        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel',
+            'message_id', 'attachment_id', 'Attachments'),
+        'parent_id': fields.many2one('mail.message', 'Parent Message', select=True, ondelete='set null', help="Initial thread message."),
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
-
         'model': fields.char('Related Document Model', size=128, select=1),
         'res_id': fields.integer('Related Document ID', select=1),
         'record_name': fields.function(get_record_name, type='string',
             string='Message Record Name',
             help="Name get of the related document."),
-
         'notification_ids': fields.one2many('mail.notification', 'message_id', 'Notifications'),
-        'subject': fields.char('Subject', size=128),
+        'subject': fields.char('Subject'),
         'date': fields.datetime('Date'),
-        'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
+        'message_id': fields.char('Message-Id', help='Message unique identifier', select=1, readonly=1),
         'body': fields.html('Content'),
     }
 
@@ -118,7 +103,6 @@ class mail_message(osv.Model):
             return [('notification_ids.partner_id','=',partner_id),('notification_ids.read','=',False)]
         return []
 
-
     def _get_default_author(self, cr, uid, context={}):
         return self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
 
@@ -233,7 +217,6 @@ class mail_message(osv.Model):
             ('partner_id', '=', partner_id),
             ('message_id', 'in', ids),
         ], context=context)
-        notifications = {}
         for notification in not_obj.browse(cr, uid, not_ids, context=context):
             if notification.message_id.id in ids:
                 pass
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 4493b226b18..12dab7dfe92 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -19,19 +19,23 @@
 #
 ##############################################################################
 
+import base64
 import dateutil
 import email
 import logging
+import pytz
+import re
+import time
+import xmlrpclib
 from email.utils import parsedate
 from email.message import Message
-from osv import osv, fields
-from mail_message import decode
-import time
+
 import tools
+from mail_message import decode
+from osv import osv, fields
 from tools.translate import _
 from tools.safe_eval import safe_eval as eval
-import pytz
-import xmlrpclib
+
 
 _logger = logging.getLogger(__name__)
 
@@ -372,9 +376,8 @@ class mail_thread(osv.Model):
         routes = self.message_route(cr, uid, msg_txt, model,
                                     thread_id, custom_values,
                                     context=context)
-        msg = self.parse_message(cr, uid, msg_txt, save_original=save_original, context=context)
-        if strip_attachments and 'attachments' in msg:
-            del msg['attachments']
+        msg = self.message_parse(cr, uid, msg_txt, save_original=save_original, context=context)
+        if strip_attachments: msg.pop('attachments', None)
         for model, thread_id, custom_values, user_id in routes:
             if self._name != model:
                 context.update({'thread_model': model})
@@ -445,7 +448,50 @@ class mail_thread(osv.Model):
             self.write(cr, uid, ids, update_vals, context=context)
         return True
 
-    def parse_message(self, cr, uid, message, save_original=False, context=None):
+
+    def _message_extract_payload(self, message, save_original=False):
+        """Extract body as HTML and attachments from the mail message"""
+        attachments = []
+        body = u''
+        if save_original:
+            attachments.append(('original_email.eml', message.as_string()))
+        if not message.is_multipart() or 'text/' in message.get('content-type', ''):
+            encoding = message.get_content_charset()
+            body = message.get_payload(decode=True)
+            body = tools.ustr(body, encoding, errors='replace')
+        else:
+            alternative = (message.get_content_type() == 'multipart/alternative')
+            for part in message.walk():
+                if part.get_content_maintype() == 'multipart':
+                    continue # skip container
+                filename = part.get_filename() # None if normal part
+                encoding = part.get_content_charset() # None if attachment
+                # 1) Explicit Attachments -> attachments
+                if filename or part.get('content-disposition','').strip().startswith('attachment'):
+                    attachments.append((filename or 'attachment', part.get_payload(decode=True)))
+                    continue
+                # 2) text/plain -> <pre/>
+                if part.get_content_type() == 'text/plain' and (not alternative or not body):
+                    insertion_point = body.find('</html>')
+                    # plain text is wrapped in <pre/> to preserve formatting
+                    text = u'<pre>%s</pre>' % tools.ustr(part.get_payload(decode=True),
+                                                         encoding, errors='replace')
+                    body = body[:insertion_point] + text + body[:insertion_point]
+                # 3) text/html -> raw
+                elif part.get_content_type() == 'text/html':
+                    html = tools.ustr(part.get_payload(decode=True), encoding, errors='replace')
+                    if alternative:
+                        body = html
+                    else:
+                        html = re.sub('(?i)</?html>', '', html)
+                        insertion_point = body.find('</html>')
+                        body = body[:insertion_point] + text + body[:insertion_point]
+                # 4) Anything else -> attachment
+                else:
+                    attachments.append((filename or 'attachment', part.get_payload(decode=True)))
+        return body, attachments
+
+    def message_parse(self, cr, uid, message, save_original=False, context=None):
         """Parses a string or email.message.Message representing an
            RFC-2822 email, and returns a generic dict holding the
            message details.
@@ -453,8 +499,8 @@ class mail_thread(osv.Model):
            :param message: the message to parse
            :type message: email.message.Message | string | unicode
            :param bool save_original: whether the returned dict
-               should include an ``original`` entry with the base64
-               encoded source of the message.
+               should include an ``original`` attachment containing
+               the source of the message
            :rtype: dict
            :return: A dict with the following structure, where each
                     field may not be present if missing in original
@@ -462,113 +508,58 @@ class mail_thread(osv.Model):
 
                     { 'message-id': msg_id,
                       'subject': subject,
-                      'from': from,          --> author_id
-                      'to': to,              --> partner_ids
-                      'cc': cc,              --> partner_ids
-                      'headers' : { 'X-Mailer': mailer,  --> to remove
-                                    #.. all X- headers...
-                                  },
-                      'content_subtype': msg_mime_subtype,  --> to remove
-                      'body': plaintext_body           --> keep body
+                      'from': from,
+                      'to': to,
+                      'cc': cc,
+                      'body': unified_body, 
                       'body_html': html_body,               --> to remove
                       'attachments': [('file1', 'bytes'),
-                                       ('file2', 'bytes') }
-                       # ...
-                       'original': source_of_email,         --> attachment document
+                                      ('file2', 'bytes')}
                     }
         """
-        msg_txt = message
-        attachments = []
-        if isinstance(message, str):
-            msg_txt = email.message_from_string(message)
-
-        # Warning: message_from_string doesn't always work correctly on unicode,
-        # we must use utf-8 strings here :-(
-        if isinstance(message, unicode):
-            message = message.encode('utf-8')
-            msg_txt = email.message_from_string(message)
-
-        message_id = msg_txt.get('message-id', False)
-        msg = {}
-
-        if save_original:
-            msg_original = message.as_string() if isinstance(message, Message) \
-                                                  else message
-            attachments.append(('original_email.eml', msg_original))
+        msg_dict = {}
+        if not isinstance(message, Message):
+            if isinstance(message, unicode):
+                # Warning: message_from_string doesn't always work correctly on unicode,
+                # we must use utf-8 strings here :-(
+                message = message.encode('utf-8')
+            message = email.message_from_string(message)
 
+        message_id = message['message-id']
         if not message_id:
             # Very unusual situation, be we should be fault-tolerant here
-            message_id = time.time()
-            msg_txt['message-id'] = message_id
-            _logger.info('Parsing Message without message-id, generating a random one: %s', message_id)
+            message_id = "<%s@localhost>" % time.time()
+            _logger.debug('Parsing Message without message-id, generating a random one: %s', message_id)
+        msg_dict['message_id'] = message_id
 
-        msg_fields = msg_txt.keys()
+        if 'Subject' in message:
+            msg_dict['subject'] = decode(message.get('Subject'))
 
-        msg['message_id'] = message_id
+        # Envelope fields not stored in  mail.message but made available for message_new() 
+        msg_dict['from'] = decode(message.get('from'))
+        msg_dict['to'] = decode(message.get('to'))
+        msg_dict['cc'] = decode(message.get('cc'))
 
-        if 'Subject' in msg_fields:
-            msg['subject'] = decode(msg_txt.get('Subject'))
-
-        #if 'Content-Type' in msg_fields:
-        #    msg['content-type'] = msg_txt.get('Content-Type')
-
-        # find author_id
-
-        if 'From' in msg_fields:
-            author_ids = self._message_find_partners(cr, uid, msg_txt, ['From'], context=context)
-            #decode(msg_txt.get('From') or msg_txt.get_unixfrom()) )
+        if 'From' in message:
+            author_ids = self._message_find_partners(cr, uid, message, ['From'], context=context)
             if author_ids:
-                msg['author_id'] = author_ids[0]
+                msg_dict['author_id'] = author_ids[0]
+        partner_ids = self._message_find_partners(cr, uid, message, ['From','To','Cc'], context=context)
+        msg_dict['partner_ids'] = partner_ids
 
-        partner_ids = self._message_find_partners(cr, uid, msg_txt, ['From','To','Delivered-To','CC','Cc'], context=context)
-        msg['partner_ids'] = partner_ids
-
-        if 'Date' in msg_fields:
-            date_hdr = decode(msg_txt.get('Date'))
+        if 'Date' in message:
+            date_hdr = decode(message.get('Date'))
             # convert from email timezone to server timezone
             date_server_datetime = dateutil.parser.parse(date_hdr).astimezone(pytz.timezone(tools.get_server_timezone()))
             date_server_datetime_str = date_server_datetime.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
-            msg['date'] = date_server_datetime_str
-
-        #if 'Content-Transfer-Encoding' in msg_fields:
-        #    msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
-
-        #if 'References' in msg_fields:
-        #    msg['references'] = msg_txt.get('References')
+            msg_dict['date'] = date_server_datetime_str
 
         # FP Note: todo - find parent_id
-        if 'In-Reply-To' in msg_fields:
+        if 'In-Reply-To' in message:
             pass
-
-        if not msg_txt.is_multipart() or 'text/plain' in msg.get('content-type', ''):
-            encoding = msg_txt.get_content_charset()
-            body = msg_txt.get_payload(decode=True)
-            if 'text/html' in msg.get('content-type', ''):
-                msg['body'] =  body
-
-        if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''):
-            body = ""
-            for part in msg_txt.walk():
-                if part.get_content_maintype() == 'multipart':
-                    continue
-
-                encoding = part.get_content_charset()
-                filename = part.get_filename()
-                if part.get_content_maintype()=='text':
-                    content = part.get_payload(decode=True)
-                    if filename:
-                        attachments.append(( filename, msg_original))
-                    content = tools.ustr(content, encoding)
-                    msg['body'] = content
-                elif part.get_content_maintype() in ('application', 'image'):
-                    if filename:
-                        attachments.append(( filename, part.get_payload(decode=True)))
-                    else:
-                        res = part.get_payload(decode=True)
-                        msg['body'] += tools.ustr(res, encoding)
-
-        msg['attachments'] = attachments
-        return msg
+        
+        msg_dict['body'], msg_dict['attachments'] = self._message_extract_payload(message)
+        return msg_dict
 
     #------------------------------------------------------
     # Note specific
@@ -610,9 +601,11 @@ class mail_thread(osv.Model):
                 content = content.encode('utf-8')
             data_attach = {
                 'name': name,
-                'datas': content,
+                'datas': base64.b64encode(str(content)),
                 'datas_fname': name,
                 'description': name,
+                'res_model': context.get('thread_model') or self._name,
+                'res_id': thread_id,
             }
             to_attach.append((0,0, data_attach))
 
@@ -626,6 +619,7 @@ class mail_thread(osv.Model):
             'parent_id': parent_id,
             'attachment_ids': to_attach
         })
+        for x in ('from','to','cc'): values.pop(x, None) # Avoid warnings 
         return self.pool.get('mail.message').create(cr, uid, values, context=context)
 
 

From a7193cb193e166c5a04a68c7a842ae926f7c07b2 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 23 Aug 2012 21:31:30 +0200
Subject: [PATCH 525/999] [FIX] crm: fix some missing bits after the big
 refactoring

bzr revid: odo@openerp.com-20120823193130-4u42mhyih43k32nb
---
 addons/crm/crm_lead.py                        |  2 +-
 addons/crm/wizard/crm_lead_to_partner.py      | 19 +++++++++++--------
 .../report/crm_helpdesk_report.py             |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 83ffb379950..b9741d17c3a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -635,7 +635,7 @@ class crm_lead(base_stage, osv.osv):
         partner_id =  False
         if lead.partner_name and lead.contact_name:
             partner_id = self._lead_create_contact(cr, uid, lead, lead.partner_name, True, context=context)
-            self._lead_create_contact(cr, uid, lead, lead.contact_name, False, partner_id, context=context)
+            partner_id = self._lead_create_contact(cr, uid, lead, lead.contact_name, False, partner_id, context=context)
         elif lead.partner_name and not lead.contact_name:
             partner_id = self._lead_create_contact(cr, uid, lead, lead.partner_name, True, context=context)
         elif not lead.partner_name and lead.contact_name:
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 430ec3c1543..60d358e034c 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -50,16 +50,19 @@ class crm_lead2partner(osv.osv_memory):
     def _select_partner(self, cr, uid, context=None):
         if context is None:
             context = {}
-        lead = self.pool.get('crm.lead')
-        partner = self.pool.get('res.partner')
-        lead_ids = list(context and context.get('active_ids', []) or [])
-        if not len(lead_ids):
+        if not context.get('active_model') == 'crm.lead' or not context.get('active_id'):
             return False
-        this = lead.browse(cr, uid, lead_ids[0], context=context)
-        if not partner_id and this.partner_name:
+        partner = self.pool.get('res.partner')
+        lead = self.pool.get('crm.lead')
+        this = lead.browse(cr, uid, context.get('active_id'), context=context)
+        if this.email_from:
+            partner_ids = partner.search(cr, uid, [('email', '=', this.email_from)], context=context)
+            if partner_ids:
+                partner_id = partner_ids[0]
+        if not this.partner_id and this.partner_name:
             partner_ids = partner.search(cr, uid, [('name', '=', this.partner_name)], context=context)
-            if partner_ids and len(partner_ids):
-               partner_id = partner_ids[0]
+            if partner_ids:
+                partner_id = partner_ids[0]
         return partner_id
 
     def default_get(self, cr, uid, fields, context=None):
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py
index 93a33d62819..6496935c2d2 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report.py
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py
@@ -97,7 +97,7 @@ class crm_helpdesk_report(osv.osv):
                     c.planned_cost,
                     count(*) as nbr,
                     extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
-                    (SELECT count(id) FROM mail_message WHERE model='crm.helpdesk' AND res_id=c.id AND email_from IS NOT NULL) AS email,
+                    (SELECT count(id) FROM mail_message WHERE model='crm.helpdesk' AND res_id=c.id AND type = 'email') AS email,
                     abs(avg(extract('epoch' from (c.date_deadline - c.date_closed)))/(3600*24)) as delay_expected
                 from
                     crm_helpdesk c

From cd67c50e295c65e9b7e4581163fa519f5813e94a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 23 Aug 2012 22:06:29 +0200
Subject: [PATCH 526/999] [MERGE] crm: cherry-pick of mass conversion
 improvements from 6.1

This corresponds to rev.6762 from 6.1, which includes a lot
of fixes related to mass conversions, and is completely
related to the kind of fixes currently done for crm during
the mail refactoring.
This should not break crm more than it is already in this branch.

bzr revid: odo@openerp.com-20120823200629-1m1eym62l7aabzgl
---
 addons/crm/crm_lead.py                        | 14 +++--
 addons/crm/crm_phonecall.py                   |  6 +--
 addons/crm/wizard/crm_lead_to_opportunity.py  | 53 ++++++++++---------
 .../wizard/crm_lead_to_opportunity_view.xml   | 34 ++++++++----
 addons/crm/wizard/crm_lead_to_partner.py      | 10 ++--
 addons/crm/wizard/crm_phonecall_to_partner.py |  4 +-
 6 files changed, 71 insertions(+), 50 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index b9741d17c3a..703a389ba93 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -531,7 +531,7 @@ class crm_lead(base_stage, osv.osv):
         oldest = self._merge_find_oldest(cr, uid, ids, context=context)
         if ctx_opportunities :
             first_opportunity = ctx_opportunities[0]
-            tail_opportunities = opportunities_list
+            tail_opportunities = opportunities_list + ctx_opportunities[1:]
         else:
             first_opportunity = opportunities_list[0]
             tail_opportunities = opportunities_list[1:]
@@ -591,8 +591,6 @@ class crm_lead(base_stage, osv.osv):
         for lead in self.browse(cr, uid, ids, context=context):
             if lead.state in ('done', 'cancel'):
                 continue
-            if user_ids or section_id:
-                self.allocate_salesman(cr, uid, [lead.id], user_ids, section_id, context=context)
 
             vals = self._convert_opportunity_data(cr, uid, lead, customer, section_id, context=context)
             self.write(cr, uid, [lead.id], vals, context=context)
@@ -604,6 +602,10 @@ class crm_lead(base_stage, osv.osv):
                 mail_message.write(cr, uid, msg_ids, {
                         'partner_id': lead.partner_id.id
                     }, context=context)
+
+        if user_ids or section_id:
+            self.allocate_salesman(cr, uid, ids, user_ids, section_id, context=context)
+
         return True
 
     def _lead_create_contact(self, cr, uid, lead, name, is_company, parent_id=False, context=None):
@@ -663,10 +665,12 @@ class crm_lead(base_stage, osv.osv):
         if context is None:
             context = {}
         partner_ids = {}
+        force_partner_id = partner_id
         for lead in self.browse(cr, uid, ids, context=context):
             if action == 'create':
                 if not partner_id:
                     partner_id = self._create_lead_partner(cr, uid, lead, context)
+                partner_id = force_partner_id or self._create_lead_partner(cr, uid, lead, context=context)
             self._lead_set_partner(cr, uid, lead, partner_id, context=context)
             partner_ids[lead.id] = partner_id
         return partner_ids
@@ -825,7 +829,7 @@ class crm_lead(base_stage, osv.osv):
         if update_vals is None: update_vals = {}
 
         if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
-            vals['priority'] = msg.get('priority')
+            update_vals['priority'] = msg.get('priority')
         maps = {
             'cost':'planned_cost',
             'revenue': 'planned_revenue',
@@ -836,7 +840,7 @@ class crm_lead(base_stage, osv.osv):
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
                 key = maps.get(res.group(1).lower())
-                vals[key] = res.group(2).lower()
+                update_vals[key] = res.group(2).lower()
 
         return super(crm_lead, self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
 
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index e613733d9ab..44894fc881d 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -177,11 +177,11 @@ class crm_phonecall(base_state, osv.osv):
         if context is None:
             context = {}
         partner_ids = {}
+        force_partner_id = partner_id
         for call in self.browse(cr, uid, ids, context=context):
             if action == 'create':
-               if not partner_id:
-                   partner_id = self._call_create_partner(cr, uid, call, context=context)
-               self._call_create_partner_address(cr, uid, call, partner_id, context=context)
+                partner_id = force_partner_id or self._call_create_partner(cr, uid, call, context=context)
+                self._call_create_partner_address(cr, uid, call, partner_id, context=context)
             self._call_set_partner(cr, uid, [call.id], partner_id, context=context)
             partner_ids[call.id] = partner_id
         return partner_ids
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 547d3ed299e..fc366768023 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -24,8 +24,6 @@ from tools.translate import _
 import tools
 import re
 
-import time
-
 class crm_lead2opportunity_partner(osv.osv_memory):
     _name = 'crm.lead2opportunity.partner'
     _description = 'Lead To Opportunity Partner'
@@ -35,8 +33,8 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         'action': fields.selection([('exist', 'Link to an existing partner'), \
                                     ('create', 'Create a new partner'), \
                                     ('nothing', 'Do not link to a partner')], \
-                                    'Action', required=True),
-        'name': fields.selection([('convert', 'Convert to Opportunity'), ('merge', 'Merge with existing Opportunity')],'Select Action', required=True),
+                                    'Related Partner', required=True),
+        'name': fields.selection([('convert', 'Convert to Opportunities'), ('merge', 'Merge with existing Opportunities')], 'Conversion Action', required=True),
         'opportunity_ids': fields.many2many('crm.lead', string='Opportunities', domain=[('type', '=', 'opportunity')]),
     }
 
@@ -68,8 +66,6 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             if ids:
                 opportunities.append(ids[0])
         if not partner_id:
-            label = False
-            opp_ids = []
             if email:
                 # Find email of existing opportunity matches the email_from of the lead
                 cr.execute("""select id from crm_lead where type='opportunity' and
@@ -106,23 +102,36 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         if context is None:
             context = {}
         lead = self.pool.get('crm.lead')
-        partner_id = self._create_partner(cr, uid, ids, context=context)
+        res = False
+        partner_ids_map = self._create_partner(cr, uid, ids, context=context)
         lead_ids = vals.get('lead_ids', [])
-        user_ids = vals.get('user_ids', False)
         team_id = vals.get('section_id', False)
-        return lead.convert_opportunity(cr, uid, lead_ids, partner_id, user_ids, team_id, context=context)
+        for lead_id in lead_ids:
+            partner_id = partner_ids_map.get(lead_id, False)
+            # FIXME: cannot pass user_ids as the salesman allocation only works in batch
+            res = lead.convert_opportunity(cr, uid, [lead_id], partner_id, [], team_id, context=context)
+        # FIXME: must perform salesman allocation in batch separately here  
+        user_ids = vals.get('user_ids', False)
+        if user_ids:
+            lead.allocate_salesman(cr, uid, lead_ids, user_ids, team_id=team_id, context=context)
+        return res
 
     def _merge_opportunity(self, cr, uid, ids, opportunity_ids, action='merge', context=None):
-        #TOFIX: is it usefully ?
         if context is None:
             context = {}
-        merge_opportunity = self.pool.get('crm.merge.opportunity')
         res = False
-        #If we convert in mass, don't merge if there is no other opportunity but no warning
-        if action == 'merge' and (len(opportunity_ids) > 1 or not context.get('mass_convert') ):
-            self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [opportunity_ids[0].id])]}, context=context)
-            context.update({'lead_ids' : record_id, "convert" : True})
-            res = merge_opportunity.merge(cr, uid, data.opportunity_ids, context=context)
+        # Expected: all newly-converted leads (active_ids) will be merged with the opportunity(ies)
+        # that have been selected in the 'opportunity_ids' m2m, with all these records
+        # merged into the first opportunity (and the rest deleted)
+        opportunity_ids = [o.id for o in opportunity_ids]
+        lead_ids = context.get('active_ids', [])
+        if action == 'merge' and lead_ids and opportunity_ids:
+            # Add the leads in the to-merge list, next to other opps
+            # (the fact that they're passed in context['lead_ids'] means that
+            # they cannot be selected to contain the result of the merge.
+            opportunity_ids.extend(lead_ids)
+            context.update({'lead_ids': lead_ids, "convert" : True})
+            res = self.pool.get('crm.lead').merge_opportunity(cr, uid, opportunity_ids, context=context)
         return res
 
     def action_apply(self, cr, uid, ids, context=None):
@@ -131,15 +140,13 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         """
         if not context:
             context = {}
-
         lead = self.pool.get('crm.lead')
         lead_ids = context.get('active_ids', [])
         data = self.browse(cr, uid, ids, context=context)[0]
         self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids}, context=context)
-        self._merge_opportunity(cr, uid, ids, data.opportunity_ids, data.action, context=context)
+        self._merge_opportunity(cr, uid, ids, data.opportunity_ids, data.name, context=context)
         return lead.redirect_opportunity_view(cr, uid, lead_ids[0], context=context)
 
-crm_lead2opportunity_partner()
 
 class crm_lead2opportunity_mass_convert(osv.osv_memory):
     _name = 'crm.lead2opportunity.partner.mass'
@@ -148,9 +155,8 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
 
 
     _columns = {
-            'user_ids':  fields.many2many('res.users', string='Salesmans'),
+            'user_ids':  fields.many2many('res.users', string='Salesmen'),
             'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-
     }
     def _convert_opportunity(self, cr, uid, ids, vals, context=None):
         data = self.browse(cr, uid, ids, context=context)[0]
@@ -162,9 +168,6 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
         return super(crm_lead2opportunity_mass_convert, self)._convert_opportunity(cr, uid, ids, vals, context=context)
 
     def mass_convert(self, cr, uid, ids, context=None):
-        value = self.default_get(cr, uid, ['partner_id', 'opportunity_ids'], context=context)
-        value['opportunity_ids'] = [(6, 0, value['opportunity_ids'])]
-        self.write(cr, uid, ids, value, context=context)
         return self.action_apply(cr, uid, ids, context=context)
-crm_lead2opportunity_mass_convert()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 8829749efa3..6a826f7bc0e 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -37,24 +37,38 @@
             <field name="model">crm.lead2opportunity.partner.mass</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <field name="action"/>
-                    <field name="name" colspan="4"/>
-                    <group string="Assigned Opportunities to">
-                        <field name="section_id"/>
+                    <group string="Conversion Options">
+                        <field name="action"/>
+                        <field name="partner_id" attrs="{'invisible':[('action','!=','exist')],'required': [('action', '=', 'exist')]}"/>
+                        <field name="name"/>
                     </group>
-                    <separator string="Select Salesman"/>
-                    <field name="user_ids">
+                    <group string="Select Opportunities" attrs="{'invisible': [('name', '=', 'convert')]}">
+                    <field name="opportunity_ids" colspan="4" nolabel="1" attrs="{'invisible': [('name', '=', 'convert')]}">
                         <tree>
-                            <field name="name"/>
+                            <field name="name" />
+                            <field name="partner_id" />
+                            <field name="user_id" />
+                            <field name="section_id" />
                         </tree>
                     </field>
+                    </group>
+                    
+                    <group string="Assign opportunities to">
+                        <field name="section_id" />
+                        <field name="user_ids" colspan="4">
+                            <tree>
+                                <field name="name" />
+                            </tree>
+                        </field>
+                    </group>
+                    
                     <footer>
-                        <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
+                        <button name="mass_convert" string="Convert to Opportunities" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
+                    </footer>                            
                 </form>
-            </field>
+              </field>
         </record>
 
         <record id="action_crm_lead2opportunity_partner" model="ir.actions.act_window">
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 60d358e034c..9b239bab7b9 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -55,6 +55,7 @@ class crm_lead2partner(osv.osv_memory):
         partner = self.pool.get('res.partner')
         lead = self.pool.get('crm.lead')
         this = lead.browse(cr, uid, context.get('active_id'), context=context)
+        partner_id = False
         if this.email_from:
             partner_ids = partner.search(cr, uid, [('email', '=', this.email_from)], context=context)
             if partner_ids:
@@ -106,15 +107,16 @@ class crm_lead2partner(osv.osv_memory):
         lead_ids = context and context.get('active_ids') or []
         data = self.browse(cr, uid, ids, context=context)[0]
         partner_id = data.partner_id and data.partner_id.id or False
-        partner_ids = lead.convert_partner(cr, uid, lead_ids, data.action, partner_id, context=context)
-        return partner_ids[lead_ids[0]]
+        return lead.convert_partner(cr, uid, lead_ids, data.action, partner_id, context=context)
 
     def make_partner(self, cr, uid, ids, context=None):
         """
         This function Makes partner based on action.
         """
-        partner_id = self._create_partner(cr, uid, ids, context=context)
-        return self.pool.get('res.partner').redirect_partner_form(cr, uid, partner_id, context=context)
+        # Only called from Form view, so only meant to convert  one Lead. 
+        lead_id = context and context.get('active_id') or False
+        partner_ids_map = self._create_partner(cr, uid, ids, context=context)
+        return self.pool.get('res.partner').redirect_partner_form(cr, uid, partner_ids_map.get(lead_id, False), context=context)
 
 crm_lead2partner()
 
diff --git a/addons/crm/wizard/crm_phonecall_to_partner.py b/addons/crm/wizard/crm_phonecall_to_partner.py
index 422af02f99d..715b7396c66 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner.py
+++ b/addons/crm/wizard/crm_phonecall_to_partner.py
@@ -57,12 +57,10 @@ class crm_phonecall2partner(osv.osv_memory):
         if context is None:
             context = {}
         phonecall = self.pool.get('crm.phonecall')
-
         data = self.browse(cr, uid, ids, context=context)[0]
         call_ids = context and context.get('active_ids') or []
         partner_id = data.partner_id and data.partner_id.id or False
-        partner_ids = phonecall.convert_partner(cr, uid, call_ids, data.action, partner_id, context=context)
-        return partner_ids[call_ids[0]]
+        return phonecall.convert_partner(cr, uid, call_ids, data.action, partner_id, context=context)
 
 crm_phonecall2partner()
 

From 12f01f09a12548e7f984449d46206864eebed409 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 24 Aug 2012 11:04:59 +0530
Subject: [PATCH 527/999] [IMP] 1] if create='false' no extra row in a editable
 embeded list. 2] If edit='false' o2mfrom pop should be on readony mode

bzr revid: jam@tinyerp.com-20120824053459-91ejrex8ox4hfptz
---
 addons/web/static/src/js/view_form.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 97e4b976c04..e91d343a618 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3461,7 +3461,8 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
         }
     },
     do_activate_record: function(index, id) {
-        var self = this;
+        var self = this, 
+            attr_readonly = (_.has(this.fields_view.arch.attrs, 'edit'))?JSON.parse(this.fields_view.arch.attrs.edit):true;
         var pop = new instance.web.form.FormOpenPopup(self.o2m.view);
         pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(), {
             title: _t("Open: ") + self.o2m.string,
@@ -3477,7 +3478,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
                 return self.o2m.dataset.read_ids.apply(self.o2m.dataset, arguments);
             },
             form_view_options: {'not_interactible_on_create':true},
-            readonly: self.o2m.get("effective_readonly")
+            readonly: attr_readonly ? self.o2m.get("effective_readonly") : true,
         });
     },
     do_button_action: function (name, id, callback) {
@@ -3565,7 +3566,11 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
 });
 instance.web.form.One2ManyList = instance.web.ListView.List.extend({
     pad_table_to: function (count) {
-        this._super(count > 0 ? count - 1 : 0);
+        count = count > 0 ? count - 1 : 0
+        if (! this.view._is_action_enabled('create')){
+            count = this.records.length
+        }
+        this._super(count);
 
         // magical invocation of wtf does that do
         if (this.view.o2m.get('effective_readonly')) {

From 813db083ff7844d2ffcdcb8a2ad5bedf3a0bfaf4 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 24 Aug 2012 11:15:47 +0530
Subject: [PATCH 528/999] [REF] refectroed the row count code

bzr revid: jam@tinyerp.com-20120824054547-v3me14ca341rkj44
---
 addons/web/static/src/js/view_form.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e91d343a618..de7b737ad34 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3566,11 +3566,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
 });
 instance.web.form.One2ManyList = instance.web.ListView.List.extend({
     pad_table_to: function (count) {
-        count = count > 0 ? count - 1 : 0
-        if (! this.view._is_action_enabled('create')){
-            count = this.records.length
-        }
-        this._super(count);
+        this._super(this.view._is_action_enabled('create') ? (count > 0 ? count - 1 : 0) : this.records.length);
 
         // magical invocation of wtf does that do
         if (this.view.o2m.get('effective_readonly')) {

From 041b29e164a8a1737c5f11ee8447672fbcb3b474 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Fri, 24 Aug 2012 12:03:38 +0530
Subject: [PATCH 529/999] [MERGE]merge with main branch

bzr revid: tch@tinyerp.com-20120824063338-xjf9tt2or8mp6kcg
---
 openerp/addons/base/res/res_bank.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index 95f05cf89d6..6c654097d15 100644
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -201,7 +201,7 @@ class res_partner_bank(osv.osv):
                         result = self._prepare_name_get(cr, uid, t, val, context=context)
                     except:
                         result += ' [Formatting Error]'
-                        raise osv.except_osv(_("Warning"), _("You cannot avoid default format_layout to result in True"))
+                        raise osv.except_osv(_("Error"), _("You cannot avoid default format_layout to result in True"))
             res.append((val.id, result))
         return res
 

From 523a7610c413d15fbfec104a8aa4c9d9de92085e Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Fri, 24 Aug 2012 12:39:07 +0530
Subject: [PATCH 530/999] [MERGE]merge with main branch

bzr revid: tch@tinyerp.com-20120824070907-g6g6jpkj2t10kals
---
 openerp/addons/base/res/res_bank.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index 6c654097d15..dbf098f3535 100644
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -201,7 +201,7 @@ class res_partner_bank(osv.osv):
                         result = self._prepare_name_get(cr, uid, t, val, context=context)
                     except:
                         result += ' [Formatting Error]'
-                        raise osv.except_osv(_("Error"), _("You cannot avoid default format_layout to result in True"))
+                        raise osv.except_osv(_("Formating Error"), _("Invalid Bank name"))
             res.append((val.id, result))
         return res
 

From a932d1dc0069e13cd26b113c90aed0d4b3320ff4 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Fri, 24 Aug 2012 14:12:32 +0530
Subject: [PATCH 531/999] [MERGE]merge with main branch

bzr revid: tch@tinyerp.com-20120824084232-8b0x7euh7m9f0yor
---
 openerp/addons/base/res/res_bank.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index dbf098f3535..112e64de812 100644
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -201,7 +201,7 @@ class res_partner_bank(osv.osv):
                         result = self._prepare_name_get(cr, uid, t, val, context=context)
                     except:
                         result += ' [Formatting Error]'
-                        raise osv.except_osv(_("Formating Error"), _("Invalid Bank name"))
+                        raise osv.except_osv(_("Formating Error"), _("Invalid Bank Account Type Name format."))
             res.append((val.id, result))
         return res
 

From 4969c586b4898b1ca1e9cf112985ce89f6030ae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 24 Aug 2012 10:53:42 +0200
Subject: [PATCH 532/999] [FIX] mail_mail: temp fix, commented headers
 propagation; mail_followers: send emails accordign to email preferences was
 not correct.

bzr revid: tde@openerp.com-20120824085342-aa9s1ojl2j3v85fk
---
 addons/mail/mail_followers.py | 13 +++++++------
 addons/mail/mail_mail.py      |  4 +++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 671e2405b49..f73478f3a6f 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -72,6 +72,7 @@ class mail_notification(osv.Model):
         """ Send by email the notification depending on the user preferences """
         context = context or {}
         partner_obj = self.pool.get('res.partner')
+        mail_mail_obj = self.pool.get('mail.mail')
         notification_obj = self.pool.get('mail.notification')
         msg_obj = self.pool.get('mail.message')
         msg = msg_obj.browse(cr, uid, msg_id, context=context)
@@ -89,20 +90,20 @@ class mail_notification(osv.Model):
             if partner.notification_email_pref=='none' or not partner.email:
                 continue
             # Partners want to receive only emails and comments
-            if partner.notification_email_pref=='comment' and msg.type in ('email','comment'):
+            if partner.notification_email_pref=='comment' and msg.type not in ('email','comment'):
                 continue
 
             towrite['state'] = 'outgoing'
             if partner.email not in towrite['email_to']:
                 towrite['email_to'].append(partner.email)
 
-        if towrite.get('state', False) and not context.get('noemail', False):
-            if towrite.get('subject', False):
+        if towrite.get('state') and not context.get('noemail'):
+            if towrite.get('subject'):
                 towrite['subject'] = msg.name_get()[0][1]
             towrite['message_id'] = msg.id
             towrite['email_to'] = ', '.join(towrite['email_to'])
-            mail_message_obj = self.pool.get('mail.mail')
-            newid = mail_message_obj.create(cr, uid, towrite, context=context)
-            mail_message_obj.send(cr, uid, [newid], context=context)
+            
+            email_notif_id = mail_mail_obj.create(cr, uid, towrite, context=context)
+            mail_mail_obj.send(cr, uid, [email_notif_id], context=context)
 
         return True
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index bd0bfbf33c0..c5a062054f3 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -185,7 +185,9 @@ class mail_mail(osv.Model):
                     object_id=message.res_id and ('%s-%s' % (message.res_id,message.model)),
                     subtype=message.content_subtype,
                     subtype_alternative=content_subtype_alternative,
-                    headers=message.headers and ast.literal_eval(message.headers))
+                    # TDE FIXME: what to do with headers ? currently ycommented to avoid bugs
+                    # headers=message.headers and ast.literal_eval(message.headers))
+                    )
                 res = ir_mail_server.send_email(cr, uid, msg,
                                                 mail_server_id=message.mail_server_id.id,
                                                 context=context)

From 7e59db5f0f04dfc165131566f2284d575e194fe6 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Fri, 24 Aug 2012 14:29:18 +0530
Subject: [PATCH 533/999] [MERGE]merge with main branch

bzr revid: tch@tinyerp.com-20120824085918-y69p2653fsqw5t9y
---
 openerp/addons/base/res/res_bank.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index 112e64de812..d07b5d712f7 100644
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -200,7 +200,6 @@ class res_partner_bank(osv.osv):
                             val._data[val.id]['bank_name'] = _('BANK')
                         result = self._prepare_name_get(cr, uid, t, val, context=context)
                     except:
-                        result += ' [Formatting Error]'
                         raise osv.except_osv(_("Formating Error"), _("Invalid Bank Account Type Name format."))
             res.append((val.id, result))
         return res

From 6a386dc762929d6a7ce368a78e17b43890631b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 24 Aug 2012 11:31:30 +0200
Subject: [PATCH 534/999] [FIX] crm_forward_to_partner: to_email is now
 tools.email_split.

bzr revid: tde@openerp.com-20120824093130-e24hm16pq14x84zb
---
 .../wizard/crm_forward_to_partner.py                  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index ce6087cad69..361cdeaf1e4 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -20,11 +20,12 @@
 #
 ##############################################################################
 
-import time
 import re
+import time
+import tools
+
 from osv import osv, fields
-from tools.translate import _
-from mail.mail_message import to_email
+from tools.translate import _, 
 
 class crm_lead_forward_to_partner(osv.osv_memory):
     """Forwards lead history"""
@@ -111,13 +112,13 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             if this.send_to == 'user':
                 lead.allocate_salesman(cr, uid, [case.id], [this.user_id.id], context=context)
 
-            email_cc = to_email(case.email_cc)
+            email_cc = tools.email_split(case.email_cc)
             email_cc = email_cc and email_cc[0] or ''
             new_cc = []
             if email_cc:
                 new_cc.append(email_cc)
             for to in this.email_to.split(','):
-                email_to = to_email(to)
+                email_to = tools.email_split(to)
                 email_to = email_to and email_to[0] or ''
                 if email_to not in new_cc:
                     new_cc.append(to)

From d3eac6d18a37b34c3492fae4f2869c20fe64d23a Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 24 Aug 2012 15:06:57 +0530
Subject: [PATCH 535/999] [ADD]l10n_in_hr_payroll:added postgres report for
 payslip and palyslip lines

bzr revid: kbh@tinyerp.com-20120824093657-dlw1d0bh39cg7h79
---
 addons/l10n_in_hr_payroll/__openerp__.py      |  1 +
 addons/l10n_in_hr_payroll/report/__init__.py  |  1 +
 .../report/payslip_report.py                  | 88 +++++++++++++++++++
 .../report/payslip_report_view.xml            | 87 ++++++++++++++++++
 4 files changed, 177 insertions(+)
 create mode 100644 addons/l10n_in_hr_payroll/report/payslip_report.py
 create mode 100644 addons/l10n_in_hr_payroll/report/payslip_report_view.xml

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 8fbf6f1a9de..6d891c7a08e 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -53,6 +53,7 @@ Indian Payroll Salary Rules.
          'wizard/hr_salary_employee_bymonth_view.xml',
          'wizard/hr_yearly_salary_detail_view.xml',
          'report/payment_advice_report_view.xml',
+         'report/payslip_report_view.xml',
 
      ],
     'test': [
diff --git a/addons/l10n_in_hr_payroll/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py
index 5c76aa37e1c..8a20170c384 100644
--- a/addons/l10n_in_hr_payroll/report/__init__.py
+++ b/addons/l10n_in_hr_payroll/report/__init__.py
@@ -27,5 +27,6 @@ import report_payroll_advice
 import report_hr_salary_employee_bymonth
 import payment_advice_report
 import report_hr_yearly_salary_detail
+import payslip_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/payslip_report.py b/addons/l10n_in_hr_payroll/report/payslip_report.py
new file mode 100644
index 00000000000..b688af4329b
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/payslip_report.py
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-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/>.
+#
+##############################################################################
+
+import tools
+from osv import fields, osv
+
+class payslip_report(osv.osv):
+    _name = "payslip.report"
+    _description = "Payslip Analysis"
+    _auto = False
+    _columns = {
+        'name':fields.char('Name', size=32, readonly=True),
+        'date_from': fields.date('Date From', readonly=True,),
+        'date_to': fields.date('Date To', readonly=True,),
+        'year': fields.char('Year', size=4, readonly=True),
+        'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'),
+            ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'),
+            ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
+        'state': fields.selection([
+            ('draft', 'Draft'),
+            ('done', 'Done'),
+            ('cancel', 'Rejected'),
+        ], 'State', readonly=True),
+        'employee_id': fields.many2one('hr.employee', 'Employee', readonly=True),
+        'nbr': fields.integer('# Payslip lines', readonly=True),
+        'number': fields.char('Number', size=16, readonly=True),
+        'struct_id': fields.many2one('hr.payroll.structure', 'Structure', readonly=True),
+        'company_id':fields.many2one('res.company', 'Company', readonly=True),
+        'paid': fields.boolean('Made Payment Order ? ', readonly=True),
+        'total': fields.float('Total', readonly=True),
+        'category_id':fields.many2one('hr.salary.rule.category', 'Category', readonly=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'payslip_report')
+        cr.execute("""
+            create or replace view payslip_report as (
+                select
+                    min(l.id) as id,
+                    l.name,
+                    p.struct_id,
+                    p.state,
+                    p.date_from,
+                    p.date_to,
+                    p.number,
+                    p.company_id,
+                    p.paid,
+                    l.category_id,
+                    l.employee_id,
+                    sum(l.total) as total,
+                    to_char(p.date_from, 'YYYY') as year,
+                    to_char(p.date_from, 'MM') as month,
+                    to_char(p.date_from, 'YYYY-MM-DD') as day,
+                    to_char(p.date_to, 'YYYY') as to_year,
+                    to_char(p.date_to, 'MM') as to_month,
+                    to_char(p.date_to, 'YYYY-MM-DD') as to_day,
+                    1 AS nbr
+                from
+                    hr_payslip as p
+                    left join hr_payslip_line as l on (p.id=l.slip_id)
+                where 
+                    l.employee_id IS NOT NULL
+                group by
+                    p.number,l.name,p.date_from,p.date_to,p.state,p.company_id,p.paid,
+                    l.employee_id,p.struct_id,l.category_id
+            )
+        """)
+payslip_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/payslip_report_view.xml b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml
new file mode 100644
index 00000000000..a6fc870b76b
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <record id="view_payslip_tree" model="ir.ui.view">
+        <field name="name">payslip.report.tree</field>
+        <field name="model">payslip.report</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree colors="blue:state == 'draft';black:state == 'done';gray:state == 'cancel' " string="Payslip Analysis">
+                <field name="nbr" sum="# Payslip Lines"/>
+                <field name="name"/>
+                <field name="employee_id" invisible="1"/>
+                <field name="date_to" invisible="1"/>
+                <field name="date_from" invisible="1"/>
+                <field name="state" invisible="1"/>
+                <field name="number" invisible="1"/>
+                <field name="struct_id" invisible="1"/>
+                <field name="year" invisible="1"/>
+                <field name="day" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="paid" invisible="1"/>
+                <field name="total" />
+                <field name="category_id" invisible="1"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_payslip_search" model="ir.ui.view">
+        <field name="name">payslip.report.search</field>
+        <field name="model">payslip.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Payslip Analysis">
+                 <group>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Payslips which are in draft state"/>
+                    <filter icon="terp-check" string="Done" name="done" domain="[('state','=','done')]" help="Payslips which are in done state"/>
+                    <filter icon="terp-check" string="Rejected" name="cancel" domain="[('state','=','cancel')]" help="Payslips which are in cancel state"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-camera_test" string="Paid" domain="[('paid','=',True)]" help="Payslips which are paid"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <separator orientation="vertical"/>
+                    <field name="number"/>
+                    <field name="name"/>
+                    <field name="employee_id"/>
+                </group>
+                <newline/>
+                 <group expand="1" string="Extended Filters...">
+                    <separator orientation="vertical"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By...">
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day of Payslip"/>
+                    <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Month of Payslip"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year of Payslip"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}" />
+                    <filter string="Structure" context="{'group_by':'struct_id'}" />
+                    <filter string="Category" name="category" context="{'group_by':'category_id'}" />
+                    <filter string="Line Name" context="{'group_by':'name'}" />
+                    <separator orientation="vertical"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_payslip_report_all" model="ir.actions.act_window">
+        <field name="name">Payslip Analysis</field>
+        <field name="res_model">payslip.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_payslip_tree"/>
+        <field name="context">{'search_default_order_month':1,'search_default_employee':1,'search_default_category':1,'group_by_no_leaf':uid,'group_by':[]}</field>
+        <field name="help">This report performs analysis on Payslip</field>
+    </record>
+
+    <menuitem action="action_payslip_report_all" id="menu_reporting_payslip" parent="hr.menu_hr_reporting" sequence="5" groups="base.group_hr_manager"/>
+
+</data>
+</openerp>

From c5cfb049f8573226be572a7a742b5f5381f6d15d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 24 Aug 2012 12:02:05 +0200
Subject: [PATCH 536/999] [FIX] Fixed last commit (forgotten a ','), fixed demo
 data about non-existing fields.

bzr revid: tde@openerp.com-20120824100205-nm4vjw13qx363cb5
---
 addons/crm/crm_lead_demo.xml                               | 1 -
 addons/crm_partner_assign/wizard/crm_forward_to_partner.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 79aa1676a7e..83617d394fb 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -555,7 +555,6 @@ Andrew</field>
             <field name="res_id" ref="crm_case_15"/>
             <field name="body"><![CDATA[Email0 inquiry]]></field>
             <field name="type">email</field>
-            <field name="state">sent</field>
         </record>
         <record id="message_note0" model="mail.message">
             <field name="subject">Reply</field>
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 361cdeaf1e4..3f90bebff97 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -25,7 +25,7 @@ import time
 import tools
 
 from osv import osv, fields
-from tools.translate import _, 
+from tools.translate import _
 
 class crm_lead_forward_to_partner(osv.osv_memory):
     """Forwards lead history"""

From 36c3a308e684411bea18ddeb1965a7ab0cf9f597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 24 Aug 2012 12:03:35 +0200
Subject: [PATCH 537/999] [TOCHECK] crm_lead: commented statemetns that make no
 sense abotu changing partner of emails when converting a lead into an
 oportunity.

bzr revid: tde@openerp.com-20120824100335-1kso3qphdh8piq32
---
 addons/crm/crm_lead.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 703a389ba93..167a180b53e 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -597,11 +597,12 @@ class crm_lead(base_stage, osv.osv):
 
             self.convert_opportunity_send_note(cr, uid, lead, context=context)
             #TOCHECK: why need to change partner details in all messages of lead ?
-            if lead.partner_id:
-                msg_ids = [ x.id for x in lead.message_ids]
-                mail_message.write(cr, uid, msg_ids, {
-                        'partner_id': lead.partner_id.id
-                    }, context=context)
+            # TDE FIXME: I propose to delete this, makes no sense to update partner of an already-send email ...
+            # if lead.partner_id:
+            #     msg_ids = [x.id for x in lead.message_ids]
+            #     mail_message.write(cr, uid, msg_ids, {
+            #             'partner_id': lead.partner_id.id
+            #         }, context=context)
 
         if user_ids or section_id:
             self.allocate_salesman(cr, uid, ids, user_ids, section_id, context=context)

From 70b90a23439eeb5c82f19936ab8ce485600e9b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 24 Aug 2012 12:04:51 +0200
Subject: [PATCH 538/999] [FIX] mail_followers: when sending the notification
 email, it could be interesting to have something in the body. Well, receiving
 void emails ensure that your spam is not a time-consuming one, but I am not
 sure this was the intended purpose.

bzr revid: tde@openerp.com-20120824100451-82crb3j7i0ki2h9h
---
 addons/mail/mail_followers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index f73478f3a6f..72dd3519ace 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -79,7 +79,8 @@ class mail_notification(osv.Model):
 
         towrite = {
             'email_to': [],
-            'subject': msg.subject
+            'subject': msg.subject,
+            'body': msg.body,
         }
 
         for partner in partner_obj.browse(cr, uid, partner_ids, context=context):

From 540502bc7f4e3a71df78bea52dee88b7335ba1e2 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 24 Aug 2012 15:52:27 +0530
Subject: [PATCH 539/999] [FIX] product : Error when group by 'type'.

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

bzr revid: mdi@tinyerp.com-20120824102227-1yrv9y4ww6vy3o7p
---
 addons/product/product_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 70651a0a795..74d89659c09 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -41,6 +41,7 @@
                     <field name="default_code"/>
                     <field name="name"/>
                     <field name="categ_id" invisible="1"/>
+                    <field name="type" invisible="1"/>
                     <field name="variants" groups="product.group_product_variant"/>
                     <field name="uom_id" string="Unit of Measure" groups="product.group_uom"/>
                     <field name="qty_available"/>

From bcf9ef416ee62093da90eb1155f650bb46833f8d Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 24 Aug 2012 16:04:10 +0530
Subject: [PATCH 540/999] [FIX]l10n_in_hr_payroll:changed name of inputs

bzr revid: kbh@tinyerp.com-20120824103410-lvecrt1ov2szsjvw
---
 .../data/l10n_in_hr_payroll_data.xml             | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index ae465db8e8d..ba95e025673 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -441,7 +441,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="condition_select">none</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = inputs.LAI.amount</field>
+            <field name="amount_python_compute">result = - (inputs.LAI.amount)</field>
             <field name="register_id" ref="hr_leave_availed_register"/>
             <field name="sequence" eval="180"/>
         </record>
@@ -507,43 +507,43 @@ Now difference of income tax between payment year and actual year would be allow
 
         <record id="hr_rule_input_arrears" model="hr.rule.input">
             <field name="code">ARS</field>
-            <field name="name">Arrears Input</field>
+            <field name="name">Arrears</field>
             <field name="input_id" ref="hr_salary_rule_arrears"/>
         </record>
 
         <record id="hr_rule_input_le" model="hr.rule.input">
             <field name="code">LE</field>
-            <field name="name">Leave Encashment Input</field>
+            <field name="name">Leave Encashment</field>
             <field name="input_id" ref="hr_salary_rule_le"/>
         </record>
 
         <record id="hr_rule_input_journals" model="hr.rule.input">
             <field name="code">PJ</field>
-            <field name="name">Periodical Journals Input</field>
+            <field name="name">Periodical Journals</field>
             <field name="input_id" ref="hr_salary_rule_journals"/>
         </record>
 
         <record id="hr_rule_input_telephone" model="hr.rule.input">
             <field name="code">TR</field>
-            <field name="name">Telephone Reimbursement Input</field>
+            <field name="name">Telephone Reimbursement</field>
             <field name="input_id" ref="hr_salary_rule_telephone"/>
         </record>
 
         <record id="hr_rule_input_car" model="hr.rule.input">
             <field name="code">CEI</field>
-            <field name="name">Car Expenses Input</field>
+            <field name="name">Car Expenses</field>
             <field name="input_id" ref="hr_payroll_rule_car"/>
         </record>
 
         <record id="hr_rule_input_internet" model="hr.rule.input">
             <field name="code">IE</field>
-            <field name="name">Internet Expence Input</field>
+            <field name="name">Internet Expence</field>
             <field name="input_id" ref="hr_salary_rule_internet"/>
         </record>
 
         <record id="hr_rule_input_leave_avail" model="hr.rule.input">
             <field name="code">LAI</field>
-            <field name="name">Leave Availed Input</field>
+            <field name="name">Leave Availed</field>
             <field name="input_id" ref="hr_payslip_rule_dla"/>
         </record>
     </data>

From 18f6fd89900b242124e138f5389f97f79a6c2dad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 24 Aug 2012 12:38:45 +0200
Subject: [PATCH 541/999] [FIX] email_template: fixed inherited view.

bzr revid: tde@openerp.com-20120824103845-7g1jzgtcctry6nod
---
 addons/email_template/wizard/mail_compose_message_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index d0e842fa950..dff6f4a3ad4 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -31,7 +31,7 @@
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form_chatter"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='dest_partner_ids']" position="after">
+                    <xpath expr="//field[@name='partner_ids']" position="after">
                         <field name="use_template" colspan="2" nolabel="1" invisible="1"
                             on_change="onchange_use_template(use_template, context)"/>
                         <field name="template_id" colspan="2" nolabel="1"

From 8335b55e877f2d2bca1bd5541e830d6272aba358 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Fri, 24 Aug 2012 16:10:31 +0530
Subject: [PATCH 542/999] [FIX] l10n_in_hr_payrol: Remove food coupan register
 for dedcution

bzr revid: mra@tinyerp.com-20120824104031-0je3kogotvsh7i64
---
 addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index ae465db8e8d..ee8ac04cc65 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -35,10 +35,6 @@
             <field name="name">Register for Company Provided Transport Deduction</field>
         </record>
 
-        <record id="hr_food_coupen_deduction_register" model="hr.contribution.register">
-            <field name="name">Register for Food Coupons Deduction</field>
-        </record>
-
         <record id="hr_labour_Welfare_fund_register" model="hr.contribution.register">
             <field name="name">Register for State Labour Welfare Fund Deduction</field>
         </record>
@@ -398,7 +394,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="code">FD</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="name">Deduction Towards Food Coupons</field>
-            <field name="register_id" ref="hr_food_coupen_deduction_register"/>
+            <field name="register_id" ref="hr_food_coupen_register"/>
             <field name="sequence" eval="166"/>
          </record>
 

From 599ef6b96088b314f7c4c22213a3b90dd1288621 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Fri, 24 Aug 2012 16:24:41 +0530
Subject: [PATCH 543/999] [FIX] l10n_in_hr_payroll:access for payslip report
 object

bzr revid: mra@tinyerp.com-20120824105441-zpmeznbhwkdznr3e
---
 addons/l10n_in_hr_payroll/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/l10n_in_hr_payroll/security/ir.model.access.csv b/addons/l10n_in_hr_payroll/security/ir.model.access.csv
index 5b440b569e4..7ca0834449b 100644
--- a/addons/l10n_in_hr_payroll/security/ir.model.access.csv
+++ b/addons/l10n_in_hr_payroll/security/ir.model.access.csv
@@ -2,3 +2,4 @@
 "access_hr_payroll_advice_user","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_user",1,1,1,1
 "access_hr_payroll_advice_line_user","hr.payroll.advice.line","model_hr_payroll_advice_line","base.group_hr_user",1,1,1,1
 "access_hr_payroll_advice_report_user","payment.advice.report","model_payment_advice_report","base.group_hr_manager",1,1,1,1
+"access_hr_payroll_payslip_report_user","payslip.report","model_payslip_report","base.group_hr_manager",1,1,1,1

From f37ef70b660047d4e5c92833590e5d757ad07de3 Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (Open ERP)" <jir@tinyerp.com>
Date: Fri, 24 Aug 2012 16:27:52 +0530
Subject: [PATCH 544/999] [MERGE]: Merge with lp:openobject-addons

bzr revid: jir@tinyerp.com-20120824105752-hz9ho2vf0jeiwg5a
---
 addons/account/account_invoice.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 882c3b754e0..ed32fbb0d05 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -214,7 +214,7 @@ class account_invoice(osv.osv):
             \n* The \'Cancelled\' state is used when user cancel invoice.'),
         'sent': fields.boolean('Sent', readonly=True, help="It indicates that the invoice has been sent."),
         'date_invoice': fields.date('Invoice Date', readonly=True, states={'draft':[('readonly',False)]}, select=True, help="Keep empty to use the current date"),
-        'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'cancel':[('readonly',True)]}, select=True,
+        'date_due': fields.date('Due Date', readonly=True, states={'draft':[('readonly',False)]}, select=True,
             help="If you use payment terms, the due date will be computed automatically at the generation "\
                 "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."),
         'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}),
@@ -253,7 +253,7 @@ class account_invoice(osv.osv):
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'check_total': fields.float('Verification Total', digits_compute=dp.get_precision('Account'), states={'open':[('readonly',True)],'cancel':[('readonly',True)],'paid':[('readonly',True)]}),
+        'check_total': fields.float('Verification Total', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
         'reconciled': fields.function(_reconciled, string='Paid/Reconciled', type='boolean',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?

From 47e33a1d70bed41f62eef925919f49f2c8f7cc70 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Fri, 24 Aug 2012 16:31:46 +0530
Subject: [PATCH 545/999] [FIX] l10n_in_hr_payroll: small fix

bzr revid: mra@tinyerp.com-20120824110146-n70knsb0c1fn5sfe
---
 addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index ca109fefa82..26adfcc5e91 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -425,7 +425,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="name">Deduction Towards Company Provided Group Term Insurance</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
-            <field eval="1000.0" name="amount_fix"/>
+            <field eval="-1000.0" name="amount_fix"/>
             <field name="register_id" ref="hr_group_term_insurance_register"/>
             <field name="sequence" eval="175"/>
             <field name="note">Group term insurance provides a solid foundation to a comprehensive employee benifit program,backed up by government asistance in the form of valuable tax incentives to both employees and employers.</field>

From f6a818f68337d598d2c4de5afec034b3fcb159a1 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 24 Aug 2012 13:09:12 +0200
Subject: [PATCH 546/999] [IMP] fix a typo

bzr revid: abo@openerp.com-20120824110912-0sdtpd1udzrgvli5
---
 addons/account/res_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index f7b4a83c689..b0dad991e16 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -44,7 +44,7 @@ class account_config_settings(osv.osv_memory):
         'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
             string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer  will be able to pay your invoices or quotations with a button \"Pay with  Paypal\" in automated emails or through the OpenERP portal."),
         'company_footer': fields.related('company_id', 'rml_footer', type='text', readonly=True,
-            string='Bank accounts on reports will display as followed', help="Bank accounts as printed in the footer of each customer  document. This is for information purpose only, you should configure these bank accounts through the above button \"Configure Bank Accounts\"."),
+            string='Bank accounts on reports will displayed as followed', help="Bank accounts as printed in the footer of each customer's document. This is for information purpose only, you should configure these bank accounts through the above button \"Configure Bank Accounts\"."),
 
         'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
         'chart_template_id': fields.many2one('account.chart.template', 'Template', domain="[('visible','=', True)]"),

From f4c2bd121f36ef7a8dd589d1c631f9c42b12ae3a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 24 Aug 2012 13:23:12 +0200
Subject: [PATCH 547/999] [IMP] mail.compose.message: cascade delete
 attachments upon vacuum-clean

bzr revid: odo@openerp.com-20120824112312-zs5raruc4qdprlnp
---
 addons/mail/mail_message.py                | 2 +-
 addons/mail/wizard/mail_compose_message.py | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 79e7eb81456..4ce552d6b05 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -220,7 +220,7 @@ class mail_message(osv.Model):
         for notification in not_obj.browse(cr, uid, not_ids, context=context):
             if notification.message_id.id in ids:
                 pass
-                # FO Note: we should put this again !!!
+                # FP Note: we should put this again !!!
                 #ids.remove(notification.message_id.id)
 
         # check messages according to related documents
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 46ef8a4786f..8a172bd62e4 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import ast
 import re
 
 import tools
@@ -281,6 +280,12 @@ class mail_compose_message(osv.TransientModel):
             return tools.ustr(result)
         return template and EXPRESSION_PATTERN.sub(merge, template)
 
+    def unlink(self, cr, uid, ids, context=None):
+        # Cascade delete all attachments, as they are owned by the composition wizard
+        for wizard in self.read(cr, uid, ids, ['attachment_ids'], context=context):
+            self.pool.get('ir.attachment').unlink(cr, uid, wizard['attachment_ids'], context=context)
+        return super(mail_compose_message,self).unlink(cr, uid, ids, context=context)
+
     def dummy(self, cr, uid, ids, context=None):
         """ TDE: defined to have buttons that do basically nothing. It is
             currently impossible to have buttons that do nothing special

From 9b4b784878fea1b879a6d7bd33f2b7f1c7ae9800 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 24 Aug 2012 13:24:34 +0200
Subject: [PATCH 548/999] [IMP] company's  field's name also fix RML
 indentation

bzr revid: abo@openerp.com-20120824112434-m3nw1l3292r74yly
---
 openerp/addons/base/res/res_company.py | 52 +++++++++++++-------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index afd34e38b0c..a398e5e5dc7 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -111,7 +111,7 @@ class res_company(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
         'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
         'rml_footer': fields.text('General Information Footer'),
-        'rml_header': fields.text('RML Header', required=True),
+        'rml_header': fields.text('RML Header and Footer', required=True),
         'rml_header2': fields.text('RML Internal Header', required=True),
         'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True),
         'logo': fields.related('partner_id', 'image', string="Logo", type="binary"),
@@ -276,37 +276,37 @@ class res_company(osv.osv):
             return self._header_a4
 
     _header_main = """
-    <header>
-    <pageTemplate>
-        <frame id="first" x1="1.3cm" y1="2.5cm" height="%s" width="19.0cm"/>
-        <pageGraphics>
-            <!-- You Logo - Change X,Y,Width and Height -->
-            <image x="1.3cm" y="%s" height="40.0" >[[ company.logo or removeParentNode('image') ]]</image>
-            <setFont name="DejaVu Sans" size="8"/>
-            <fill color="black"/>
-            <stroke color="black"/>
-            <lines>1.3cm %s 20cm %s</lines>
+<header>
+<pageTemplate>
+    <frame id="first" x1="1.3cm" y1="2.5cm" height="%s" width="19.0cm"/>
+    <pageGraphics>
+        <!-- You Logo - Change X,Y,Width and Height -->
+        <image x="1.3cm" y="%s" height="40.0" >[[ company.logo or removeParentNode('image') ]]</image>
+        <setFont name="DejaVu Sans" size="8"/>
+        <fill color="black"/>
+        <stroke color="black"/>
+        <lines>1.3cm %s 20cm %s</lines>
 
-            <drawRightString x="20cm" y="%s">[[ company.rml_header1 ]]</drawRightString>
+        <drawRightString x="20cm" y="%s">[[ company.rml_header1 ]]</drawRightString>
 
 
-            <drawString x="1.3cm" y="%s">[[ company.partner_id.name ]]</drawString>
-            <drawString x="1.3cm" y="%s">[[ company.partner_id.street or  '' ]]</drawString>
-            <drawString x="1.3cm" y="%s">[[ company.partner_id.city or '' ]] - [[ company.partner_id.country_id and company.partner_id.country_id.name  or '']]</drawString>
-            <drawString x="1.3cm" y="%s">Phone:</drawString>
-            <drawRightString x="7cm" y="%s">[[ company.partner_id.phone or '' ]]</drawRightString>
-            <drawString x="1.3cm" y="%s">Mail:</drawString>
-            <drawRightString x="7cm" y="%s">[[ company.partner_id.email or '' ]]</drawRightString>
-            <lines>1.3cm %s 7cm %s</lines>
+        <drawString x="1.3cm" y="%s">[[ company.partner_id.name ]]</drawString>
+        <drawString x="1.3cm" y="%s">[[ company.partner_id.street or  '' ]]</drawString>
+        <drawString x="1.3cm" y="%s">[[ company.partner_id.city or '' ]] - [[ company.partner_id.country_id and company.partner_id.country_id.name  or '']]</drawString>
+        <drawString x="1.3cm" y="%s">Phone:</drawString>
+        <drawRightString x="7cm" y="%s">[[ company.partner_id.phone or '' ]]</drawRightString>
+        <drawString x="1.3cm" y="%s">Mail:</drawString>
+        <drawRightString x="7cm" y="%s">[[ company.partner_id.email or '' ]]</drawRightString>
+        <lines>1.3cm %s 7cm %s</lines>
 
-            <!--page bottom-->
+        <!--page bottom-->
 
-            <lines>1.2cm 2.15cm 19.9cm 2.15cm</lines>
+        <lines>1.2cm 2.15cm 19.9cm 2.15cm</lines>
 
-            <drawCentredString x="10.5cm" y="1.7cm">[[ company.rml_footer ]]</drawCentredString>
-            <drawCentredString x="10.5cm" y="0.8cm">Contact : [[ user.name ]] - Page: <pageNumber/></drawCentredString>
-        </pageGraphics>
-    </pageTemplate>
+        <drawCentredString x="10.5cm" y="1.7cm">[[ company.rml_footer ]]</drawCentredString>
+        <drawCentredString x="10.5cm" y="0.8cm">Contact : [[ user.name ]] - Page: <pageNumber/></drawCentredString>
+    </pageGraphics>
+</pageTemplate>
 </header>"""
 
     _header_a4 = _header_main % ('23.0cm', '27.6cm', '27.7cm', '27.7cm', '27.8cm', '27.2cm', '26.8cm', '26.4cm', '26.0cm', '26.0cm', '25.6cm', '25.6cm', '25.5cm', '25.5cm')

From 239012ff9d185fb640517b7087c0767bec9cc93a Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Fri, 24 Aug 2012 17:13:41 +0530
Subject: [PATCH 549/999] [FIX] l10n_in_hr_payroll: small fix

bzr revid: mra@tinyerp.com-20120824114341-cah1258419d439ge
---
 addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 26adfcc5e91..2ee0a5b3086 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -381,7 +381,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="condition_select">none</field>
             <field name="amount_select">fix</field>
-            <field eval="1500.0" name="amount_fix"/>
+            <field eval="-1500.0" name="amount_fix"/>
             <field name="register_id" ref="hr_company_transport_register"/>
             <field name="sequence" eval="165"/>
             <field name="note">Company provided transport amount is based on company.</field>
@@ -403,7 +403,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="name">Employee's Deduction Towards State Labour Welfare Fund</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
-            <field eval="3.0" name="amount_fix"/>
+            <field eval="-3.0" name="amount_fix"/>
             <field name="sequence" eval="170"/>
             <field name="register_id" ref="hr_labour_Welfare_fund_register"/>
             <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>
@@ -414,7 +414,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="name">Employer's Deduction Towards State Labour Welfare Fund </field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
-            <field eval="6.0" name="amount_fix"/>
+            <field eval="-6.0" name="amount_fix"/>
             <field name="sequence" eval="171"/>
             <field name="register_id" ref="hr_labour_Welfare_fund_register"/>
             <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>

From 4b3e0602477c06883136b230b6d63823b38e2d4e Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 24 Aug 2012 13:58:00 +0200
Subject: [PATCH 550/999] [IMP] company: keep the complete footer example, like
 it was before alose remove some whitespaces

bzr revid: abo@openerp.com-20120824115800-177ba0eajjqu1ypb
---
 openerp/addons/base/base_data.xml | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index ccb25861ae7..fb267a141fb 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -84,7 +84,7 @@
         <record id="au" model="res.country">
             <field name="name">Australia</field>
             <field name="code">au</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s %(state_code)s %(zip)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s %(state_code)s %(zip)s\n%(country_name)s'"/>
         </record>
         <record id="aw" model="res.country">
             <field name="name">Aruba</field>
@@ -113,7 +113,7 @@
         <record id="be" model="res.country">
             <field name="name">Belgium</field>
             <field name="code">be</field>
-            <field name="address_format" eval="'%(street)s\n%(zip)s, %(city)s\n%(country_name)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(zip)s, %(city)s\n%(country_name)s'"/>
         </record>
         <record id="bf" model="res.country">
             <field name="name">Burkina Faso</field>
@@ -158,7 +158,7 @@
         <record id="br" model="res.country">
             <field name="name">Brazil</field>
             <field name="code">br</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s%(country_name)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s%(country_name)s'"/>
         </record>
         <record id="bs" model="res.country">
             <field name="name">Bahamas</field>
@@ -187,7 +187,7 @@
         <record id="ca" model="res.country">
             <field name="name">Canada</field>
             <field name="code">ca</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'"/>
         </record>
         <record id="cc" model="res.country">
             <field name="name">Cocos (Keeling) Islands</field>
@@ -264,7 +264,7 @@
         <record id="de" model="res.country">
             <field name="name">Germany</field>
             <field name="code">de</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'"/>
         </record>
         <record id="dj" model="res.country">
             <field name="name">Djibouti</field>
@@ -309,7 +309,7 @@
         <record id="es" model="res.country">
             <field name="name">Spain</field>
             <field name="code">es</field>
-            <field name="address_format" eval="'%(street)s\n%(zip)s %(city)s,%(state_name)s\n%(country_name)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(zip)s %(city)s,%(state_name)s\n%(country_name)s'"/>
         </record>
         <record id="et" model="res.country">
             <field name="name">Ethiopia</field>
@@ -338,7 +338,7 @@
         <record id="fr" model="res.country">
             <field name="name">France</field>
             <field name="code">fr</field>
-            <field name="address_format" eval="'%(street)s\n%(zip)s %(city)s\n%(country_name)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(zip)s %(city)s\n%(country_name)s'"/>
         </record>
         <record id="ga" model="res.country">
             <field name="name">Gabon</field>
@@ -455,7 +455,7 @@
         <record id="in" model="res.country">
             <field name="name">India</field>
             <field name="code">in</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(zip)s\n%(state_name)s%(country_name)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(zip)s\n%(state_name)s%(country_name)s'"/>
         </record>
         <record id="io" model="res.country">
             <field name="name">British Indian Ocean Territory</field>
@@ -700,7 +700,7 @@
         <record id="nl" model="res.country">
             <field name="name">Netherlands</field>
             <field name="code">nl</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'"/>
         </record>
         <record id="no" model="res.country">
             <field name="name">Norway</field>
@@ -968,7 +968,7 @@
         </record>
         <record id="uk" model="res.country">
             <field name="name">United Kingdom</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(country_name)s\n%(zip)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(country_name)s\n%(zip)s'"/>
             <field name="code">gb</field>
         </record>
         <record id="um" model="res.country">
@@ -978,7 +978,7 @@
         <record id="us" model="res.country">
             <field name="name">United States</field>
             <field name="code">us</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'"/>
         </record>
         <record id="uy" model="res.country">
             <field name="name">Uruguay</field>
@@ -1088,7 +1088,10 @@
             <field name="name">Your Company</field>
             <field name="partner_id" ref="main_partner"/>
             <field name="rml_header1">Your Company Slogan</field>
-            <field name="rml_footer">Website: www.yourcompany.com | Phone: +33 1 49 51 23 94 </field>
+            <field name="rml_footer">
+                Website: www.yourcompany.com | Phone: +33 1 49 51 23 94
+                Bank Accounts... to be configured in menu Settings / Accounting/Invoicing.
+            </field>
             <field name="currency_id" ref="base.EUR"/>
         </record>
 
@@ -1744,7 +1747,7 @@
             <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateUYU" model="res.currency.rate">
-            <field name="currency_id" ref="UYU" />
+            <field name="currency_id" ref="UYU"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
             <field name="rate">28.36</field>
         </record>

From 545d7843e36bbc6351abdd319eac3016f11daaa2 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 24 Aug 2012 14:01:02 +0200
Subject: [PATCH 551/999] [FIX] marketing_campaign: make tests pass again, move
 partner resolution to mail_compose_message

email_template's job is to generate a mail.mail record, but it
does not care about linking it automatically to a partner
(and certainly not creating new partners) as this must be
usable for mass mailing and for marketing campaign,
and we don't want to pollute the partners database with
possibly thousands of partially fake emails

bzr revid: odo@openerp.com-20120824120102-jycs8x4vkxdmrvge
---
 addons/email_template/email_template.py               | 8 --------
 addons/mail/wizard/mail_compose_message.py            | 8 ++++++++
 addons/marketing_campaign/test/marketing_campaign.yml | 8 +-------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 291ddd6a0ef..9adab6d3976 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -315,7 +315,6 @@ class email_template(osv.osv):
                   'message_id': False,
                   'state': 'outgoing',
                   'content_subtype': 'plain',
-                  'partner_ids': [],
         }
         if not template_id:
             return values
@@ -330,13 +329,6 @@ class email_template(osv.osv):
                                                  template.model, res_id, context=context) \
                                                  or False
 
-        # if email_to: find or create a partner
-        if values['email_to']:
-            partner_id = self.pool.get('mail.thread').message_partner_by_email(cr, uid, values['email_to'], context=context)['partner_id']
-            if not partner_id:
-                partner_id = self.pool.get('res.partner').name_create(cr, uid, values['email_to'], context=context)
-            values['partner_ids'] = [partner_id]
-
         if values['body_html']:
             values.update(content_subtype='html')
 
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 8a172bd62e4..44c30241c13 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -241,6 +241,14 @@ class mail_compose_message(osv.TransientModel):
                 subject = self.render_template(cr, uid, subject, active_model, active_id)
                 body = self.render_template(cr, uid, wizard.body_html, active_model, active_id)
 
+                # TODO TDE: find partner_ids
+                # if email_to: find or create a partner
+                if values['email_to']:
+                    partner_id = self.pool.get('mail.thread').message_partner_by_email(cr, uid, values['email_to'], context=context)['partner_id']
+                    if not partner_id:
+                        partner_id = self.pool.get('res.partner').name_create(cr, uid, values['email_to'], context=context)
+                    values['partner_ids'] = [partner_id]
+
             # determine the ids we are commenting
             if mass_mail_mode:
                 res_ids = context.get('active_ids', [])
diff --git a/addons/marketing_campaign/test/marketing_campaign.yml b/addons/marketing_campaign/test/marketing_campaign.yml
index 04063a6fbc1..3d540b4ccb7 100644
--- a/addons/marketing_campaign/test/marketing_campaign.yml
+++ b/addons/marketing_campaign/test/marketing_campaign.yml
@@ -42,7 +42,7 @@
     record = self.browse(cr, uid, ids[0])
     assert record.state == 'todo' or record.state == 'done' , 'Marketing Workitem shoud be in draft state.'
 -
-  I check follow-up detail of first activity.
+  I process follow-up of first activity.
 -
   !python {model: marketing.campaign.workitem}: |
     ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
@@ -50,12 +50,6 @@
     assert ids, 'Follow-up item is not created for first activity.'
     work_item_id = self.browse(cr ,uid ,ids[0] ,context)
     assert work_item_id.res_name, 'Resource Name is not defined.'
--
-  I process follow-up of first activity.
--
-  !python {model: marketing.campaign.workitem}: |
-    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
-    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_0'))])
     self.process(cr, uid, ids)
     record = self.browse(cr, uid, ids)[0]
     assert record.state == "done", "Follow-up item should be closed after process."

From fb76f9f03792da709e0fefeef3735cf9107d999a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 24 Aug 2012 14:29:28 +0200
Subject: [PATCH 552/999] [IMP] [FIX] crm_partner_assign: as it inherits from
 mail.compose.message, updated the form view to avoid crashe; updated
 mail.compose.message composition mode, that is now an updatable selection
 field. crm_partner_assign will habe to be massively cleaned with the new mail
 module.

bzr revid: tde@openerp.com-20120824122928-dof1y1uxv3lkiwly
---
 .../wizard/crm_forward_to_partner.py          | 29 +++++++++++--------
 .../wizard/crm_forward_to_partner_view.xml    |  7 +----
 addons/mail/wizard/mail_compose_message.py    | 11 +++----
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 3f90bebff97..14013c76b44 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -32,6 +32,11 @@ class crm_lead_forward_to_partner(osv.osv_memory):
     _name = 'crm.lead.forward.to.partner'
     _inherit = "mail.compose.message"
 
+    def _get_composition_mode_selection(self, cr, uid, context=None):
+        composition_mode = super(crm_lead_forward_to_partner, self)._get_composition_mode_selection(cr, uid, context=context)
+        composition_mode.append(('forward', 'Forward'))
+        return composition_mode
+
     _columns = {
         'send_to': fields.selection([('user', 'User'), ('partner', 'Partner'), \
                          ('email', 'Email Address')], 'Send to', required=True),
@@ -44,7 +49,6 @@ class crm_lead_forward_to_partner(osv.osv_memory):
     _defaults = {
         'send_to' : 'email',
         'history': 'latest',
-        'email_from': lambda s, cr, uid, c: s.pool.get('res.users').browse(cr, uid, uid, c).email,
     }
 
     def on_change_email(self, cr, uid, ids, user, context=None):
@@ -68,19 +72,20 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             res = {'value': {'body' : body}}
         return res
     
-    def on_change_partner(self, cr, uid, ids, partner_id):
+    def on_change_partners(self, cr, uid, ids, partner_id):
         """This function fills address information based on partner/user selected
         """
-        if not partner_id:
-            return {'value' : {'email_to' : False}}
-        partner_obj = self.pool.get('res.partner')
-        data = {}
-        partner = partner_obj.browse(cr, uid, [partner_id])
-        user_id = partner and partner[0].user_id or False
-        data.update({'email_from': partner and partner[0].email or "", 
-                     'email_cc' : user_id and user_id.user or '', 
-                     'user_id': user_id and user_id.id or False})
-        return {'value' : data}
+        return {}
+        # if not partner_id:
+        #     return {'value' : {'email_to' : False}}
+        # partner_obj = self.pool.get('res.partner')
+        # data = {}
+        # partner = partner_obj.browse(cr, uid, [partner_id])
+        # user_id = partner and partner[0].user_id or False
+        # data.update({'email_from': partner and partner[0].email or "", 
+        #              'email_cc' : user_id and user_id.user or '', 
+        #              'user_id': user_id and user_id.id or False})
+        # return {'value' : data}
 
     def action_forward(self, cr, uid, ids, context=None):
         """
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index f415a00c680..0613c0aacab 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -17,16 +17,11 @@
                                 on_change="on_change_email(user_id)"/>
                         </group>
                         <group col="4" colspan="4" attrs="{'invisible' : [('send_to','!=','partner')]}">
-                            <field name="partner_id" attrs="{'required' : [('send_to','=','partner')]}" on_change="on_change_partner(partner_id)" colspan="2"/>
+                            <field name="partner_ids" attrs="{'required' : [('send_to','=','partner')]}" on_change="on_change_partners(partner_ids)" colspan="2"/>
                         </group>
                     </group>
                     <separator string="" colspan="4"/>
                     <group col="6" colspan="4">
-                        <field name="email_from" colspan="4" required="1"/>
-                        <field name="email_to" colspan="4" required="1"/>
-                        <field name="email_cc" colspan="4"/>
-                        <field name="email_bcc" colspan="4"/>
-                        <field name="reply_to" colspan="4"/>
                         <field name="subject" colspan="4" widget="char" size="512"/>
                     </group>
                     <separator string="" colspan="4"/>
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 44c30241c13..e64b0cd23aa 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -88,12 +88,13 @@ class mail_compose_message(osv.TransientModel):
                 result[field] = vals[field]
         return result
 
+    def _get_composition_mode_selection(self, cr, uid, context=None):
+        return [('comment', 'Comment a document'), ('reply', 'Reply to a message'), ('mass_mail', 'Mass mailing')]
+
     _columns = {
-        'composition_mode': fields.selection([
-            ('comment', 'Comment a document'),
-            ('reply', 'Reply to a message'),
-            ('mass_mail', 'Mass mailing')
-            ], string='Composition mode'),
+        'composition_mode': fields.selection(
+            lambda s, *a, **k: s._get_composition_mode_selection(*a, **k),
+            string='Composition mode'),
         'partner_ids': fields.many2many('res.partner',
             'mail_compose_message_res_partner_rel',
             'wizard_id', 'partner_id', 'Additional contacts'),

From 33f03a839aca7508be39193275ad6944eec9d886 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 24 Aug 2012 14:36:13 +0200
Subject: [PATCH 553/999] [IMP] remove useless <br/> and space

bzr revid: abo@openerp.com-20120824123613-sijnk7hovy2dl4kw
---
 openerp/addons/base/report/mako_footer.html  | 2 +-
 openerp/addons/base/res/res_company_view.xml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/report/mako_footer.html b/openerp/addons/base/report/mako_footer.html
index 434f4955828..9f8990998a7 100644
--- a/openerp/addons/base/report/mako_footer.html
+++ b/openerp/addons/base/report/mako_footer.html
@@ -8,7 +8,7 @@
 	<tr>
 		<td>
 			% if company['rml_footer']:
-				<p align = "center"><small><b>${company.rml_footer}</b></small></br></p>
+				<p align="center"><small><b>${company.rml_footer}</b></small></p>
 			%endif
 		</td>
 	</tr>
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 16f2813075f..112ee05d77c 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -160,7 +160,7 @@
                             <field name="sequence"/>
                         </group>
                     </group>
-                   </sheet> 
+                   </sheet>
                 </form>
             </field>
         </record>
@@ -188,4 +188,3 @@
 
     </data>
 </openerp>
-

From c53a15ef83469641ff1687d21acef8ee64764bbc Mon Sep 17 00:00:00 2001
From: "Hardik Sanchawat (OpenERP)" <>
Date: Fri, 24 Aug 2012 18:10:13 +0530
Subject: [PATCH 554/999] [IMP] Improved rate of currencies

bzr revid: pso@tinyerp.com-20120824124013-d81zzicddughxs13
---
 openerp/addons/base/country_data.xml  |  4 +--
 openerp/addons/base/currency_data.xml | 45 ++++++++++-----------------
 2 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/openerp/addons/base/country_data.xml b/openerp/addons/base/country_data.xml
index 13df5ff5a8f..9c74c23f555 100644
--- a/openerp/addons/base/country_data.xml
+++ b/openerp/addons/base/country_data.xml
@@ -462,7 +462,7 @@
         <record id="gt" model="res.country">
             <field name="name">Guatemala</field>
             <field name="code">gt</field>
-            <field name="currency_id" ref="QTQ"/>
+            <field name="currency_id" ref="GTQ"/>
         </record>
         <record id="gu" model="res.country">
             <field name="name">Guam (USA)</field>
@@ -1281,4 +1281,4 @@
             <field name="currency_id" ref="ZWD"/>
         </record>
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/openerp/addons/base/currency_data.xml b/openerp/addons/base/currency_data.xml
index 393049ad2cf..53cc9f179df 100644
--- a/openerp/addons/base/currency_data.xml
+++ b/openerp/addons/base/currency_data.xml
@@ -969,7 +969,7 @@
         <record id="rateTPE" model="res.currency.rate">
             <field name="currency_id" ref="TPE" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.00</field>
+            <field name="rate">1.2535</field>
         </record>
         
         <record id="ECS" model="res.currency">
@@ -1102,30 +1102,17 @@
             <field name="rate">0.786</field>
         </record>
         
-        <record id="QTQ" model="res.currency">
-            <field name="name">QTQ</field>
+        <record id="GTQ" model="res.currency">
+            <field name="name">GTQ</field>
             <field name="symbol">Q</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
-        <record id="rateQTQ" model="res.currency.rate">
-            <field name="currency_id" ref="QTQ" />
+        <record id="rateGTQ" model="res.currency.rate">
+            <field name="currency_id" ref="GTQ" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.0000</field>
-        </record>
-        
-        <record id="GGP" model="res.currency">
-            <field name="name">GGP</field>
-            <field name="symbol">£</field>
-            <field name="rounding">0.01</field>
-            <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
-        </record>
-        <record id="rateGGP" model="res.currency.rate">
-            <field name="currency_id" ref="GGP" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.00000</field>
+            <field name="rate">9.8827</field>
         </record>
         
         <record id="GNF" model="res.currency">
@@ -1150,7 +1137,7 @@
         <record id="rateGWP" model="res.currency.rate">
             <field name="currency_id" ref="GWP" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.000000</field>
+            <field name="rate">659.30</field>
         </record>
         
         <record id="GYD" model="res.currency">
@@ -1553,7 +1540,7 @@
         <record id="rateZRZ" model="res.currency.rate">
             <field name="currency_id" ref="ZRZ" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.000000</field>
+            <field name="rate">1148948.76</field>
         </record>
         
         <record id="MZN" model="res.currency">
@@ -1709,7 +1696,7 @@
         <record id="rateVUB" model="res.currency.rate">
             <field name="currency_id" ref="VUB" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.00000</field>
+            <field name="rate">5.3821</field>
         </record>
 
         <record id="EUR" model="res.currency">
@@ -1761,7 +1748,7 @@
         <record id="rateUYP" model="res.currency.rate">
             <field name="currency_id" ref="UYP" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.000000</field>
+            <field name="rate">26.91</field>
         </record>
 
         <record id="AED" model="res.currency">
@@ -1787,7 +1774,7 @@
         <record id="rateUAG" model="res.currency.rate">
             <field name="currency_id" ref="UAG" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.000000</field>
+            <field name="rate">10.17</field>
         </record>
 
         <record id="TMM" model="res.currency">
@@ -1813,7 +1800,7 @@
         <record id="rateTRL" model="res.currency.rate">
             <field name="currency_id" ref="TRL" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.000000</field>
+            <field name="rate">2.255</field>
         </record>
 		
         <record id="TND" model="res.currency">
@@ -1890,7 +1877,7 @@
         <record id="rateTJR" model="res.currency.rate">
             <field name="currency_id" ref="TJR" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.000000</field>
+            <field name="rate">5.95</field>
         </record>		
 
         <record id="TWD" model="res.currency">
@@ -1981,7 +1968,7 @@
         <record id="rateSSP" model="res.currency.rate">
             <field name="currency_id" ref="SSP" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.00000</field>
+            <field name="rate">5.528</field>
         </record>	
 
         <record id="GBP" model="res.currency">
@@ -2007,7 +1994,7 @@
         <record id="rateSOD" model="res.currency.rate">
             <field name="currency_id" ref="SOD" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.00000</field>
+            <field name="rate">1,993.71</field>
         </record>
 
         <record id="SBD" model="res.currency">
@@ -2305,7 +2292,7 @@
         <record id="rateYUM" model="res.currency.rate">
             <field name="currency_id" ref="YUM" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">0.00000</field>
+            <field name="rate">1.96</field>
         </record>		
 		
     </data>

From b24789a9653ac162ff64a38f3fdea1e1093677a8 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 24 Aug 2012 14:43:34 +0200
Subject: [PATCH 555/999] [IMP] reorganize columns

bzr revid: abo@openerp.com-20120824124334-xegqtgy4na1ytrbr
---
 openerp/addons/base/res/res_company.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index a398e5e5dc7..dda0a747546 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -109,9 +109,9 @@ class res_company(osv.osv):
         'parent_id': fields.many2one('res.company', 'Parent Company', select=True),
         'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
-        'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
         'rml_footer': fields.text('General Information Footer'),
         'rml_header': fields.text('RML Header and Footer', required=True),
+        'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
         'rml_header2': fields.text('RML Internal Header', required=True),
         'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True),
         'logo': fields.related('partner_id', 'image', string="Logo", type="binary"),

From 31dd9297dd781db2df05e33482a10e5be2c36dcc Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 24 Aug 2012 14:57:59 +0200
Subject: [PATCH 556/999] [FIX] proper indentation for rml_footer example data

bzr revid: abo@openerp.com-20120824125759-v98ecwe0dtbvdah4
---
 openerp/addons/base/base_data.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index fb267a141fb..393faf45965 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1088,10 +1088,8 @@
             <field name="name">Your Company</field>
             <field name="partner_id" ref="main_partner"/>
             <field name="rml_header1">Your Company Slogan</field>
-            <field name="rml_footer">
-                Website: www.yourcompany.com | Phone: +33 1 49 51 23 94
-                Bank Accounts... to be configured in menu Settings / Accounting/Invoicing.
-            </field>
+            <field name="rml_footer">Website: www.yourcompany.com | Phone: +33 1 49 51 23 94
+Bank Accounts... to be configured in menu Settings / Accounting/Invoicing.</field>
             <field name="currency_id" ref="base.EUR"/>
         </record>
 

From 844ba62cf97950f81d695b23d70b83d8a4fecc70 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Fri, 24 Aug 2012 18:56:39 +0530
Subject: [PATCH 557/999] [IMP] Improvements

bzr revid: pso@tinyerp.com-20120824132639-ny81h7vo813i2ilb
---
 openerp/addons/base/currency_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/currency_data.xml b/openerp/addons/base/currency_data.xml
index 53cc9f179df..4cb3f1773b5 100644
--- a/openerp/addons/base/currency_data.xml
+++ b/openerp/addons/base/currency_data.xml
@@ -1994,7 +1994,7 @@
         <record id="rateSOD" model="res.currency.rate">
             <field name="currency_id" ref="SOD" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">1,993.71</field>
+            <field name="rate">1993.71</field>
         </record>
 
         <record id="SBD" model="res.currency">

From d91979671fb749fe379d1d0b995b5d19705175d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 24 Aug 2012 16:20:00 +0200
Subject: [PATCH 558/999] [REF] crm_partner_assign: refactored code a bit,
 following cleaning of mail, because it inherit from mail.compose.message.
 Removed send_to field, as the new composer is based on partners and simplify
 this wizard; removed a lot of code about setting email_from, email_to, ...
 because this should be managed by the other layers of the mail module.
 Cleaned the code in a more general way to remove weird things. Updated
 releveant form view, especially about context on Forward button, and the form
 view of the wizard that has been much simplified.

bzr revid: tde@openerp.com-20120824142000-0jbgvgdiip5475yp
---
 addons/crm_partner_assign/crm_lead_view.xml   |   7 +-
 .../test/partner_assign.yml                   |   4 +-
 .../wizard/crm_forward_to_partner.py          | 226 ++++++++----------
 .../wizard/crm_forward_to_partner_view.xml    |  54 ++---
 4 files changed, 124 insertions(+), 167 deletions(-)

diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index d4ff93d52fd..057d5240847 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -19,8 +19,7 @@
                                             attrs="{'invisible':[('partner_assigned_id','=',False)]}"
                                             name="%(crm_lead_forward_to_partner_act)d"
                                             icon="terp-mail-forward" type="action"
-                                            context="{'default_name': 'partner', 'default_partner_id': partner_assigned_id}"
-                                        />
+                                            context="{'mail.compose.message.mode': 'forward', 'default_partner_ids': [partner_assigned_id]}"/>
                                     </div>
                                 </group>
                                 <group string="Geo Assignation">
@@ -37,8 +36,6 @@
             </field>
         </record>
 
-
-
         <record id="view_crm_opportunity_geo_assign_tree" model="ir.ui.view">
             <field name="name">crm.lead.geo_assign.tree.inherit</field>
             <field name="model">crm.lead</field>
@@ -49,6 +46,7 @@
                  </field>
             </field>
         </record>
+
         <record model="ir.ui.view" id="crm_opportunity_partner_filter">
             <field name="name">crm.opportunity.partner.filter.assigned</field>
             <field name="model">crm.lead</field>
@@ -63,5 +61,6 @@
                 </field>
             </field>
          </record>
+
     </data>
 </openerp>
diff --git a/addons/crm_partner_assign/test/partner_assign.yml b/addons/crm_partner_assign/test/partner_assign.yml
index bc4cd0d6e57..a055fc6cd6d 100644
--- a/addons/crm_partner_assign/test/partner_assign.yml
+++ b/addons/crm_partner_assign/test/partner_assign.yml
@@ -29,8 +29,8 @@
   I forward this opportunity to its nearest partner.
 -
   !python {model: crm.lead.forward.to.partner}: |
-    context.update({'active_model': 'crm.lead', 'active_id': ref('crm.crm_case_19'), 'active_ids': [ref('crm.crm_case_19')]})
-    forward_id = self.create(cr, uid, {'email_from': 'test@openerp.com', 'send_to': 'partner'}, context=context)
+    context.update({'default_model': 'crm.lead', 'default_res_id': ref('crm.crm_case_19'), 'active_ids': [ref('crm.crm_case_19')]})
+    forward_id = self.create(cr, uid, {}, context=context)
     try:
       self.action_forward(cr, uid, [forward_id], context=context)
     except:
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 14013c76b44..5b0fe97b015 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -28,107 +28,110 @@ from osv import osv, fields
 from tools.translate import _
 
 class crm_lead_forward_to_partner(osv.osv_memory):
-    """Forwards lead history"""
+    """ Forward info history to partners. """
     _name = 'crm.lead.forward.to.partner'
     _inherit = "mail.compose.message"
 
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        # set as comment, perform overrided document-like action that calls get_record_data
+        old_mode = context.get('mail.compose.message.mode', 'forward')
+        context['mail.compose.message.mode'] = 'comment'
+        res = super(crm_lead_forward_to_partner, self).default_get(cr, uid, fields, context=context)
+        # back to forward mode
+        context['mail.compose.message.mode'] = old_mode
+        res['composition_mode'] = context['mail.compose.message.mode']
+        return res
+
     def _get_composition_mode_selection(self, cr, uid, context=None):
         composition_mode = super(crm_lead_forward_to_partner, self)._get_composition_mode_selection(cr, uid, context=context)
         composition_mode.append(('forward', 'Forward'))
         return composition_mode
 
     _columns = {
-        'send_to': fields.selection([('user', 'User'), ('partner', 'Partner'), \
-                         ('email', 'Email Address')], 'Send to', required=True),
-        'user_id': fields.many2one('res.users', "User"),
-        'attachment_ids': fields.many2many('ir.attachment','lead_forward_to_partner_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
-        'partner_id' : fields.many2one('res.partner', 'Partner'),
-        'history': fields.selection([('info', 'Case Information'), ('latest', 'Latest email'), ('whole', 'Whole Story')], 'Send history', required=True),
+        'partner_ids': fields.many2many('res.partner',
+            'lead_forward_to_partner_res_partner_rel',
+            'wizard_id', 'partner_id', 'Additional contacts'),
+        'attachment_ids': fields.many2many('ir.attachment',
+            'lead_forward_to_partner_attachment_rel',
+            'wizard_id', 'attachment_id', 'Attachments'),
+        'history_mode': fields.selection([('info', 'Case Information'),
+            ('latest', 'Latest email'), ('whole', 'Whole Story')],
+            'Send history', required=True),
     }
 
     _defaults = {
-        'send_to' : 'email',
-        'history': 'latest',
+        'history_mode': 'latest',
+        'content_subtype': lambda self,cr, uid, context={}: 'html',
     }
 
-    def on_change_email(self, cr, uid, ids, user, context=None):
-        if not user:
-            return {'value': {'email_to': False}}
-        return {'value': {'email_to': self.pool.get('res.users').browse(cr, uid, uid, context=context).email}}
-
-    def on_change_history(self, cr, uid, ids, history_type, context=None):
-        """Gives message body according to type of history selected
-            * info: Forward the case information
-            * whole: Send the whole history
-            * latest: Send the latest histoy
+    def get_record_data(self, cr, uid, model, res_id, context=None):
+        """ Override of mail.compose.message, to add default values coming
+            form the related lead.
         """
-        #TODO: ids and context are not comming
-        res = {}
-        res_id = context.get('active_id')
-        model = context.get('active_model')
-        lead = self.pool.get(model).browse(cr, uid, res_id, context)
-        body = self._get_message_body(cr, uid, lead, history_type, context=context)
-        if body:
-            res = {'value': {'body' : body}}
+        res = super(crm_lead_forward_to_partner, self).get_record_data(cr, uid, model, res_id, context=context)
+        if model not in ('crm.lead') or not res_id:
+            return res
+        lead_obj = self.pool.get(model)
+        lead = lead_obj.browse(cr, uid, res_id, context=context)
+        subject = '%s: %s - %s' % (_('Fwd'), _('Lead forward'), lead.name)
+        body = self._get_message_body(cr, uid, lead, 'info', context=context)
+        res.update({
+            'subject': subject,
+            'body': body,
+            })
         return res
+
+    def on_change_history_mode(self, cr, uid, ids, history_mode, model, res_id, context=None):
+        """ Update body when changing history_mode """
+        if model and model == 'crm.lead' and res_id:
+            lead = self.pool.get(model).browse(cr, uid, res_id, context=context)
+            body = self._get_message_body(cr, uid, lead, history_mode, context=context)
+            return {'value': {'body': body}}
     
-    def on_change_partners(self, cr, uid, ids, partner_id):
-        """This function fills address information based on partner/user selected
-        """
+    def on_change_partner_ids(self, cr, uid, ids, partner_ids, context=None):
+        """ TDE-TODO: Keep void; maybe we could check that partner_ids have
+            email  defined. """
         return {}
-        # if not partner_id:
-        #     return {'value' : {'email_to' : False}}
-        # partner_obj = self.pool.get('res.partner')
-        # data = {}
-        # partner = partner_obj.browse(cr, uid, [partner_id])
-        # user_id = partner and partner[0].user_id or False
-        # data.update({'email_from': partner and partner[0].email or "", 
-        #              'email_cc' : user_id and user_id.user or '', 
-        #              'user_id': user_id and user_id.id or False})
-        # return {'value' : data}
+
+    def create(self, cr, uid, values, context=None):
+        """ TDE-HACK: remove 'type' from context, because when viewing an
+            opportunity form view, a default_type is set and propagated
+            to the wizard, that has a not matching type field. """
+        default_type = context.pop('default_type', None)
+        new_id = super(crm_lead_forward_to_partner, self).create(cr, uid, values, context=context)
+        if default_type:
+            context['default_type'] = default_type
+        return new_id
 
     def action_forward(self, cr, uid, ids, context=None):
         """
-        Forward the lead to a partner
+            Forward the lead to a partner
         """
         if context is None:
             context = {}
         res = {'type': 'ir.actions.act_window_close'}
-        model = context.get('active_model')
-        if model not in ('crm.lead'):
+        wizard = self.browse(cr, uid, ids[0], context=context)
+        if wizard.model not in ('crm.lead'):
             return res
 
-        this = self.browse(cr, uid, ids[0], context=context)
-        lead = self.pool.get(model)
-        lead_id = context and context.get('active_id', False) or False
-        lead_ids = lead_id and [lead_id] or []
-        mode = context.get('mail.compose.message.mode')
-        if mode == 'mass_mail':
+        lead = self.pool.get(wizard.model)
+        lead_ids = wizard.res_id and [wizard.res_id] or []
+
+        if wizard.composition_mode == 'mass_mail':
             lead_ids = context and context.get('active_ids', []) or []
-            value = self.default_get(cr, uid, ['body', 'email_to', 'email_cc', 'subject', 'history'], context=context)
+            value = self.default_get(cr, uid, ['body', 'email_to', 'email_cc', 'subject', 'history_mode'], context=context)
             self.write(cr, uid, ids, value, context=context)
-            context['mail.compose.message.mode'] = mode
 
         self.send_mail(cr, uid, ids, context=context)
-        for case in lead.browse(cr, uid, lead_ids, context=context):
-            if (this.send_to == 'partner' and this.partner_id):
-                lead.assign_partner(cr, uid, [case.id], this.partner_id.id, context=context)
+        # for case in lead.browse(cr, uid, lead_ids, context=context):
+            # TDE: WHAT TO DO WITH THAT ?
+            # if (this.send_to == 'partner' and this.partner_id):
+            #     lead.assign_partner(cr, uid, [case.id], this.partner_id.id, context=context)
 
-            if this.send_to == 'user':
-                lead.allocate_salesman(cr, uid, [case.id], [this.user_id.id], context=context)
-
-            email_cc = tools.email_split(case.email_cc)
-            email_cc = email_cc and email_cc[0] or ''
-            new_cc = []
-            if email_cc:
-                new_cc.append(email_cc)
-            for to in this.email_to.split(','):
-                email_to = tools.email_split(to)
-                email_to = email_to and email_to[0] or ''
-                if email_to not in new_cc:
-                    new_cc.append(to)
-            update_vals = {'email_cc' : ', '.join(new_cc) }
-            lead.write(cr, uid, [case.id], update_vals, context=context)
+            # if this.send_to == 'user':
+            #     lead.allocate_salesman(cr, uid, [case.id], [this.user_id.id], context=context)
         return res
 
     def _get_info_body(self, cr, uid, lead, context=None):
@@ -137,75 +140,40 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         if lead.type == 'opportunity':
             field_names += ['partner_id']
         field_names += [
-           'partner_name' , 'title', 'function', 'street', 'street2',
+            'partner_name' , 'title', 'function', 'street', 'street2',
             'zip', 'city', 'country_id', 'state_id', 'email_from',
             'phone', 'fax', 'mobile', 'categ_id', 'description',
         ]
         return proxy._mail_body(cr, uid, lead, field_names, context=context)
 
-    def _get_message_body(self, cr, uid, lead, mode='whole', context=None):
-        """This function gets whole communication history and returns as top posting style
+    def _get_message_body(self, cr, uid, lead, history_mode='whole', context=None):
+        """ This function gets whole communication history and returns as top
+            posting style
+            #1: form a body, based on the lead
+            #2: append to the body the communication history, based on the
+                history_mode parameter
+
+            - info: Forward the case information
+            - latest: Send the latest history
+            - whole: Send the whole history
+
+            :param lead: browse_record on crm.lead
+            :param history_mode: 'whole' or 'latest'
         """
         mail_message = self.pool.get('mail.message')
-        message_ids = []
         body = self._get_info_body(cr, uid, lead, context=context)
-        if mode in ('whole', 'latest'):
-            message_ids = lead.message_ids
-            message_ids = map(lambda x: x.id, filter(lambda x: x.email_from, message_ids))
-            if mode == 'latest' and len(message_ids):
-                message_ids = [message_ids[0]]
-            for message in mail_message.browse(cr, uid, message_ids, context=context):
-                header = '-------- Original Message --------'
-                sender = 'From: %s' %(message.email_from or '')
-                to = 'To: %s' % (message.email_to or '')
-                sentdate = 'Date: %s' % (message.date or '')
-                desc = '\n%s'%(message.body)
-                original = [header, sender, to, sentdate, desc, '\n']
-                original = '\n'.join(original)
-                body += original
+        if history_mode not in ('whole', 'latest'):
+            return body or ''
+        for message in lead.message_ids:
+            header = '-------- Original Message --------'
+            sentdate = 'Date: %s' % (message.date or '')
+            desc = '\n%s'%(message.body)
+            original = [header, sentdate, desc, '\n']
+            original = '\n'.join(original)
+            body += original
+            if history_mode == 'latest':
+                break
         return body or ''
 
-    def get_value(self, cr, uid, model, res_id, context=None):
-        if context is None:
-            context = {}
-        res = super(crm_lead_forward_to_partner, self).get_value(cr, uid,  model, res_id, context=context)
-        if model not in ("crm.lead"):
-            return res
-        proxy = self.pool.get(model)
-        partner = self.pool.get('res.partner')
-        lead = proxy.browse(cr, uid, res_id, context=context)
-        mode = context.get('mail.compose.message.mode')
-        if mode == "forward":
-            body_type = context.get('mail.compose.message.body')
-            email_cc = res.get('email_cc', "")
-            email = res.get('email_to', "")
-            subject = '%s: %s - %s' % (_('Fwd'), 'Lead forward', lead.name)
-            body = self._get_message_body(cr, uid, lead, body_type, context=context)
-            partner_assigned_id = lead.partner_assigned_id and lead.partner_assigned_id.id or False
-            user_id = False
-            if not partner_assigned_id:
-                partner_assigned_id = proxy.search_geo_partner(cr, uid, [lead.id], context=None).get(lead.id, False)
-            if partner_assigned_id:
-                assigned_partner = partner.browse(cr, uid, partner_assigned_id, context=context)
-                user_id = assigned_partner.user_id and assigned_partner.user_id.id or False
-                email_cc = assigned_partner.user_id and assigned_partner.user_id.email or ''
-                email = assigned_partner.email
-            
-            res.update({
-                'subject' : subject,
-                'body' : body,
-                'email_cc' : email_cc,
-                'email_to' : email,
-                'partner_assigned_id': partner_assigned_id,
-                'user_id': user_id,
-            })
-        return res
-        
 
-    def default_get(self, cr, uid, fields, context=None):
-        if context is None:
-            context = {}
-        context['mail.compose.message.mode'] = 'forward'
-        context['mail.compose.message.body'] = 'info'
-        return super(crm_lead_forward_to_partner, self).default_get(cr, uid, fields, context=context)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 0613c0aacab..600bd301b3f 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -7,37 +7,31 @@
             <field name="model">crm.lead.forward.to.partner</field>
             <field name="arch" type="xml">
                 <form string="Send Mail" version="7.0">
+                    <field name="composition_mode" colspan="2" nolabel="1" invisible="1"/>
+                    <field name="model" colspan="2" nolabel="1" invisible="1"/>
+                    <field name="res_id" colspan="2" nolabel="1" invisible="1"/>
                     <separator string="Forward to Partner" colspan="4"/>
-                    <group col="4" colspan="6">
-                        <field name="history" colspan="2" on_change="on_change_history(history, context)"/>
-                        <field name="send_to" colspan="2"/>
-                        <group col="2" colspan="2" attrs="{ 'invisible' : [('send_to','!=','user')]}">
-                            <field name="user_id"
-                                attrs="{ 'required' : [('send_to','=','user')]}"
-                                on_change="on_change_email(user_id)"/>
-                        </group>
-                        <group col="4" colspan="4" attrs="{'invisible' : [('send_to','!=','partner')]}">
-                            <field name="partner_ids" attrs="{'required' : [('send_to','=','partner')]}" on_change="on_change_partners(partner_ids)" colspan="2"/>
-                        </group>
+                    <group col="4">
+                        <field name="history_mode" colspan="4"
+                            on_change="on_change_history_mode(history_mode, model, res_id)"/>
+                        <field name="subject" colspan="4"/>
+                        <field name="partner_ids" colspan="4" widget="many2many_tags"
+                            on_change="on_change_partner_ids(partner_ids)"/>
+                        <notebook colspan="4">
+                            <page string="Body">
+                                <field name="body"/>
+                            </page>
+                            <page string="Attachments">
+                                <field name="attachment_ids"/>
+                            </page>
+                        </notebook>
                     </group>
-                    <separator string="" colspan="4"/>
-                    <group col="6" colspan="4">
-                        <field name="subject" colspan="4" widget="char" size="512"/>
-                    </group>
-                    <separator string="" colspan="4"/>
-                    <notebook colspan="4">
-                        <page string="Body">
-                            <field name="body" colspan="4" nolabel="1"/>
-                        </page>
-                        <page string="Attachments">
-                            <label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
-                            <field name="attachment_ids" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
                     <footer>
-                        <button name="action_forward" string="Send" type="object" class="oe_highlight"/>
+                        <button name="action_forward" string="Send" type="object"
+                            class="oe_highlight"/>
                         or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
+                        <button string="Cancel" special="cancel"
+                            class="oe_link"/>
                     </footer>
                 </form>
             </field>
@@ -52,8 +46,6 @@
             <field name="target">new</field>
         </record>
 
-
-
         <act_window id="action_crm_send_mass_forward"
             multi="True"
             key2="client_action_multi" name="Mass forward to partner"
@@ -61,9 +53,7 @@
             view_mode="form" target="new" view_type="form"
             context="{'mail.compose.message.mode' : 'mass_mail'}"
             view_id="crm_lead_forward_to_partner_form"
-       />
-
-
+        />
 
     </data>
 </openerp>

From ab6b3cc266068efc9e61d01d4dbb023eb3025093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 24 Aug 2012 16:31:12 +0200
Subject: [PATCH 559/999] [IMP] Remove some warnings about: alias_force_id ->
 alias_force_thread_id; type set in view that is not necessayr anymore.

bzr revid: tde@openerp.com-20120824143112-krho3ahvklxcod29
---
 addons/mail/mail_followers_view.xml | 1 -
 addons/mail/res_users.py            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mail/mail_followers_view.xml b/addons/mail/mail_followers_view.xml
index 0637d4dc11e..eb22abc2629 100644
--- a/addons/mail/mail_followers_view.xml
+++ b/addons/mail/mail_followers_view.xml
@@ -6,7 +6,6 @@
         <record model="ir.ui.view" id="view_followers_tree">
             <field name="name">mail.followers.tree</field>
             <field name="model">mail.followers</field>
-            <field name="type">tree</field>
             <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Followers">
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index babf2213bd5..b32b6a6ff65 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -75,7 +75,7 @@ class res_users(osv.Model):
         # Use read() not browse(), to avoid prefetching uninitialized inherited fields
         for user_data in res_users_model.read(cr, SUPERUSER_ID, users_no_alias, ['login']):
             alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, {'alias_name': user_data['login'],
-                                                                         'alias_force_id': user_data['id']},
+                                                                         'alias_force_thread_id': user_data['id']},
                                                       model_name=self._name)
             res_users_model.write(cr, SUPERUSER_ID, user_data['id'], {'alias_id': alias_id})
             _logger.info('Mail alias created for user %s (uid %s)', user_data['login'], user_data['id'])

From 6e3ea98e486751a13fa6802b1a03b3c0365b20d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 24 Aug 2012 18:09:36 +0200
Subject: [PATCH 560/999] [IMP] mail_mail: re-instaured body_alternative, using
 html2plaintext of tools. Removed some dead imports.

bzr revid: tde@openerp.com-20120824160936-n3fehtgf4f2k0dkn
---
 addons/mail/mail_mail.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index c5a062054f3..fa0c18ef529 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -19,13 +19,9 @@
 #
 ##############################################################################
 
-import ast
+# import ast
 import base64
-import datetime
-import email
 import logging
-import re
-import time
 import tools
 
 from osv import osv
@@ -158,10 +154,10 @@ class mail_mail(osv.Model):
                 body = message.body_html if message.content_subtype == 'html' else message.body
                 body_alternative = None
                 content_subtype_alternative = None
-                if message.content_subtype == 'html' and message.body:
+                if message.content_subtype == 'html':
                     # we have a plain text alternative prepared, pass it to 
                     # build_message instead of letting it build one
-                    body_alternative = message.body
+                    body_alternative = tools.html2plaintext(message.body)
                     content_subtype_alternative = 'plain'
 
                 # handle destination_partners

From d583b98a9731118c123df2a99006ef24e0eacef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 24 Aug 2012 18:10:38 +0200
Subject: [PATCH 561/999] [IMP] mail_followers: moved email creation for emails
 send for notification into a dedicated method; updated subject and body
 creation (added default subject, added signature on body).

bzr revid: tde@openerp.com-20120824161038-vhylgsify9f9xder
---
 addons/mail/mail_followers.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 72dd3519ace..2045df49d70 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -71,19 +71,13 @@ class mail_notification(osv.Model):
     def notify(self, cr, uid, partner_ids, msg_id, context=None):
         """ Send by email the notification depending on the user preferences """
         context = context or {}
-        partner_obj = self.pool.get('res.partner')
         mail_mail_obj = self.pool.get('mail.mail')
-        notification_obj = self.pool.get('mail.notification')
         msg_obj = self.pool.get('mail.message')
         msg = msg_obj.browse(cr, uid, msg_id, context=context)
 
-        towrite = {
-            'email_to': [],
-            'subject': msg.subject,
-            'body': msg.body,
-        }
+        towrite = self.notify_get_notif_email_dict(cr, uid, msg, context=context)
 
-        for partner in partner_obj.browse(cr, uid, partner_ids, context=context):
+        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
             # Do not send an email to the writer
             if partner.user_id.id == uid:
                 continue
@@ -98,9 +92,7 @@ class mail_notification(osv.Model):
             if partner.email not in towrite['email_to']:
                 towrite['email_to'].append(partner.email)
 
-        if towrite.get('state') and not context.get('noemail'):
-            if towrite.get('subject'):
-                towrite['subject'] = msg.name_get()[0][1]
+        if towrite.get('state') and not context.get('mail_noemail'):
             towrite['message_id'] = msg.id
             towrite['email_to'] = ', '.join(towrite['email_to'])
             
@@ -108,3 +100,18 @@ class mail_notification(osv.Model):
             mail_mail_obj.send(cr, uid, [email_notif_id], context=context)
 
         return True
+
+    def notify_get_notif_email_dict(self, cr, uid, msg, context=None):
+        """ Return the content of the email send for notification.
+            :param message: browse record on source mail.message
+        """
+        subject = msg.subject or '%s posted a comment on %s' % (msg.author_id.name, msg.record_name)
+        body = msg.body
+        author_signature = msg.author_id.user_ids[0].signature
+        if author_signature:
+            body += '<div>%s</div>' % (author_signature)
+        return {
+            'email_to': [],
+            'subject': subject,
+            'body': body,
+        }

From d19ad1ff4ba8008cc2829ada1e9ba8e6ea989b17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 24 Aug 2012 18:11:17 +0200
Subject: [PATCH 562/999] [TEST] mail: added tests for the composer, includes a
 first bench of tests for notifications and send emails.

bzr revid: tde@openerp.com-20120824161117-abur02jlgs08my21
---
 addons/mail/tests/test_mail.py | 82 ++++++++++++++++++++++++----------
 1 file changed, 58 insertions(+), 24 deletions(-)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 83c9f363c7f..29db0bc529e 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.tests import common
+import tools
 
 MAIL_TEMPLATE = """Return-Path: <whatever-2a840@postmaster.twitter.com>
 To: {to}
@@ -78,6 +79,9 @@ class test_mail(common.TransactionCase):
         self.res_users = self.registry('res.users')
         self.res_partner = self.registry('res.partner')
 
+        # Install mock SMTP gateway
+        self.registry('ir.mail_server').send_email = lambda *a,**kwargs: True
+
         # groups@.. will cause the creation of new mail groups
         self.mail_group_model_id = self.ir_model.search(self.cr, self.uid, [('model','=', 'mail.group')])[0]
         self.mail_alias.create(self.cr, self.uid, {'alias_name': 'groups',
@@ -235,41 +239,71 @@ class test_mail(common.TransactionCase):
         cr, uid = self.cr, self.uid
         mail_compose = self.registry('mail.compose.message')
         user_admin = self.res_users.browse(cr, uid, uid)
+        self.res_users.write(cr, uid, [uid], {'signature': 'Admin'})
+        user_admin.refresh()
         group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
-        # print 'pigs message_ids: %s' % group_pigs.message_ids
-        # print 'pigs follower_ids: %s' % group_pigs.message_follower_ids
 
-        # Create partner Bert Poilu
-        partner_bert_id = self.res_partner.create(cr, uid, {'name': 'Bert Poilu', 'email': 'bert@poil.poil'})
-        partner_raoul_id = self.res_partner.create(cr, uid, {'name': 'Raoul Grosbedon'})
+        # Mail data
+        _subject = 'Pigs'
+        _mail_subject = '%s posted a comment on %s' % (user_admin.name, group_pigs.name)
+        _body_text = 'Pigs rules'
+        _body_html = '<b>Pigs</b> rules'
+
+        # Create partners
+        # 0 - Create an email address for Admin, to check email sending
+        self.res_users.write(cr, uid, [uid], {'email': 'a@a'})
+        # 1 - Bert Tartopoils, with email, should receive emails for comments and emails
+        partner_bert_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
+        # 2 - Raoul Grosbedon, without email, to test email verification; should receive emails for every message
+        partner_raoul_id = self.res_partner.create(cr, uid, {'name': 'Raoul Grosbedon', 'notification_email_pref': 'all'})
+        # 3 - Roger Poilvache, with email, should never receive emails
+        partner_roger_id = self.res_partner.create(cr, uid, {'name': 'Roger Poilvache', 'email': 'r@r', 'notification_email_pref': 'none'})
 
         # Create a new comment on group_pigs
         compose_id = mail_compose.create(cr, uid,
-            {'subject': 'Pigs', 'body_text': 'Pigs rules', 'partner_ids': [(4, partner_bert_id), (4, partner_raoul_id)]},
+            {'subject': _subject, 'body_text': _body_text, 'partner_ids': [(4, partner_bert_id), (4, partner_raoul_id), (4, partner_roger_id)]},
             {'mail.compose.message': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_pigs_id})
-        # print 'wizard id: %s' % compose_id
         compose = mail_compose.browse(cr, uid, compose_id)
-        # print 'wizard partner_ids: %s' % compose.partner_ids
-        self.assertTrue(compose.model == 'mail.group' and compose.res_id == self.group_pigs_id)
+        self.assertTrue(compose.model == 'mail.group' and compose.res_id == self.group_pigs_id,
+            'Wizard message has model %s and res_id %s; should be mail.group and %s' % (compose.model, compose.res_id, self.group_pigs_id))
 
-        # Send the comment
+        # Post the comment, get created message
         mail_compose.send_mail(cr, uid, [compose_id])
-
         group_pigs.refresh()
-        # print 'pigs message_ids: %s' % group_pigs.message_ids[0]
-        new_message = group_pigs.message_ids[0]
-        new_partner_ids = [partner.id for partner in new_message.partner_ids]
+        first_com = group_pigs.message_ids[0]
 
-        # print 'pigs new_message subject: %s' %  new_message.subject
-        # print 'pigs new_message body: %s' %  new_message.body
-        # print 'pigs new_message partner_ids: %s' %  new_message.partner_ids
-
-        notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', new_message.id)])
-        # print notif_ids
+        # Check message content
+        self.assertTrue(first_com.subject == False and first_com.body == _body_text,
+            'Posted comment subject is %s and body is %s; should be False and %s' % (first_com.subject, first_com.body, _body_text))
 
         # Message partners = notified people = writer + partner_ids
-        self.assertTrue(len(new_partner_ids) == 3, 'There should be 3 partners linked to the newly posted comment.')
-        self.assertTrue(len(notif_ids) == 3, 'There should be only 3 entries in mail_notification')
-        self.assertTrue(all(id in [user_admin.partner_id.id, partner_bert_id, partner_raoul_id] for id in new_partner_ids),
-            'Admin, Bert and Roaul should be the 3 partners of the newly created message')
+        first_com_pids = [partner.id for partner in first_com.partner_ids]
+        notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', first_com.id)])
+        self.assertTrue(len(first_com_pids) == 4, 'There are %s partners linked to the newly posted comment; should be 4' % (len(first_com_pids)))
+        self.assertTrue(len(notif_ids) == 4, 'There are %s 3 entries in mail_notification: should be 4' % (len(notif_ids)))
+        self.assertTrue(all(id in [user_admin.partner_id.id, partner_bert_id, partner_raoul_id, partner_roger_id] for id in first_com_pids),
+            'Admin, Bert Raoul and Roger should be the 4 partners of the newly created message')
+
+        # Fetch latest created email, that should be the email send to partners
+        mail_ids = self.mail_mail.search(cr, uid, [], limit=1)
+        mail = self.mail_mail.browse(cr, uid, mail_ids[0])
+        mail_emails = tools.email_split(mail.email_to)
+
+        # Check email subject, body, and email_to
+        expected_emails = ['a@a', 'b@b']
+        self.assertTrue(mail.subject == _mail_subject and _body_text in mail.body,
+            'Send email subject is \'%s\' and should be %s; body is %s and should contain %s' % (mail.subject, _mail_subject, mail.body, _body_text))
+        self.assertTrue(all(email in mail_emails for email in expected_emails) and len(mail_emails) == 2,
+            'Send email emails are %s; should be %s' % (mail_emails, expected_emails))
+
+        # Create a reply to the last comment, with default partners
+        compose_id = mail_compose.create(cr, uid,
+            {}, {'mail.compose.message.mode': 'reply', 'default_model': 'mail.thread', 'default_res_id': self.group_pigs_id,
+                'active_id': first_com.id})
+        compose = mail_compose.browse(cr, uid, compose_id)
+        self.assertTrue(compose.model == 'mail.group' and compose.res_id == self.group_pigs_id,
+            'Wizard message has model: %s and res_id:%s; should be mail.group and %s' % (compose.model, compose.res_id, self.group_pigs_id))
+        self.assertTrue(compose.parent_id.id == first_com.id and len(compose.partner_ids) == 5,
+            'Wizard parent_id is %d; should be %d; or wrong partner_ids (TO BE CONTINUED)' % (compose.parent_id.id, first_com.id))
+
         
\ No newline at end of file

From 971756e0161d48eb53f754068b6ba11edf8269dd Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 24 Aug 2012 18:13:20 +0200
Subject: [PATCH 563/999] [FIX] crm: correct mass conversion wizard defaults,
 fixes crm tests

bzr revid: odo@openerp.com-20120824161320-mdfqibfe53v2op79
---
 addons/crm/test/process/lead2opportunity2win.yml |  5 +++--
 addons/crm/wizard/crm_lead_to_opportunity.py     | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index 0156dc9a8b1..ed552421cf0 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -73,7 +73,7 @@
   I convert mass lead into opportunity customer.
 -
   !python {model: crm.lead2opportunity.partner.mass}: |
-    context.update({'active_model': 'crm.lead', 'active_ids': [ref("crm_case_11"), ref("crm_case_2")], 'active_id': ref("crm_case_4")}) 
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref("crm_case_11"), ref("crm_case_2")], 'active_id': ref("crm_case_11")}) 
     id = self.create(cr, uid, {'user_ids': [ref('base.user_root')], 'section_id': ref('crm.section_sales_department')}, context=context)
     self.mass_convert(cr, uid, [id], context=context)
 -
@@ -83,7 +83,8 @@
     opp = self.browse(cr, uid, ref('crm_case_11'))
     assert opp.name == "Need estimated cost for new project", "Opportunity name not correct"
     assert opp.type == 'opportunity', 'Lead is not converted to opportunity!'
-    assert opp.partner_id.name == "Thomas Passot", 'Partner mismatch!'
+    expected_partner = "Thomas Passot"
+    assert opp.partner_id.name == expected_partner, 'Partner mismatch! %s vs %s' % (opp.partner_id.name, expected_partner)
     assert opp.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
 -
   Then check for second lead converted on opportunity.
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index fc366768023..e90303dda66 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -153,11 +153,24 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
     _description = 'Mass Lead To Opportunity Partner'
     _inherit = 'crm.lead2opportunity.partner'
 
-
     _columns = {
             'user_ids':  fields.many2many('res.users', string='Salesmen'),
             'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
+
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(crm_lead2opportunity_mass_convert, self).default_get(cr, uid, fields, context)
+        if 'partner_id' in fields:
+            # avoid forcing the partner of the first lead as default
+            res['partner_id'] = False
+        if 'action' in fields:
+            res['action'] = 'create'
+        if 'name' in fields:
+            res['name'] = 'convert'
+        if 'opportunity_ids' in fields:
+            res['opportunity_ids'] = False
+        return res
+
     def _convert_opportunity(self, cr, uid, ids, vals, context=None):
         data = self.browse(cr, uid, ids, context=context)[0]
         salesteam_id = data.section_id and data.section_id.id or False

From aa4f0002e1351359c2d142afec9c9120472d3c08 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 24 Aug 2012 18:59:00 +0200
Subject: [PATCH 564/999] [WIP] company: improve bank accounts management in
 footer

bzr revid: abo@openerp.com-20120824165900-li4qvg82uxxs1di6
---
 openerp/addons/base/res/res_company.py       | 14 +++++++++++---
 openerp/addons/base/res/res_company_view.xml | 17 +++++++++--------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index dda0a747546..8f5b44e8e75 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -141,20 +141,28 @@ class res_company(osv.osv):
     def _set_rml_footer(self, cr, uid, ids, footer=False, context=None):
         return self.write(cr, uid, ids, {'rml_footer': footer}, context=context)
 
-    def on_change_header(self, cr, uid, ids, customize_footer, phone, email, fax, website, vat, reg=False, context=None):
+    def on_change_header(self, cr, uid, ids, customize_footer, phone, email, fax, website, vat, company_registry=False, bank_ids=False, context=None):
         val = []
         if customize_footer:
             return {}
+
         if phone: val.append(_('Phone: ')+phone)
         if fax: val.append(_('Fax: ')+fax)
         if email: val.append(_('Email: ')+email)
         if website: val.append(_('Website: ')+website)
         if vat: val.append(_('TIN: ')+vat)
-        if reg: val.append(_('Reg: ')+reg)
+        if company_registry: val.append(_('Reg: ')+company_registry)
+        # if the bank accounts got edited and at least one if flagged as "show in the footer"
+        if bank_ids:
+            bank_ids = self.browse(cr, uid, ids[0], context=context).bank_ids
+            bank_account_numbers = [bank_account.acc_number for bank_account in bank_ids if bank_account.footer]
+
+            val.append(_('Bank Account'+('s' if len(bank_account_numbers) > 1 else '')+': ')+', '.join(bank_account_numbers))
+
         footer = ' | '.join(val)
         self._set_rml_footer(cr, uid, ids, footer, context=context)
-        return {'value': {'rml_footer': footer}}
 
+        return {'value': {'rml_footer': footer}}
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False, access_rights_uid=None):
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 112ee05d77c..54b68b09c6e 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -55,24 +55,25 @@
                                    <div>
                                        <field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
                                    </div>
-                                    <field name="website" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry)" widget="url" placeholder="e.g. www.openerp.com"/>
+                                    <field name="website" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)" widget="url" placeholder="e.g. www.openerp.com"/>
                                 </group>
                                 <group>
-                                    <field name="phone" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry)"/>
-                                    <field name="fax" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry)"/>
-                                    <field name="email" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry)"/>
-                                    <field name="vat" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry)"/>
-                                    <field name="company_registry" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry)"/>
+                                    <field name="phone" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    <field name="fax" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    <field name="email" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    <field name="vat" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    <field name="company_registry" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
                                 </group>
                             </group>
                             <group string="Bank Accounts">
-                                <field name="bank_ids" colspan="4" nolabel="1"/>
+                                <field name="bank_ids" colspan="4" nolabel="1" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                            </group>
+                            <group string="Footer Configuration">
                                 <field name="customize_footer"/>
                                 <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
                                 <label for="rml_footer"/>
                                 <div name="bank_acc">
                                     <field name="rml_footer" attrs="{'readonly': [('customize_footer','=', False)]}"/>
-                                    <!--<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward" class="oe_inline"/>-->
                                 </div>
                             </group>
                         </page>

From e79baa9e8a5759a3626c15dba76b1f03d8ecd098 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 27 Aug 2012 10:31:51 +0530
Subject: [PATCH 565/999] [FIX] resolve Conflicts reverts

bzr revid: jam@tinyerp.com-20120827050151-yinbjtladoe3vu5w
---
 addons/web_diagram/static/src/js/diagram.js        | 2 +-
 addons/web_diagram/static/src/xml/base_diagram.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index 657e68d6f06..543cc6a9c12 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -47,7 +47,7 @@ instance.web.DiagramView = instance.web.View.extend({
             return label.tag == "label";
         });
 
-        this.$el.html(QWeb.render("DiagramView", this));
+        this.$el.html(QWeb.render("DiagramView", {'widget': this}));
         this.$el.addClass(this.fields_view.arch.attrs['class']);
 
         _.each(self.labels,function(label){
diff --git a/addons/web_diagram/static/src/xml/base_diagram.xml b/addons/web_diagram/static/src/xml/base_diagram.xml
index b6065093231..f883f949457 100644
--- a/addons/web_diagram/static/src/xml/base_diagram.xml
+++ b/addons/web_diagram/static/src/xml/base_diagram.xml
@@ -2,7 +2,7 @@
 <t t-name="DiagramView">
     <div class="oe_diagram_header" t-att-id="element_id + '_header'">
         <h3 class="oe_diagram_title"/>
-            <t t-if="this._is_action_enabled('create')">
+            <t t-if="widget._is_action_enabled('create')">
                 <div class="oe_diagram_buttons">
                         <button type="button" id="new_node" class="oe_button oe_diagram_button_new">New Node</button>
                 </div>

From ee8061190285765f32546c9ff6738bea98a58d3e Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Mon, 27 Aug 2012 10:45:07 +0530
Subject: [PATCH 566/999] [IMP] l10n_in_hr_payroll: typo

bzr revid: mra@tinyerp.com-20120827051507-d6jpql116j7s8q3k
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index f3537a25cd7..95bb65514a2 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -44,8 +44,8 @@ class hr_contract(osv.osv):
         'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll'), help="Amount for Tax Deduction at Source"),
         'driver_salay': fields.boolean('Driver Salary', help="Check this box if you provide allowance for driver"),
         'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance"),
-        'voluntary_provident_fund': fields.float('Voluntary Provident Fund', digits_compute=dp.get_precision('Payroll'), help="VPF computed as percentage(%)"),
-        'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance for Metro and Non Metro City', digits_compute=dp.get_precision('Payroll'), help="HRA computed as percentage(%)"),
+        'voluntary_provident_fund': fields.float('Voluntary Provident Fund (%)', digits_compute=dp.get_precision('Payroll'), help="VPF computed as percentage(%)"),
+        'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance (%)', digits_compute=dp.get_precision('Payroll'), help="HRA computed as percentage(%)"),
         'supplementary_allowance': fields.float('Supplementary Allowance', digits_compute=dp.get_precision('Payroll')),
     }
 

From 6aa5ea647f245b396bbd7f5f040a1bde0ba8c990 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Mon, 27 Aug 2012 10:58:43 +0530
Subject: [PATCH 567/999] [IMP] l10n_in_hr_payroll: typo

bzr revid: mra@tinyerp.com-20120827052843-tx702vetryimkldk
---
 addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 2ee0a5b3086..528d4f8dc35 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -71,7 +71,7 @@
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * contract.house_rent_allowance_metro_nonmetro / 100) or (contract.wage * contract.house_rent_allowance_metro_nonmetro / 100)</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="name">House Rent Allowance for metro and nonmetro city</field>
+            <field name="name">House Rent Allowance</field>
             <field name="register_id" ref="hr_houserent_allowance_register"/>
             <field name="sequence" eval="51"/>
         </record>

From b5cd423bcafe0857467e06ecc0fdd7dab7e76171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 27 Aug 2012 10:51:45 +0200
Subject: [PATCH 568/999] [FIX] Chatter: tried to fix the display on Wall /
 document.

bzr revid: tde@openerp.com-20120827085145-7v4l5cz6u7lhsajw
---
 addons/mail/static/src/css/mail.css | 32 +++++++++++++++++++++--------
 addons/mail/static/src/xml/mail.xml |  8 +++-----
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d094aa9fbcb..f33f1c6ed99 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -1,3 +1,20 @@
+/* ------------------------------------------------------------ */
+/* Reset because of ugly display of end of August
+/* ------------------------------------------------------------ */
+
+.openerp .oe_mail_wall ul, .openerp .oe_mail_wall li {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+}
+
+.openerp .oe_mail_recthread ul, .openerp .oe_mail_recthread li {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+}
+
+
 /* ------------------------------------------------------------ */
 /* Wall
 /* ------------------------------------------------------------ */
@@ -8,19 +25,16 @@
     background: white;
 }
 
-.openerp div.oe_mail_wall_main {
-    float: left;
-    width: 560px;
-    margin: 8px;
-}
-
-.openerp div.oe_mail_wall_aside {
+.openerp div.oe_mail_wall div.oe_mail_wall_aside {
     margin-left: 565px;
     margin: 8px;
 }
 
-.openerp ul.oe_mail_wall_threads {
-    margin-top: 8px;
+.openerp div.oe_mail_wall ul.oe_mail_wall_threads {
+    float: left;
+    width: 560px;
+    margin: 8px;
+    list-style-type: none;
 }
 
 /* Specific display of threads in the wall */
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index d0ae83316e7..06a1ce48605 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -27,11 +27,9 @@
             </tr>
           </tbody>
         </table>
-        <div class="oe_mail_wall_main">
-            <ul class="oe_mail_wall_threads">
-                <!-- contains threads -->
-            </ul>
-        </div>
+        <ul class="oe_mail_wall_threads">
+            <!-- contains threads -->
+        </ul>
         <div class="oe_mail_wall_aside">
                 <!-- contains currently nothing -->
         </div>

From 3d78cacd447ee26e4f89af2e6afe8425523271bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 27 Aug 2012 11:28:24 +0200
Subject: [PATCH 569/999] [FIX] base_calendar: fixed a typo in crm_meeting_view
 added when merging trunk.

bzr revid: tde@openerp.com-20120827092824-ic9v3ug6ljyqeip1
---
 addons/base_calendar/crm_meeting_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index d5d5d2dcc72..928f8d94d5c 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -244,7 +244,7 @@
         <field name="name">CRM - Meetings Tree</field>
         <field name="model">crm.meeting</field>
         <field name="arch" type="xml">
-            <tree string="Meetings" fonts="bold:message_unread==True"
+            <tree string="Meetings" fonts="bold:message_unread==True">
                 <field name="name" string="Subject" />
                 <field name="user_id"/>
                 <field name="date"/>

From 9e3184ad33ccdafe2277878c053870b7ed26bb1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 27 Aug 2012 11:42:28 +0200
Subject: [PATCH 570/999] [CLEAN] mail_message: get_record_name and name_get
 now use a dedicated function to truncate names. Moved arbitrary '18' into a
 variable.

bzr revid: tde@openerp.com-20120827094228-xl2i88lhqgn0fw04
---
 addons/mail/mail_message.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 4ce552d6b05..bd74e5eb0d0 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -21,7 +21,6 @@
 
 import logging
 from email.header import decode_header
-
 from osv import osv, fields
 import tools
 
@@ -45,15 +44,22 @@ class mail_message(osv.Model):
     _inherit = ['ir.needaction_mixin']
     _order = 'id desc'
 
+    _message_read_limit = 10
+    _message_record_name_length = 18
+
+    def _shorten_name(self, name):
+        if len(name) <= (self._message_record_name_length+3):
+            return name
+        else:
+            return name[:18] + '...'
+
     def get_record_name(self, cr, uid, ids, name, arg, context=None):
+        """ Return the related document name, using get_name. """
         result = dict.fromkeys(ids, '')
         for message in self.browse(cr, uid, ids, context=context):
             if not message.model or not message.res_id:
                 continue
-            doc = self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1]
-            if len(doc)>18:
-                doc=doc[:18]+'...'
-            result[message.id] = doc
+            result[message.id] = self._shorten_name(self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1])
         return result
 
     def name_get(self, cr, uid, ids, context=None):
@@ -62,12 +68,8 @@ class mail_message(osv.Model):
             ids = [ids]
         res = []
         for message in self.browse(cr, uid, ids, context=context):
-            name = ''
-            if message.subject:
-                name = '%s: ' % (message.subject)
-            if message.body:
-                name = name + message.body[0:20]
-            res.append((message.id, name))
+            name = '%s: %s' % (message.subject or '', message.body or '')
+            res.append((message.id, self._shorten_name(name.lstrip(' :'))))
         return res
 
     _columns = {

From 6f8dc9815ab8008f07a9d6eade52b466d8ed53c1 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 27 Aug 2012 11:54:27 +0200
Subject: [PATCH 571/999] [IMP] add a comment

bzr revid: abo@openerp.com-20120827095427-la88mj8vmroobhmn
---
 openerp/addons/base/res/res_company.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 8f5b44e8e75..0e5f90c3dcd 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -156,7 +156,7 @@ class res_company(osv.osv):
         if bank_ids:
             bank_ids = self.browse(cr, uid, ids[0], context=context).bank_ids
             bank_account_numbers = [bank_account.acc_number for bank_account in bank_ids if bank_account.footer]
-
+            # append the account(s) in the footer and manage plural form of "account" if necessary
             val.append(_('Bank Account'+('s' if len(bank_account_numbers) > 1 else '')+': ')+', '.join(bank_account_numbers))
 
         footer = ' | '.join(val)

From 1491a9f1368f11d0a53e4d6295dbfafa847d4b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 27 Aug 2012 12:16:59 +0200
Subject: [PATCH 572/999] [REF] mail: mail_mail views are now in
 mail_mail_view.xml file.

bzr revid: tde@openerp.com-20120827101659-9i1c0rcep4ixzxpb
---
 addons/mail/__openerp__.py        |   1 +
 addons/mail/mail_mail_view.xml    | 131 ++++++++++++++++++++++++++++++
 addons/mail/mail_message_view.xml | 127 -----------------------------
 3 files changed, 132 insertions(+), 127 deletions(-)
 create mode 100644 addons/mail/mail_mail_view.xml

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index daec8d03183..99dd6bda6ac 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -64,6 +64,7 @@ The main features of the module are:
         'wizard/mail_compose_message_view.xml',
         'res_config_view.xml',
         'mail_message_view.xml',
+        'mail_mail_view.xml',
         'mail_followers_view.xml',
         'mail_thread_view.xml',
         'mail_group_view.xml',
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
new file mode 100644
index 00000000000..3abe0b1ddc6
--- /dev/null
+++ b/addons/mail/mail_mail_view.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_mail_form">
+            <field name="name">mail.mail.form</field>
+            <field name="model">mail.mail</field>
+            <field name="arch" type="xml">
+                <form string="Email message" version="7.0">
+                    <sheet>
+                        <label for="subject" class="oe_edit_only"/>
+                        <h2><field name="subject"/></h2>
+                        <div>
+                            by <field name="author_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/>
+                            <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
+                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
+                        </div>
+                        <notebook colspan="4">
+                            <page string="Message Details">
+                                <group>
+                                    <group>
+                                        <field name="email_from"/>
+                                        <field name="email_to"/>
+                                        <field name="email_cc"/>
+                                        <field name="reply_to"/>
+                                    </group>
+                                    <group>
+                                        <field name="partner_ids" widget="many2many_tags"/>
+                                    </group>
+                                </group>
+                                <notebook>
+                                    <page string="Body">
+                                        <field name="body" widget="text"/>
+                                    </page>
+                                    <page string="Body (Rich)">
+                                        <field name="body_html"/>
+                                    </page>
+                                </notebook>
+                            </page>
+                            <page string="Advanced" groups="base.group_no_one">
+                                <group>
+                                    <group>
+                                        <field name="auto_delete"/>
+                                        <field name="type"/>
+                                        <field name="content_subtype"/>
+                                        <field name="state" colspan="2"/>
+                                        <field name="mail_server_id"/>
+                                        <field name="model"/>
+                                        <field name="res_id"/>
+                                    </group>
+                                    <group>
+                                        <field name="message_id"/>
+                                        <field name="references"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="Attachments">
+                                <field name="attachment_ids"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_tree">
+            <field name="name">mail.message.tree</field>
+            <field name="model">mail.mail</field>
+            <field name="arch" type="xml">
+                <tree string="Emails" colors="grey:state in ('sent', 'cancel');blue:state=='outgoing';red:state=='exception';black:state=='received'">
+                    <field name="date"/>
+                    <field name="subject"/>
+                    <field name="author_id" string="User"/>
+                    <field name="message_id" invisible="1"/>
+                    <field name="partner_ids" invisible="1"/>
+                    <field name="model" invisible="1"/>
+                    <field name="res_id" invisible="1"/>
+                    <field name="email_from" invisible="1"/>
+                    <field name="state" invisible="1"/>
+                    <field name="type" invisible="1"/>
+                    <button name="send" string="Send Now" type="object" icon="gtk-media-play" states='outgoing'/>
+                    <button name="mark_outgoing" string="Retry" type="object" icon="gtk-redo" states='exception,cancel'/>
+                    <button name="cancel" string="Cancel" type="object" icon="terp-gtk-stop" states='outgoing'/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_search">
+            <field name="name">mail.mail.search</field>
+            <field name="model">mail.mail</field>
+            <field name="arch" type="xml">
+                <search string="Email Search">
+                    <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
+                    <field name="date"/>
+                    <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
+                    <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
+                    <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
+                    <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
+                    <separator/>
+                    <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/>
+                    <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/>
+                    <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
+                    <group expand="0" string="Extended Filters...">
+                        <field name="author_id"/>
+                        <field name="partner_ids"/>
+                        <field name="model"/>
+                        <field name="res_id"/>
+                    </group>
+                    <group expand="0" string="Group By...">
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                        <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/>
+                        <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="action_view_mail_mail" model="ir.actions.act_window">
+            <field name="name">Messages</field>
+            <field name="res_model">mail.mail</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_received': 1, 'search_default_type_email': 1}</field>
+            <field name="search_view_id" ref="view_mail_search"/>
+        </record>
+
+        <!-- Add menu entry in Settings/Email -->
+        <menuitem name="Mails" id="menu_mail_mail" parent="base.menu_email" action="action_view_mail_mail" />
+    </data>
+</openerp>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 853326249ec..bc39a36cd3a 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -69,121 +69,6 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_mail_form">
-            <field name="name">mail.mail.form</field>
-            <field name="model">mail.mail</field>
-            <field name="arch" type="xml">
-                <form string="Email message" version="7.0">
-                    <sheet>
-                        <label for="subject" class="oe_edit_only"/>
-                        <h2><field name="subject"/></h2>
-						<div>
-                            by <field name="author_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/>
-                            <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
-                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
-                        </div>
-                        <notebook colspan="4">
-                            <page string="Message Details">
-                                <group>
-                                    <group>
-                                        <field name="email_from"/>
-                                        <field name="email_to"/>
-                                        <field name="email_cc"/>
-                                        <field name="reply_to"/>
-                                    </group>
-                                    <group>
-                                        <field name="partner_ids" widget="many2many_tags"/>
-                                    </group>
-                                </group>
-                                <notebook>
-                                    <page string="Body">
-                                        <field name="body" widget="text"/>
-                                    </page>
-                                    <page string="Body (Rich)">
-                                        <field name="body_html"/>
-                                    </page>
-                                </notebook>
-                            </page>
-                            <page string="Advanced" groups="base.group_no_one">
-                                <group>
-                                    <group>
-                                        <field name="auto_delete"/>
-                                        <field name="type"/>
-                                        <field name="content_subtype"/>
-                                        <field name="state" colspan="2"/>
-                                        <field name="mail_server_id"/>
-                                        <field name="model"/>
-                                        <field name="res_id"/>
-                                    </group>
-                                    <group>
-                                        <field name="message_id"/>
-                                        <field name="references"/>
-                                    </group>
-                                </group>
-                            </page>
-                            <page string="Attachments">
-                                <field name="attachment_ids"/>
-                            </page>
-                        </notebook>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_mail_tree">
-            <field name="name">mail.message.tree</field>
-            <field name="model">mail.mail</field>
-            <field name="arch" type="xml">
-                <tree string="Emails" colors="grey:state in ('sent', 'cancel');blue:state=='outgoing';red:state=='exception';black:state=='received'">
-                    <field name="date"/>
-                    <field name="subject"/>
-                    <field name="author_id" string="User"/>
-                    <field name="message_id" invisible="1"/>
-                    <field name="partner_ids" invisible="1"/>
-                    <field name="model" invisible="1"/>
-                    <field name="res_id" invisible="1"/>
-                    <field name="email_from" invisible="1"/>
-                    <field name="state" invisible="1"/>
-                    <field name="type" invisible="1"/>
-                    <button name="send" string="Send Now" type="object" icon="gtk-media-play" states='outgoing'/>
-                    <button name="mark_outgoing" string="Retry" type="object" icon="gtk-redo" states='exception,cancel'/>
-                    <button name="cancel" string="Cancel" type="object" icon="terp-gtk-stop" states='outgoing'/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_mail_search">
-            <field name="name">mail.mail.search</field>
-            <field name="model">mail.mail</field>
-            <field name="arch" type="xml">
-                <search string="Email Search">
-                    <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
-                    <field name="date"/>
-                    <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
-                    <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
-                    <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
-                    <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
-                    <separator/>
-                    <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/>
-                    <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/>
-                    <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
-                    <group expand="0" string="Extended Filters...">
-                        <field name="author_id"/>
-                        <field name="partner_ids"/>
-                        <field name="model"/>
-                        <field name="res_id"/>
-                    </group>
-                    <group expand="0" string="Group By...">
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                        <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/>
-                        <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
         <record id="action_view_mail_message" model="ir.actions.act_window">
             <field name="name">Messages</field>
             <field name="res_model">mail.message</field>
@@ -192,24 +77,12 @@
             <field name="search_view_id" ref="view_message_search"/>
         </record>
 
-        <record id="action_view_mail_mail" model="ir.actions.act_window">
-            <field name="name">Messages</field>
-            <field name="res_model">mail.mail</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_received': 1, 'search_default_type_email': 1}</field>
-            <field name="search_view_id" ref="view_mail_search"/>
-        </record>
-
         <act_window domain="[('partner_id', '=', active_id), ('email_from', '!=', False)]"
             context="{'default_partner_id': active_id}"
             id="act_res_partner_emails" name="Emails"
             res_model="mail.message"
             src_model="res.partner"
             view_id="view_message_tree"/>
-
-        <!-- Add menu entry in Settings/Email -->
-        <menuitem name="Mails" id="menu_mail_mail" parent="base.menu_email" action="action_view_mail_mail" />
         
         <!-- Add menu entry in Settings/Email -->
         <menuitem name="Messages" id="menu_mail_message" parent="base.menu_email" action="action_view_mail_message"/>

From 76fe68b63789b01ca77cfce1f938da5f84f8c289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 27 Aug 2012 12:17:41 +0200
Subject: [PATCH 573/999] [FIX] project: fixed demo data (user_id -> author_id;
 BTW user_qdp is not always present I think, changed author to demo user).

bzr revid: tde@openerp.com-20120827101741-i9iooz6r0ht02dsi
---
 addons/project/project_demo.xml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index aaad6b167a0..b3ace3645f5 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -441,36 +441,30 @@
         <record id="message_task_1" model="mail.message">
             <field name="model">project.task</field>
             <field name="res_id" ref="project_task_22"/>
-            <field name="content_subtype">plain</field>
-            <field name="body_text">Hello Quentin,
+            <field name="body">Hello Demo,
 There is a change in customer requirement.
 Can you check the document from customer again.
 Thanks,</field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
-
         <record id="message_task_2" model="mail.message">
             <field name="model">project.task</field>
             <field name="res_id" ref="project_task_22"/>
             <field name="parent_id" ref="message_task_1"/>
-            <field name="content_subtype">plain</field>
-            <field name="body_text">Ok, I have checked the mail,
+            <field name="body">Ok, I have checked the mail,
 I will update the document and let you know.</field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_qdp"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
-
-
         <record id="message_task_3" model="mail.message">
             <field name="model">project.task</field>
             <field name="res_id" ref="project_task_22"/>
             <field name="parent_id" ref="message_task_2"/>
-            <field name="content_subtype">plain</field>
-            <field name="body_text">Fine!
+            <field name="body">Fine!
 Send it ASAP, its urgent.</field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
 
     </data>

From f386e2de33edd9571755275208ab640c55e097e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 27 Aug 2012 12:18:07 +0200
Subject: [PATCH 574/999] [IMP] base demo data: added a partner for demo user.

bzr revid: tde@openerp.com-20120827101807-wop2m7fdfgkyh0e7
---
 openerp/addons/base/base_demo.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_demo.xml b/openerp/addons/base/base_demo.xml
index 34feb3af990..064b1f49e69 100644
--- a/openerp/addons/base/base_demo.xml
+++ b/openerp/addons/base/base_demo.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record id="partner_demo" model="res.partner">
+            <field name="name">Demo User</field>
+            <field name="company_id" ref="main_company"/>
+            <field name="customer" eval="False"/>
+        </record>
         <record id="user_demo" model="res.users">
+            <field name="partner_id" ref="base.partner_demo"/>
             <field name="login">demo</field>
             <field name="password">demo</field>
-            <field name="name">Demo User</field>
             <field name="signature">Mr Demo</field>
             <field name="company_id" ref="main_company"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user')])]"/>

From a22a5abd9e6b1e6351237a3d4b05109f3bdc73da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 27 Aug 2012 12:29:41 +0200
Subject: [PATCH 575/999] [IMP] portal, mail, crm: misc fixes of demo data.

bzr revid: tde@openerp.com-20120827102941-l213uv3sdt9mfq5c
---
 addons/crm/crm_lead_demo.xml         | 11 +++++++----
 addons/mail/data/mail_group_data.xml |  2 +-
 addons/portal/portal_demo.xml        |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index a7bd667041d..4442b22e77e 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -560,30 +560,32 @@ Andrew</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
             <field name="type">comment</field>
-            <field name="body"><![CDATA[Internal note0]]></field>
-            <field name="parent_id" ref="message_email0"/>
             <field name="body">Dear Customer,
 Thanks for showing interest in our products.
 We have attached the catalogue,
 We would like to know your interests, Let us know if we can call you for more details.
 
 Thanks</field>
+            <field name="parent_id" ref="message_email0"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
         <record id="message_note0_comment0" model="mail.message">
             <field name="subject">Re: Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
+            <field name="type">comment</field>
             <field name="body">&lt;div&gt;Thanks for the information,&lt;/div&gt;&lt;div&gt;I will visit the store soon.&lt;/div&gt;</field>
             <field name="parent_id" ref="message_note0"/>
-            <field name="type">comment</field>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
         <record id="message_note0_comment1" model="mail.message">
             <field name="subject">Re: Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
+            <field name="type">comment</field>
             <field name="body">&lt;font color="#1f1f1f"&gt;Can you tell me if the store is open at 9:00 PM?&lt;/b&gt;&lt;/font&gt;</field>
             <field name="parent_id" ref="message_note0"/>
-            <field name="type">comment</field>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
         <record id="message_email1" model="mail.message">
             <field name="subject">Re: Plan to buy a Laptop</field>
@@ -591,6 +593,7 @@ Thanks</field>
             <field name="res_id" ref="crm_case_15"/>
             <field name="body">Yes, its open till 10:00 PM, you are welcome!</field>
             <field name="type">email</field>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
         <record id="message_email_12" model="mail.message">
             <field name="subject">Inquiry</field>
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index a577007bc35..c9ac97e6836 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -14,7 +14,7 @@
 
         <!-- notify all employees of module installation -->
         <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
+            <!-- thread_id, body='', subject=False, msg_type='notification', parent_id=False -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>Your homepage is a summary of messages you received and key information about documents you follow.
 
diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index 0271f2de471..6ad2a40d6b6 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -50,7 +50,7 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in
             <field name="body"><![CDATA[Thanks !  (second comment)]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
-            <field name="author_id" ref="base.partner_root"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
 
     </data>

From 773376f17909c52864c7657ee9aa8caa75929bc4 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 27 Aug 2012 16:56:40 +0530
Subject: [PATCH 576/999] [IMP]Crm :Applying multi currency group to currency
 field

bzr revid: dhr@tinyerp.com-20120827112640-grr1rfsxc3v46c5w
---
 addons/crm/crm_lead_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6a715893a17..4c322f52935 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -324,7 +324,7 @@
                                         <b><field name="name"/></b>
                                         <t t-if="record.planned_revenue.raw_value">
                                             - <b><t t-esc="Math.round(record.planned_revenue.value)"/>
-                                            <field name="company_currency"/></b>
+                                            <field name="company_currency" groups="base.group_multi_currency"/></b>
                                         </t>
                                     </div>
                                     <div>
@@ -435,7 +435,7 @@
                             <label for="planned_revenue" class="oe_edit_only"/>
                             <h2>
                                 <field name="planned_revenue" class="oe_inline"/>
-                                <field name="company_currency" class="oe_inline"/> at
+                                <field name="company_currency" class="oe_inline" groups="base.group_multi_currency"/> at
                                 <field name="probability" class="oe_inline" widget="integer"/>%% success rate
                             </h2>
                         </div>

From 5ae69cb1ac2c4c59e29df5bbe856b172e30c98e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 27 Aug 2012 14:01:17 +0200
Subject: [PATCH 577/999] [FIX] hr_timesheet_sheet: fixed data
 (message_append_post does not exist, probably a merge hiatus).

bzr revid: tde@openerp.com-20120827120117-hwbsrrokyur3uch8
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index 0a666752195..046fd7fe3d0 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
         <!-- Notify all employees of module installation -->
-        <function model="mail.group" name="message_append_post">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>From the top menu "Human Resources", encode and validate timesheets and attendances.</value>

From 706b816935f829af17be3c2ee21007bdfda2589b Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 27 Aug 2012 17:33:53 +0530
Subject: [PATCH 578/999] [IMP]Stock: applying multi currency group to currency
 fields

bzr revid: dhr@tinyerp.com-20120827120353-3dwutnuj6uan3kls
---
 addons/stock/wizard/stock_partial_move_view.xml    | 4 ++--
 addons/stock/wizard/stock_partial_picking_view.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index acfc4b1923c..54f15e99dff 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -44,7 +44,7 @@
                     <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="stock.group_production_lot"/>
                     <field name="update_cost" invisible="1"/>
                     <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
-                    <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                    <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}" groups="base.group_multi_currency"/>
                 </tree>
             </field>
         </record>
@@ -63,7 +63,7 @@
                         <field name="prodlot_id" domain="[('product_id', '=', product_id)]"/>
                         <field name="update_cost" invisible="1"/>
                         <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
-                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}" groups="base.group_multi_currency"/>
                     </group>
                  </form>
             </field>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 7de85594a26..b1add22acd1 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -27,7 +27,7 @@
                             <!-- Removed as this feature is not logic: price must be updated upon reception of invoice -->
                             <field name="update_cost" invisible="1"/>
                             <field name="cost"  invisible="1"/>
-                            <field name="currency"  invisible="1"/>
+                            <field name="currency"  invisible="1" groups="base.group_multi_currency"/>
                         </tree>
                     </field>
                     <footer>
@@ -52,7 +52,7 @@
                     <!-- Removed as this feature is not logic: price must be updated upon reception of invoice -->
                     <field name="update_cost" invisible="1"/>
                     <field name="cost" invisible="1"/>
-                    <field name="currency" invisible="1"/>
+                    <field name="currency" invisible="1" groups="base.group_multi_currency"/>
                 </tree>
             </field>
         </record>
@@ -71,7 +71,7 @@
                         <field name="prodlot_id" domain="[('product_id', '=', product_id)]" attrs="{'required':[('tracking','=',True)]}"/>
                         <field name="update_cost" invisible="1"/>
                         <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
-                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}" groups="base.group_multi_currency"/>
                     </group>
                  </form>
             </field>

From d70bbbe87a6904cece564d1fec286687c95e8095 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Mon, 27 Aug 2012 18:32:30 +0530
Subject: [PATCH 579/999] [IMP] Renamed ID of currencies

bzr revid: pso@tinyerp.com-20120827130230-zw8ka90mhj4y1uie
---
 openerp/addons/base/country_data.xml  | 2 +-
 openerp/addons/base/currency_data.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/country_data.xml b/openerp/addons/base/country_data.xml
index 9c74c23f555..5731b37f382 100644
--- a/openerp/addons/base/country_data.xml
+++ b/openerp/addons/base/country_data.xml
@@ -462,7 +462,7 @@
         <record id="gt" model="res.country">
             <field name="name">Guatemala</field>
             <field name="code">gt</field>
-            <field name="currency_id" ref="GTQ"/>
+            <field name="currency_id" ref="QTQ"/>
         </record>
         <record id="gu" model="res.country">
             <field name="name">Guam (USA)</field>
diff --git a/openerp/addons/base/currency_data.xml b/openerp/addons/base/currency_data.xml
index 4cb3f1773b5..11a83404b02 100644
--- a/openerp/addons/base/currency_data.xml
+++ b/openerp/addons/base/currency_data.xml
@@ -1102,15 +1102,15 @@
             <field name="rate">0.786</field>
         </record>
         
-        <record id="GTQ" model="res.currency">
-            <field name="name">GTQ</field>
+        <record id="QTQ" model="res.currency">
+            <field name="name">QTQ</field>
             <field name="symbol">Q</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
-        <record id="rateGTQ" model="res.currency.rate">
-            <field name="currency_id" ref="GTQ" />
+        <record id="rateQTQ" model="res.currency.rate">
+            <field name="currency_id" ref="QTQ" />
             <field eval="time.strftime('%Y-01-01')" name="name"/>
             <field name="rate">9.8827</field>
         </record>

From 547ac8ac4efd0e2454c1d3010e8d9dffb320920e Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 27 Aug 2012 18:33:40 +0530
Subject: [PATCH 580/999] [IMP]Account:applying multi_currency group to
 currency fields

bzr revid: dhr@tinyerp.com-20120827130340-tw52x8w0v6lyt2d8
---
 addons/account/account_bank_view.xml          |  4 +--
 addons/account/account_invoice_view.xml       | 16 ++++-----
 addons/account/account_view.xml               | 36 +++++++++----------
 addons/account/res_config_view.xml            |  4 +--
 .../wizard/account_change_currency_view.xml   |  2 +-
 .../account_report_central_journal_view.xml   |  2 +-
 .../account_report_general_journal_view.xml   |  2 +-
 .../account_report_general_ledger_view.xml    |  2 +-
 .../account_report_partner_ledger_view.xml    |  2 +-
 .../account_report_print_journal_view.xml     |  2 +-
 10 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml
index 8ceb8a91885..ef793a1bef5 100644
--- a/addons/account/account_bank_view.xml
+++ b/addons/account/account_bank_view.xml
@@ -15,7 +15,7 @@
                 <group name="accounting" col="2" colspan="2" attrs="{'invisible': [('company_id','=', False)]}">
                     <separator string="Accounting Information" colspan="2"/>
                     <field name="journal_id"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                 </group>
             </group>
         </field>
@@ -28,7 +28,7 @@
         <field name="inherit_id" ref="base.view_partner_bank_tree"/>
         <field name="arch" type="xml">
             <field name="acc_number" position="after">
-                <field name="currency_id"/>
+                <field name="currency_id" groups="base.group_multi_currency"/>
             </field>
         </field>
     </record>
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 143c5514141..febc9b6d90d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -127,7 +127,7 @@
                     <field name="user_id"/>
                     <field name="date_due"/>
                     <field name="origin"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="residual" sum="Residual Amount"/>
                     <field name="amount_untaxed" sum="Untaxed Amount"/>
                     <field name="amount_total" sum="Total Amount"/>
@@ -184,7 +184,7 @@
                                 name="account_id" groups="account.group_account_user"/>
                             <field name="journal_id" groups="account.group_account_user"
                                 on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
-                            <field name="currency_id"/>
+                            <field name="currency_id" groups="base.group_multi_currency"/>
                         </group>
                     </group>
                     <notebook>
@@ -264,8 +264,8 @@
                                     <field name="journal_id"/>
                                     <field name="debit"/>
                                     <field name="credit"/>
-                                    <field name="amount_currency"/>
-                                    <field name="currency_id"/>
+                                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                 </tree>
                             </field>
                         </page>
@@ -326,9 +326,9 @@
                             <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]"
                                 name="account_id" groups="account.group_account_user"/>
 
-                            <label for="currency_id"/>
+                            <label for="currency_id" groups="base.group_multi_currency"/>
                             <div>
-                                <field name="currency_id" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
                                 <!-- note fp: I don't think we need this feature ?
                                 <button name="%(action_account_change_currency)d" type="action"
                                   icon="terp-stock_effects-object-colorize"
@@ -418,8 +418,8 @@
                                     <field name="journal_id" groups="base.group_user"/>
                                     <field name="debit"/>
                                     <field name="credit"/>
-                                    <field name="amount_currency"/>
-                                    <field name="currency_id"/>
+                                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                 </tree>
                             </field>
                         </page>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5bf45aab487..60c80a7ab92 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -197,14 +197,14 @@
                             <field name="credit" attrs="{'readonly':[('type','=','view')]}"/>
                             <field name="balance"/>
                         </group>
-                        <group>
+                        <group groups="base.group_multi_currency">
                             <field name="tax_ids" domain="[('parent_id','=',False)]" widget="many2many_tags"/>
                             <field name="reconcile"/>
                             <field name="child_consol_ids"
                                 attrs="{'invisible':[('type','!=','consolidation')]}"
                                 widget="many2many_tags"/>
                         </group>
-                        <group>
+                        <group groups="base.group_multi_currency">
                             <field name="currency_id"/>
                             <field name="currency_mode" attrs="{'readonly': [('currency_id','=',False)]}"/>
                         </group>
@@ -248,7 +248,7 @@
                     <field name="balance"/>
                     <field name="type"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="company_currency_id"/>
+                    <field name="company_currency_id" groups="base.group_multi_currency"/>
                 </tree>
             </field>
         </record>
@@ -296,7 +296,7 @@
                     <field name="debit"/>
                     <field name="credit"/>
                     <field name="balance"/>
-                    <field name="company_currency_id"/>
+                    <field name="company_currency_id" groups="base.group_multi_currency"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="type"/>
                     <field name="parent_id" invisible="1"/>
@@ -321,7 +321,7 @@
                     <field name="parent_id" invisible="1"/>
                     <field name="user_type" invisible="1"/>
                     <field name="type" invisible="1"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="exchange_rate"/>
                     <field name="foreign_balance"/>
                     <field name="adjusted_balance"/>
@@ -489,7 +489,7 @@
                         <group>
                             <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="currency"/>
+                            <field name="currency" groups="base.group_multi_currency"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
                     </group>
@@ -645,7 +645,7 @@
                             <label for="balance_start"/>
                             <div>
                                 <field name="balance_start" class="oe_inline"/>
-                                <field name="currency" class="oe_inline"/>
+                                <field name="currency" class="oe_inline" groups="base.group_multi_currency"/>
                             </div>
                             <field name="balance_end_real"/>
                         </group>
@@ -1066,8 +1066,8 @@
                     <field name="credit" sum="Total credit"/>
                     <field name="account_tax_id"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-                    <field name="amount_currency" attrs="{'readonly':[('state','=','valid')]}"/>
-                    <field name="currency_id" attrs="{'readonly':[('state','=','valid')]}"/>
+                    <field name="amount_currency" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/>
+                    <field name="currency_id" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/>
                     <field name="reconcile_partial_id"/>
                     <field name="reconcile_id"/>
                     <field name="state"/>
@@ -1118,7 +1118,7 @@
 	                                    <field name="tax_amount"/>
 	                                    <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
 	                                </group>
-	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
+	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency" groups="base.group_multi_currency">
 	                                    <field name="currency_id"/>
 	                                    <field name="amount_currency"/>
 	                                </group>
@@ -1166,8 +1166,8 @@
                                 <field name="credit"/>
 
                                 <separator colspan="4" string="Optional Information"/>
-                                <field name="currency_id"/>
-                                <field name="amount_currency"/>
+                                <field name="currency_id" groups="base.group_multi_currency"/>
+                                <field name="amount_currency" groups="base.group_multi_currency"/>
                                 <field name="quantity"/>
                                 <field name="move_id" required="False"/>
                                 <newline/>
@@ -1394,7 +1394,7 @@
                                                     <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
                                                 </group>
 
-                                                <group string="Currency">
+                                                <group string="Currency" groups="base.group_multi_currency">
                                                     <field name="currency_id"/>
                                                     <field name="amount_currency"/>
                                                 </group>
@@ -1431,8 +1431,8 @@
                                     <field name="debit" sum="Total Debit"/>
                                     <field name="credit" sum="Total Credit"/>
                                     <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
-                                    <field name="amount_currency"/>
-                                    <field name="currency_id"/>
+                                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                     <field name="tax_code_id"/>
                                     <field name="tax_amount"/>
                                     <field name="state"/>
@@ -2075,7 +2075,7 @@
                                 <field name="type"/>
                                 <field name="user_type"/>
 
-                                <field name="currency_id"/>
+                                <field name="currency_id" groups="base.group_multi_currency"/>
                                 <field name="reconcile"/>
                                 <field name="chart_template_id"/>
                             </group>
@@ -2400,7 +2400,7 @@
                             <tree editable="bottom">
                                 <field name="acc_name"/>
                                 <field name="account_type"/>
-                                <field name="currency_id" widget="selection"/>
+                                <field name="currency_id" widget="selection" groups="base.group_multi_currency"/>
                             </tree>
                         </field>
                     </div>
@@ -2565,7 +2565,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             <field name="date" attrs="{'readonly':[('state','!=','draft')]}"  on_change="onchange_date(date, company_id)"/>
                             <field name="closing_date" readonly="1"/>
                             <field name="period_id" class="oe_inline"/>
-                            <field name="currency" invisible="1"/>
+                            <field name="currency" invisible="1" groups="base.group_multi_currency"/>
                         </group>
                     </group>
                     <notebook>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 79a65f70414..9398d04b3cc 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -107,8 +107,8 @@
                         <label for="id" string="Options"/>
                         <div name="account_config">
                             <div>
-                                <label for="currency_id"/>
-                                <field name="currency_id" class="oe_inline"/>
+                                <label for="currency_id" groups="base.group_multi_currency"/>
+                                <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
                             </div>
                             <div>
                                 <label for="decimal_precision"/>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 1da342b4236..2f166f056c9 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -7,7 +7,7 @@
             <field name="arch" type="xml">
                 <form string="Invoice Currency" version="7.0">
                     <group string="This wizard will change the currency of the invoice">
-                        <field name="currency_id"/>
+                        <field name="currency_id" groups="base.group_multi_currency"/>
                     </group>
                     <footer>
                         <button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
diff --git a/addons/account/wizard/account_report_central_journal_view.xml b/addons/account/wizard/account_report_central_journal_view.xml
index 2819d93471d..27b611f5838 100644
--- a/addons/account/wizard/account_report_central_journal_view.xml
+++ b/addons/account/wizard/account_report_central_journal_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
                 <field name="target_move" position="after">
-                    <field name="amount_currency"/>
+                    <field name="amount_currency" groups="base.group_multi_currency"/>
                     <newline/>
                 </field>
             </field>
diff --git a/addons/account/wizard/account_report_general_journal_view.xml b/addons/account/wizard/account_report_general_journal_view.xml
index fc57789d0b7..d68860a8e33 100644
--- a/addons/account/wizard/account_report_general_journal_view.xml
+++ b/addons/account/wizard/account_report_general_journal_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <data>
             <xpath expr="//field[@name='target_move']" position="after">
-               <field name="amount_currency"/>
+               <field name="amount_currency" groups="base.group_multi_currency"/>
                <newline/>
             </xpath>
             </data>
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index b636101ee79..e5da60e26b4 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -12,7 +12,7 @@
                 <field name="display_account"/>
                 <field name="sortby"/>
                 <field name="landscape"/>
-                <field name="amount_currency"/>
+                <field name="amount_currency" groups="base.group_multi_currency"/>
                 <newline/>
             </xpath>
             <xpath expr="//field[@name='filter']" position="after">
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index f3dd9a80f09..461765164ea 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -10,7 +10,7 @@
             <data>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="result_selection"/>
-                <field name="amount_currency"/>
+                <field name="amount_currency" groups="base.group_multi_currency"/>
                 <field name="page_split"/>
                 <newline/>
             </xpath>
diff --git a/addons/account/wizard/account_report_print_journal_view.xml b/addons/account/wizard/account_report_print_journal_view.xml
index ae8049d579e..227d2b35706 100644
--- a/addons/account/wizard/account_report_print_journal_view.xml
+++ b/addons/account/wizard/account_report_print_journal_view.xml
@@ -10,7 +10,7 @@
             <data>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="sort_selection"/>
-                <field name="amount_currency"/>
+                <field name="amount_currency" groups="base.group_multi_currency"/>
                 <newline/>
                 <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" colspan="4" invisible="1"/>
                 <separator string="Periods"  colspan="4"/>

From f437ecfa90e354d089397e90b415aac6b5dab1f3 Mon Sep 17 00:00:00 2001
From: "Amit (OpenERP)" <amp@tinyerp.com>
Date: Mon, 27 Aug 2012 18:46:19 +0530
Subject: [PATCH 581/999] [IMP] Improved the code

bzr revid: amp@tinyerp.com-20120827131619-bo1nbuomfzlznmty
---
 addons/hr/hr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 6613e16467b..0e202a11e74 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -290,7 +290,7 @@ class hr_department(osv.osv):
         'member_ids': fields.one2many('hr.employee', 'department_id', 'Members', readonly=True),
     }
     
-    def copy(self, cr, uid, id, default=None, context=None):
+    def copy(self, cr, uid, ids, default=None, context=None):
         if default is None:
             default = {}
         default = default.copy()

From 345a580752581445560f2c5d133fda2a8cda63f5 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Mon, 27 Aug 2012 18:48:33 +0530
Subject: [PATCH 582/999] [IMP] Rename id fo currency

bzr revid: pso@tinyerp.com-20120827131833-1bah6laics8v9ony
---
 addons/l10n_syscohada/l10n_syscohada_data.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_syscohada/l10n_syscohada_data.xml b/addons/l10n_syscohada/l10n_syscohada_data.xml
index feeea3a2314..d90988e00e3 100644
--- a/addons/l10n_syscohada/l10n_syscohada_data.xml
+++ b/addons/l10n_syscohada/l10n_syscohada_data.xml
@@ -1816,15 +1816,15 @@
     #
     -->
 
-      <record id="base.CFA" model="res.currency">
+      <record id="base.XOF" model="res.currency">
         <field name="name">XOF</field>
         <field name="symbol">CFA</field>
         <field name="rounding">1</field>
         <field name="accuracy">4</field>
     </record>
-    <record id="base.rateCFA" model="res.currency.rate">
+    <record id="base.rateXOF" model="res.currency.rate">
            <field name="rate">655.957</field>
-           <field name="currency_id" ref="base.CFA"/>
+           <field name="currency_id" ref="base.XOF"/>
            <field eval="time.strftime('%Y-01-01')" name="name"/>
        </record>
            <!--

From 8fd057ee7b407bcf3634f5612b40cf3c55898eb5 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 27 Aug 2012 18:54:00 +0530
Subject: [PATCH 583/999] [IMP]account_asset,account_coda and account_payment
 :Applying multi currency group to currency field

bzr revid: dhr@tinyerp.com-20120827132400-jar8us97nmhlpj8e
---
 addons/account_asset/account_asset_view.xml   |  6 ++---
 addons/account_coda/account_coda_view.xml     |  8 +++----
 .../account_payment/account_payment_view.xml  | 24 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index c230f63e204..bb0222d5e4f 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -100,7 +100,7 @@
                         </group>
                         <group>
                             <field name="purchase_date"/>
-                            <field name="currency_id"/>
+                            <field name="currency_id" groups="base.group_multi_currency"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
                         </group>
                     </group>
@@ -192,7 +192,7 @@
                 <field name="partner_id"/>
                 <field name="purchase_value"/>
                 <field name="value_residual"/>
-                <field name="currency_id"/>
+                <field name="currency_id" groups="base.group_multi_currency"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <field name="state"/>
             </tree>
@@ -211,7 +211,7 @@
                 <field name="purchase_date"/>
                 <field name="purchase_value"/>
                 <field name="value_residual"/>
-                <field name="currency_id"/>
+                <field name="currency_id" groups="base.group_multi_currency"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <field name="state"/>
             </tree>
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 0b42ad6352f..3762669e5a3 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -16,7 +16,7 @@
                 <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
                 <field name="bank_id"/>
                 <field name="journal"/>
-                <field name="currency"/>
+                <field name="currency" groups="base.group_multi_currency"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <group expand="0" string="Group By...">
                     <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
@@ -32,7 +32,7 @@
         <tree string="CODA Bank Account Configuration">
           <field name="name"/>
           <field name="bank_id"/>
-          <field name="currency"/>
+          <field name="currency" groups="base.group_multi_currency"/>
           <field name="description1"/>
           <field name="journal"/>
           <field name="state"/>
@@ -48,7 +48,7 @@
                 <field name="name" colspan="4"/>
                 <field name="bank_id" domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
                 <field name="description1"/>
-                <field name="currency"/>
+                <field name="currency" groups="base.group_multi_currency"/>
                 <field name="description2"/>
                 <field name="coda_st_naming"/>
                 <field name="state" on_change="onchange_state(state)"/>
@@ -305,7 +305,7 @@
                       <field name="name"/>
                       <field name="date"/>
                       <field name="coda_bank_account_id"/>
-                      <field name="currency"/>
+                      <field name="currency" groups="base.group_multi_currency"/>
                       <field name="period_id"/>
                       <field name="type"/>
                       <newline/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index e3e9b2ae558..3ad94c1bdbd 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -30,8 +30,8 @@
                     <field name="debit" sum="Total debit"/>
                     <field name="credit" sum="Total credit"/>
                     <field name="amount_to_pay"/>
-                    <field name="amount_currency"/>
-                    <field name="currency_id"/>
+                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="period_id" invisible="1"/>
                 </tree>
             </field>
@@ -131,8 +131,8 @@
                                         <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
                                         <separator colspan="4" string="Transaction Information"/>
                                         <field name="date"/>
-                                        <label for="amount_currency"/>
-                                        <div>
+                                        <label for="amount_currency" groups="base.group_multi_currency"/>
+                                        <div groups="base.group_multi_currency">
                                             <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
                                             <field name="currency" nolabel="1" class="oe_inline"/>
                                         </div>
@@ -154,7 +154,7 @@
                                         <label for="amount"/>
                                         <div>
                                             <field name="amount" class="oe_inline"/>
-                                            <field name="company_currency" class="oe_inline"/>
+                                            <field name="company_currency" class="oe_inline" groups="base.group_multi_currency"/>
                                         </div>
                                         <separator colspan="4" string="Entry Information"/>
                                         <field name="create_date" readonly="1"/>
@@ -171,8 +171,8 @@
                             <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                             <field name="ml_maturity_date"/>
                             <field name="date"/>
-                            <field name="amount_currency" string="Amount"/>
-                            <field name="currency"/>
+                            <field name="amount_currency" string="Amount" groups="base.group_multi_currency"/>
+                            <field name="currency" groups="base.group_multi_currency"/>
                             <field name="name"/>
                             <field name="amount" sum="Total in Company Currency" invisible="1"/>
                         </tree>
@@ -257,8 +257,8 @@
                                 <field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)]"/>
                                 <separator colspan="4" string="Transaction Information"/>
                                 <field name="date"/>
-                                <label for="amount_currency"/>
-                                <div>
+                                <label for="amount_currency" groups="base.group_multi_currency"/>
+                                <div groups="base.group_multi_currency">
                                     <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
                                     <field name="currency" class="oe_inline"/>
                                 </div>
@@ -278,7 +278,7 @@
                         <page string="Information">
                             <group col="4" string="General Information">
                                 <field name="amount"/>
-                                <field name="company_currency" nolabel="1"/>
+                                <field name="company_currency" nolabel="1" groups="base.group_multi_currency"/>
                             </group>
                             <group col="4" string="Entry Information">
                                 <field name="create_date"/>
@@ -302,8 +302,8 @@
                     <field name="partner_id"/>
                     <field name="communication"/>
                     <field name="amount" sum="Amount Total"/>
-                    <field name="amount_currency" sum="Currency Amount Total"/>
-                    <field name="currency"/>
+                    <field name="amount_currency" sum="Currency Amount Total" groups="base.group_multi_currency"/>
+                    <field name="currency" groups="base.group_multi_currency"/>
                     <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                     <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode)"/>
                     <field name="create_date"/>

From dc5b8efdf765bf9486672a838c3b2cadd968c069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 27 Aug 2012 16:47:53 +0200
Subject: [PATCH 584/999] [IMP] mail: moved tree formation in message_read in a
 dedicated method; added / fixed some tests. Note that tests for message_read
 will have to be added.

bzr revid: tde@openerp.com-20120827144753-csoho4iz34f6zpy1
---
 addons/mail/mail_message.py    | 97 ++++++++++++++++------------------
 addons/mail/tests/test_mail.py | 41 ++++++++++++--
 2 files changed, 81 insertions(+), 57 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index bd74e5eb0d0..9af688be533 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -119,74 +119,67 @@ class mail_message(osv.Model):
     # Message loading for web interface
     #------------------------------------------------------
 
-    _limit = 3
-    def _message_dict_get(self, cr, uid, msg, context={}):
-        attachs = self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)
-        author = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0]
-        # TDE: need user to show 'delete' link -> necessary ?
-        author_user = self.pool.get('res.users').name_get(cr, uid, [x.id for x in msg.author_id.user_ids], context=context)[0]
+    def _message_dict_get(self, cr, uid, msg, context=None):
+        """ Return a dict representation of the message browse record. """
+        attachment_ids = self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)
+        author_id = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0]
+        author_user_id = self.pool.get('res.users').name_get(cr, uid, [msg.author_id.user_ids[0].id], context=context)[0]
         partner_ids = self.pool.get('res.partner').name_get(cr, uid, [x.id for x in msg.partner_ids], context=context)
         return {
             'id': msg.id,
             'type': msg.type,
-            'attachment_ids': attachs,
+            'attachment_ids': attachment_ids,
             'body': msg.body,
             'model': msg.model,
             'res_id': msg.res_id,
             'record_name': msg.record_name,
             'subject': msg.subject,
             'date': msg.date,
-            'author_id': author,
-            'author_user_id': author_user,
+            'author_id': author_id,
+            'author_user_id': author_user_id,
             'partner_ids': partner_ids,
-            'child_ids': []
+            'child_ids': [],
         }
 
-    def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, context=None):
-        """ 
-            If IDS are provided, fetch these records, otherwise use the domain to
-            fetch the matching records. After having fetched the records provided
-            by IDS, it will fetch children (according to thread_level).
-            
-            Return [
-            
-            ]
+    def message_read_tree_get(self, cr, uid, messages, flat=True, context=None):
+        """ Get a tree representation of the browse records.
+            :param messages: mail.message browse record list
         """
-        context = context or {}
-        if ids is False:
-            ids = self.search(cr, uid, domain, context=context, limit=10)
-
-        # FP Todo: flatten to max X level of mail_thread
-        messages = self.browse(cr, uid, ids, context=context)
-
-        result = []
+        roots = []
         tree = {} # key: ID, value: record
         for msg in messages:
-            if len(result)<(self._limit-1):
-                record = self._message_dict_get(cr, uid, msg, context=context)
-                if thread_level and msg.parent_id:
-                    while msg.parent_id:
-                        if msg.parent_id.id in tree:
-                            record_parent = tree[msg.parent_id.id]
-                        else:
-                            record_parent = self._message_dict_get(cr, uid, msg.parent_id, context=context)
-                            if msg.parent_id.parent_id:
-                                tree[msg.parent_id.id] = record_parent
-                        record_parent['child_ids'].append(record)
-                        record = record_parent
-                        msg = msg.parent_id
-                if msg.id not in tree:
-                    result.append(record)
-                    tree[msg.id] = record
-            else:
-                result.append({
-                    'type': 'expandable',
-                    'domain': [('id','<=', msg.id)]+domain,
-                    'context': context,
-                    'thread_level': thread_level  # should be improve accodting to level of records
-                })
-                break
-        return result
+            record = self._message_dict_get(cr, uid, msg, context=context)
+            if not flat and msg.parent_id:
+                while msg.parent_id:
+                    if msg.parent_id.id in tree:
+                        record_parent = tree[msg.parent_id.id]
+                    else:
+                        record_parent = self._message_dict_get(cr, uid, msg.parent_id, context=context)
+                        if msg.parent_id.parent_id:
+                            tree[msg.parent_id.id] = record_parent
+                    record_parent['child_ids'].append(record)
+                    record = record_parent
+                    msg = msg.parent_id
+            if msg.id not in tree:
+                roots.append(record)
+                tree[msg.id] = record
+        return roots
+
+    def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, limit=None, context=None):
+        """ Fetch and read messages. If IDs are provided, fetch these records.
+            Otherwise use the domain to fetch the matching records. After having
+            fetched the records provided by IDS, it will fetch children
+            according to thread_level.
+
+            :return result: A tree structure: list of msg_dict, with child_ids
+                being also msg_dict.
+        """
+        limit = limit or self._message_read_limit
+        if ids is False:
+            ids = self.search(cr, uid, domain, context=context, limit=limit)
+        messages = self.browse(cr, uid, ids, context=context)
+        # FP note - TDE note: TODO: flatten - order
+        return self.message_read_tree_get(cr, uid, messages, thread_level>0, context=context)
 
 
     #------------------------------------------------------
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 29db0bc529e..61181832579 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -234,6 +234,39 @@ class test_mail(common.TransactionCase):
         self.assertTrue(all(id in follower_ids for id in [user_admin.partner_id.id]),
             'Admin the only Pigs group followers')
 
+    def test_03_message_read(self):
+        """ Tests designed for message_read. """
+        def _flatten(read_dict):
+            res = []
+            for val in read_dict:
+                current = {'_id': val['id']}
+                if val.get('child_ids'):
+                    current['child_ids'] = _flatten(val.get('child_ids'))
+                res.append(current)
+            return res
+
+        # TDE NOTE: this test is not finished, as the message_read method is not fully specified.
+        # It wil be updated as soon as we have fixed specs !
+        cr, uid  = self.cr, self.uid
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+
+        # Add a few messages to pigs group
+        msgid1 = group_pigs.message_post(body='My Body', subject='1', parent_id=False)
+        msgid2 = group_pigs.message_post(body='My Body', subject='1-1', parent_id=msgid1)
+        msgid3 = group_pigs.message_post(body='My Body', subject='1-2', parent_id=msgid1)
+        msgid4 = group_pigs.message_post(body='My Body', subject='2', parent_id=False)
+        msgid5 = group_pigs.message_post(body='My Body', subject='1-1-1', parent_id=msgid2)
+        msgid6 = group_pigs.message_post(body='My Body', subject='2-1', parent_id=msgid4)
+        msgid7 = group_pigs.message_post(body='My Body', subject='1-3', parent_id=msgid1)
+        msgid8 = group_pigs.message_post(body='My Body', subject='1-3-1', parent_id=msgid7)
+
+        # First try: read flat
+        first_try_ids = [msgid8, msgid7, msgid6, msgid5, msgid4, msgid3, msgid2, msgid1]
+        res = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=0)
+        
+        # Second try: read with thread_level 1
+        res = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=1)
+
     def test_10_mail_composer(self):
         """ Tests designed for the mail.compose.message wizard. """
         cr, uid = self.cr, self.uid
@@ -296,14 +329,12 @@ class test_mail(common.TransactionCase):
         self.assertTrue(all(email in mail_emails for email in expected_emails) and len(mail_emails) == 2,
             'Send email emails are %s; should be %s' % (mail_emails, expected_emails))
 
-        # Create a reply to the last comment, with default partners
+        # Create a reply to the last comment
         compose_id = mail_compose.create(cr, uid,
             {}, {'mail.compose.message.mode': 'reply', 'default_model': 'mail.thread', 'default_res_id': self.group_pigs_id,
                 'active_id': first_com.id})
         compose = mail_compose.browse(cr, uid, compose_id)
         self.assertTrue(compose.model == 'mail.group' and compose.res_id == self.group_pigs_id,
             'Wizard message has model: %s and res_id:%s; should be mail.group and %s' % (compose.model, compose.res_id, self.group_pigs_id))
-        self.assertTrue(compose.parent_id.id == first_com.id and len(compose.partner_ids) == 5,
-            'Wizard parent_id is %d; should be %d; or wrong partner_ids (TO BE CONTINUED)' % (compose.parent_id.id, first_com.id))
-
-        
\ No newline at end of file
+        self.assertTrue(compose.parent_id.id == first_com.id,
+            'Wizard parent_id is %d; should be %d' % (compose.parent_id.id, first_com.id))

From 4d510a3d310a476564927f2934a11b118cc371d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 27 Aug 2012 17:03:03 +0200
Subject: [PATCH 585/999] [REF] mail_thread: message_read: re-added old
 expandable, to have same behavior as 'beofre in this branch'.

bzr revid: tde@openerp.com-20120827150303-ena57f72e3mgwtg2
---
 addons/mail/mail_message.py       | 13 +++++++++++--
 addons/mail/static/src/js/mail.js |  2 +-
 addons/mail/tests/test_mail.py    |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 9af688be533..a4536fb1786 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -141,7 +141,7 @@ class mail_message(osv.Model):
             'child_ids': [],
         }
 
-    def message_read_tree_get(self, cr, uid, messages, flat=True, context=None):
+    def message_read_tree_get(self, cr, uid, messages, domain, limit, flat=True, context=None):
         """ Get a tree representation of the browse records.
             :param messages: mail.message browse record list
         """
@@ -163,6 +163,13 @@ class mail_message(osv.Model):
             if msg.id not in tree:
                 roots.append(record)
                 tree[msg.id] = record
+            if len(roots) >= limit:
+                roots.append({
+                    'type': 'expandable',
+                    'domain': [('id','<=', msg.id)]+domain,
+                    'context': context,
+                    'thread_level': thread_level  # should be improve accodting to level of records
+                })
         return roots
 
     def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, limit=None, context=None):
@@ -179,7 +186,9 @@ class mail_message(osv.Model):
             ids = self.search(cr, uid, domain, context=context, limit=limit)
         messages = self.browse(cr, uid, ids, context=context)
         # FP note - TDE note: TODO: flatten - order
-        return self.message_read_tree_get(cr, uid, messages, thread_level>0, context=context)
+        # TDE NOTE: add expandable: TO FIX WHEN SPECIFIED
+        trees = self.message_read_tree_get(cr, uid, messages, domain, limit, thread_level==0, context=context)
+        return trees
 
 
     #------------------------------------------------------
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ecf34de3576..5eda999f874 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -421,7 +421,7 @@ openerp.mail = function(session) {
             // TODO first use: use IDS, otherwise set false
 
             var read_defer = this.ds_msg.call('message_read',
-                [false, fetch_domain, this.options.thread_level, fetch_context]
+                [false, fetch_domain, this.options.thread_level, undefined, fetch_context]
                 ).then(this.proxy('message_display'));
             return read_defer;
         },
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 61181832579..e63aa57c0a1 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -313,7 +313,7 @@ class test_mail(common.TransactionCase):
         first_com_pids = [partner.id for partner in first_com.partner_ids]
         notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', first_com.id)])
         self.assertTrue(len(first_com_pids) == 4, 'There are %s partners linked to the newly posted comment; should be 4' % (len(first_com_pids)))
-        self.assertTrue(len(notif_ids) == 4, 'There are %s 3 entries in mail_notification: should be 4' % (len(notif_ids)))
+        self.assertTrue(len(notif_ids) == 4, 'There are %s entries in mail_notification: should be 4' % (len(notif_ids)))
         self.assertTrue(all(id in [user_admin.partner_id.id, partner_bert_id, partner_raoul_id, partner_roger_id] for id in first_com_pids),
             'Admin, Bert Raoul and Roger should be the 4 partners of the newly created message')
 

From 80a73e723797bc373b4f84812e2e285d8ced59e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 27 Aug 2012 17:32:57 +0200
Subject: [PATCH 586/999] [FIX] sale: fixed demo data. Added a protection
 against void body in final body creation.

bzr revid: tde@openerp.com-20120827153257-astw7738j6qdqc8l
---
 addons/mail/mail_followers.py |  2 +-
 addons/sale/sale_demo.xml     | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 2045df49d70..129f4b479b7 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -106,7 +106,7 @@ class mail_notification(osv.Model):
             :param message: browse record on source mail.message
         """
         subject = msg.subject or '%s posted a comment on %s' % (msg.author_id.name, msg.record_name)
-        body = msg.body
+        body = msg.body or ''
         author_signature = msg.author_id.user_ids[0].signature
         if author_signature:
             body += '<div>%s</div>' % (author_signature)
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 192d73472c4..c8a3bb74774 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -304,36 +304,33 @@
         <record id="message_sale_1" model="mail.message">
             <field name="model">sale.order</field>
             <field name="res_id" ref="sale_order_2"/>
-            <field name="content_subtype">plain</field>
-            <field name="body_text">Hi,
+            <field name="body">Hi,
 I have a confusion for pricing of Services, I have heard there is a discount above 25 hours.
 Can you clarify please?</field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_demo"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
 
         <record id="message_sale_2" model="mail.message">
             <field name="model">sale.order</field>
             <field name="res_id" ref="sale_order_2"/>
             <field name="parent_id" ref="message_sale_1"/>
-            <field name="content_subtype">plain</field>
-            <field name="body_text">Hello, 
+            <field name="body">Hello, 
 Sorry but that scheme is not available for now,
 We would like to know if you confirm the quotation with pricing we sent to you.
 Thanks,
 Sales Department</field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
 
         <record id="message_sale_3" model="mail.message">
             <field name="model">sale.order</field>
             <field name="res_id" ref="sale_order_2"/>
             <field name="parent_id" ref="message_sale_2"/>
-            <field name="content_subtype">plain</field>
-            <field name="body_text">Ok, fine, we will intimate you after discussing with our team.</field>
+            <field name="body">Ok, fine, we will intimate you after discussing with our team.</field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_demo"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
         <!-- sale advance demo.. -->
         <!-- Demo Data for Product -->

From f4deb95339bfa89805dddaee01a5d46504c3a1a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 27 Aug 2012 18:22:37 +0200
Subject: [PATCH 587/999] [REV] mail_message: reverted changes on message_read,
 back to its fist version, except limit that is more usable than an hardcoded
 one. Added some tests that crash, because message_read is really wrong.

bzr revid: tde@openerp.com-20120827162237-eljqnvenwy0xv5dc
---
 addons/mail/mail_message.py    | 86 ++++++++++++++++++----------------
 addons/mail/tests/test_mail.py | 80 ++++++++++++++++---------------
 2 files changed, 89 insertions(+), 77 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index a4536fb1786..304592e076b 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -141,54 +141,60 @@ class mail_message(osv.Model):
             'child_ids': [],
         }
 
-    def message_read_tree_get(self, cr, uid, messages, domain, limit, flat=True, context=None):
-        """ Get a tree representation of the browse records.
-            :param messages: mail.message browse record list
+    def _debug_print_tree(self, tree, prefix=''):
+        for elem in tree:
+            print '%s%s' % (prefix, elem['id'])
+            if elem['child_ids']:
+                self._debug_print_tree(elem['child_ids'], prefix+'-')
+
+    def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, limit=None, context=None):
+        """ 
+            If IDS are provided, fetch these records, otherwise use the domain to
+            fetch the matching records. After having fetched the records provided
+            by IDS, it will fetch children (according to thread_level).
+            
+            Return [
+            
+            ]
         """
-        roots = []
+        limit = limit or self._message_read_limit
+        context = context or {}
+        if ids is False:
+            ids = self.search(cr, uid, domain, context=context, limit=limit)
+
+        # FP Todo: flatten to max X level of mail_thread
+        messages = self.browse(cr, uid, ids, context=context)
+
+        result = []
         tree = {} # key: ID, value: record
         for msg in messages:
-            record = self._message_dict_get(cr, uid, msg, context=context)
-            if not flat and msg.parent_id:
-                while msg.parent_id:
-                    if msg.parent_id.id in tree:
-                        record_parent = tree[msg.parent_id.id]
-                    else:
-                        record_parent = self._message_dict_get(cr, uid, msg.parent_id, context=context)
-                        if msg.parent_id.parent_id:
-                            tree[msg.parent_id.id] = record_parent
-                    record_parent['child_ids'].append(record)
-                    record = record_parent
-                    msg = msg.parent_id
-            if msg.id not in tree:
-                roots.append(record)
-                tree[msg.id] = record
-            if len(roots) >= limit:
-                roots.append({
+            if len(result)<(limit-1):
+                record = self._message_dict_get(cr, uid, msg, context=context)
+                if thread_level and msg.parent_id:
+                    while msg.parent_id:
+                        if msg.parent_id.id in tree:
+                            record_parent = tree[msg.parent_id.id]
+                        else:
+                            record_parent = self._message_dict_get(cr, uid, msg.parent_id, context=context)
+                            if msg.parent_id.parent_id and msg.parent_id.id not in tree:
+                                tree[msg.parent_id.id] = record_parent
+                        record_parent['child_ids'].append(record)
+                        record = record_parent
+                        msg = msg.parent_id
+                if msg.id not in tree:
+                    result.append(record)
+                    tree[msg.id] = record
+            else:
+                result.append({
                     'type': 'expandable',
                     'domain': [('id','<=', msg.id)]+domain,
                     'context': context,
                     'thread_level': thread_level  # should be improve accodting to level of records
                 })
-        return roots
-
-    def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, limit=None, context=None):
-        """ Fetch and read messages. If IDs are provided, fetch these records.
-            Otherwise use the domain to fetch the matching records. After having
-            fetched the records provided by IDS, it will fetch children
-            according to thread_level.
-
-            :return result: A tree structure: list of msg_dict, with child_ids
-                being also msg_dict.
-        """
-        limit = limit or self._message_read_limit
-        if ids is False:
-            ids = self.search(cr, uid, domain, context=context, limit=limit)
-        messages = self.browse(cr, uid, ids, context=context)
-        # FP note - TDE note: TODO: flatten - order
-        # TDE NOTE: add expandable: TO FIX WHEN SPECIFIED
-        trees = self.message_read_tree_get(cr, uid, messages, domain, limit, thread_level==0, context=context)
-        return trees
+                break
+        # TDE temp: debug print
+        # self._debug_print_tree(result)
+        return result
 
 
     #------------------------------------------------------
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index e63aa57c0a1..f425007b4c1 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -121,7 +121,7 @@ class test_mail(common.TransactionCase):
                           self.mail_thread.message_process,
                           cr, uid, None, mail_spam)
 
-    def test_01_many2many_reference_field(self):
+    def test_10_many2many_reference_field(self):
         """ Tests designed for the many2many_reference field (follower_ids).
             We will test to perform writes using the many2many commands 0, 3, 4,
             5 and 6. """
@@ -205,7 +205,7 @@ class test_mail(common.TransactionCase):
         self.assertTrue(all(id in follower_ids for id in [partner_bert_id, user_admin.partner_id.id]),
             'Bert and Admin should be the followers of dummy mail.group data')
 
-    def test_02_message_followers(self):
+    def test_11_message_followers(self):
         """ Tests designed for the subscriber API. """
         cr, uid = self.cr, self.uid
         user_admin = self.res_users.browse(cr, uid, uid)
@@ -234,41 +234,8 @@ class test_mail(common.TransactionCase):
         self.assertTrue(all(id in follower_ids for id in [user_admin.partner_id.id]),
             'Admin the only Pigs group followers')
 
-    def test_03_message_read(self):
-        """ Tests designed for message_read. """
-        def _flatten(read_dict):
-            res = []
-            for val in read_dict:
-                current = {'_id': val['id']}
-                if val.get('child_ids'):
-                    current['child_ids'] = _flatten(val.get('child_ids'))
-                res.append(current)
-            return res
-
-        # TDE NOTE: this test is not finished, as the message_read method is not fully specified.
-        # It wil be updated as soon as we have fixed specs !
-        cr, uid  = self.cr, self.uid
-        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
-
-        # Add a few messages to pigs group
-        msgid1 = group_pigs.message_post(body='My Body', subject='1', parent_id=False)
-        msgid2 = group_pigs.message_post(body='My Body', subject='1-1', parent_id=msgid1)
-        msgid3 = group_pigs.message_post(body='My Body', subject='1-2', parent_id=msgid1)
-        msgid4 = group_pigs.message_post(body='My Body', subject='2', parent_id=False)
-        msgid5 = group_pigs.message_post(body='My Body', subject='1-1-1', parent_id=msgid2)
-        msgid6 = group_pigs.message_post(body='My Body', subject='2-1', parent_id=msgid4)
-        msgid7 = group_pigs.message_post(body='My Body', subject='1-3', parent_id=msgid1)
-        msgid8 = group_pigs.message_post(body='My Body', subject='1-3-1', parent_id=msgid7)
-
-        # First try: read flat
-        first_try_ids = [msgid8, msgid7, msgid6, msgid5, msgid4, msgid3, msgid2, msgid1]
-        res = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=0)
-        
-        # Second try: read with thread_level 1
-        res = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=1)
-
-    def test_10_mail_composer(self):
-        """ Tests designed for the mail.compose.message wizard. """
+    def test_20_message_post_and_compose(self):
+        """ Tests designed for message_post and the mail.compose.message wizard. """
         cr, uid = self.cr, self.uid
         mail_compose = self.registry('mail.compose.message')
         user_admin = self.res_users.browse(cr, uid, uid)
@@ -338,3 +305,42 @@ class test_mail(common.TransactionCase):
             'Wizard message has model: %s and res_id:%s; should be mail.group and %s' % (compose.model, compose.res_id, self.group_pigs_id))
         self.assertTrue(compose.parent_id.id == first_com.id,
             'Wizard parent_id is %d; should be %d' % (compose.parent_id.id, first_com.id))
+
+    def test_30_message_read(self):
+        """ Tests designed for message_read. """
+        def _simplify_struct(read_dict):
+            res = []
+            for val in read_dict:
+                current = {'_id': val['id']}
+                if val.get('child_ids'):
+                    current['child_ids'] = _flatten(val.get('child_ids'))
+                res.append(current)
+            return res
+
+        # TDE NOTE: this test is not finished, as the message_read method is not fully specified.
+        # It wil be updated as soon as we have fixed specs !
+        cr, uid  = self.cr, self.uid
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+
+        # Add a few messages to pigs group
+        msgid1 = group_pigs.message_post(body='My Body', subject='1', parent_id=False)
+        msgid2 = group_pigs.message_post(body='My Body', subject='1-1', parent_id=msgid1)
+        msgid3 = group_pigs.message_post(body='My Body', subject='1-2', parent_id=msgid1)
+        msgid4 = group_pigs.message_post(body='My Body', subject='2', parent_id=False)
+        msgid5 = group_pigs.message_post(body='My Body', subject='1-1-1', parent_id=msgid2)
+        # msgid6 = group_pigs.message_post(body='My Body', subject='2-1', parent_id=msgid4)
+        # msgid7 = group_pigs.message_post(body='My Body', subject='1-3', parent_id=msgid1)
+        # msgid8 = group_pigs.message_post(body='My Body', subject='1-3-1', parent_id=msgid7)
+
+        # First try: read flat
+        # first_try_ids = [msgid8, msgid7, msgid6, msgid5, msgid4, msgid3, msgid2, msgid1]
+        # res = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=0)
+
+        # Second try: read with thread_level 1
+        res = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=1)
+        # print res
+        self.assertTrue(len(res) == 2, 'Incorrect number of child in message_read')
+        self.assertTrue(len(res[0]['child_ids']) == 2, 'Incorrect number of child in message_read')
+        self.assertTrue(len(res[0]['child_ids'][0]['child_ids']) == 1, 'Incorrect number of child in message_read')
+        # trees = self.mail_message.message_read_tree_flatten_main(cr, uid, res, thread_level=0)
+        # print trees

From b59ae47bb876a83733dec14866bd2cef5996ae2b Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 28 Aug 2012 11:55:39 +0530
Subject: [PATCH 588/999] [IMP]Account_voucher : Applying group multi currency
 to currency field

bzr revid: dhr@tinyerp.com-20120828062539-37dzdvbidj23xx7t
---
 addons/account_voucher/account_voucher_view.xml      |  4 ++--
 .../report/account_voucher_sales_receipt_view.xml    |  2 +-
 .../account_voucher/voucher_payment_receipt_view.xml | 12 ++++++------
 .../account_voucher/voucher_sales_purchase_view.xml  |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 64e1cf22156..c27c54c0ca2 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -49,7 +49,7 @@
                   <sheet string="Accounting Voucher">
                     <group col="6" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-                        <field name="payment_rate_currency_id" invisible="1"/>
+                        <field name="payment_rate_currency_id" invisible="1" groups="base.group_multi_currency"/>
                         <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
                         <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="type" required="1"/>
@@ -75,7 +75,7 @@
                                 </group>
                                 <group string="Other Information">
                                     <field name="number"/>
-                                    <field name="currency_id"/>
+                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                 </group>
                                 <group col="4" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
                                     <separator string="Total" colspan="4"/>
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index 15b2433ec25..97aadb67cfd 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -16,7 +16,7 @@
                 <field name="company_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="state" invisible="1"/>
-                <field name="currency_id" invisible="1"/>
+                <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
                 <field name="journal_id" invisible="1"/>
                 <field name="date_due" invisible="1"/>
                 <field name="account_id" invisible="1"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 503c3aeaa5e..0f484a5c781 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -102,7 +102,7 @@
                                     <field name="narration" nolabel="1" colspan="2"/>
                                 </group>
                                 <group string="Other Information" col="4">
-                                    <field name="currency_id" colspan="4"/>
+                                    <field name="currency_id" colspan="4" groups="base.group_multi_currency"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
@@ -137,7 +137,7 @@
                             <label for="amount" string="Amount"/>
                             <div>
                                 <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)" class="oe_inline"/>
-                                <field name="currency_id" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
                             </div>
                             <field name="journal_id"
                                 domain="[('type','in',['bank', 'cash'])]"
@@ -194,7 +194,7 @@
                                         <separator string="Currency Options" colspan="4"/>
                                         <field name="is_multi_currency" invisible="1"/>
                                         <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" />
                                         <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                     </group>
                                     <group col="2">
@@ -232,7 +232,7 @@
                                    <field name="state"/>
                                    <field name="reconcile_id"/>
                                    <field name="amount_currency"/>
-                                   <field name="currency_id"/>
+                                   <field name="currency_id" groups="base.group_multi_currency"/>
                                </tree>
                             </field>
                         </page>
@@ -302,7 +302,7 @@
                                 <field name="amount" class="oe_inline"
                                     invisible="context.get('line_type', False)"
                                     on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
-                                <field name="currency_id" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
                             </div>
 
                             <field name="journal_id"
@@ -401,7 +401,7 @@
                                     <field name="state"/>
                                     <field name="reconcile_id"/>
                                     <field name="amount_currency"/>
-                                    <field name="currency_id"/>
+                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                 </tree>
                             </field>
                         </page>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 5bcecfa268e..7984b42a149 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -80,7 +80,7 @@
                             <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                             <field name="name"/>
                             <field name="paid" invisible="1"/>
-                            <field name="currency_id" invisible="1"/>
+                            <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
                         </group>
                         <field name="type" invisible="True"/>
                     </group>
@@ -229,7 +229,7 @@
                             <field name="date" string="Bill Date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                             <field name="date_due"/>
                             <field name="paid" invisible="1"/>
-                            <field name="currency_id" invisible="1"/>
+                            <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
                             <field name="journal_id"
                                 domain="[('type','in',['purchase','purchase_refund'])]"
                                 widget="selection"

From 8c4ce402d1aa11e99c7d4e87bbb7e35f68334bc4 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Tue, 28 Aug 2012 12:11:11 +0530
Subject: [PATCH 589/999] [IMP]Improved base module as per requirement.

bzr revid: hsa@tinyerp.com-20120828064111-msyv13aa07az17zo
---
 openerp/addons/base/res/res_config.py | 17 +++++++++++++++++
 openerp/addons/base/res/res_users.py  |  6 +++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index 3f4a052a36b..3399cd1153e 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -553,4 +553,21 @@ class res_config_settings(osv.osv_memory):
             return act_window.read(cr, uid, action_ids[0], [], context=context)
         return {}
 
+    def name_get(self, cr, uid, ids, context=None):
+        """ Override name_get method to return an appropriate configuration wizard
+            name, and not the generated name."""
+        if not len(ids):
+            return []
+        # name_get may receive int id instead of an id list
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        act_window = self.pool.get('ir.actions.act_window')
+        action_ids = act_window.search(cr, uid, [('res_model', '=', self._name)], context=context)
+        name = self._name
+        if action_ids:
+            name = act_window.read(cr, uid, action_ids[0], ['name'], context=context)['name']
+
+        return [(record.id, name) for record in self.browse(cr, uid , ids, context=context)]
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index cddc02673b8..3078d94fd9d 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -51,7 +51,7 @@ class groups(osv.osv):
             else:
                 res[g.id] = g.name
         return res
-
+    
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
         'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'),
@@ -61,7 +61,7 @@ class groups(osv.osv):
         'menu_access': fields.many2many('ir.ui.menu', 'ir_ui_menu_group_rel', 'gid', 'menu_id', 'Access Menu'),
         'comment' : fields.text('Comment', size=250, translate=True),
         'category_id': fields.many2one('ir.module.category', 'Application', select=True),
-        'full_name': fields.function(_get_full_name, type='char', string='Group Name'),
+        'full_name': fields.function(_get_full_name, type='char', string='Group Name', store=True),
     }
 
     _sql_constraints = [
@@ -815,7 +815,7 @@ class users_view(osv.osv):
                     'type': 'selection',
                     'string': app and app.name or _('Other'),
                     'selection': [(False, '')] + [(g.id, g.name) for g in gs],
-                    'help': '\n'.join(tips),
+                    'help': g.comment,
                 }
             else:
                 # boolean group fields

From c2a8adb97613f6756267021b412d0a2e53f94638 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 28 Aug 2012 12:38:41 +0530
Subject: [PATCH 590/999] [IMP]pos,product(pricelist) and hr_expense_report :
 applying multi_currency group to currency field

bzr revid: dhr@tinyerp.com-20120828070841-l318wc2b4jkm99dz
---
 addons/hr_expense/report/hr_expense_report_view.xml | 2 +-
 addons/point_of_sale/point_of_sale_view.xml         | 2 +-
 addons/product/pricelist_view.xml                   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 1cd1e10c5ed..d984669bb08 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -16,7 +16,7 @@
                 <field name="analytic_account" invisible="1" groups="analytic.group_analytic_accounting"/>
                 <field name="department_id" invisible="1"/>
                 <field name="company_id" invisible="1"/>
-                <field name="currency_id" invisible="1"/>
+                <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
                 <field name="product_id" invisible="1"/>
                 <field name="product_qty" invisible="1"/>
                 <field name="state" invisible="1"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index dce19ab77b6..0b29ace35ea 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -963,7 +963,7 @@
                                 <field name="total_entry_encoding" />
                                 <field name="balance_end_real" />
                                 <field name="difference" />
-                                <field name="currency" />
+                                <field name="currency" groups="base.group_multi_currency" />
                                 <field name="state" />
                             </tree>
                         </field>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index adefd9e5d3c..dc120660c43 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -119,7 +119,7 @@
                     <field name="name" string="Products Price"/>
                     <field name="type"/>
                     <field name="active" />
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                 </search>
             </field>
         </record>
@@ -132,7 +132,7 @@
                 <tree string="Products Price List">
                     <field name="name"/>
                     <field name="type"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="active" />
                 </tree>
             </field>
@@ -149,7 +149,7 @@
                     <group col="4">
                         <field name="active"/>
                         <field name="type"/>
-                        <field name="currency_id"/>
+                        <field name="currency_id" groups="base.group_multi_currency"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <field name="version_id">
@@ -230,7 +230,7 @@
                         <field name="name"/>
                         <field name="active"/>
                         <field name="field"/>
-                        <field name="currency_id"/>
+                        <field name="currency_id" groups="base.group_multi_currency"/>
                     </group>
                 </form>
             </field>

From d5a3b33663f2ef4d8f163945c43969dba4826d8e Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 28 Aug 2012 12:48:59 +0530
Subject: [PATCH 591/999] [IMP]Project timesheet and report intrasat : applying
 group multi currency to currency field

bzr revid: dhr@tinyerp.com-20120828071859-c3hrto4m1x3aiyvq
---
 addons/project_timesheet/project_timesheet_view.xml | 2 +-
 addons/report_intrastat/report_intrastat_view.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index c47c411f6c9..9d60e165d1e 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -10,7 +10,7 @@
                 <field name="use_tasks" position="after">
                     <field name="use_timesheets"/>
                     <field name="timesheet_count"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="partner_id"/>
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 4f02c8f8c75..8d8da4a078f 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -84,7 +84,7 @@
                     <field name="weight"/>
                     <field name="value"/>
                     <field name="supply_units"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="type"/>
                 </tree>
             </field>

From a531865e2b5e3a4ad268640e85680f7485ede454 Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Tue, 28 Aug 2012 13:02:29 +0530
Subject: [PATCH 592/999] removed unwanted code.

bzr revid: vba@tinyerp.com-20120828073229-3l5tlis2jp3dbh30
---
 addons/project/security/project_security.xml | 15 ---------------
 addons/survey/survey.py                      |  4 ----
 2 files changed, 19 deletions(-)

diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index c64f26661ea..f867285138a 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -69,20 +69,5 @@
         <field name="domain_force">[(1,'=',1)]</field>
         <field name="groups" eval="[(4,ref('project.group_project_manager'))]"/>
     </record>
-
-    <record model="ir.rule" id="project_visibility_rule">
-        <field name="name" >Project According to User</field>
-        <field name="model_id" ref="model_project_project"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('user_id','=',False),('user_id','=',user.id)]</field>
-    </record>
-
-    <record model="ir.rule" id="project_manager_all_project_rule">
-        <field name="name">Project Managers all projects</field>
-        <field name="model_id" ref="model_project_project"/>
-        <field name="domain_force">[(1,'=',1)]</field>
-        <field name="groups" eval="[(4,ref('project.group_project_manager'))]"/>
-    </record>
-
 </data>
 </openerp>
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 255128ffba0..dde3130e9c5 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -45,10 +45,6 @@ class survey(osv.osv):
     _description = 'Survey'
     _rec_name = 'title'
 
-    def notify_survey_attempt(self, ids=False, args=None):
-        print "How it works !!!"
-        return True
-
     def default_get(self, cr, uid, fields, context=None):
         data = super(survey, self).default_get(cr, uid, fields, context)
         return data

From bc5da1a02b30f4a89edb988de0d2edb48d183b8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 28 Aug 2012 09:34:14 +0200
Subject: [PATCH 593/999] [REVIEW] tools: moved email_split function in emails
 section, instead of 'somwhere in the file'.

bzr revid: tde@openerp.com-20120828073414-lt4bpubxtv3235b6
---
 openerp/tools/misc.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 024d75fcae0..f609981342e 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -395,6 +395,11 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
         cr.close()
     return res
 
+def email_split(text):
+    """ Return a list of the email addresses found in ``text`` """
+    if not text: return []
+    return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
+
 #----------------------------------------------------------
 # SMS
 #----------------------------------------------------------

From 2a916edbade8505201aba8b520981e9ac26873c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 28 Aug 2012 09:53:21 +0200
Subject: [PATCH 594/999] [REVIEW] ir_ui_menu: cleaned _get_needaction code.

bzr revid: tde@openerp.com-20120828075321-7emtlqvh5oj6o31r
---
 openerp/addons/base/ir/ir_ui_menu.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index 05523faa550..77e923adf48 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -23,9 +23,7 @@
 import base64
 import re
 import threading
-
 from tools.safe_eval import safe_eval as eval
-
 import tools
 import openerp.modules
 from osv import fields, osv
@@ -258,18 +256,15 @@ class ir_ui_menu(osv.osv):
         return res
 
     def _get_needaction(self, cr, uid, ids, field_names, args, context=None):
-        if context is None:
-            context = {}
         res = {}
         for menu in self.browse(cr, uid, ids, context=context):
-            res[menu.id] = {}
-            res[menu.id]['needaction_enabled'] = False
-            res[menu.id]['needaction_counter'] = False
-            res[menu.id] = {}
+            res[menu.id] = {
+                'needaction_enabled': False,
+                'needaction_counter': False,
+            }
             if menu.action and menu.action.type in ('ir.actions.act_window','ir.actions.client') and menu.action.res_model:
                 obj = self.pool.get(menu.action.res_model)
                 if obj._needaction:
-                    dom = []
                     if menu.action.type=='ir.actions.act_window':
                         dom = menu.action.domain and eval(menu.action.domain, {'uid': uid}) or []
                     else:

From df47c52bab4ed691519f7173f32ecf11751d19d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 28 Aug 2012 09:53:55 +0200
Subject: [PATCH 595/999] [REVIEW] ir_needaction: cleaned comments, removed
 unused import.

bzr revid: tde@openerp.com-20120828075355-iiblaa6gqio78dcj
---
 openerp/addons/base/ir/ir_needaction.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 1e59a6fbb8e..3bb405fcbfa 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -19,37 +19,35 @@
 #
 ##############################################################################
 
-from osv import osv, fields
+from osv import osv
 
 class ir_needaction_mixin(osv.Model):
     '''Mixin class for objects using the need action feature.
 
-    Need action feature can be used by objects having to be able to
+    Need action feature can be used by models that have to be able to
     signal that an action is required on a particular record. If in
     the business logic an action must be performed by somebody, for
     instance validation by a manager, this mechanism allows to set a
     list of users asked to perform an action.
 
-    Objects using the 'need_action' feature should override the
-    ``needaction_domain_get`` method. This methods returns a
+    Models using the 'need_action' feature should override the
+    ``_needaction_domain_get`` method. This method returns a
     domain to filter records requiring an action for a specific user.
 
     This class also offers several global services:
-    - ``needaction_get_action_count``: as ``needaction_get_record_ids``
-    but returns only the number of action, not the ids (performs a
-    search with count=True)
+    - ``_needaction_count``: returns the number of actions uid has to perform
     '''
 
     _name = 'ir.needaction_mixin'
     _needaction = True
 
     #------------------------------------------------------
-    # Addon API
+    # Addons API
     #------------------------------------------------------
 
     def _needaction_domain_get(self, cr, uid, context=None):
         """ Returns the domain to filter records that require an action
-            :return: domain or False is no need action
+            :return: domain or False is no action
         """
         return False
 
@@ -58,8 +56,7 @@ class ir_needaction_mixin(osv.Model):
     #------------------------------------------------------
 
     def _needaction_count(self, cr, uid, domain=[], context=None):
-        """Given the current model and a user_id
-           get the number of actions it has to perform"""
+        """ Get the number of actions uid has to perform. """
         dom = self._needaction_domain_get(cr, uid, context=context)
         if dom is False:
             return 0

From ec85db8e83b01111db0d3e76fc6a815d37702695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 28 Aug 2012 10:09:39 +0200
Subject: [PATCH 596/999] [REVIEW] tools: removed duplicate email_split in
 tools.

bzr revid: tde@openerp.com-20120828080939-5bt3klbep49gjw47
---
 openerp/tools/misc.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index f609981342e..e86f189e9ca 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -1118,12 +1118,6 @@ class unquote(str):
     def __repr__(self):
         return self
 
-def email_split(text):
-    """Return a list of the email addresses found in ``text``"""
-    if not text: return []
-    return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
-
-
 class UnquoteEvalContext(defaultdict):
     """Defaultdict-based evaluation context that returns 
        an ``unquote`` string for any missing name used during

From 8ff4fbdc60dcf2a16e78119615cb1f1bd95d66c7 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 28 Aug 2012 14:19:45 +0530
Subject: [PATCH 597/999] [IMP]account_analytic_analysis: applying group multi
 currency to currency field

bzr revid: dhr@tinyerp.com-20120828084945-06v2328h6zqkqgp3
---
 addons/account/account_invoice_view.xml                     | 2 +-
 addons/account/project/project_view.xml                     | 6 +++---
 .../account/report/account_analytic_entries_report_view.xml | 2 +-
 addons/account/report/account_entries_report_view.xml       | 2 +-
 addons/account/report/account_invoice_report_view.xml       | 2 +-
 addons/account/report/account_report_view.xml               | 6 +++---
 .../account/wizard/account_report_central_journal_view.xml  | 2 +-
 .../account/wizard/account_report_general_journal_view.xml  | 2 +-
 .../account/wizard/account_report_general_ledger_view.xml   | 2 +-
 .../account/wizard/account_report_partner_ledger_view.xml   | 2 +-
 addons/account/wizard/account_report_print_journal_view.xml | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index febc9b6d90d..46807297307 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -264,7 +264,7 @@
                                     <field name="journal_id"/>
                                     <field name="debit"/>
                                     <field name="credit"/>
-                                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                                    <field name="amount_currency"/>
                                     <field name="currency_id" groups="base.group_multi_currency"/>
                                 </tree>
                             </field>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e3b902a000f..cb99cf7aca8 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -56,7 +56,7 @@
                     <field name="credit"/>
                     <field name="balance"/>
                     <field name="state" invisible="1"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="date" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
@@ -140,7 +140,7 @@
                             <label for="amount_currency"/>
                             <div>
                                 <field name="amount_currency" class="oe_inline"/>
-                                <field name="currency_id" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
                             </div>
                         </group>
                         <group string="Product Information">
@@ -250,7 +250,7 @@
                             <label for="amount_currency"/>
                             <div>
                                 <field name="amount_currency" class="oe_inline"/>
-                                <field name="currency_id" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
                             </div>
                             <field invisible="1" name="general_account_id"/>
                         </group>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 8963ba97376..b43005ef179 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -14,7 +14,7 @@
                 <field name="name" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
-                <field name="currency_id" invisible="1"/>
+                <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
                 <field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                 <field name="general_account_id" invisible="1"/>
                 <field name="journal_id" invisible="1"/>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 667c61ab78f..69129c8b3ee 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -13,7 +13,7 @@
                 <field name="nbr" sum="# of Entries "/>
                 <field name="quantity" sum="# of Products Qty " invisible="not context.get('quantity_visible', False)"/>
                 <field name="amount_currency" invisible="not context.get('amount_currency_visible', False)"/>
-                <field name="currency_id" invisible="not context.get('currency_id_visible', False)"/>
+                <field name="currency_id" invisible="not context.get('currency_id_visible', False)" groups="base.group_multi_currency"/>
                 <field name="debit"/>
                 <field name="credit"/>
                 <field name="balance"/>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index c22d5d55f45..f155345faa6 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -19,7 +19,7 @@
                 <field name="categ_id" invisible="1"/>
                 <field name="state" invisible="1"/>
                 <field name="period_id" invisible="1"/>
-                <field name="currency_id" invisible="1"/>
+                <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
                 <field name="journal_id" invisible="1"/>
                 <field name="partner_bank_id" invisible="1"/>
                 <field name="date_due" invisible="1"/>
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index a947cce4f57..b2c2c010b84 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -92,7 +92,7 @@
                     <field name="partner_id"/>
                     <field name="amount_untaxed" sum="Untaxed Amount"/>
                     <field name="amount_total" sum="Total Amount"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="date_invoice"/>
                     <field name="date_due"/>
                     <field name="residual"/>
@@ -121,7 +121,7 @@
                     <field name="account_id"/>
                     <field name="quantity"/>
                     <field name="amount_total"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                 </tree>
             </field>
         </record>
@@ -168,7 +168,7 @@
                     <field name="user_type"/>
                     <field name="quantity"/>
                     <field name="amount_total"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_central_journal_view.xml b/addons/account/wizard/account_report_central_journal_view.xml
index 27b611f5838..2819d93471d 100644
--- a/addons/account/wizard/account_report_central_journal_view.xml
+++ b/addons/account/wizard/account_report_central_journal_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
                 <field name="target_move" position="after">
-                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                    <field name="amount_currency"/>
                     <newline/>
                 </field>
             </field>
diff --git a/addons/account/wizard/account_report_general_journal_view.xml b/addons/account/wizard/account_report_general_journal_view.xml
index d68860a8e33..fc57789d0b7 100644
--- a/addons/account/wizard/account_report_general_journal_view.xml
+++ b/addons/account/wizard/account_report_general_journal_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <data>
             <xpath expr="//field[@name='target_move']" position="after">
-               <field name="amount_currency" groups="base.group_multi_currency"/>
+               <field name="amount_currency"/>
                <newline/>
             </xpath>
             </data>
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index e5da60e26b4..b636101ee79 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -12,7 +12,7 @@
                 <field name="display_account"/>
                 <field name="sortby"/>
                 <field name="landscape"/>
-                <field name="amount_currency" groups="base.group_multi_currency"/>
+                <field name="amount_currency"/>
                 <newline/>
             </xpath>
             <xpath expr="//field[@name='filter']" position="after">
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index 461765164ea..f3dd9a80f09 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -10,7 +10,7 @@
             <data>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="result_selection"/>
-                <field name="amount_currency" groups="base.group_multi_currency"/>
+                <field name="amount_currency"/>
                 <field name="page_split"/>
                 <newline/>
             </xpath>
diff --git a/addons/account/wizard/account_report_print_journal_view.xml b/addons/account/wizard/account_report_print_journal_view.xml
index 227d2b35706..ae8049d579e 100644
--- a/addons/account/wizard/account_report_print_journal_view.xml
+++ b/addons/account/wizard/account_report_print_journal_view.xml
@@ -10,7 +10,7 @@
             <data>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="sort_selection"/>
-                <field name="amount_currency" groups="base.group_multi_currency"/>
+                <field name="amount_currency"/>
                 <newline/>
                 <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" colspan="4" invisible="1"/>
                 <separator string="Periods"  colspan="4"/>

From de18f4a401bb8d2d2be2758fdaba3a9dd80184e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 28 Aug 2012 10:50:18 +0200
Subject: [PATCH 598/999] [CLEAN] ir_needaction: cleaned needaction_count.

bzr revid: tde@openerp.com-20120828085018-z6uywvk2oeqoog06
---
 openerp/addons/base/ir/ir_needaction.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 3bb405fcbfa..ba3a5c4a998 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -58,8 +58,6 @@ class ir_needaction_mixin(osv.Model):
     def _needaction_count(self, cr, uid, domain=[], context=None):
         """ Get the number of actions uid has to perform. """
         dom = self._needaction_domain_get(cr, uid, context=context)
-        if dom is False:
+        if not dom:
             return 0
-        result = self.search(cr, uid, (domain or []) +dom, context=context, count=True)
-        return result
-
+        return self.search(cr, uid, (domain or []) +dom, context=context, count=True)

From ee3f4bd2a0b53c127b80437c80cfdcc4129d4bb2 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 28 Aug 2012 14:58:50 +0530
Subject: [PATCH 599/999] [IMP]Applying group multi currency to field currency
 in project kanban view

bzr revid: dhr@tinyerp.com-20120828092850-75v55gcscsgxv0ai
---
 addons/project_timesheet/project_timesheet_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 9d60e165d1e..c8c3aa67178 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -20,7 +20,7 @@
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_deadline')]" position="before">
                     <div class="oe_kanban_project_fields oe_kanban_project_invoice" t-if="record.partner_id.raw_value">
                         <div>Amount to invoice</div>
-                        <div><field name="amount_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/></div>
+                        <div ><field name="amount_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]" groups="base.group_multi_currency"/></div>
                         <div>Time to Invoice</div>
                         <div><field name="time_to_invoice"/> <field name="company_uom_id"/></div>
                     </div>

From aa20e32fbae23a11da32d4b80b37bfad38903205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 28 Aug 2012 11:50:46 +0200
Subject: [PATCH 600/999] [FIX] mail.compose.message: added a log access
 because it seems abstract model need that ...

bzr revid: tde@openerp.com-20120828095046-tqx7gpm6d2we4d1o
---
 addons/mail/wizard/mail_compose_message.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index e64b0cd23aa..e4b1d01c5e7 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -47,6 +47,7 @@ class mail_compose_message(osv.TransientModel):
     _name = 'mail.compose.message'
     _inherit = 'mail.message'
     _description = 'Email composition wizard'
+    _log_access = True
 
     def default_get(self, cr, uid, fields, context=None):
         """ Handle composition mode. Some details about context keys:

From 481bdd269f1986525d2cc1c4ab843209ff85a656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 28 Aug 2012 11:53:23 +0200
Subject: [PATCH 601/999] [IMP] mail.message: added an 'unread' functional
 searchable field. This field is used to replace the buggy
 needaction_domain_get on mail.message (having 2 notifications with 1/ correct
 partner 2/ unread could lead to false needaction, because of verified domain.
 The domain is now based on the unread field, that computes unread messages
 for the user. To avoid having too much overhead, it has been implemented
 directly in sql.

bzr revid: tde@openerp.com-20120828095323-3tb01d7vaoa0m9rb
---
 addons/mail/mail_message.py | 44 ++++++++++++++++++++++++++++++++-----
 addons/mail/mail_thread.py  |  2 +-
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 304592e076b..f73dfff3b3c 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -53,7 +53,7 @@ class mail_message(osv.Model):
         else:
             return name[:18] + '...'
 
-    def get_record_name(self, cr, uid, ids, name, arg, context=None):
+    def _get_record_name(self, cr, uid, ids, name, arg, context=None):
         """ Return the related document name, using get_name. """
         result = dict.fromkeys(ids, '')
         for message in self.browse(cr, uid, ids, context=context):
@@ -62,6 +62,36 @@ class mail_message(osv.Model):
             result[message.id] = self._shorten_name(self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1])
         return result
 
+    def _get_unread(self, cr, uid, ids, name, arg, context=None):
+        """ Compute if the message is unread by the current user. """
+        res = dict.fromkeys(id, False)
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        notif_obj = self.pool.get('mail.notification')
+        notif_ids = notif_obj.search(cr, uid, [
+            ('partner_id', 'in', [partner_id]),
+            ('message_id', 'in', ids),
+            ('read', '=', False)
+        ], context=context)
+        for notif in notif_obj.browse(cr, uid, notif_ids, context=context):
+            res[notif.message_id.id]['unread'] = True
+        return res
+
+    def _search_unread(self, cr, uid, obj, name, domain, context=None):
+        """ Search for messages unread by the current user. """
+        read_value = not domain[0][2]
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        cr.execute("""  SELECT mail_message.id \
+                        FROM mail_message \
+                        JOIN mail_notification ON ( \
+                            mail_notification.message_id = mail_message.id ) \
+                        WHERE mail_notification.partner_id = %s AND \
+                            mail_notification.read = %s \
+                    """ % (partner_id, read_value) )
+        res = cr.fetchall()
+        message_ids = [r[0] for r in res]
+        return [('id', 'in', message_ids)]
+
+
     def name_get(self, cr, uid, ids, context=None):
         # name_get may receive int id instead of an id list
         if isinstance(ids, (int, long)):
@@ -89,7 +119,7 @@ class mail_message(osv.Model):
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
         'model': fields.char('Related Document Model', size=128, select=1),
         'res_id': fields.integer('Related Document ID', select=1),
-        'record_name': fields.function(get_record_name, type='string',
+        'record_name': fields.function(_get_record_name, type='string',
             string='Message Record Name',
             help="Name get of the related document."),
         'notification_ids': fields.one2many('mail.notification', 'message_id', 'Notifications'),
@@ -97,15 +127,17 @@ class mail_message(osv.Model):
         'date': fields.datetime('Date'),
         'message_id': fields.char('Message-Id', help='Message unique identifier', select=1, readonly=1),
         'body': fields.html('Content'),
+        'unread': fields.function(_get_unread, fnct_search=_search_unread,
+            type='boolean', string='Unread',
+            help='Functional field to search for unread messages linked to uid'),
     }
 
-    def _needaction_domain_get(self, cr, uid, context={}):
+    def _needaction_domain_get(self, cr, uid, context=None):
         if self._needaction:
-            partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
-            return [('notification_ids.partner_id','=',partner_id),('notification_ids.read','=',False)]
+            return [('unread', '=', True)]
         return []
 
-    def _get_default_author(self, cr, uid, context={}):
+    def _get_default_author(self, cr, uid, context=None):
         return self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
 
     _defaults = {
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 12dab7dfe92..6efc34619e7 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -220,7 +220,7 @@ class mail_thread(osv.Model):
 
     def _needaction_domain_get(self, cr, uid, context={}):
         if self._needaction:
-            return [('message_unread','=',True)]
+            return [('message_unread', '=', True)]
         return []
 
     #------------------------------------------------------

From 159209a3a6db5e6d1600da29c616f6781069f2e8 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 28 Aug 2012 16:00:51 +0530
Subject: [PATCH 602/999] [IMP]Project form:applying group multi currency to
 currency field

bzr revid: dhr@tinyerp.com-20120828103051-fivtgpsgrbl0vmzv
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6dbcaebd045..6dfa95868f4 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -136,7 +136,7 @@
                                     <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/>
                                     <field name="priority"/>
                                     <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-                                    <field name="currency_id" groups="base.group_multi_company" required="1"/>
+                                    <field name="currency_id" groups="base.group_multi_currency" required="1"/>
                                     <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                                 </group>
                             </group>

From 115e6f9687d14137293c80d2298263a2656fd309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 28 Aug 2012 13:31:28 +0200
Subject: [PATCH 603/999] [IMP] [TEST] mail.notification: added an SQL
 constraint on mail.notification, to have default false value on read column
 even when writing into the table using write on the partner_ids column of
 mail.message (therefore by-passing the default_get of the orm for
 mail_notification model). Added tests for needaction, based on mail.message,
 that by the way helped trigerred this bug. Hooray.

bzr revid: tde@openerp.com-20120828113128-70gjunh6bx3pho30
---
 addons/mail/mail_followers.py  | 35 +++++++++++++++++++++++-----------
 addons/mail/tests/test_mail.py | 35 ++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 129f4b479b7..f54b2bd0317 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -24,12 +24,12 @@ from osv import fields
 
 class mail_followers(osv.Model):
     """ mail_followers holds the data related to the follow mechanism inside
-    OpenERP. Partners can choose to follow documents (records) of any kind that
-    inherits from mail.thread. Following documents allow to receive
-    notifications for new messages.
-    A subscription is characterized by:
-        :param: res_model: model of the followed objects
-        :param: res_id: ID of resource (may be 0 for every objects)
+        OpenERP. Partners can choose to follow documents (records) of any kind
+        that inherits from mail.thread. Following documents allow to receive
+        notifications for new messages.
+        A subscription is characterized by:
+            :param: res_model: model of the followed objects
+            :param: res_id: ID of resource (may be 0 for every objects)
     """
     _name = 'mail.followers'
     _rec_name = 'partner_id'
@@ -48,8 +48,7 @@ class mail_followers(osv.Model):
 
 class mail_notification(osv.Model):
     """ Class holding notifications pushed to partners. Followers and partners
-        added in 'contacts to notify' receive notifications. Hiding notifications
-        in the wall consists in setting them as 'read'. """
+        added in 'contacts to notify' receive notifications. """
     _name = 'mail.notification'
     _rec_name = 'partner_id'
     _log_access = False
@@ -64,9 +63,23 @@ class mail_notification(osv.Model):
     _defaults = {
         'read': False,
     }
-    # FP Note: todo: check that we can not create a notification for
-    # a message we can not read.
-    # def create(self, ...)
+
+    def init(self, cr):
+        """ Set a postgresql NOT NULL constraint with default value false for
+            the read column. The reason is that when writing in this table using
+            partner_ids of mail.message model, it bypasses the ORM default
+            values, leading to 'None' values for read field. This broke the
+            needaction mechanism for mail.message. """
+        cr.execute("ALTER TABLE mail_notification ALTER read SET NOT NULL")
+        cr.execute("ALTER TABLE mail_notification ALTER read SET DEFAULT false")
+
+    def create(self, cr, uid, vals, context=None):
+        """ Override of create to check that we can not create a notification
+            for a message the user can not read. """
+        if self.pool.get('mail.message').check_access_rights(cr, uid, 'read'):
+            return super(self, mail_notification).create(cr, uid, vals, context=context)
+        else:
+            return False
 
     def notify(self, cr, uid, partner_ids, msg_id, context=None):
         """ Send by email the notification depending on the user preferences """
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index f425007b4c1..bd1134f2bdc 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -344,3 +344,38 @@ class test_mail(common.TransactionCase):
         self.assertTrue(len(res[0]['child_ids'][0]['child_ids']) == 1, 'Incorrect number of child in message_read')
         # trees = self.mail_message.message_read_tree_flatten_main(cr, uid, res, thread_level=0)
         # print trees
+
+    def test_40_needaction(self):
+        """ Tests for mail.message needaction. """
+        cr, uid  = self.cr, self.uid
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        user_admin = self.res_users.browse(cr, uid, uid)
+
+        # Demo values: check unread notification = needaction on mail.message
+        notif_ids = self.mail_notification.search(cr, uid, [
+            ('partner_id', '=', user_admin.partner_id.id),
+            ('read', '=', False)
+            ])
+        na_count = self.mail_message._needaction_count(cr, uid, domain = [])
+        self.assertTrue(len(notif_ids) == na_count,
+            'Number of unread notifications (%s) does not match the needaction count (%s)' % (len(notif_ids), na_count))
+
+        # Post 4 message on group_pigs
+        msgid1 = group_pigs.message_post(body='My Body')
+        msgid2 = group_pigs.message_post(body='My Body')
+        msgid3 = group_pigs.message_post(body='My Body')
+        msgid4 = group_pigs.message_post(body='My Body')
+
+        # Check there are 4 new needaction on mail.message
+        notif_ids = self.mail_notification.search(cr, uid, [
+            ('partner_id', '=', user_admin.partner_id.id),
+            ('read', '=', False)
+            ])
+        na_count = self.mail_message._needaction_count(cr, uid, domain = [])
+        self.assertTrue(len(notif_ids) == na_count,
+            'Number of unread notifications after posting messages (%s) does not match the needaction count (%s)' % (len(notif_ids), na_count))
+
+        # Check there are 4 needaction on mail.message with particular domain
+        na_count = self.mail_message._needaction_count(cr, uid, domain = [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
+        self.assertTrue(na_count == 4,
+            'Number of posted message (4) does not match the needaction count with domain mail.group - group pigs (%s)' % (na_count))

From 00a456096399c39c5cd8e82772ddc36685efa003 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Tue, 28 Aug 2012 18:17:50 +0530
Subject: [PATCH 604/999] [MERGE] Merged MDI's branch to fix the issue of
 name_get of ir.actions.todo

bzr revid: pso@tinyerp.com-20120828124750-1kbqgdq0mrc0av2b
---
 openerp/addons/base/res/res_config.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index 3f4a052a36b..8dcd5f769fe 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -552,5 +552,22 @@ class res_config_settings(osv.osv_memory):
         if action_ids:
             return act_window.read(cr, uid, action_ids[0], [], context=context)
         return {}
+    
+    def name_get(self, cr, uid, ids, context=None):
+        """ Override name_get method to return an appropriate configuration wizard
+        name, and not the generated name."""
+        
+        if not len(ids):
+            return []
+        # name_get may receive int id instead of an id list
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+            
+        act_window = self.pool.get('ir.actions.act_window')
+        action_ids = act_window.search(cr, uid, [('res_model', '=', self._name)], context=context)
+        name = self._name
+        if action_ids:
+            name = act_window.read(cr, uid, action_ids[0], ['name'], context=context)['name']
+        return [(record.id, name) for record in self.browse(cr, uid , ids, context=context)]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From d7a6f580d8a6cef28b7d9dad43f5387e1517834b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 28 Aug 2012 14:55:22 +0200
Subject: [PATCH 605/999] [CLEAN] mail_thread: removed an unused method; misc
 clean.

bzr revid: tde@openerp.com-20120828125522-4pt7j97qfuj8c0bw
---
 addons/mail/mail_thread.py | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 6efc34619e7..48d1d87c5ff 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -26,17 +26,16 @@ import logging
 import pytz
 import re
 import time
+import tools
 import xmlrpclib
+
 from email.utils import parsedate
 from email.message import Message
-
-import tools
 from mail_message import decode
 from osv import osv, fields
 from tools.translate import _
 from tools.safe_eval import safe_eval as eval
 
-
 _logger = logging.getLogger(__name__)
 
 def decode_header(message, header, separator=' '):
@@ -622,7 +621,6 @@ class mail_thread(osv.Model):
         for x in ('from','to','cc'): values.pop(x, None) # Avoid warnings 
         return self.pool.get('mail.message').create(cr, uid, values, context=context)
 
-
     #------------------------------------------------------
     # Followers API
     #------------------------------------------------------
@@ -666,25 +664,11 @@ class mail_thread(osv.Model):
         # return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
 
     #------------------------------------------------------
-    # Notification API
-    #------------------------------------------------------
-
-    def message_remove_pushed_notifications(self, cr, uid, ids, msg_ids, remove_childs=True, context=None):
-        notif_obj = self.pool.get('mail.notification')
-        msg_obj = self.pool.get('mail.message')
-        if remove_childs:
-            notif_msg_ids = msg_obj.search(cr, uid, [('id', 'child_of', msg_ids)], context=context)
-        else:
-            notif_msg_ids = msg_ids
-        to_del_notif_ids = notif_obj.search(cr, uid, ['&', ('user_id', '=', uid), ('message_id', 'in', notif_msg_ids)], context=context)
-        return notif_obj.unlink(cr, uid, to_del_notif_ids, context=context)
-
-    #------------------------------------------------------
-    # Thread_state
+    # Thread state
     #------------------------------------------------------
 
     def message_mark_as_unread(self, cr, uid, ids, context=None):
-        """ Set as read. """
+        """ Set as unread. """
         notobj = self.pool.get('mail.notification')
         partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         cr.execute('''

From 3abb39324779a68b2c28233ffb4a311200864c4f Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Tue, 28 Aug 2012 18:26:23 +0530
Subject: [PATCH 606/999] [IMP] Improvements

bzr revid: pso@tinyerp.com-20120828125623-1nq457mpd1dijq4j
---
 openerp/addons/base/res/res_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index 8dcd5f769fe..d6b42e970bf 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -557,7 +557,7 @@ class res_config_settings(osv.osv_memory):
         """ Override name_get method to return an appropriate configuration wizard
         name, and not the generated name."""
         
-        if not len(ids):
+        if not ids:
             return []
         # name_get may receive int id instead of an id list
         if isinstance(ids, (int, long)):

From 720ddfd5c8e801cce3f4635ab9cdc3e2f5198a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 28 Aug 2012 15:13:11 +0200
Subject: [PATCH 607/999] [FIX] mail_message: fixed messages that could be
 present several times in the result structure of message_read.

bzr revid: tde@openerp.com-20120828131311-1z27oxmgcej9qf4m
---
 addons/mail/mail_followers_view.xml |  2 +-
 addons/mail/mail_message.py         | 15 ++++-----------
 addons/mail/tests/test_mail.py      | 17 +++++++++++++++--
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/addons/mail/mail_followers_view.xml b/addons/mail/mail_followers_view.xml
index eb22abc2629..36f08b3814a 100644
--- a/addons/mail/mail_followers_view.xml
+++ b/addons/mail/mail_followers_view.xml
@@ -37,7 +37,7 @@
         </record>
 
         <record id="action_view_notifications" model="ir.actions.act_window">
-            <field name="name">Pushed notif</field>
+            <field name="name">Notifications</field>
             <field name="res_model">mail.notification</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index f73dfff3b3c..3a1417b2dba 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -173,12 +173,6 @@ class mail_message(osv.Model):
             'child_ids': [],
         }
 
-    def _debug_print_tree(self, tree, prefix=''):
-        for elem in tree:
-            print '%s%s' % (prefix, elem['id'])
-            if elem['child_ids']:
-                self._debug_print_tree(elem['child_ids'], prefix+'-')
-
     def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, limit=None, context=None):
         """ 
             If IDS are provided, fetch these records, otherwise use the domain to
@@ -208,9 +202,10 @@ class mail_message(osv.Model):
                             record_parent = tree[msg.parent_id.id]
                         else:
                             record_parent = self._message_dict_get(cr, uid, msg.parent_id, context=context)
-                            if msg.parent_id.parent_id and msg.parent_id.id not in tree:
+                            if msg.parent_id.parent_id:
                                 tree[msg.parent_id.id] = record_parent
-                        record_parent['child_ids'].append(record)
+                        if record['id'] not in [x['id'] for x in record_parent['child_ids']]:
+                            record_parent['child_ids'].append(record)
                         record = record_parent
                         msg = msg.parent_id
                 if msg.id not in tree:
@@ -224,8 +219,6 @@ class mail_message(osv.Model):
                     'thread_level': thread_level  # should be improve accodting to level of records
                 })
                 break
-        # TDE temp: debug print
-        # self._debug_print_tree(result)
         return result
 
 
@@ -338,6 +331,6 @@ class mail_notification(osv.Model):
     def set_message_read(self, cr, uid, msg_id, context=None):
         partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         notif_ids = self.search(cr, uid, [('partner_id', '=', partner_id), ('message_id', '=', msg_id)], context=context)
-        return self.write(cr, uid, notif_ids, {'read': True})
+        return self.write(cr, uid, notif_ids, {'read': True}, context=context)
 
 
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index bd1134f2bdc..4a228d4d9ca 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -338,12 +338,25 @@ class test_mail(common.TransactionCase):
 
         # Second try: read with thread_level 1
         res = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=1)
-        # print res
+        # print '----'
+        # self.mail_message._debug_print_tree(res)
+        # print '----'
+
         self.assertTrue(len(res) == 2, 'Incorrect number of child in message_read')
         self.assertTrue(len(res[0]['child_ids']) == 2, 'Incorrect number of child in message_read')
         self.assertTrue(len(res[0]['child_ids'][0]['child_ids']) == 1, 'Incorrect number of child in message_read')
         # trees = self.mail_message.message_read_tree_flatten_main(cr, uid, res, thread_level=0)
-        # print trees
+        # print '----'
+        # self.mail_message._debug_print_tree(trees)
+        # print '----'
+
+        res = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=1)
+        # trees = self.mail_message.message_read_tree_flatten_main(cr, uid, res, thread_level=1)
+        # print '----'
+        # self.mail_message._debug_print_tree(trees)
+        # print '----'
+
+        self.assertTrue(len(res) == 3, 'Incorrect number of child in message_read')
 
     def test_40_needaction(self):
         """ Tests for mail.message needaction. """

From c791b22a8c935a9c10f3b64aed01ebff970f21df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 28 Aug 2012 16:26:34 +0200
Subject: [PATCH 608/999] [FIX] [TEST] mail_message: added a flattening method,
 to flatten the result structure of message according to a given number of
 thread level. Added some tests that go with that feature.

bzr revid: tde@openerp.com-20120828142634-gfsjjih4mr1n2lyt
---
 addons/mail/mail_message.py    | 45 +++++++++++++++++++++
 addons/mail/tests/test_mail.py | 73 +++++++++++++++++++++++-----------
 2 files changed, 94 insertions(+), 24 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 3a1417b2dba..3927ba639aa 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -173,6 +173,46 @@ class mail_message(osv.Model):
             'child_ids': [],
         }
 
+    def message_read_tree_flatten(self, cr, uid, messages, current_level, level, context=None):
+        """ Given a tree with several roots of following structure :
+            [
+                {'id': 1, 'child_ids':[
+                    {'id': 11, 'child_ids': [...] },
+                ] },
+                {...}
+            ]
+            Flatten it to have a maximum number of level, with 0 being
+            completely flat.
+            Perform the flattening at leafs if above the maximum depth, then get
+            back in the tree.
+        """
+        def _flatten(msg_dict):
+            """ from    {'id': x, 'child_ids': [{child1}, {child2}]}
+                get     [{'id': x, 'child_ids': []}, {child1}, {child2}]
+            """
+            child_ids = msg_dict.pop('child_ids', [])
+            msg_dict['child_ids'] = []
+            return [msg_dict] + child_ids
+        # Depth-first flattening
+        for message in messages:
+            message['child_ids'] = self.message_read_tree_flatten(cr, uid, message['child_ids'], current_level+1, level, context=context)
+        # Flatten if above maximum depth
+        if current_level < level:
+            return messages
+        new_list = []
+        for x in range(0, len(messages)):
+            flatenned = _flatten(messages[x])
+            for flat in flatenned:
+                new_list.append(flat)
+        messages = new_list
+        return messages
+
+    def _debug_print_tree(self, tree, prefix=''):
+        for elem in tree:
+            print '%s%s (%s childs: %s)' % (prefix, elem['id'], len(elem['child_ids']), [xelem['id'] for xelem in elem['child_ids']])
+            if elem['child_ids']:
+                self._debug_print_tree(elem['child_ids'], prefix+'--')
+
     def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, limit=None, context=None):
         """ 
             If IDS are provided, fetch these records, otherwise use the domain to
@@ -219,6 +259,11 @@ class mail_message(osv.Model):
                     'thread_level': thread_level  # should be improve accodting to level of records
                 })
                 break
+
+        # Flatten the result
+        if thread_level > 0:
+            result = self.message_read_tree_flatten(cr, uid, result, 0, thread_level, context=context)
+
         return result
 
 
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 4a228d4d9ca..01d17c39ebb 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -322,41 +322,66 @@ class test_mail(common.TransactionCase):
         cr, uid  = self.cr, self.uid
         group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
 
+        # Test message_read_tree_flatten that flattens a thread according to a given thread_level
+        import copy
+        tree = [
+            {'id': 1, 'child_ids':[
+                {'id': 3, 'child_ids': [] },
+                {'id': 4, 'child_ids': [
+                    {'id': 5, 'child_ids': []},
+                    {'id': 12, 'child_ids': []},
+                    ] },
+                {'id': 8, 'child_ids': [
+                    {'id': 10, 'child_ids': []},
+                    ] },
+                ] },
+            {'id': 2, 'child_ids': [
+                {'id': 7, 'child_ids': [
+                    {'id': 9, 'child_ids': []},
+                    ] },
+                ] },
+            {'id': 6, 'child_ids': [
+                {'id': 11, 'child_ids': [] },
+                ] },
+            ]
+        new_tree = self.mail_message.message_read_tree_flatten(cr, uid, copy.deepcopy(tree), 0, 0)
+        # self.mail_message._debug_print_tree(new_tree)
+        # print '-------------------'
+        self.assertTrue(len(new_tree) == 12, 'Flattening wrongly produced')
+        new_tree = self.mail_message.message_read_tree_flatten(cr, uid, copy.deepcopy(tree), 0, 1)
+        # self.mail_message._debug_print_tree(new_tree)
+        # print '-------------------'
+        self.assertTrue(len(new_tree) == 3 and len(new_tree[0]['child_ids']) == 6 and len(new_tree[1]['child_ids']) == 2 and len(new_tree[2]['child_ids']) == 1,
+            'Flattening wrongly produced')
+        new_tree = self.mail_message.message_read_tree_flatten(cr, uid, copy.deepcopy(tree), 0, 2)
+        # self.mail_message._debug_print_tree(new_tree)
+        # print '-------------------'
+        self.assertTrue(len(new_tree) == 3 and len(new_tree[0]['child_ids']) == 3 and len(new_tree[0]['child_ids'][1]) == 2,
+            'Flattening wrongly produced')
+
         # Add a few messages to pigs group
         msgid1 = group_pigs.message_post(body='My Body', subject='1', parent_id=False)
         msgid2 = group_pigs.message_post(body='My Body', subject='1-1', parent_id=msgid1)
         msgid3 = group_pigs.message_post(body='My Body', subject='1-2', parent_id=msgid1)
         msgid4 = group_pigs.message_post(body='My Body', subject='2', parent_id=False)
         msgid5 = group_pigs.message_post(body='My Body', subject='1-1-1', parent_id=msgid2)
-        # msgid6 = group_pigs.message_post(body='My Body', subject='2-1', parent_id=msgid4)
-        # msgid7 = group_pigs.message_post(body='My Body', subject='1-3', parent_id=msgid1)
-        # msgid8 = group_pigs.message_post(body='My Body', subject='1-3-1', parent_id=msgid7)
+        msgid6 = group_pigs.message_post(body='My Body', subject='2-1', parent_id=msgid4)
 
         # First try: read flat
-        # first_try_ids = [msgid8, msgid7, msgid6, msgid5, msgid4, msgid3, msgid2, msgid1]
-        # res = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=0)
+        first_try_ids = [msgid6, msgid5, msgid4, msgid3, msgid2, msgid1]
+        tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=0)
+        self.assertTrue(all(elem['id'] in first_try_ids for elem in tree) and len(tree) == 6,
+            'Incorrect structure and/or number of childs in purely flat message_read')
 
         # Second try: read with thread_level 1
-        res = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=1)
-        # print '----'
-        # self.mail_message._debug_print_tree(res)
-        # print '----'
+        tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=1)
+        # self.mail_message._debug_print_tree(tree)
+        self.assertTrue(len(tree) == 2 and len(tree[1]['child_ids']) == 3, 'Incorrect number of child in message_read')
 
-        self.assertTrue(len(res) == 2, 'Incorrect number of child in message_read')
-        self.assertTrue(len(res[0]['child_ids']) == 2, 'Incorrect number of child in message_read')
-        self.assertTrue(len(res[0]['child_ids'][0]['child_ids']) == 1, 'Incorrect number of child in message_read')
-        # trees = self.mail_message.message_read_tree_flatten_main(cr, uid, res, thread_level=0)
-        # print '----'
-        # self.mail_message._debug_print_tree(trees)
-        # print '----'
-
-        res = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=1)
-        # trees = self.mail_message.message_read_tree_flatten_main(cr, uid, res, thread_level=1)
-        # print '----'
-        # self.mail_message._debug_print_tree(trees)
-        # print '----'
-
-        self.assertTrue(len(res) == 3, 'Incorrect number of child in message_read')
+        # Third try: read with thread_level 2
+        tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=2)
+        # self.mail_message._debug_print_tree(tree)
+        self.assertTrue(len(tree) == 2 and len(tree[1]['child_ids']) == 2 and len(tree[1]['child_ids'][0]['child_ids']) == 1, 'Incorrect number of child in message_read')
 
     def test_40_needaction(self):
         """ Tests for mail.message needaction. """

From a3fbc61638b5a877bac1c235c063710da1cbd77b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 28 Aug 2012 16:37:54 +0200
Subject: [PATCH 609/999] [FIX] mail_message: fixed a typo.

bzr revid: tde@openerp.com-20120828143754-206i4tg4u8ochmpx
---
 addons/mail/mail_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 3927ba639aa..5430e9b352c 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -64,7 +64,7 @@ class mail_message(osv.Model):
 
     def _get_unread(self, cr, uid, ids, name, arg, context=None):
         """ Compute if the message is unread by the current user. """
-        res = dict.fromkeys(id, False)
+        res = dict.fromkeys(ids, False)
         partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         notif_obj = self.pool.get('mail.notification')
         notif_ids = notif_obj.search(cr, uid, [

From fe03a7f1ed21175bc1f6be2a0ff41cb8bce2191f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 28 Aug 2012 17:02:44 +0200
Subject: [PATCH 610/999] [FIX] mail_message: fixed _get_unread, because of an
 unitialized dict; mail_followers: fixed a wrong parameters order.

bzr revid: tde@openerp.com-20120828150244-vcpxj2nroc8esjzk
---
 addons/mail/mail_followers.py | 2 +-
 addons/mail/mail_message.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index f54b2bd0317..409ed4a2f6f 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -77,7 +77,7 @@ class mail_notification(osv.Model):
         """ Override of create to check that we can not create a notification
             for a message the user can not read. """
         if self.pool.get('mail.message').check_access_rights(cr, uid, 'read'):
-            return super(self, mail_notification).create(cr, uid, vals, context=context)
+            return super(mail_notification, self).create(cr, uid, vals, context=context)
         else:
             return False
 
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 5430e9b352c..1aa1c34568d 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -64,7 +64,7 @@ class mail_message(osv.Model):
 
     def _get_unread(self, cr, uid, ids, name, arg, context=None):
         """ Compute if the message is unread by the current user. """
-        res = dict.fromkeys(ids, False)
+        res = dict((id, {'unread': False}) for id in ids)
         partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         notif_obj = self.pool.get('mail.notification')
         notif_ids = notif_obj.search(cr, uid, [

From b19d73525d01caad2ffe8b9ad663b8a86aa984d5 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Aug 2012 19:39:01 +0200
Subject: [PATCH 611/999] [IMP] mail: implement parent message resolution when
 parsing incoming message + cleanup lint

bzr revid: odo@openerp.com-20120828173901-8y9y16crvii8d2qg
---
 addons/mail/mail_mail.py       |  5 +---
 addons/mail/mail_message.py    |  5 ++--
 addons/mail/mail_thread.py     | 11 +++++++--
 addons/mail/tests/test_mail.py | 43 +++++++++++++++++++++++++++-------
 4 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index fa0c18ef529..ebfd19e87b3 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -180,10 +180,7 @@ class mail_mail(osv.Model):
                     references = message.references,
                     object_id=message.res_id and ('%s-%s' % (message.res_id,message.model)),
                     subtype=message.content_subtype,
-                    subtype_alternative=content_subtype_alternative,
-                    # TDE FIXME: what to do with headers ? currently ycommented to avoid bugs
-                    # headers=message.headers and ast.literal_eval(message.headers))
-                    )
+                    subtype_alternative=content_subtype_alternative)
                 res = ir_mail_server.send_email(cr, uid, msg,
                                                 mail_server_id=message.mail_server_id.id,
                                                 context=context)
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 1aa1c34568d..2cd22aa76b4 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -50,8 +50,7 @@ class mail_message(osv.Model):
     def _shorten_name(self, name):
         if len(name) <= (self._message_record_name_length+3):
             return name
-        else:
-            return name[:18] + '...'
+        return name[:self._message_record_name_length] + '...'
 
     def _get_record_name(self, cr, uid, ids, name, arg, context=None):
         """ Return the related document name, using get_name. """
@@ -318,6 +317,8 @@ class mail_message(osv.Model):
             self.pool.get(model).check_access_rule(cr, uid, mids, mode, context=context)
 
     def create(self, cr, uid, values, context=None):
+        if not values.get('message_id') and values.get('res_id') and values.get('model'):
+            values['message_id'] = tools.generate_tracking_message_id('%(model)s-%(res_id)s'% values)
         newid = super(mail_message, self).create(cr, uid, values, context)
         self.check(cr, uid, [newid], mode='create', context=context)
         self.notify(cr, uid, newid, context=context)
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 48d1d87c5ff..eb9b48bbc5f 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -553,9 +553,16 @@ class mail_thread(osv.Model):
             date_server_datetime_str = date_server_datetime.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
             msg_dict['date'] = date_server_datetime_str
 
-        # FP Note: todo - find parent_id
         if 'In-Reply-To' in message:
-            pass
+            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]
+
+        if 'References' in message and 'parent_id' not in msg_dict:
+            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id','in',
+                                                                         [x.strip() for x in decode(message['References']).split()])])
+            if parent_ids:
+                msg_dict['parent_id'] = parent_ids[0]
         
         msg_dict['body'], msg_dict['attachments'] = self._message_extract_payload(message)
         return msg_dict
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 01d17c39ebb..e6faf26e0ad 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -313,7 +313,7 @@ class test_mail(common.TransactionCase):
             for val in read_dict:
                 current = {'_id': val['id']}
                 if val.get('child_ids'):
-                    current['child_ids'] = _flatten(val.get('child_ids'))
+                    current['child_ids'] = _simplify_struct(val.get('child_ids'))
                 res.append(current)
             return res
 
@@ -395,14 +395,12 @@ class test_mail(common.TransactionCase):
             ('read', '=', False)
             ])
         na_count = self.mail_message._needaction_count(cr, uid, domain = [])
-        self.assertTrue(len(notif_ids) == na_count,
+        self.assertEqual(len(notif_ids), na_count,
             'Number of unread notifications (%s) does not match the needaction count (%s)' % (len(notif_ids), na_count))
 
         # Post 4 message on group_pigs
-        msgid1 = group_pigs.message_post(body='My Body')
-        msgid2 = group_pigs.message_post(body='My Body')
-        msgid3 = group_pigs.message_post(body='My Body')
-        msgid4 = group_pigs.message_post(body='My Body')
+        for dummy in range(4):
+            group_pigs.message_post(body='My Body')
 
         # Check there are 4 new needaction on mail.message
         notif_ids = self.mail_notification.search(cr, uid, [
@@ -410,10 +408,39 @@ class test_mail(common.TransactionCase):
             ('read', '=', False)
             ])
         na_count = self.mail_message._needaction_count(cr, uid, domain = [])
-        self.assertTrue(len(notif_ids) == na_count,
+        self.assertEqual(len(notif_ids), na_count,
             'Number of unread notifications after posting messages (%s) does not match the needaction count (%s)' % (len(notif_ids), na_count))
 
         # Check there are 4 needaction on mail.message with particular domain
         na_count = self.mail_message._needaction_count(cr, uid, domain = [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
-        self.assertTrue(na_count == 4,
+        self.assertEqual(na_count, 4,
             'Number of posted message (4) does not match the needaction count with domain mail.group - group pigs (%s)' % (na_count))
+
+    def test_50_thread_parent_resolution(self):
+        """Verify parent/child relationships are correctly established when processing incoming mails"""
+        cr, uid = self.cr, self.uid
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        msg1 = group_pigs.message_post(body='My Body', subject='1')
+        msg2 = group_pigs.message_post(body='My Body', subject='2')
+        msg1, msg2 = self.mail_message.browse(cr, uid, [msg1,msg2])
+        self.assertTrue(msg1.message_id, "New message should have a proper message_id")
+
+        # Reply to msg1, make sure the reply is properly attached using the various reply identification mechanisms
+        # 1. In-Reply-To header
+        reply_msg = MAIL_TEMPLATE.format(to='Pretty Pigs <group+pigs@example.com>, other@gmail.com', subject='Re: 1',
+                                         extra='In-Reply-To: %s' % msg1.message_id)
+        self.mail_thread.message_process(cr, uid, None, reply_msg)
+        # 2. References header
+        reply_msg2 = MAIL_TEMPLATE.format(to='Pretty Pigs <group+pigs@example.com>, other@gmail.com', subject='Re: Re: 1',
+                                         extra='References: <2233@a.com>\r\n\t<3edss_dsa@b.com> %s' % msg1.message_id)
+        self.mail_thread.message_process(cr, uid, None, reply_msg2)
+        # 3. Subject contains [<ID>] + model passed to message+process -> only attached to group, not to mail
+        reply_msg3 = MAIL_TEMPLATE.format(to='Pretty Pigs <group+pigs@example.com>, other@gmail.com',
+                                          extra='', subject='Re: [%s] 1' % self.group_pigs_id)
+        self.mail_thread.message_process(cr, uid, 'mail.group', reply_msg3)
+        group_pigs.refresh()
+        msg1.refresh()
+        self.assertEqual(5, len(group_pigs.message_ids), 'group should contain 5 messages')
+        self.assertEqual(2, len(msg1.child_ids), 'msg1 should have 2 children now')
+
+

From 3ef83d99e197cbdb12e993b2fbac88b557e4591c Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 28 Aug 2012 20:04:40 +0200
Subject: [PATCH 612/999] Tweaks to kanban view

bzr revid: mit@openerp.com-20120828180440-axp9g1n3y7dayofq
---
 addons/web_kanban/static/src/css/kanban.css  | 7 ++-----
 addons/web_kanban/static/src/css/kanban.sass | 6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 345becc7cdd..53cad801b49 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -249,7 +249,7 @@
   width: 100%;
 }
 .openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column {
-  background: white;
+  background: #eeeeee;
 }
 .openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column .oe_kanban_record {
   float: left;
@@ -340,15 +340,12 @@
   background: white;
   border: 1px solid #d8d8d8;
   border-bottom-color: #b9b9b9;
-  padding: 6px;
+  padding: 8px;
   display: block;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
 }
-.openerp .oe_kanban_view .oe_kanban_card:last-child {
-  margin-bottom: 0;
-}
 .openerp .oe_kanban_view .oe_kanban_card:hover {
   border: 1px solid #7c7bad;
   -moz-box-shadow: 0 0 4px #7c7bad;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index b85d3ebea03..83b17dcfa4d 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -234,7 +234,7 @@
     &.oe_kanban_grouped .oe_kanban_show_more .oe_button
         width: 100%
     &.oe_kanban_ungrouped .oe_kanban_column
-        background: white
+        background: #eee
         .oe_kanban_record
             float: left
             padding: 2px
@@ -307,11 +307,9 @@
         background: white
         border: 1px solid #d8d8d8
         border-bottom-color: #b9b9b9
-        padding: 6px
+        padding: 8px
         display: block
         @include radius(4px)
-        &:last-child
-            margin-bottom: 0
         &:hover
             border: 1px solid #7C7BAD
             @include box-shadow(0 0 4px #7C7BAD)

From 004a1a64ee3e0ba79cf8460df13799e27f282365 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 29 Aug 2012 11:23:33 +0530
Subject: [PATCH 613/999] [ADD] Added 'groups_id' field into 'ir_ui_view'
 model.

bzr revid: mdi@tinyerp.com-20120829055333-6iw12tthxeidkkus
---
 openerp/addons/base/ir/ir.xml        | 11 +++++++++--
 openerp/addons/base/ir/ir_ui_view.py |  3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 49bb719bad7..9cfb4c3b8bf 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -599,8 +599,15 @@
                             <field name="xml_id"/>
                         </group>
                     </group>
-                    <field name="arch"/>
-                  </sheet>  
+                    <notebook>
+                        <page string="Architecture">
+                            <field name="arch"/>
+                        </page>
+                        <page string="Groups">
+                            <field name="groups_id"/>
+                        </page>
+                    </notebook>
+                   </sheet>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index b2805884f18..7b8165ec694 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -63,6 +63,9 @@ class view(osv.osv):
         'name': fields.char('View Name',size=64,  required=True),
         'model': fields.char('Object', size=64, required=True, select=True),
         'priority': fields.integer('Sequence', required=True),
+        'groups_id': fields.many2many('res.groups', 'ir_ui_view_group_rel',
+            'view_id', 'group_id', 'Groups', help="If you have groups, the visibility of this view will be based on these groups. "\
+                "If this field is empty, OpenERP will compute visibility based on the related object's read access."),
         'type': fields.function(_type_field, type='selection', selection=[
             ('tree','Tree'),
             ('form','Form'),

From f45b3bf33c74679001089482d6889a37f9c1b6e1 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 29 Aug 2012 11:40:48 +0530
Subject: [PATCH 614/999] [IMP]Account : changes made for amount_currency field
 and related changes applied

bzr revid: dhr@tinyerp.com-20120829061048-rc6x81wewks3x0e2
---
 addons/account/account_menuitem.xml            |  2 +-
 addons/account/account_view.xml                | 14 +++++++-------
 addons/account/res_config_view.xml             |  6 +++---
 addons/account_coda/account_coda_view.xml      |  2 +-
 .../wizard/account_followup_print_view.xml     |  2 +-
 .../account_payment/account_payment_view.xml   | 18 +++++++++---------
 .../voucher_payment_receipt_view.xml           |  6 +++---
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 9ac6f98661c..480d5ec76a6 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -44,7 +44,7 @@
         <menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>
 
         <menuitem id="next_id_22" name="Partners" parent="menu_finance_generic_reporting" sequence="1"/>
-        <menuitem id="menu_multi_currency" name="Multi-Currencies" parent="menu_finance_generic_reporting" sequence="10"/>
+        <menuitem id="menu_multi_currency" name="Multi-Currencies" parent="menu_finance_generic_reporting" sequence="10" groups="base.group_multi_currency"/>
         <menuitem
             parent="account.menu_finance_legal_statement"
             id="final_accounting_reports"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 60c80a7ab92..13813baf3fc 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1066,7 +1066,7 @@
                     <field name="credit" sum="Total credit"/>
                     <field name="account_tax_id"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-                    <field name="amount_currency" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/>
+                    <field name="amount_currency" attrs="{'readonly':[('state','=','valid')]}"/>
                     <field name="currency_id" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/>
                     <field name="reconcile_partial_id"/>
                     <field name="reconcile_id"/>
@@ -1118,8 +1118,8 @@
 	                                    <field name="tax_amount"/>
 	                                    <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
 	                                </group>
-	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency" groups="base.group_multi_currency">
-	                                    <field name="currency_id"/>
+	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
+	                                    <field name="currency_id" groups="base.group_multi_currency"/>
 	                                    <field name="amount_currency"/>
 	                                </group>
 	                                <group string="Reconciliation">
@@ -1167,7 +1167,7 @@
 
                                 <separator colspan="4" string="Optional Information"/>
                                 <field name="currency_id" groups="base.group_multi_currency"/>
-                                <field name="amount_currency" groups="base.group_multi_currency"/>
+                                <field name="amount_currency"/>
                                 <field name="quantity"/>
                                 <field name="move_id" required="False"/>
                                 <newline/>
@@ -1394,8 +1394,8 @@
                                                     <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
                                                 </group>
 
-                                                <group string="Currency" groups="base.group_multi_currency">
-                                                    <field name="currency_id"/>
+                                                <group string="Currency">
+                                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                                     <field name="amount_currency"/>
                                                 </group>
 
@@ -1431,7 +1431,7 @@
                                     <field name="debit" sum="Total Debit"/>
                                     <field name="credit" sum="Total Credit"/>
                                     <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
-                                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                                    <field name="amount_currency"/>
                                     <field name="currency_id" groups="base.group_multi_currency"/>
                                     <field name="tax_code_id"/>
                                     <field name="tax_amount"/>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 9398d04b3cc..7e51cae0418 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -106,9 +106,9 @@
                     <group>
                         <label for="id" string="Options"/>
                         <div name="account_config">
-                            <div>
-                                <label for="currency_id" groups="base.group_multi_currency"/>
-                                <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
+                            <div groups="base.group_multi_currency">
+                                <label for="currency_id"/>
+                                <field name="currency_id" class="oe_inline"/>
                             </div>
                             <div>
                                 <label for="decimal_precision"/>
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 3762669e5a3..23e63b2a4a4 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -20,7 +20,7 @@
                 <field name="company_id" groups="base.group_multi_company"/>
                 <group expand="0" string="Group By...">
                     <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
-                    <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
+                    <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}" groups="base.group_multi_currency"/>
                 </group>
             </search>
         </field>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index fe77dbc053e..8850c260708 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -92,7 +92,7 @@
                             <label string="%%(followup_amount)s: Total Amount Due"/>
                             <label string="%%(date)s: Current Date"/>
                             <label string="%%(company_name)s: User's Company name"/>
-                            <label string="%%(company_currency)s: User's Company Currency"/>
+                            <label string="%%(company_currency)s: User's Company Currency" groups="base.group_multi_currency"/>
                             <label string="%%(heading)s: Move line header"/>
                             <label string="%%(line)s: Ledger Posting lines"/>
                         </group>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 3ad94c1bdbd..2ce98b03250 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -30,7 +30,7 @@
                     <field name="debit" sum="Total debit"/>
                     <field name="credit" sum="Total credit"/>
                     <field name="amount_to_pay"/>
-                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                    <field name="amount_currency"/>
                     <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="period_id" invisible="1"/>
                 </tree>
@@ -131,10 +131,10 @@
                                         <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
                                         <separator colspan="4" string="Transaction Information"/>
                                         <field name="date"/>
-                                        <label for="amount_currency" groups="base.group_multi_currency"/>
-                                        <div groups="base.group_multi_currency">
+                                        <label for="amount_currency"/>
+                                        <div>
                                             <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
-                                            <field name="currency" nolabel="1" class="oe_inline"/>
+                                            <field name="currency" nolabel="1" class="oe_inline" groups="base.group_multi_currency"/>
                                         </div>
                                         <field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)"/>
                                         <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
@@ -171,7 +171,7 @@
                             <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                             <field name="ml_maturity_date"/>
                             <field name="date"/>
-                            <field name="amount_currency" string="Amount" groups="base.group_multi_currency"/>
+                            <field name="amount_currency" string="Amount"/>
                             <field name="currency" groups="base.group_multi_currency"/>
                             <field name="name"/>
                             <field name="amount" sum="Total in Company Currency" invisible="1"/>
@@ -257,10 +257,10 @@
                                 <field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)]"/>
                                 <separator colspan="4" string="Transaction Information"/>
                                 <field name="date"/>
-                                <label for="amount_currency" groups="base.group_multi_currency"/>
-                                <div groups="base.group_multi_currency">
+                                <label for="amount_currency"/>
+                                <div>
                                     <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
-                                    <field name="currency" class="oe_inline"/>
+                                    <field name="currency" class="oe_inline" groups="base.group_multi_currency"/>
                                 </div>
                                 <field name="partner_id" on_change="onchange_partner(partner_id, False)"/>
                                 <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
@@ -302,7 +302,7 @@
                     <field name="partner_id"/>
                     <field name="communication"/>
                     <field name="amount" sum="Amount Total"/>
-                    <field name="amount_currency" sum="Currency Amount Total" groups="base.group_multi_currency"/>
+                    <field name="amount_currency" sum="Currency Amount Total"/>
                     <field name="currency" groups="base.group_multi_currency"/>
                     <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                     <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode)"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 0f484a5c781..9230704397b 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -104,7 +104,7 @@
                                 <group string="Other Information" col="4">
                                     <field name="currency_id" colspan="4" groups="base.group_multi_currency"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                     <field name="number" colspan="4"/>
                                 </group>
@@ -194,7 +194,7 @@
                                         <separator string="Currency Options" colspan="4"/>
                                         <field name="is_multi_currency" invisible="1"/>
                                         <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" />
+                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
                                         <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                     </group>
                                     <group col="2">
@@ -366,7 +366,7 @@
                                 <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
                                 <group>

From b1724905d4a4837810ef9fef7f88ad05a9d6d45e Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 29 Aug 2012 15:12:52 +0530
Subject: [PATCH 615/999] [FIX]l10n_in_hr_payroll:rules improved,help updated

bzr revid: kbh@tinyerp.com-20120829094252-wzdygt5muwcuochl
---
 .../data/hr.salary.rule.csv                   |  4 ++--
 .../data/l10n_in_hr_payroll_data.xml          | 20 ++++++++++++++++---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  |  6 +++---
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
index f13dc346065..2fe1ba739f4 100644
--- a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
+++ b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
@@ -1,5 +1,5 @@
 "id","amount_select","condition_range_min","condition_range_max","amount_percentage","amount_fix","name","category_id","sequence","code","parent_rule_id/id","condition_select","condition_range","amount_percentage_base"
-1,"fix",1,1,,1200,"Education Allowance For One Child","Allowance",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
-2,"fix",2,10,,2400,"Education Allowance For Two Child","Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
+1,"fix",1,1,,100,"Education Allowance For One Child","Allowance",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
+2,"fix",2,10,,200,"Education Allowance For Two Child","Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
 3,"fix",1,1,,300,"Child Hostel Allowance For One Child","Allowance",26,"CHOONE","hr_payroll_rule_child2","range","employee.children",
 4,"fix",2,10,,600,"Child Hostel Allowance For Two Child","Allowance",27,"CHOTWO","hr_payroll_rule_child2","range","employee.children",
diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 528d4f8dc35..8af9300ee49 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -208,13 +208,22 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="note">This would be fully taxable based on Bonus.</field>
         </record>
 
+        <record id="hr_salary_rule_medical_allow" model="hr.salary.rule">
+            <field name="code">MEDA</field>
+            <field name="name">Medical Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="1250.0" name="amount_fix"/>
+            <field name="sequence" eval="43"/>
+            <field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
+        </record>
 
         <record id="hr_salary_rule_medical" model="hr.salary.rule">
             <field name="code">MEDA</field>
             <field name="name">Medical Reimbursement</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="amount_select">fix</field>
-            <field eval="1250.0" name="amount_fix"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.MR.amount</field>
             <field name="sequence" eval="32"/>
             <field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
         </record>
@@ -225,7 +234,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="quantity">worked_days.WORK100.number_of_days</field>
             <field name="code">FC</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="name">Food Coupons Allowance</field>
+            <field name="name">Food Allowance</field>
             <field name="register_id" ref="hr_food_coupen_register"/>
             <field name="sequence" eval="33"/>
          </record>
@@ -542,5 +551,10 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="name">Leave Availed</field>
             <field name="input_id" ref="hr_payslip_rule_dla"/>
         </record>
+        <record id="hr_rule_input_medical" model="hr.rule.input">
+            <field name="code">MR</field>
+            <field name="name">Medical Reimbursement</field>
+            <field name="input_id" ref="hr_salary_rule_medical"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 95bb65514a2..cc810fcc1cb 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -44,9 +44,9 @@ class hr_contract(osv.osv):
         'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll'), help="Amount for Tax Deduction at Source"),
         'driver_salay': fields.boolean('Driver Salary', help="Check this box if you provide allowance for driver"),
         'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance"),
-        'voluntary_provident_fund': fields.float('Voluntary Provident Fund (%)', digits_compute=dp.get_precision('Payroll'), help="VPF computed as percentage(%)"),
-        'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance (%)', digits_compute=dp.get_precision('Payroll'), help="HRA computed as percentage(%)"),
-        'supplementary_allowance': fields.float('Supplementary Allowance', digits_compute=dp.get_precision('Payroll')),
+        'voluntary_provident_fund': fields.float('Voluntary Provident Fund (%)', digits_compute=dp.get_precision('Payroll'), help="VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government.And VPF computed as percentage(%)"),
+        'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance (%)', digits_compute=dp.get_precision('Payroll'), help="HRA is an allowance given by the employer to the employee for taking care of his rental or accommodation expenses.And HRA computed as percentage(%)"),
+        'supplementary_allowance': fields.float('Supplementary Allowance', digits_compute=dp.get_precision('Payroll'), help="Supplementary Allowance provides a basic weekly allowance to eligible people who have little or no income"),
     }
 
 hr_contract()

From 19cc47791814b847fe3c2490915250d96cf9a7d4 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 29 Aug 2012 15:38:09 +0530
Subject: [PATCH 616/999] [IMP]Removed currency group from amount field

bzr revid: dhr@tinyerp.com-20120829100809-366o73igiko7wq8z
---
 addons/account/account_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 46807297307..1f7bb4ad79c 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -418,7 +418,7 @@
                                     <field name="journal_id" groups="base.group_user"/>
                                     <field name="debit"/>
                                     <field name="credit"/>
-                                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                                    <field name="amount_currency"/>
                                     <field name="currency_id" groups="base.group_multi_currency"/>
                                 </tree>
                             </field>

From c42ba7020b4e33e50083175c1a1376455ae0c832 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 29 Aug 2012 15:58:34 +0530
Subject: [PATCH 617/999] [FIX]l10n_in_hr_payroll:All company contribution will
 not appear on the payslip excepts if company deduction from employee salary

bzr revid: kbh@tinyerp.com-20120829102834-o52m2hyq69783ao1
---
 addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 8af9300ee49..91eb8e2ef0a 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -393,6 +393,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field eval="-1500.0" name="amount_fix"/>
             <field name="register_id" ref="hr_company_transport_register"/>
             <field name="sequence" eval="165"/>
+            <field name="appears_on_payslip" eval="False"/>
             <field name="note">Company provided transport amount is based on company.</field>
         </record>
 
@@ -426,6 +427,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field eval="-6.0" name="amount_fix"/>
             <field name="sequence" eval="171"/>
             <field name="register_id" ref="hr_labour_Welfare_fund_register"/>
+            <field name="appears_on_payslip" eval="False"/>
             <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>
         </record>
 
@@ -437,6 +439,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field eval="-1000.0" name="amount_fix"/>
             <field name="register_id" ref="hr_group_term_insurance_register"/>
             <field name="sequence" eval="175"/>
+            <field name="appears_on_payslip" eval="False"/>
             <field name="note">Group term insurance provides a solid foundation to a comprehensive employee benifit program,backed up by government asistance in the form of valuable tax incentives to both employees and employers.</field>
         </record>
 
@@ -460,6 +463,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = - (contract.medical_insurance)</field>
             <field eval="-50.0" name="amount_fix"/>
+            <field name="appears_on_payslip" eval="False"/>
             <field name="register_id" ref="hr_medical_insurance_register"/>
             <field name="sequence" eval="185"/>
         </record>
@@ -470,6 +474,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">fix</field>
             <field eval="-200.0" name="amount_fix"/>
+            <field name="appears_on_payslip" eval="False"/>
             <field name="register_id" ref="hr_other_deduction_register"/>
             <field name="sequence" eval="187"/>
         </record>
@@ -482,6 +487,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) or - (contract.wage * 0.10)</field>
             <field name="sequence" eval="190"/>
             <field name="register_id" ref="hr_nps_contribution_register"/>
+            <field name="appears_on_payslip" eval="False"/>
             <field name= "note">Any amount contributed by your employer to your NPS account is treated as part of your salary and is included in your income but you can claim deduction under Section 80C for this too.thus, effectively making it exempt from tax within the limit of 10% of your basic salary. This is very useful and tax efficient for you particularly if you fall in the maximum tax.</field>
         </record>
 
@@ -493,6 +499,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) or - (contract.wage * 0.12)</field>
             <field name="sequence" eval="195"/>
             <field name="register_id" ref="hr_register_provident_fund"/>
+            <field name="appears_on_payslip" eval="False"/>
             <field name="note">Both the employees and employer contribute to the fund at the rate of 12% of the basic wages, dearness allowance and retaining allowance, if any, payable to employees per month.</field>
         </record>
 

From 699720066b526c2d83ebe9e5f096e195717e3d36 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 29 Aug 2012 16:35:28 +0530
Subject: [PATCH 618/999] [FIX]l10n_in_hr_payroll:description added

bzr revid: kbh@tinyerp.com-20120829110528-mcvijjnfzt5xj594
---
 addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index 91eb8e2ef0a..5d8b4d0b5d8 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -64,6 +64,7 @@
             <field name="amount_percentage_base">contract.wage</field>
             <field name="amount_percentage" eval="50"/>
             <field name="sequence" eval="13"/>
+            <field name="note">Dearness allowance (D.A.) is part of a person's salary. It is calculated as a percent of the basic salary. This amount is then added to the basic salary along with house rent allowance to get the total salary. Or you can say that The Dearness Allowance is a part of the total compensation a person receives for having performed his or her job.</field>
         </record>
 
         <record id="hr_salary_rule_houserentallowancemetro_nonmetro" model="hr.salary.rule">
@@ -74,6 +75,7 @@
             <field name="name">House Rent Allowance</field>
             <field name="register_id" ref="hr_houserent_allowance_register"/>
             <field name="sequence" eval="51"/>
+            <field name="note">HRA is an allowance given by the employer to the employee for taking care of his rental or accommodation expenses.</field>
         </record>
 
         <record id="hr_salary_trans_allownce" model="hr.salary.rule">
@@ -83,6 +85,7 @@
             <field name="amount_select">fix</field>
             <field eval="800.0" name="amount_fix"/>
             <field name="sequence" eval="14"/>
+            <field name="note">A conveyance allowance refers to an amount of money reimbursed to someone for the operation of a vehicle or the riding of a vehicle. The allowance is typically a designated amount or percentage of total transportation expenses that is referenced in a country's tax laws or code. Organizations and private or public businesses may also offer a conveyance allowance in addition to reimbursing employees or members for transportation expenses. In this instance, the conveyance allowance may identify an unusual transport occurrence that may not be covered by a designated travel expense report such as travel to a specific job site that requires a daily bus or taxi ride.</field>
         </record>
 
         <record id="hr_salary_rule_special" model="hr.salary.rule">
@@ -127,6 +130,7 @@
             <field name="sequence" eval="21"/>
             <field name="amount_select">code</field>
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.10) or (contract.wage * 0.10)</field>
+            <field name="note">This allowance is paid to Employees who are posted in big cities. The purpose is to compensate the high cost of living in cities like Mumbai, Delhi, etc. However it is Fully Taxable.</field>
         </record>
 
         <record id="hr_payroll_rule_metrocity" model="hr.salary.rule">
@@ -347,6 +351,7 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="amount_python_compute">result = -200 if contract.wage &gt;= 12000 else -150 if ((contract.wage &gt;= 9000) and (contract.wage &lt;= 11999)) else -80 if ((contract.wage &gt;= 6000) and (contract.wage &lt;= 8999)) else -20 if  ((contract.wage &gt;= 3000) and (contract.wage &lt;= 5999)) else -0</field>
             <field name="register_id" ref="hr_professional_tax_deduction_register"/>
             <field eval="145" name="sequence"/>
+            <field name="note">Workers living in states that impose the professional tax must submit a payment each half-year for the right to practice a profession or trade. It applies equally to employees who work for the national or state government, and those employed by private corporations. The professional tax uses a six-month accounting system, which divides the year into two periods, beginning on April 1 and October 1.</field>
         </record>
 
         <record id="hr_payslip_rule_epf" model="hr.salary.rule">

From 1d131bae8439fa8e0cace9f16f5deeb7052ef12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 29 Aug 2012 13:44:24 +0200
Subject: [PATCH 619/999] [RENAME] mail: res.partner: renamed
 notification_email_pref into notification_email_send, because this pref
 suffix is very ugly.

bzr revid: tde@openerp.com-20120829114424-fznd0ujsqnk1hve7
---
 addons/mail/mail_followers.py  | 4 ++--
 addons/mail/res_partner.py     | 4 ++--
 addons/mail/res_users.py       | 4 ++--
 addons/mail/res_users_view.xml | 4 ++--
 addons/mail/tests/test_mail.py | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 409ed4a2f6f..d0444a31cc1 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -95,10 +95,10 @@ class mail_notification(osv.Model):
             if partner.user_id.id == uid:
                 continue
             # Partner does not want to receive any emails
-            if partner.notification_email_pref=='none' or not partner.email:
+            if partner.notification_email_send=='none' or not partner.email:
                 continue
             # Partners want to receive only emails and comments
-            if partner.notification_email_pref=='comment' and msg.type not in ('email','comment'):
+            if partner.notification_email_send=='comment' and msg.type not in ('email','comment'):
                 continue
 
             towrite['state'] = 'outgoing'
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index c8b1e9c9240..a11247990d5 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -27,7 +27,7 @@ class res_partner_mail(osv.Model):
     _inherit = ['res.partner', 'mail.thread']
 
     _columns = {
-        'notification_email_pref': fields.selection([
+        'notification_email_send': fields.selection([
             ('all', 'All feeds'),
             ('comment', 'Comments and emails'),
             ('none', 'Never')
@@ -37,7 +37,7 @@ class res_partner_mail(osv.Model):
     }
 
     _defaults = {
-        'notification_email_pref': lambda *args: 'comment'
+        'notification_email_send': lambda *args: 'comment'
     }
 
 
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 480b6aacd22..ebaff2bdce7 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -44,14 +44,14 @@ class res_users(osv.Model):
     }
 
     def __init__(self, pool, cr):
-        """ Override of __init__ to add access rights on notification_email_pref
+        """ Override of __init__ to add access rights on notification_email_send
             field. Access rights are disabled by default, but allowed on
             fields defined in self.SELF_WRITEABLE_FIELDS.
         """
         init_res = super(res_users, self).__init__(pool, cr)
         # duplicate list to avoid modifying the original reference
         self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS)
-        self.SELF_WRITEABLE_FIELDS.append('notification_email_pref')
+        self.SELF_WRITEABLE_FIELDS.append('notification_email_send')
         return init_res
 
     def _auto_init(self, cr, context=None):
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 005d71cb09f..a119765e1ec 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
             <data>
                 <field name="email" position="before">
-                    <field name="notification_email_pref" readonly="0"/>
+                    <field name="notification_email_send" readonly="0"/>
                 </field>
             </data>
             </field>
@@ -24,7 +24,7 @@
             <field name="arch" type="xml">
             <data>
                 <field name="email" position="before">
-                    <field name="notification_email_pref"/>
+                    <field name="notification_email_send"/>
                 </field>
                 <field name="email" position="after">
                     <field name="alias_domain" invisible="1"/>
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index e6faf26e0ad..ef72810309b 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -255,9 +255,9 @@ class test_mail(common.TransactionCase):
         # 1 - Bert Tartopoils, with email, should receive emails for comments and emails
         partner_bert_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
         # 2 - Raoul Grosbedon, without email, to test email verification; should receive emails for every message
-        partner_raoul_id = self.res_partner.create(cr, uid, {'name': 'Raoul Grosbedon', 'notification_email_pref': 'all'})
+        partner_raoul_id = self.res_partner.create(cr, uid, {'name': 'Raoul Grosbedon', 'notification_email_send': 'all'})
         # 3 - Roger Poilvache, with email, should never receive emails
-        partner_roger_id = self.res_partner.create(cr, uid, {'name': 'Roger Poilvache', 'email': 'r@r', 'notification_email_pref': 'none'})
+        partner_roger_id = self.res_partner.create(cr, uid, {'name': 'Roger Poilvache', 'email': 'r@r', 'notification_email_send': 'none'})
 
         # Create a new comment on group_pigs
         compose_id = mail_compose.create(cr, uid,

From 1eedcaedad3a528c6eea48571b9eb215b5a5d225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 29 Aug 2012 14:56:40 +0200
Subject: [PATCH 620/999] [IMP] point_of_sale: TODO changes

bzr revid: fva@openerp.com-20120829125640-5bml13zupja3w30b
---
 addons/point_of_sale/static/src/js/TODO.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/TODO.txt b/addons/point_of_sale/static/src/js/TODO.txt
index edadbe188ea..5eeb4c2606a 100644
--- a/addons/point_of_sale/static/src/js/TODO.txt
+++ b/addons/point_of_sale/static/src/js/TODO.txt
@@ -49,9 +49,9 @@ TODO AUG 20
         v L'impression est foireuse
 
 * CLIENT
-    - create a new branch
+    v create a new branch
     - Self-checkout welcome screen
-        - removal of products for the root category
+        ~ removal of products for the root category
     - Terminal de payement
     - Code à barres
     - Vidanges

From 192a5ed4a0668ed7031891ff81bf14b2e5d115db Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Wed, 29 Aug 2012 18:52:09 +0530
Subject: [PATCH 621/999] [MERGE] Merged PNA's branch to write new currency
 into demo pricelist

bzr revid: pso@tinyerp.com-20120829132209-v17f20ffvvyoesly
---
 addons/product/pricelist.py | 11 +++++++++++
 addons/purchase/company.py  |  9 +++++++++
 2 files changed, 20 insertions(+)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index c333000621a..e88de61299f 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -436,7 +436,18 @@ class product_pricelist_item(osv.osv):
         return {}
 product_pricelist_item()
 
+class res_company(osv.osv):
+    _inherit = 'res.company'
 
+    def write(self, cr, uid, ids, vals, context=None):
+        res = super(res_company, self).write(cr, uid, ids, vals, context)
+        product_pricelist_obj = self.pool.get('product.pricelist')
+        currency = product_pricelist_obj._get_currency(cr, uid, context)
+        pricelist = self.pool.get('ir.model.data').get_object(cr, uid, 'product', 'list0')
+        product_pricelist_obj.write(cr, uid, pricelist.id, {'currency_id': currency}, context=context)
+        return res
+    
+res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase/company.py b/addons/purchase/company.py
index 2a01605782c..5126fbc0a86 100644
--- a/addons/purchase/company.py
+++ b/addons/purchase/company.py
@@ -30,6 +30,15 @@ class company(osv.osv):
     _defaults = {
         'po_lead': lambda *a: 1.0,
     }
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        res = super(company, self).write(cr, uid, ids, vals, context)
+        product_pricelist_obj = self.pool.get('product.pricelist')
+        currency = product_pricelist_obj._get_currency(cr, uid, context)
+        pricelist = self.pool.get('ir.model.data').get_object(cr, uid, 'purchase', 'list0')
+        product_pricelist_obj.write(cr, uid, pricelist.id, {'currency_id': currency}, context=context)
+        return res
+    
 company()
 
 

From 3b2423c5dae204fa262d41dff4f40c35accc6d1e Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 29 Aug 2012 15:37:32 +0200
Subject: [PATCH 622/999] [IMP] ir.ui.view: filter inheriting views based on
 groups

bzr revid: rco@openerp.com-20120829133732-ijyy3y05mlbazgya
---
 openerp/addons/base/ir/ir_ui_view.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 3caacfc1494..bad2c3d85af 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -169,20 +169,25 @@ class view(osv.osv):
            :rtype: list of tuples
            :return: [(view_arch,view_id), ...]
         """
+        user_groups = frozenset(self.pool.get('res.users').browse(cr, 1, uid, context).groups_id)
         if self.pool._init:
             # Module init currently in progress, only consider views from modules whose code was already loaded 
-            query = """SELECT v.arch, v.id FROM ir_ui_view v LEFT JOIN ir_model_data md ON (md.model = 'ir.ui.view' AND md.res_id = v.id)
+            query = """SELECT v.id FROM ir_ui_view v LEFT JOIN ir_model_data md ON (md.model = 'ir.ui.view' AND md.res_id = v.id)
                        WHERE v.inherit_id=%s AND v.model=%s AND md.module in %s  
                        ORDER BY priority"""
             query_params = (view_id, model, tuple(self.pool._init_modules))
         else:
             # Modules fully loaded, consider all views
-            query = """SELECT v.arch, v.id FROM ir_ui_view v
+            query = """SELECT v.id FROM ir_ui_view v
                        WHERE v.inherit_id=%s AND v.model=%s  
                        ORDER BY priority"""
             query_params = (view_id, model)
         cr.execute(query, query_params)
-        return cr.fetchall()
+        view_ids = [v[0] for v in cr.fetchall()]
+        # filter views based on user groups
+        return [(view.arch, view.id)
+                for view in self.browse(cr, 1, view_ids, context)
+                if not (view.groups_id and user_groups.isdisjoint(view.groups_id))]
 
     def write(self, cr, uid, ids, vals, context=None):
         if not isinstance(ids, (list, tuple)):

From 9b6379462be8fd0fc2ec3e3565ccb5b778e6c6bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 29 Aug 2012 17:00:02 +0200
Subject: [PATCH 623/999] [REF] mail_mail: cool and clean refactoring of the
 models. Removed body_html and content_subtype fields. We now entirely rely on
 the body field, that holds sanitized HTML. Added a user_signature field from
 email_template. mail_mail.send() is now responsible of adding the signature
 on emails. mail_notification.notify() sets the user_signature flag on emails
 send for notifciations. mail_mail.send() is responsible of adding a default
 subject on emails send if there is no subject on the mail.message, and res_id
 and model are set. purchase_requisition: removed an override of mail.message
 schedule_with_attach.

bzr revid: tde@openerp.com-20120829150002-v8t581oesnw0rhvl
---
 addons/mail/mail_followers.py                 | 39 ++++-----
 addons/mail/mail_mail.py                      | 81 ++++++++++---------
 addons/mail/mail_mail_view.xml                |  6 +-
 addons/mail/mail_message.py                   |  2 +-
 addons/mail/wizard/mail_compose_message.py    |  2 +-
 .../purchase_requisition.py                   | 21 -----
 6 files changed, 58 insertions(+), 93 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index d0444a31cc1..255b6d55a50 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -84,11 +84,20 @@ class mail_notification(osv.Model):
     def notify(self, cr, uid, partner_ids, msg_id, context=None):
         """ Send by email the notification depending on the user preferences """
         context = context or {}
+        # mail_noemail (do not send email) or no partner_ids: do not send, return
+        if context.get('mail_noemail') or not partner_ids:
+            return True
+
         mail_mail_obj = self.pool.get('mail.mail')
         msg_obj = self.pool.get('mail.message')
         msg = msg_obj.browse(cr, uid, msg_id, context=context)
 
-        towrite = self.notify_get_notif_email_dict(cr, uid, msg, context=context)
+        towrite = {
+            'mail_message_id': msg.id,
+            'email_to': [],
+            'user_signature': True,
+            'auto_delete': True,
+        }
 
         for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
             # Do not send an email to the writer
@@ -97,34 +106,14 @@ class mail_notification(osv.Model):
             # Partner does not want to receive any emails
             if partner.notification_email_send=='none' or not partner.email:
                 continue
-            # Partners want to receive only emails and comments
+            # Partner want to receive only emails and comments
             if partner.notification_email_send=='comment' and msg.type not in ('email','comment'):
                 continue
 
-            towrite['state'] = 'outgoing'
             if partner.email not in towrite['email_to']:
                 towrite['email_to'].append(partner.email)
+        towrite['email_to'] = ', '.join(towrite['email_to'])
 
-        if towrite.get('state') and not context.get('mail_noemail'):
-            towrite['message_id'] = msg.id
-            towrite['email_to'] = ', '.join(towrite['email_to'])
-            
-            email_notif_id = mail_mail_obj.create(cr, uid, towrite, context=context)
-            mail_mail_obj.send(cr, uid, [email_notif_id], context=context)
-
+        email_notif_id = mail_mail_obj.create(cr, uid, towrite, context=context)
+        mail_mail_obj.send(cr, uid, [email_notif_id], context=context)
         return True
-
-    def notify_get_notif_email_dict(self, cr, uid, msg, context=None):
-        """ Return the content of the email send for notification.
-            :param message: browse record on source mail.message
-        """
-        subject = msg.subject or '%s posted a comment on %s' % (msg.author_id.name, msg.record_name)
-        body = msg.body or ''
-        author_signature = msg.author_id.user_ids[0].signature
-        if author_signature:
-            body += '<div>%s</div>' % (author_signature)
-        return {
-            'email_to': [],
-            'subject': subject,
-            'body': body,
-        }
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index ebfd19e87b3..50b5b4cfe84 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -26,6 +26,7 @@ import tools
 
 from osv import osv
 from osv import fields
+from tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
@@ -50,29 +51,27 @@ class mail_mail(osv.Model):
         ], 'Status', readonly=True),
         'auto_delete': fields.boolean('Auto Delete',
             help="Permanently delete this email after sending it, to save space"),
+        'user_signature': fields.boolean('Add Signature',
+            help="If checked, the user's signature will be appended to the text version of the message"),
         'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
         'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences.'),
         'email_to': fields.text('To', help='Message recipients'),
         'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
         'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
-
-        'content_subtype': fields.char('Message content subtype', size=32,
-            oldname="subtype", readonly=1,
-            help="Type of message, usually 'html' or 'plain', used to select "\
-                  "plain-text or rich-text contents accordingly"),
-        'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML version of the message"),
     }
 
-    def _get_default_from(self, cr, uid, context={}):
+    def _get_default_from(self, cr, uid, context=None):
         cur = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if not cur.alias_domain:
-            raise osv.except_osv(_('Invalid Action!'), _('Unable to send email, set an alias domain in your server settings.'))
+            # TDE temp: impossible to install social module, because mail.group tries to send emails ...
+            # raise osv.except_osv(_('Invalid Action!'), _('Unable to send email, set an alias domain in your server settings.'))
+            pass
         return cur.alias_name + '@' + cur.alias_domain
 
     _defaults = {
         'state': 'outgoing',
-        'content_subtype': 'plain',
-        'email_from': _get_default_from
+        'email_from': lambda self, cr, uid, ctx=None: self._get_default_from(cr, uid, ctx),
+        'user_signature': False,
     }
 
     def mark_outgoing(self, cr, uid, ids, context=None):
@@ -144,50 +143,53 @@ class mail_mail(osv.Model):
            :return: True
         """
         ir_mail_server = self.pool.get('ir.mail_server')
-        self.write(cr, uid, ids, {'state': 'outgoing'}, context=context)
         for message in self.browse(cr, uid, ids, context=context):
             try:
+                body = message.body
+
+                # handle attachments
                 attachments = []
                 for attach in message.attachment_ids:
                     attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
 
-                body = message.body_html if message.content_subtype == 'html' else message.body
-                body_alternative = None
-                content_subtype_alternative = None
-                if message.content_subtype == 'html':
-                    # we have a plain text alternative prepared, pass it to 
-                    # build_message instead of letting it build one
-                    body_alternative = tools.html2plaintext(message.body)
-                    content_subtype_alternative = 'plain'
+                #  add signature if flag set
+                if message.user_signature:
+                    signature = message.author_id and message.author_id.user_ids[0].signature or ''
+                    insertion_point = body.find('</html>')
+                    body = body[:insertion_point] + signature + body[:insertion_point]
 
-                # handle destination_partners
-                partner_ids_email_to = ''
-                for partner in message.partner_ids:
-                    partner_ids_email_to += '%s ' % (partner.email or '')
-                message_email_to = '%s %s' % (partner_ids_email_to, message.email_to or '')
+                # no subject, res_id, model: '<Author> posted on <Resource>'
+                if not message.subject and message.model and message.res_id:
+                    subject = '%s posted on %s' % (message.author_id.name, message.record_name)
+                else:
+                    subject = message.subject
+
+                # use only sanitized html and set its plaintexted version as alternative
+                body_alternative = tools.html2plaintext(body)
+                content_subtype_alternative = 'plain'
 
                 # build an RFC2822 email.message.Message object and send it
                 # without queuing
                 msg = ir_mail_server.build_email(
-                    email_from=message.email_from,
-                    email_to=tools.email_split(message_email_to),
-                    subject=message.subject,
-                    body=body,
-                    body_alternative=body_alternative,
-                    email_cc=tools.email_split(message.email_cc),
-                    reply_to=message.reply_to,
-                    attachments=attachments, message_id=message.message_id,
+                    subject = subject,
+                    body = body,
+                    body_alternative = body_alternative,
+                    email_from = message.email_from,
+                    email_to = tools.email_split(message.email_to),
+                    email_cc = tools.email_split(message.email_cc),
+                    reply_to = message.reply_to,
+                    attachments = attachments,
+                    message_id = message.message_id,
                     references = message.references,
-                    object_id=message.res_id and ('%s-%s' % (message.res_id,message.model)),
-                    subtype=message.content_subtype,
-                    subtype_alternative=content_subtype_alternative)
+                    object_id = message.res_id and ('%s-%s' % (message.res_id,message.model)),
+                    subtype = 'html',
+                    subtype_alternative = content_subtype_alternative)
                 res = ir_mail_server.send_email(cr, uid, msg,
-                                                mail_server_id=message.mail_server_id.id,
-                                                context=context)
+                    mail_server_id=message.mail_server_id.id, context=context)
                 if res:
-                    message.write({'state':'sent', 'message_id': res, 'email_to': message_email_to})
+                    message.write({'state':'sent', 'message_id': res})
                 else:
-                    message.write({'state':'exception', 'email_to': message_email_to})
+                    message.write({'state':'exception'})
                 message.refresh()
                 if message.state == 'sent':
                     self._postprocess_sent_message(cr, uid, message, context=context)
@@ -198,4 +200,3 @@ class mail_mail(osv.Model):
             if auto_commit == True:
                 cr.commit()
         return True
-
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index 3abe0b1ddc6..9f8a3419498 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -29,10 +29,7 @@
                                 </group>
                                 <notebook>
                                     <page string="Body">
-                                        <field name="body" widget="text"/>
-                                    </page>
-                                    <page string="Body (Rich)">
-                                        <field name="body_html"/>
+                                        <field name="body"/>
                                     </page>
                                 </notebook>
                             </page>
@@ -41,7 +38,6 @@
                                     <group>
                                         <field name="auto_delete"/>
                                         <field name="type"/>
-                                        <field name="content_subtype"/>
                                         <field name="state" colspan="2"/>
                                         <field name="mail_server_id"/>
                                         <field name="model"/>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 2cd22aa76b4..6c47e0006c9 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -125,7 +125,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),
-        'body': fields.html('Content'),
+        'body': fields.html('Contents', help='Automatically sanitized HTML contents'),
         'unread': fields.function(_get_unread, fnct_search=_search_unread,
             type='boolean', string='Unread',
             help='Functional field to search for unread messages linked to uid'),
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index e4b1d01c5e7..96ce253c2a8 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -241,7 +241,7 @@ class mail_compose_message(osv.TransientModel):
                 active_model = context.get('default_model', False)
                 active_model_pool = self.pool.get(active_model)
                 subject = self.render_template(cr, uid, subject, active_model, active_id)
-                body = self.render_template(cr, uid, wizard.body_html, active_model, active_id)
+                body = self.render_template(cr, uid, wizard.body, active_model, active_id)
 
                 # TODO TDE: find partner_ids
                 # if email_to: find or create a partner
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index f8d7741822e..90a5244e66f 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -194,27 +194,6 @@ class purchase_requisition(osv.osv):
 
 purchase_requisition()
 
-class mail_message(osv.osv):
-    _inherit = 'mail.message'
-    
-    def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, email_cc=None,
-                             email_bcc=None, reply_to=False, attachments=None, message_id=False, references=False,
-                             res_id=False, content_subtype='plain', headers=None, mail_server_id=False, auto_delete=False,
-                             context=None):
-        result = super(mail_message, self).schedule_with_attach(cr, uid, email_from, email_to, subject, body, model=model, email_cc=email_cc,
-            email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
-            res_id=res_id, content_subtype=content_subtype, headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
-            context=context)
-        # check model is purchase.order
-        if model and model == 'purchase.order' and res_id:
-            requisition_id = self.pool.get('purchase.order').browse(cr, uid, res_id, context=context).requisition_id
-            if requisition_id:
-                result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, model='purchase.requisition', email_cc=email_cc,
-                    email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
-                    res_id=requisition_id.id, content_subtype=content_subtype, headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
-                    context=context)
-        return result
-
 class purchase_requisition_line(osv.osv):
 
     _name = "purchase.requisition.line"

From d8c65aa88eb9f779941feae45955fa09aaf8ce11 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 29 Aug 2012 18:46:14 +0200
Subject: [PATCH 624/999] [IMP] mail.notification: simplify model creation +
 some lint cleanup

No need for extra constraints/defaults, in OpenERP
boolean values are `true` and `not true` (false/NULL).

This seems to work well with db indexes too.

bzr revid: odo@openerp.com-20120829164614-9kqrownb7q4vzrjc
---
 addons/mail/mail_followers.py | 12 +-----------
 addons/mail/mail_message.py   |  7 ++++---
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 255b6d55a50..0c9a1a65432 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -64,22 +64,12 @@ class mail_notification(osv.Model):
         'read': False,
     }
 
-    def init(self, cr):
-        """ Set a postgresql NOT NULL constraint with default value false for
-            the read column. The reason is that when writing in this table using
-            partner_ids of mail.message model, it bypasses the ORM default
-            values, leading to 'None' values for read field. This broke the
-            needaction mechanism for mail.message. """
-        cr.execute("ALTER TABLE mail_notification ALTER read SET NOT NULL")
-        cr.execute("ALTER TABLE mail_notification ALTER read SET DEFAULT false")
-
     def create(self, cr, uid, vals, context=None):
         """ Override of create to check that we can not create a notification
             for a message the user can not read. """
         if self.pool.get('mail.message').check_access_rights(cr, uid, 'read'):
             return super(mail_notification, self).create(cr, uid, vals, context=context)
-        else:
-            return False
+        return False
 
     def notify(self, cr, uid, partner_ids, msg_id, context=None):
         """ Send by email the notification depending on the user preferences """
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 6c47e0006c9..97473886e1a 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -78,14 +78,15 @@ class mail_message(osv.Model):
     def _search_unread(self, cr, uid, obj, name, domain, context=None):
         """ Search for messages unread by the current user. """
         read_value = not domain[0][2]
+        read_cond = '' if read_value else '!= true'
         partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         cr.execute("""  SELECT mail_message.id \
                         FROM mail_message \
                         JOIN mail_notification ON ( \
                             mail_notification.message_id = mail_message.id ) \
-                        WHERE mail_notification.partner_id = %s AND \
-                            mail_notification.read = %s \
-                    """ % (partner_id, read_value) )
+                        WHERE mail_notification.partner_id = %%s AND \
+                            mail_notification.read %s \
+                    """ % read_cond, (partner_id,) )
         res = cr.fetchall()
         message_ids = [r[0] for r in res]
         return [('id', 'in', message_ids)]

From 83bb1753ac60e8d98563061c3b4d5642feddf2c8 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Thu, 30 Aug 2012 11:08:56 +0530
Subject: [PATCH 625/999] [IMP] Improved code to write default company currency
 into the pricelists

bzr revid: pso@tinyerp.com-20120830053856-uzsqy4usnp1widvo
---
 addons/product/pricelist.py |  8 ++++++--
 addons/purchase/company.py  | 11 ++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index e88de61299f..6be5e91dd52 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -438,13 +438,17 @@ product_pricelist_item()
 
 class res_company(osv.osv):
     _inherit = 'res.company'
+    
+    def _get_default_product_pricelist(self, cr, uid, context=None):
+        model, pricelist_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product', 'list0')
+        return [pricelist_id]
 
     def write(self, cr, uid, ids, vals, context=None):
         res = super(res_company, self).write(cr, uid, ids, vals, context)
         product_pricelist_obj = self.pool.get('product.pricelist')
         currency = product_pricelist_obj._get_currency(cr, uid, context)
-        pricelist = self.pool.get('ir.model.data').get_object(cr, uid, 'product', 'list0')
-        product_pricelist_obj.write(cr, uid, pricelist.id, {'currency_id': currency}, context=context)
+        pricelist_ids = self._get_default_product_pricelist(cr, uid, context=context)
+        product_pricelist_obj.write(cr, uid, pricelist_ids, {'currency_id': currency}, context=context)
         return res
     
 res_company()
diff --git a/addons/purchase/company.py b/addons/purchase/company.py
index 5126fbc0a86..fb362091a7c 100644
--- a/addons/purchase/company.py
+++ b/addons/purchase/company.py
@@ -31,13 +31,10 @@ class company(osv.osv):
         'po_lead': lambda *a: 1.0,
     }
     
-    def write(self, cr, uid, ids, vals, context=None):
-        res = super(company, self).write(cr, uid, ids, vals, context)
-        product_pricelist_obj = self.pool.get('product.pricelist')
-        currency = product_pricelist_obj._get_currency(cr, uid, context)
-        pricelist = self.pool.get('ir.model.data').get_object(cr, uid, 'purchase', 'list0')
-        product_pricelist_obj.write(cr, uid, pricelist.id, {'currency_id': currency}, context=context)
-        return res
+    def _get_default_product_pricelist(self, cr, uid, context=None):
+        pricelist_ids = super(company, self)._get_default_product_pricelist(cr, uid, context=context)
+        model, pricelist_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'purchase', 'list0')
+        return pricelist_ids + [pricelist_id]
     
 company()
 

From eb57fb150352960ccbca36388ffcc776ae034aa0 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 30 Aug 2012 11:19:08 +0530
Subject: [PATCH 626/999] [FIX]l10n_in_hr_payroll:python code for rules

bzr revid: kbh@tinyerp.com-20120830054908-7j6vydmwwfzsoned
---
 .../data/l10n_in_hr_payroll_data.xml          | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
index ae300ce4d91..8c6449e6336 100644
--- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -70,7 +70,9 @@
         <record id="hr_salary_rule_houserentallowancemetro_nonmetro" model="hr.salary.rule">
             <field name="code">HRAMN</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * contract.house_rent_allowance_metro_nonmetro / 100) or (contract.wage * contract.house_rent_allowance_metro_nonmetro / 100)</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and 
+((contract.wage + DA) * contract.house_rent_allowance_metro_nonmetro / 100)
+or (contract.wage * contract.house_rent_allowance_metro_nonmetro / 100))</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance</field>
             <field name="register_id" ref="hr_houserent_allowance_register"/>
@@ -129,7 +131,8 @@
             <field name="condition_select">none</field>
             <field name="sequence" eval="21"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.10) or (contract.wage * 0.10)</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.10) 
+or (contract.wage * 0.10))</field>
             <field name="note">This allowance is paid to Employees who are posted in big cities. The purpose is to compensate the high cost of living in cities like Mumbai, Delhi, etc. However it is Fully Taxable.</field>
         </record>
 
@@ -348,7 +351,11 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="condition_select">python</field>
             <field name="condition_python">result = contract.wage &gt;= 3000 </field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = -200 if contract.wage &gt;= 12000 else -150 if ((contract.wage &gt;= 9000) and (contract.wage &lt;= 11999)) else -80 if ((contract.wage &gt;= 6000) and (contract.wage &lt;= 8999)) else -20 if  ((contract.wage &gt;= 3000) and (contract.wage &lt;= 5999)) else -0</field>
+            <field name="amount_python_compute">result = (-200 if contract.wage &gt;= 12000 
+else -150 if ((contract.wage &gt;= 9000) and (contract.wage &lt;= 11999)) 
+else -80 if ((contract.wage &gt;= 6000) and (contract.wage &lt;= 8999)) 
+else -20 if  ((contract.wage &gt;= 3000) and (contract.wage &lt;= 5999))  
+else -0)</field>
             <field name="register_id" ref="hr_professional_tax_deduction_register"/>
             <field eval="145" name="sequence"/>
             <field name="note">Workers living in states that impose the professional tax must submit a payment each half-year for the right to practice a profession or trade. It applies equally to employees who work for the national or state government, and those employed by private corporations. The professional tax uses a six-month accounting system, which divides the year into two periods, beginning on April 1 and October 1.</field>
@@ -359,7 +366,8 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="name">Employee's PF Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) or - (contract.wage * 0.12)</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) 
+or - (contract.wage * 0.12))</field>
             <field name= "note">Employer contribution does not become part of employee’s income and hence income tax is not payable on this part.</field>
             <field name="register_id" ref="hr_register_provident_fund"/>
             <field name="sequence" eval="150"/>
@@ -370,7 +378,8 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="name">Employee's NPS Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) or - (contract.wage * 0.10)</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) 
+or - (contract.wage * 0.10))</field>
             <field name="sequence" eval="155"/>
             <field name="register_id" ref="hr_nps_contribution_register"/>
             <field name="note">Employee can claim deduction even of employer's contribution to NPS.</field>
@@ -383,7 +392,9 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="condition_select">python</field>
             <field name="condition_python">result = bool(contract.voluntary_provident_fund)</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * contract.voluntary_provident_fund / 100) or - (contract.wage * contract.voluntary_provident_fund / 100)</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and 
+- ((contract.wage + DA) * contract.voluntary_provident_fund / 100) 
+or - (contract.wage * contract.voluntary_provident_fund / 100))</field>
             <field name="sequence" eval="160"/>
             <field name="register_id" ref="hr_vpf_contribution_register"/>
             <field name="note">VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government.This additional amount enjoys all the benefits of PF except that the employer is not liable to contribute any extra amount apart from 12%.An added advantage is that the interest rate is equal to the interest rate of PF and he withdrawal is tax free. Please note that the maximum contribution towards VPF is 100% of your Basic.The highest rate of interest (close to 9%) makes it a very attractive saving scheme. Because of these advantages many employees chose not to close their PF account even after getting employment else where other than India.Employees also get a major tax break on their entire contribution to the fund up to a ceiling of Rs. 70,000/-</field>
@@ -488,7 +499,8 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="name">Employer's NPS Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) or - (contract.wage * 0.10)</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) 
+or - (contract.wage * 0.10))</field>
             <field name="sequence" eval="190"/>
             <field name="register_id" ref="hr_nps_contribution_register"/>
             <field name="appears_on_payslip" eval="False"/>
@@ -500,7 +512,8 @@ Now difference of income tax between payment year and actual year would be allow
             <field name="name">Employer's PF Contribution</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) or - (contract.wage * 0.12)</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) 
+or - (contract.wage * 0.12))</field>
             <field name="sequence" eval="195"/>
             <field name="register_id" ref="hr_register_provident_fund"/>
             <field name="appears_on_payslip" eval="False"/>

From bec83eef6fad3e2f7d8dcf71078f8e20d05284ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 30 Aug 2012 10:51:16 +0200
Subject: [PATCH 627/999] [REF] mail_mail: body_html is back, holding the body
 of emails to send. Body of send emails is mail_mail.body_html, not body
 anymore. Signature adding is back to mail_followers.notify(). Subject adding
 is still done just before sending. Updated mail_mail view.
 mail.compose.message: body_text inside <pre>. [TESTS] mail: added tests for
 message_post, updated tests for mail.message.compose to test the composer
 only.

bzr revid: tde@openerp.com-20120830085116-o5h13yqodt0vof0k
---
 addons/mail/mail_followers.py              |  30 ++-
 addons/mail/mail_mail.py                   |  18 +-
 addons/mail/mail_mail_view.xml             |   2 +-
 addons/mail/tests/test_mail.py             | 213 ++++++++++++++++-----
 addons/mail/wizard/mail_compose_message.py |   4 +-
 5 files changed, 199 insertions(+), 68 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 0c9a1a65432..b18832fa9cd 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -21,6 +21,7 @@
 
 from osv import osv
 from osv import fields
+import tools
 
 class mail_followers(osv.Model):
     """ mail_followers holds the data related to the follow mechanism inside
@@ -82,24 +83,39 @@ class mail_notification(osv.Model):
         msg_obj = self.pool.get('mail.message')
         msg = msg_obj.browse(cr, uid, msg_id, context=context)
 
+        # add signature
+        body_html = msg.body
+        signature = msg.author_id and msg.author_id.user_ids[0].signature or ''
+        insertion_point = body_html.find('</html>')
+        if insertion_point > -1:
+            insertion_point = body_html.find('</html>')
+            body_html = body_html[:insertion_point] + '<div>%s</div>' % tools.ustr(signature) + body_html[insertion_point:]
+        else:
+            body_html = body_html + '<div>%s</div>' % tools.ustr(signature)
+
         towrite = {
             'mail_message_id': msg.id,
             'email_to': [],
-            'user_signature': True,
-            'auto_delete': True,
+            'auto_delete': False,
+            'body_html': body_html,
         }
 
         for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
             # Do not send an email to the writer
-            if partner.user_id.id == uid:
+            if partner.user_ids and partner.user_ids[0].id == uid:
+                continue
+            # Do not send to partners without email address defined
+            if not partner.email:
                 continue
             # Partner does not want to receive any emails
-            if partner.notification_email_send=='none' or not partner.email:
+            if partner.notification_email_send == 'none':
                 continue
-            # Partner want to receive only emails and comments
-            if partner.notification_email_send=='comment' and msg.type not in ('email','comment'):
+            # Partner wants to receive only emails and comments
+            if partner.notification_email_send == 'comment' and msg.type not in ('email', 'comment'):
+                continue
+            # Partner wants to receive only emails
+            if partner.notification_email_send == 'email' and msg.type != 'email':
                 continue
-
             if partner.email not in towrite['email_to']:
                 towrite['email_to'].append(partner.email)
         towrite['email_to'] = ', '.join(towrite['email_to'])
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 50b5b4cfe84..f128662aac1 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -39,6 +39,8 @@ class mail_mail(osv.Model):
     _name = 'mail.mail'
     _description = 'Outgoing Mails'
     _inherits = {'mail.message': 'mail_message_id'}
+    _order = 'id desc'
+
     _columns = {
         'mail_message_id': fields.many2one('mail.message', 'Message', required=True, ondelete='cascade'),
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
@@ -51,13 +53,12 @@ class mail_mail(osv.Model):
         ], 'Status', readonly=True),
         'auto_delete': fields.boolean('Auto Delete',
             help="Permanently delete this email after sending it, to save space"),
-        'user_signature': fields.boolean('Add Signature',
-            help="If checked, the user's signature will be appended to the text version of the message"),
         'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
         'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences.'),
         'email_to': fields.text('To', help='Message recipients'),
         'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
         'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
+        'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML message"),
     }
 
     def _get_default_from(self, cr, uid, context=None):
@@ -71,7 +72,6 @@ class mail_mail(osv.Model):
     _defaults = {
         'state': 'outgoing',
         'email_from': lambda self, cr, uid, ctx=None: self._get_default_from(cr, uid, ctx),
-        'user_signature': False,
     }
 
     def mark_outgoing(self, cr, uid, ids, context=None):
@@ -145,19 +145,13 @@ class mail_mail(osv.Model):
         ir_mail_server = self.pool.get('ir.mail_server')
         for message in self.browse(cr, uid, ids, context=context):
             try:
-                body = message.body
+                body = message.body_html
 
                 # handle attachments
                 attachments = []
                 for attach in message.attachment_ids:
                     attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
 
-                #  add signature if flag set
-                if message.user_signature:
-                    signature = message.author_id and message.author_id.user_ids[0].signature or ''
-                    insertion_point = body.find('</html>')
-                    body = body[:insertion_point] + signature + body[:insertion_point]
-
                 # no subject, res_id, model: '<Author> posted on <Resource>'
                 if not message.subject and message.model and message.res_id:
                     subject = '%s posted on %s' % (message.author_id.name, message.record_name)
@@ -171,11 +165,11 @@ class mail_mail(osv.Model):
                 # build an RFC2822 email.message.Message object and send it
                 # without queuing
                 msg = ir_mail_server.build_email(
+                    email_from = message.email_from,
+                    email_to = tools.email_split(message.email_to),
                     subject = subject,
                     body = body,
                     body_alternative = body_alternative,
-                    email_from = message.email_from,
-                    email_to = tools.email_split(message.email_to),
                     email_cc = tools.email_split(message.email_cc),
                     reply_to = message.reply_to,
                     attachments = attachments,
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index 9f8a3419498..dc4f68b22c7 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -29,7 +29,7 @@
                                 </group>
                                 <notebook>
                                     <page string="Body">
-                                        <field name="body"/>
+                                        <field name="body_html"/>
                                     </page>
                                 </notebook>
                             </page>
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index ef72810309b..858e5e868ad 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -63,9 +63,16 @@ Content-Transfer-Encoding: quoted-printable
 ------=_Part_4200734_24778174.1344608186754--
 """
 
-
 class test_mail(common.TransactionCase):
 
+    def _mock_smtp_gateway(self, *args, **kwargs):
+        return True
+
+    def _mock_build_email(self, *args, **kwargs):
+        self._build_email_args = args
+        self._build_email_kwargs = kwargs
+        return self.build_email_real(*args, **kwargs)
+
     def setUp(self):
         super(test_mail, self).setUp()
         self.ir_model = self.registry('ir.model')
@@ -80,7 +87,9 @@ class test_mail(common.TransactionCase):
         self.res_partner = self.registry('res.partner')
 
         # Install mock SMTP gateway
-        self.registry('ir.mail_server').send_email = lambda *a,**kwargs: True
+        self.build_email_real = self.registry('ir.mail_server').build_email
+        self.registry('ir.mail_server').build_email = self._mock_build_email
+        self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
 
         # groups@.. will cause the creation of new mail groups
         self.mail_group_model_id = self.ir_model.search(self.cr, self.uid, [('model','=', 'mail.group')])[0]
@@ -234,77 +243,191 @@ class test_mail(common.TransactionCase):
         self.assertTrue(all(id in follower_ids for id in [user_admin.partner_id.id]),
             'Admin the only Pigs group followers')
 
-    def test_20_message_post_and_compose(self):
-        """ Tests designed for message_post and the mail.compose.message wizard. """
+    def test_20_message_post(self):
+        """ Tests designed for message_post. """
+        cr, uid = self.cr, self.uid
+        self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a'})
+        user_admin = self.res_users.browse(cr, uid, uid)
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+
+        # 0 - Admin
+        p_a_id = user_admin.partner_id.id
+        # 1 - Bert Tartopoils, with email, should receive emails for comments and emails
+        p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
+        # 2 - Carine Poilvache, with email, should never receive emails
+        p_c_id = self.res_partner.create(cr, uid, {'name': 'Carine Poilvache', 'email': 'c@c', 'notification_email_send': 'email'})
+        # 3 - Dédé Grosbedon, without email, to test email verification; should receive emails for every message
+        p_d_id = self.res_partner.create(cr, uid, {'name': 'Dédé Grosbedon', 'notification_email_send': 'all'})
+
+        # Subscribe #1, #2
+        group_pigs.message_subscribe([p_b_id, p_c_id])
+
+        # Mail data
+        _subject = 'Pigs'
+        _mail_subject = '%s posted on %s' % (user_admin.name, group_pigs.name)
+        _body1 = 'Pigs rules'
+        _mail_body1 = 'Pigs rules<div>Admin</div>'
+        _mail_bodyalt1 = 'Pigs rules\nAdmin'
+        _body2 = '<html>Pigs rules</html>'
+        _mail_body2 = '<html>Pigs rules<div>Admin</div></html>'
+        _mail_bodyalt2 = 'Pigs rules\nAdmin'
+
+        # Post comment with body and subject, comment preference
+        msg_id = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body1, subject=_subject, msg_type='comment')
+        # Fetch: created mail_message, mail_mail, send_email
+        message = self.mail_message.browse(cr, uid, msg_id)
+        mail_ids = self.mail_mail.search(cr, uid, [], limit=1)
+        mail = self.mail_mail.browse(cr, uid, mail_ids[0])
+        send_email = self._build_email_kwargs
+        
+        # Test: mail_message: subject is _subject, body is _body1 (no formatting done)
+        self.assertEqual(message.subject, _subject,
+            'mail.message subject is %s; should be %s' % (message.subject, _subject))
+        self.assertEqual(message.body, _body1,
+            'mail.message body is %s; should be %s' % (message.body, _body1))
+        # Test: mail_mail: subject is _subject, body_html is _mail_body1 (signature appended)
+        self.assertEqual(mail.subject, _subject,
+            'mail.mail subject is %s; should be %s' % (mail.subject, _subject))
+        self.assertEqual(mail.body_html, _mail_body1,
+            'mail.mail body_html is %s; should be %s' % (mail.body_html, _mail_body1))
+        self.assertTrue(mail.mail_message_id and mail.mail_message_id.id == msg_id,
+            'mail_mail.mail_message_id is not the id of its related mail_message; got %s, should be %s' % (mail.mail_message_id.id, msg_id))
+        # Test: send_email: email send by server: correct subject and body
+        self.assertEqual(send_email['subject'], _subject,
+            'send_email subject is %s; should be %s' % (send_email['subject'], _subject))
+        self.assertEqual(send_email['body'], _mail_body1,
+            'send_email body is %s; should be %s' % (send_email['body'], _mail_body1))
+        self.assertEqual(send_email['body_alternative'], _mail_bodyalt1,
+            'send_email body_alternative is %s; should be %s' % (send_email['body_alternative'], _mail_bodyalt1))
+        # Test: mail_message: partner_ids = group followers
+        message_pids = [partner.id for partner in message.partner_ids]
+        test_pids = [p_a_id, p_b_id, p_c_id]
+        self.assertTrue(all(pid in message_pids for pid in test_pids) and len(message_pids) == len(test_pids),
+            'mail.message partners are %s; should be %s' % (message_pids, test_pids))
+        # Test: notification linked to this message = group followers = partner_ids
+        notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
+        notif_pids = [notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)]
+        self.assertTrue(all(pid in notif_pids for pid in test_pids) and len(notif_pids) == len(test_pids),
+            'mail.message notification partners are %s; should be %s' % (notif_pids, test_pids))
+        # Test: send_email: email_to should contain b@b, not c@c (pref email), not a@a (writer)
+        test_emails = ['b@b']
+        self.assertTrue(all(email in send_email['email_to'] for email in test_emails) and len(send_email['email_to']) == len(test_emails),
+            'send_email email_to is %s; should be %s' % (send_email['email_to'], test_emails))
+
+        # New post: test automatic subject, signature in html, add a partner, email preference, parent_id previous message
+        msg_id2 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body2, msg_type='email', partner_ids=[(6, 0, [p_d_id])], parent_id=msg_id)
+        # Fetch: created mail_message, mail_mail, send_email
+        message = self.mail_message.browse(cr, uid, msg_id2)
+        mail_ids = self.mail_mail.search(cr, uid, [], limit=1)
+        mail = self.mail_mail.browse(cr, uid, mail_ids[0])
+        send_email = self._build_email_kwargs
+
+        # Test: mail_message: subject is False, body is _body1 (no formatting done), parent_id is msg_id
+        self.assertEqual(message.subject, False,
+            'mail.message subject is %s; should be %s' % (message.subject, False))
+        self.assertEqual(message.body, _body2,
+            'mail.message body is %s; should be %s' % (message.body, _body2))
+        self.assertEqual(message.parent_id.id, msg_id,
+            'mail.message parent_id is %s; should be %s' % (message.parent_id.id, msg_id))
+        # Test: mail_mail: subject is False, body_html is _mail_body1 (signature appended)
+        self.assertEqual(mail.subject, False,
+            'mail.mail subject is %s; should be %s' % (mail.subject, False))
+        self.assertEqual(mail.body_html, _mail_body2,
+            'mail.mail body_html is %s; should be %s' % (mail.body_html, _mail_body2))
+        self.assertTrue(mail.mail_message_id and mail.mail_message_id.id == msg_id2,
+            'mail_mail.mail_message_id is not the id of its related mail_message; got %s, should be %s' % (mail.mail_message_id.id, msg_id2))
+        # Test: send_email: email send by server: correct subject and body
+        self.assertEqual(send_email['subject'], _mail_subject,
+            'send_email subject is %s; should be %s' % (send_email['subject'], _mail_subject))
+        self.assertEqual(send_email['body'], _mail_body2,
+            'send_email body is %s; should be %s' % (send_email['body'], _mail_body2))
+        self.assertEqual(send_email['body_alternative'], _mail_bodyalt2,
+            'send_email body_alternative is %s; should be %s' % (send_email['body_alternative'], _mail_bodyalt2))
+        # Test: mail_message: partner_ids = group followers
+        message_pids = [partner.id for partner in message.partner_ids]
+        test_pids = [p_a_id, p_b_id, p_c_id, p_d_id]
+        self.assertTrue(all(pid in message_pids for pid in test_pids) and len(message_pids) == len(test_pids),
+            'mail.message partners are %s; should be %s' % (message_pids, test_pids))
+        # Test: notification linked to this message = group followers = partner_ids
+        notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
+        notif_pids = [notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)]
+        self.assertTrue(all(pid in notif_pids for pid in test_pids) and len(notif_pids) == len(test_pids),
+            'mail.message notification partners are %s; should be %s' % (notif_pids, test_pids))
+        # Test: send_email: email_to should contain b@b, c@c, not a@a (writer)
+        test_emails = ['b@b', 'c@c']
+        self.assertTrue(all(email in send_email['email_to'] for email in test_emails) and len(send_email['email_to']) == len(test_emails),
+            'send_email email_to is %s; should be %s' % (send_email['email_to'], test_emails))
+
+    def test_21_message_post_attachments(self):
+        """ Tests designed for attachments. """
+
+    def test_22_message_compose_wizard(self):
+        """ Tests designed for the mail.compose.message wizard. """
         cr, uid = self.cr, self.uid
         mail_compose = self.registry('mail.compose.message')
+        self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a'})
         user_admin = self.res_users.browse(cr, uid, uid)
-        self.res_users.write(cr, uid, [uid], {'signature': 'Admin'})
-        user_admin.refresh()
         group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
 
         # Mail data
         _subject = 'Pigs'
-        _mail_subject = '%s posted a comment on %s' % (user_admin.name, group_pigs.name)
+        _mail_subject = '%s posted on %s' % (user_admin.name, group_pigs.name)
         _body_text = 'Pigs rules'
-        _body_html = '<b>Pigs</b> rules'
+        _msg_body1 = '<pre>Pigs rules</pre>'
+        _body_html = '<html>Pigs rules</html>'
+        _msg_body2 = '<html>Pigs rules</html>'
 
         # Create partners
-        # 0 - Create an email address for Admin, to check email sending
-        self.res_users.write(cr, uid, [uid], {'email': 'a@a'})
+        # 0 - Admin
+        p_a_id = user_admin.partner_id.id
         # 1 - Bert Tartopoils, with email, should receive emails for comments and emails
-        partner_bert_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
-        # 2 - Raoul Grosbedon, without email, to test email verification; should receive emails for every message
-        partner_raoul_id = self.res_partner.create(cr, uid, {'name': 'Raoul Grosbedon', 'notification_email_send': 'all'})
-        # 3 - Roger Poilvache, with email, should never receive emails
-        partner_roger_id = self.res_partner.create(cr, uid, {'name': 'Roger Poilvache', 'email': 'r@r', 'notification_email_send': 'none'})
+        p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
+        # 2 - Carine Poilvache, with email, should never receive emails
+        p_c_id = self.res_partner.create(cr, uid, {'name': 'Carine Poilvache', 'email': 'c@c', 'notification_email_send': 'email'})
+        # 3 - Dédé Grosbedon, without email, to test email verification; should receive emails for every message
+        p_d_id = self.res_partner.create(cr, uid, {'name': 'Dédé Grosbedon', 'notification_email_send': 'all'})
 
-        # Create a new comment on group_pigs
+        # Subscribe #1
+        group_pigs.message_subscribe([p_b_id])
+
+        # Comment group_pigs: body_text
         compose_id = mail_compose.create(cr, uid,
-            {'subject': _subject, 'body_text': _body_text, 'partner_ids': [(4, partner_bert_id), (4, partner_raoul_id), (4, partner_roger_id)]},
-            {'mail.compose.message': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_pigs_id})
+            {'subject': _subject, 'body_text': _body_text, 'partner_ids': [(4, p_c_id), (4, p_d_id)]},
+            {'mail.compose.message.mode': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_pigs_id})
         compose = mail_compose.browse(cr, uid, compose_id)
+
+        # Test: model, res_id
         self.assertTrue(compose.model == 'mail.group' and compose.res_id == self.group_pigs_id,
-            'Wizard message has model %s and res_id %s; should be mail.group and %s' % (compose.model, compose.res_id, self.group_pigs_id))
+            'mail.compose.message has model %s and res_id %s; should be mail.group and %s' % (compose.model, compose.res_id, self.group_pigs_id))
 
         # Post the comment, get created message
         mail_compose.send_mail(cr, uid, [compose_id])
         group_pigs.refresh()
-        first_com = group_pigs.message_ids[0]
+        msg = group_pigs.message_ids[0]
 
-        # Check message content
-        self.assertTrue(first_com.subject == False and first_com.body == _body_text,
-            'Posted comment subject is %s and body is %s; should be False and %s' % (first_com.subject, first_com.body, _body_text))
-
-        # Message partners = notified people = writer + partner_ids
-        first_com_pids = [partner.id for partner in first_com.partner_ids]
-        notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', first_com.id)])
-        self.assertTrue(len(first_com_pids) == 4, 'There are %s partners linked to the newly posted comment; should be 4' % (len(first_com_pids)))
+        # Test: mail.message: subject, body inside pre
+        self.assertTrue(msg.subject == False and msg.body == _msg_body1,
+            'mail.message subject is %s, body is %s; should be %s and %s' % (msg.subject, msg.body, False, _msg_body1))
+        # Test: mail.message partners = notified people: group_pigs followers (a, b) + mail.compose.message partner_ids (c, d)
+        msg_pids = [partner.id for partner in msg.partner_ids]
+        test_pids = [p_a_id, p_b_id, p_c_id, p_d_id]
+        notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', msg.id)])
+        self.assertTrue(len(msg_pids) == 4, 'There are %s partners linked to the newly posted comment; should be 4' % (len(msg_pids)))
         self.assertTrue(len(notif_ids) == 4, 'There are %s entries in mail_notification: should be 4' % (len(notif_ids)))
-        self.assertTrue(all(id in [user_admin.partner_id.id, partner_bert_id, partner_raoul_id, partner_roger_id] for id in first_com_pids),
+        self.assertTrue(all(id in msg_pids for id in test_pids) and len(msg_pids) == len(test_pids),
             'Admin, Bert Raoul and Roger should be the 4 partners of the newly created message')
 
-        # Fetch latest created email, that should be the email send to partners
-        mail_ids = self.mail_mail.search(cr, uid, [], limit=1)
-        mail = self.mail_mail.browse(cr, uid, mail_ids[0])
-        mail_emails = tools.email_split(mail.email_to)
-
-        # Check email subject, body, and email_to
-        expected_emails = ['a@a', 'b@b']
-        self.assertTrue(mail.subject == _mail_subject and _body_text in mail.body,
-            'Send email subject is \'%s\' and should be %s; body is %s and should contain %s' % (mail.subject, _mail_subject, mail.body, _body_text))
-        self.assertTrue(all(email in mail_emails for email in expected_emails) and len(mail_emails) == 2,
-            'Send email emails are %s; should be %s' % (mail_emails, expected_emails))
-
         # Create a reply to the last comment
         compose_id = mail_compose.create(cr, uid,
             {}, {'mail.compose.message.mode': 'reply', 'default_model': 'mail.thread', 'default_res_id': self.group_pigs_id,
-                'active_id': first_com.id})
+                'active_id': msg.id})
         compose = mail_compose.browse(cr, uid, compose_id)
+
+        # Test: model, res_id, parent_id
         self.assertTrue(compose.model == 'mail.group' and compose.res_id == self.group_pigs_id,
             'Wizard message has model: %s and res_id:%s; should be mail.group and %s' % (compose.model, compose.res_id, self.group_pigs_id))
-        self.assertTrue(compose.parent_id.id == first_com.id,
-            'Wizard parent_id is %d; should be %d' % (compose.parent_id.id, first_com.id))
+        self.assertEqual(compose.parent_id.id, msg.id,
+            'Wizard parent_id is %d; should be %d' % (compose.parent_id.id, msg.id))
 
     def test_30_message_read(self):
         """ Tests designed for message_read. """
@@ -442,5 +565,3 @@ class test_mail(common.TransactionCase):
         msg1.refresh()
         self.assertEqual(5, len(group_pigs.message_ids), 'group should contain 5 messages')
         self.assertEqual(2, len(msg1.child_ids), 'msg1 should have 2 children now')
-
-
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 96ce253c2a8..b4d992c5d1b 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -20,8 +20,8 @@
 ##############################################################################
 
 import re
-
 import tools
+
 from osv import osv
 from osv import fields
 from tools.safe_eval import safe_eval as eval
@@ -232,7 +232,7 @@ class mail_compose_message(osv.TransientModel):
             # default values, according to the wizard options
             subject = wizard.subject if wizard.content_subtype == 'html' else False
             partner_ids = [(4, partner.id) for partner in wizard.partner_ids]
-            body = wizard.body if wizard.content_subtype == 'html' else wizard.body_text
+            body = wizard.body if wizard.content_subtype == 'html' else '<pre>%s</pre>' % tools.ustr(wizard.body_text)
 
             active_model_pool = self.pool.get(wizard.model if wizard.model else 'mail.thread')
             

From 426e6288f1c17a9d769b22b9c106685889674266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 30 Aug 2012 10:51:57 +0200
Subject: [PATCH 628/999] [IMP] mail: res_partner: new options in email
 preferences: emails only. Already taken into accoutn in mail_followers,
 forgot to commit the change.

bzr revid: tde@openerp.com-20120830085157-2uuffeuyvimjxqke
---
 addons/mail/res_partner.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index a11247990d5..2988cee3d9c 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -29,7 +29,8 @@ class res_partner_mail(osv.Model):
     _columns = {
         'notification_email_send': fields.selection([
             ('all', 'All feeds'),
-            ('comment', 'Comments and emails'),
+            ('comment', 'Comments and Emails'),
+            ('email', 'Emails only'),
             ('none', 'Never')
             ], 'Receive Feeds by Email', required=True,
             help="Choose in which case you want to receive an email when you "\

From 6ee4afd62bab7b7aa956fc18a48c877077d11ebe Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Thu, 30 Aug 2012 15:40:50 +0530
Subject: [PATCH 629/999] [MERGE] sale: merge the changes of
 lp:~openerp-dev/openobject-addons/trunk-editable_list_sale-rco

bzr revid: psi@tinyerp.com-20120830101050-xa4z1xz6knhpatkc
---
 addons/sale/sale_view.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c4edc162f08..ea6de33f8ba 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -357,6 +357,20 @@
             </field>
         </record>
 
+        <!-- inherited view to make the order lines list in the form non-editable
+             for the members of some usability groups -->
+        <record id="view_order_form_editable_list" model="ir.ui.view">
+            <field name="name">sale.order.form.editable.list</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="groups_id" eval="[(6, 0, [ref('product.group_uos'), ref('product.group_stock_packaging'), ref('sale.group_mrp_properties')])]"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='order_line']/tree" position="attributes">
+                    <attribute name="editable"/>
+                </xpath>
+            </field>
+        </record>
+
         <record id="view_sales_order_filter" model="ir.ui.view">
             <field name="name">sale.order.list.select</field>
             <field name="model">sale.order</field>

From 7006b17af32d81ebf6b41cae2ca5ea50d1c0f061 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 30 Aug 2012 12:32:15 +0200
Subject: [PATCH 630/999] [IMP] un-b64 the import file field, use raw binary

bzr revid: xmo@openerp.com-20120830103215-trv5cjg9jvj8ano1
---
 addons/base_import/controllers.py      |  2 +-
 addons/base_import/models.py           | 12 +++++------
 addons/base_import/tests/test_cases.py | 29 ++++++++++++--------------
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/addons/base_import/controllers.py b/addons/base_import/controllers.py
index bc014cd8265..d978730b482 100644
--- a/addons/base_import/controllers.py
+++ b/addons/base_import/controllers.py
@@ -15,7 +15,7 @@ class ImportController(openerpweb.Controller):
         import_id = int(import_id)
 
         written = req.session.model('base_import.import').write(import_id, {
-            'file': base64.b64encode(file.read()),
+            'file': file.read(),
             'file_name': file.filename,
             'file_type': file.content_type,
         }, req.session.eval_context(req.context))
diff --git a/addons/base_import/models.py b/addons/base_import/models.py
index 2e44c686fd7..f340b582eaa 100644
--- a/addons/base_import/models.py
+++ b/addons/base_import/models.py
@@ -1,10 +1,7 @@
-import base64
-import codecs
 import csv
 import itertools
 import logging
 import operator
-import random
 
 try:
     from cStringIO import StringIO
@@ -24,7 +21,8 @@ class ir_import(orm.TransientModel):
 
     _columns = {
         'res_model': fields.char('Model', size=64),
-        'file': fields.binary('File'),
+        'file': fields.binary(
+            'File', help="File to check and/or import, raw binary (not base64)"),
         'file_name': fields.char('File Name', size=None),
         'file_mime': fields.char('File Type', size=None),
     }
@@ -123,7 +121,7 @@ class ir_import(orm.TransientModel):
         :throws UnicodeDecodeError: if ``options.encoding`` is incorrect
         """
         csv_iterator = csv.reader(
-            StringIO(base64.b64decode(record.file)),
+            StringIO(record.file),
             quotechar=options['quote'],
             delimiter=options['separator'])
         csv_nonempty = itertools.ifilter(None, csv_iterator)
@@ -238,8 +236,8 @@ class ir_import(orm.TransientModel):
                 # even if it yields non-printable characters. This is
                 # in case of UnicodeDecodeError (or csv.Error
                 # compounded with UnicodeDecodeError)
-                'preview': base64.b64decode(record.file)[:ERROR_PREVIEW_BYTES]\
-                                 .decode('iso-8859-1'),
+                'preview': record.file[:ERROR_PREVIEW_BYTES]
+                                .decode( 'iso-8859-1'),
             }
 
     def _convert_import_data(self, record, fields, options, context=None):
diff --git a/addons/base_import/tests/test_cases.py b/addons/base_import/tests/test_cases.py
index e2b61c1928b..420140cd2ac 100644
--- a/addons/base_import/tests/test_cases.py
+++ b/addons/base_import/tests/test_cases.py
@@ -167,15 +167,12 @@ class test_match_headers_multiple(TransactionCase):
             })
         )
 
-import base64, csv
 class test_preview(TransactionCase):
     def make_import(self):
         Import = self.registry('base_import.import')
         id = Import.create(self.cr, self.uid, {
             'res_model': 'res.users',
-            'file': base64.b64encode(
-                u"로그인,언어\n".encode('euc_kr'),
-                "bob,1\n"),
+            'file': u"로그인,언어\nbob,1\n".encode('euc_kr'),
         })
         return Import, id
 
@@ -211,10 +208,10 @@ class test_preview(TransactionCase):
         Import = self.registry('base_import.import')
         id = Import.create(self.cr, self.uid, {
             'res_model': 'base_import.tests.models.preview',
-            'file': base64.b64encode('name,Some Value,Counter\n'
+            'file': 'name,Some Value,Counter\n'
                     'foo,1,2\n'
                     'bar,3,4\n'
-                    'qux,5,6\n')
+                    'qux,5,6\n'
         })
 
         result = Import.parse_preview(self.cr, self.uid, id, {
@@ -248,10 +245,10 @@ class test_convert_import_data(TransactionCase):
         Import = self.registry('base_import.import')
         id = Import.create(self.cr, self.uid, {
             'res_model': 'base_import.tests.models.preview',
-            'file': base64.b64encode('name,Some Value,Counter\n'
+            'file': 'name,Some Value,Counter\n'
                     'foo,1,2\n'
                     'bar,3,4\n'
-                    'qux,5,6\n')
+                    'qux,5,6\n'
         })
         record = Import.browse(self.cr, self.uid, id)
         data, fields = Import._convert_import_data(
@@ -272,10 +269,10 @@ class test_convert_import_data(TransactionCase):
         Import = self.registry('base_import.import')
         id = Import.create(self.cr, self.uid, {
             'res_model': 'base_import.tests.models.preview',
-            'file': base64.b64encode('name,Some Value,Counter\n'
+            'file': 'name,Some Value,Counter\n'
                     'foo,1,2\n'
                     'bar,3,4\n'
-                    'qux,5,6\n')
+                    'qux,5,6\n'
         })
         record = Import.browse(self.cr, self.uid, id)
         data, fields = Import._convert_import_data(
@@ -296,10 +293,10 @@ class test_convert_import_data(TransactionCase):
         Import = self.registry('base_import.import')
         id = Import.create(self.cr, self.uid, {
             'res_model': 'base_import.tests.models.preview',
-            'file': base64.b64encode('name,Some Value,Counter\n'
+            'file': 'name,Some Value,Counter\n'
                     'foo,1,2\n'
                     ',3,\n'
-                    ',5,6\n')
+                    ',5,6\n'
         })
         record = Import.browse(self.cr, self.uid, id)
         data, fields = Import._convert_import_data(
@@ -317,8 +314,8 @@ class test_convert_import_data(TransactionCase):
 
         id = Import.create(self.cr, self.uid, {
             'res_model': 'base_import.tests.models.preview',
-            'file': base64.b64encode('name,Some Value,Counter\n'
-                    'foo,1,2\n')
+            'file': 'name,Some Value,Counter\n'
+                    'foo,1,2\n'
         })
 
         record = Import.browse(self.cr, self.uid, id)
@@ -333,8 +330,8 @@ class test_convert_import_data(TransactionCase):
 
         id = Import.create(self.cr, self.uid, {
             'res_model': 'base_import.tests.models.preview',
-            'file': base64.b64encode('name,Some Value,Counter\n'
-                    'foo,1,2\n')
+            'file': 'name,Some Value,Counter\n'
+                    'foo,1,2\n'
         })
 
         record = Import.browse(self.cr, self.uid, id)

From 246d9bd37f8cfe36a17f4e4d1ce89c8f44ff39a3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 30 Aug 2012 12:32:45 +0200
Subject: [PATCH 631/999] [IMP] rename $element to $el

bzr revid: xmo@openerp.com-20120830103245-3x8hzqquwqg27sji
---
 addons/base_import/static/src/js/import.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 3a52ad548ec..81b7397ba00 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -41,7 +41,7 @@ openerp.base_import = function (instance) {
         events: {
             'change input.oe_import_file': 'file_update',
             'click input.oe_import_has_header': function (e) {
-                this.$element.toggleClass(
+                this.$el.toggleClass(
                     'oe_import_noheaders', !e.target.checked);
                 this.settings_updated();
             },
@@ -93,13 +93,13 @@ openerp.base_import = function (instance) {
         file_update: function (e) {
             if (!this.$('input.oe_import_file').val()) { return; }
 
-            this.$element.removeClass('oe_import_preview oe_import_error');
-            jsonp(this.$element, {
+            this.$el.removeClass('oe_import_preview oe_import_error');
+            jsonp(this.$el, {
                 url: '/base_import/set_file'
             }, this.proxy('settings_updated'));
         },
         settings_updated: function () {
-            this.$element.addClass('oe_import_with_file');
+            this.$el.addClass('oe_import_with_file');
             // TODO: test that write // succeeded?
             this.Import.call(
                 'parse_preview', [this.id, this.import_options()])
@@ -107,11 +107,11 @@ openerp.base_import = function (instance) {
         },
         preview: function (result) {
             if (result.error) {
-                this.$element.addClass('oe_import_error');
+                this.$el.addClass('oe_import_error');
                 this.$('.oe_import_error_report').html(
                     QWeb.render('ImportView.preview.error', result));
             } else {
-                this.$element.addClass('oe_import_preview');
+                this.$el.addClass('oe_import_preview');
                 this.$('table').html(
                     QWeb.render('ImportView.preview', result));
             }
@@ -141,7 +141,7 @@ openerp.base_import = function (instance) {
             }
             // import failed (or maybe just warnings, if we ever get
             // warnings?)
-            this.$element.addClass('oe_import_error');
+            this.$el.addClass('oe_import_error');
             this.$('.oe_import_error_report').html(
                 QWeb.render('ImportView.error', {errors: errors}));
         },

From b1407fc769bdde6a45c8214a7c74fbecfbae6234 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 30 Aug 2012 12:39:28 +0200
Subject: [PATCH 632/999] [FIX] field for file mime type is file_type, not
 file_mime

bzr revid: xmo@openerp.com-20120830103928-rjtrdvkzrybfpi0c
---
 addons/base_import/controllers.py | 1 -
 addons/base_import/models.py      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/base_import/controllers.py b/addons/base_import/controllers.py
index d978730b482..85ff993e92e 100644
--- a/addons/base_import/controllers.py
+++ b/addons/base_import/controllers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import base64
 import simplejson
 
 try:
diff --git a/addons/base_import/models.py b/addons/base_import/models.py
index f340b582eaa..80c6df70a74 100644
--- a/addons/base_import/models.py
+++ b/addons/base_import/models.py
@@ -24,7 +24,7 @@ class ir_import(orm.TransientModel):
         'file': fields.binary(
             'File', help="File to check and/or import, raw binary (not base64)"),
         'file_name': fields.char('File Name', size=None),
-        'file_mime': fields.char('File Type', size=None),
+        'file_type': fields.char('File Type', size=None),
     }
 
     def get_fields(self, cr, uid, model, context=None,

From ca6323607e4b382a3fb9f54a841f35f529267622 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 30 Aug 2012 13:06:03 +0200
Subject: [PATCH 633/999] [IMP] make import objects live for 12 hours when
 transient cron is active

bzr revid: xmo@openerp.com-20120830110603-8stvh3vpsn4vzr4f
---
 addons/base_import/models.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/base_import/models.py b/addons/base_import/models.py
index 80c6df70a74..0f1d8c5705e 100644
--- a/addons/base_import/models.py
+++ b/addons/base_import/models.py
@@ -18,6 +18,8 @@ ERROR_PREVIEW_BYTES = 200
 _logger = logging.getLogger(__name__)
 class ir_import(orm.TransientModel):
     _name = 'base_import.import'
+    # allow imports to survive for 12h in case user is slow
+    _transient_max_hours = 12.0
 
     _columns = {
         'res_model': fields.char('Model', size=64),

From 7d8e6e7e8f80536f03b29a3e6423b08c8440e3f5 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 30 Aug 2012 13:24:27 +0200
Subject: [PATCH 634/999] [IMP] company: better rml_footer default value also
 rename method on_change_header in on_change_footer

bzr revid: abo@openerp.com-20120830112427-i3x4dzltlax03p7h
---
 openerp/addons/base/base_data.xml            |  3 +--
 openerp/addons/base/res/res_company.py       |  2 +-
 openerp/addons/base/res/res_company_view.xml | 14 +++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 393faf45965..3329e107537 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1088,8 +1088,7 @@
             <field name="name">Your Company</field>
             <field name="partner_id" ref="main_partner"/>
             <field name="rml_header1">Your Company Slogan</field>
-            <field name="rml_footer">Website: www.yourcompany.com | Phone: +33 1 49 51 23 94
-Bank Accounts... to be configured in menu Settings / Accounting/Invoicing.</field>
+            <field name="rml_footer">Website: www.yourcompany.com | Phone: +33 1 49 51 23 94 | Bank Accounts: to be configured in menu Settings / Accounting/Invoicing</field>
             <field name="currency_id" ref="base.EUR"/>
         </record>
 
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 0e5f90c3dcd..edcc7335727 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -141,7 +141,7 @@ class res_company(osv.osv):
     def _set_rml_footer(self, cr, uid, ids, footer=False, context=None):
         return self.write(cr, uid, ids, {'rml_footer': footer}, context=context)
 
-    def on_change_header(self, cr, uid, ids, customize_footer, phone, email, fax, website, vat, company_registry=False, bank_ids=False, context=None):
+    def on_change_footer(self, cr, uid, ids, customize_footer, phone, email, fax, website, vat, company_registry=False, bank_ids=False, context=None):
         val = []
         if customize_footer:
             return {}
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 54b68b09c6e..5e447ebc995 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -55,18 +55,18 @@
                                    <div>
                                        <field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
                                    </div>
-                                    <field name="website" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)" widget="url" placeholder="e.g. www.openerp.com"/>
+                                    <field name="website" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)" widget="url" placeholder="e.g. www.openerp.com"/>
                                 </group>
                                 <group>
-                                    <field name="phone" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
-                                    <field name="fax" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
-                                    <field name="email" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
-                                    <field name="vat" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
-                                    <field name="company_registry" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    <field name="phone" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    <field name="fax" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    <field name="email" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    <field name="vat" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    <field name="company_registry" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
                                 </group>
                             </group>
                             <group string="Bank Accounts">
-                                <field name="bank_ids" colspan="4" nolabel="1" on_change="on_change_header(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                <field name="bank_ids" colspan="4" nolabel="1" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
                             </group>
                             <group string="Footer Configuration">
                                 <field name="customize_footer"/>

From 06e13555d51aace43ea6b2b36d717e58f6c2ba7f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 30 Aug 2012 14:21:12 +0200
Subject: [PATCH 635/999] [FIX] mail: simplify test and cleanup some code + fix
 plaintext signature append

bzr revid: odo@openerp.com-20120830122112-y2lbgcazy0opvbs8
---
 addons/mail/mail_followers.py  |  24 ++---
 addons/mail/mail_message.py    |  20 ++--
 addons/mail/mail_thread.py     |  15 ++-
 addons/mail/tests/test_mail.py | 174 ++++++++++++---------------------
 4 files changed, 94 insertions(+), 139 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index b18832fa9cd..10d33536136 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -79,19 +79,19 @@ class mail_notification(osv.Model):
         if context.get('mail_noemail') or not partner_ids:
             return True
 
-        mail_mail_obj = self.pool.get('mail.mail')
-        msg_obj = self.pool.get('mail.message')
-        msg = msg_obj.browse(cr, uid, msg_id, context=context)
+        mail_mail = self.pool.get('mail.mail')
+        msg = self.pool.get('mail.message').browse(cr, uid, msg_id, context=context)
 
         # add signature
         body_html = msg.body
         signature = msg.author_id and msg.author_id.user_ids[0].signature or ''
-        insertion_point = body_html.find('</html>')
-        if insertion_point > -1:
+        if signature:
+            signature_block = u'\n<pre>%s</pre>\n' % signature
             insertion_point = body_html.find('</html>')
-            body_html = body_html[:insertion_point] + '<div>%s</div>' % tools.ustr(signature) + body_html[insertion_point:]
-        else:
-            body_html = body_html + '<div>%s</div>' % tools.ustr(signature)
+            if insertion_point > -1:
+                body_html = body_html[:insertion_point] + signature_block + body_html[insertion_point:]
+            else:
+                body_html += signature_block
 
         towrite = {
             'mail_message_id': msg.id,
@@ -118,8 +118,8 @@ class mail_notification(osv.Model):
                 continue
             if partner.email not in towrite['email_to']:
                 towrite['email_to'].append(partner.email)
-        towrite['email_to'] = ', '.join(towrite['email_to'])
-
-        email_notif_id = mail_mail_obj.create(cr, uid, towrite, context=context)
-        mail_mail_obj.send(cr, uid, [email_notif_id], context=context)
+        if towrite['email_to']:
+            towrite['email_to'] = ', '.join(towrite['email_to'])
+            email_notif_id = mail_mail.create(cr, uid, towrite, context=context)
+            mail_mail.send(cr, uid, [email_notif_id], context=context)
         return True
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 97473886e1a..413606b9ed2 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -330,19 +330,19 @@ class mail_message(osv.Model):
             Call mail_notification.notify to manage the email sending
         """
         message = self.browse(cr, uid, newid, context=context)
-        partners_to_notify = []
+        partners_to_notify = set([])
         # add all partner_ids of the message
         if message.partner_ids:
-            for partner in message.partner_ids:
-                if partner.id not in partners_to_notify:
-                    partners_to_notify.append(partner.id)
-        # add all followers and set them as partner_ids
+            partners_to_notify |= set(partner.id for partner in message.partner_ids)
+        # add all followers and set add them in partner_ids
         if message.model and message.res_id:
-            modobj = self.pool.get(message.model)
-            for follower in modobj.browse(cr, uid, message.res_id, context=context).message_follower_ids:
-                partners_to_notify.append(follower.id)
-                self.write(cr, uid, [newid], {'partner_ids': [(4, follower.id)]}, context=context)
-        self.pool.get('mail.notification').notify(cr, uid, partners_to_notify, newid, context=context)
+            record = self.pool.get(message.model).browse(cr, uid, message.res_id, context=context)
+            extra_notified = set(partner.id for partner in record.message_follower_ids)
+            missing_notified = extra_notified - partners_to_notify
+            if missing_notified:
+                message.write({'partner_ids': [(4, p_id) for p_id in missing_notified]})
+            partners_to_notify |= extra_notified
+        self.pool.get('mail.notification').notify(cr, uid, list(partners_to_notify), newid, context=context)
 
     def read(self, cr, uid, ids, fields_to_read=None, context=None, load='_classic_read'):
         self.check(cr, uid, ids, 'read', context=context)
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index eb9b48bbc5f..5c4ecbd48f6 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -475,16 +475,25 @@ class mail_thread(osv.Model):
                     # plain text is wrapped in <pre/> to preserve formatting
                     text = u'<pre>%s</pre>' % tools.ustr(part.get_payload(decode=True),
                                                          encoding, errors='replace')
-                    body = body[:insertion_point] + text + body[:insertion_point]
+                    if insertion_point != -1:
+                        body = body[:insertion_point] + text + body[insertion_point:]
+                    else:
+                        body += text
                 # 3) text/html -> raw
                 elif part.get_content_type() == 'text/html':
                     html = tools.ustr(part.get_payload(decode=True), encoding, errors='replace')
                     if alternative:
                         body = html
+                        # force </html> tag to lowercase, for easier matching
+                        body = re.sub(r'(?i)</html>', r'</html>', body)
                     else:
-                        html = re.sub('(?i)</?html>', '', html)
+                        # strip enclosing html/body tags and append to existing body
+                        html = re.sub(r'(?i)(</?html>|</?body>)', '', html)
                         insertion_point = body.find('</html>')
-                        body = body[:insertion_point] + text + body[:insertion_point]
+                        if insertion_point != -1:
+                            body = body[:insertion_point] + html + body[insertion_point:]
+                        else:
+                            body += html
                 # 4) Anything else -> attachment
                 else:
                     attachments.append((filename or 'attachment', part.get_payload(decode=True)))
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 858e5e868ad..86f3997c6b7 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -150,69 +150,47 @@ class test_mail(common.TransactionCase):
             {'res_model': 'mail.group', 'res_id': group_dummy_id, 'partner_id': partner_bert_id})
 
         # Pigs just created: should be only Admin as follower
-        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
-        self.assertTrue(len(follower_ids) == 1,
-            'Newly created group should have only 1 follower')
-        self.assertTrue(user_admin.partner_id.id in follower_ids,
-            'Admin should be the only Pigs group follower')
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([user_admin.partner_id.id]), 'Admin should be the only Pigs fan')
 
         # Subscribe Bert through a '4' command
         group_pigs.write({'message_follower_ids': [(4, partner_bert_id)]})
         group_pigs.refresh()
-        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
-        self.assertTrue(len(follower_ids) == 2,
-            'Pigs group should have 2 followers after linking Bert')
-        self.assertTrue(all(id in follower_ids for id in [partner_bert_id, user_admin.partner_id.id]),
-            'Bert and Admin should be the 2 Pigs group followers')
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([partner_bert_id, user_admin.partner_id.id]), 'Bert and Admin should be the only Pigs fans')
 
         # Unsubscribe Bert through a '3' command
         group_pigs.write({'message_follower_ids': [(3, partner_bert_id)]})
         group_pigs.refresh()
-        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
-        self.assertTrue(len(follower_ids) == 1,
-            'Pigs group should have 1 follower after unlinking Bert')
-        self.assertTrue(all(id in follower_ids for id in [user_admin.partner_id.id]),
-            'Admin should be the only Pigs group follower')
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([user_admin.partner_id.id]), 'Admin should be the only Pigs fan')
 
         # Set followers through a '6' command
         group_pigs.write({'message_follower_ids': [(6, 0, [partner_bert_id])]})
         group_pigs.refresh()
-        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
-        self.assertTrue(len(follower_ids) == 1,
-            'Pigs group should have 1 follower after replacing followers')
-        self.assertTrue(follower_ids == [partner_bert_id],
-            'Bert should be the only Pigs group follower')
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([partner_bert_id]), 'Bert should be the only Pigs fan')
 
         # Add a follower created on the fly through a '0' command
         group_pigs.write({'message_follower_ids': [(0, 0, {'name': 'Patrick Fiori'})]})
         partner_patrick_id = self.res_partner.search(cr, uid, [('name', '=', 'Patrick Fiori')])[0]
         group_pigs.refresh()
-        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
-        self.assertTrue(len(follower_ids) == 2,
-            'Pigs group should have 2 followers after linking to new partner')
-        self.assertTrue(all(id in follower_ids for id in [partner_bert_id, partner_patrick_id]),
-            'Bert and Patrick should be Pigs group followers')
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([partner_bert_id, partner_patrick_id]), 'Bert and Patrick should be the only Pigs fans')
 
         # Finally, unlink through a '5' command
         group_pigs.write({'message_follower_ids': [(5, 0)]})
         group_pigs.refresh()
-        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
-        self.assertTrue(len(follower_ids) == 0,
-            'Pigs group should not have followers anymore')
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertFalse(follower_ids, 'Pigs group should not have fans anymore')
 
         # Test dummy data has not been altered
         fol_obj_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.thread'), ('res_id', '=', self.group_pigs_id)])
-        follower_ids = [follower.partner_id.id for follower in self.mail_followers.browse(cr, uid, fol_obj_ids)]
-        self.assertTrue(len(follower_ids) == 1,
-            'mail.thread dummy data should have 1 follower')
-        self.assertTrue(follower_ids[0] == partner_bert_id,
-            'Bert should be the follower of dummy mail.thread data')
+        follower_ids = set([follower.partner_id.id for follower in self.mail_followers.browse(cr, uid, fol_obj_ids)])
+        self.assertEqual(follower_ids, set([partner_bert_id]), 'Bert should be the follower of dummy mail.thread data')
         fol_obj_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', group_dummy_id)])
-        follower_ids = [follower.partner_id.id for follower in self.mail_followers.browse(cr, uid, fol_obj_ids)]
-        self.assertTrue(len(follower_ids) == 2,
-            'mail.group dummy data should have 2 followers')
-        self.assertTrue(all(id in follower_ids for id in [partner_bert_id, user_admin.partner_id.id]),
-            'Bert and Admin should be the followers of dummy mail.group data')
+        follower_ids = set([follower.partner_id.id for follower in self.mail_followers.browse(cr, uid, fol_obj_ids)])
+        self.assertEqual(follower_ids,set([partner_bert_id, user_admin.partner_id.id]), 'Bert and Admin should be the followers of dummy mail.group data')
 
     def test_11_message_followers(self):
         """ Tests designed for the subscriber API. """
@@ -227,21 +205,14 @@ class test_mail(common.TransactionCase):
         # Subscribe Raoul twice (niak niak) through message_subscribe_users
         group_pigs.message_subscribe_users([user_raoul_id, user_raoul_id])
         group_pigs.refresh()
-        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
-        self.assertTrue(len(follower_ids) == 2,
-            'Pigs group should have 2 followers after having subscribed Raoul. Subscribing twice '\
-            'the same user should create only one follower.')
-        self.assertTrue(all(id in follower_ids for id in [user_raoul.partner_id.id, user_admin.partner_id.id]),
-            'Admin and Raoul should be the 2 Pigs group followers')
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([user_raoul.partner_id.id, user_admin.partner_id.id]), 'Admin and Raoul should be the only 2 Pigs group followers')
 
         # Unsubscribe Raoul twice through message_unsubscribe_users
         group_pigs.message_unsubscribe_users([user_raoul_id, user_raoul_id])
         group_pigs.refresh()
-        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
-        self.assertTrue(len(follower_ids) == 1,
-            'Pigs group should have 1 follower after unsubscribing Raoul')
-        self.assertTrue(all(id in follower_ids for id in [user_admin.partner_id.id]),
-            'Admin the only Pigs group followers')
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids,  set([user_admin.partner_id.id]), 'Admin must be the only Pigs fan')
 
     def test_20_message_post(self):
         """ Tests designed for message_post. """
@@ -266,97 +237,72 @@ class test_mail(common.TransactionCase):
         _subject = 'Pigs'
         _mail_subject = '%s posted on %s' % (user_admin.name, group_pigs.name)
         _body1 = 'Pigs rules'
-        _mail_body1 = 'Pigs rules<div>Admin</div>'
+        _mail_body1 = 'Pigs rules\n<pre>Admin</pre>\n'
         _mail_bodyalt1 = 'Pigs rules\nAdmin'
         _body2 = '<html>Pigs rules</html>'
-        _mail_body2 = '<html>Pigs rules<div>Admin</div></html>'
-        _mail_bodyalt2 = 'Pigs rules\nAdmin'
+        _mail_body2 = '<html>Pigs rules\n<pre>Admin</pre>\n</html>'
+        _mail_bodyalt2 = 'Pigs rules\nAdmin\n'
 
         # Post comment with body and subject, comment preference
         msg_id = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body1, subject=_subject, msg_type='comment')
-        # Fetch: created mail_message, mail_mail, send_email
+        # Fetch: created mail_message, mail_mail, sent_email
         message = self.mail_message.browse(cr, uid, msg_id)
         mail_ids = self.mail_mail.search(cr, uid, [], limit=1)
         mail = self.mail_mail.browse(cr, uid, mail_ids[0])
-        send_email = self._build_email_kwargs
+        sent_email = self._build_email_kwargs
         
         # Test: mail_message: subject is _subject, body is _body1 (no formatting done)
-        self.assertEqual(message.subject, _subject,
-            'mail.message subject is %s; should be %s' % (message.subject, _subject))
-        self.assertEqual(message.body, _body1,
-            'mail.message body is %s; should be %s' % (message.body, _body1))
+        self.assertEqual(message.subject, _subject, 'mail.message subject incorrect')
+        self.assertEqual(message.body, _body1, 'mail.message body incorrect')
         # Test: mail_mail: subject is _subject, body_html is _mail_body1 (signature appended)
-        self.assertEqual(mail.subject, _subject,
-            'mail.mail subject is %s; should be %s' % (mail.subject, _subject))
-        self.assertEqual(mail.body_html, _mail_body1,
-            'mail.mail body_html is %s; should be %s' % (mail.body_html, _mail_body1))
-        self.assertTrue(mail.mail_message_id and mail.mail_message_id.id == msg_id,
-            'mail_mail.mail_message_id is not the id of its related mail_message; got %s, should be %s' % (mail.mail_message_id.id, msg_id))
-        # Test: send_email: email send by server: correct subject and body
-        self.assertEqual(send_email['subject'], _subject,
-            'send_email subject is %s; should be %s' % (send_email['subject'], _subject))
-        self.assertEqual(send_email['body'], _mail_body1,
-            'send_email body is %s; should be %s' % (send_email['body'], _mail_body1))
-        self.assertEqual(send_email['body_alternative'], _mail_bodyalt1,
-            'send_email body_alternative is %s; should be %s' % (send_email['body_alternative'], _mail_bodyalt1))
+        self.assertEqual(mail.subject, _subject, 'mail.mail subject incorrect')
+        self.assertEqual(mail.body_html, _mail_body1, 'mail.mail body_html incorrect')
+        self.assertEqual(mail.mail_message_id.id, msg_id, 'mail_mail.mail_message_id is not the id of its related mail_message)')
+        # Test: sent_email: email send by server: correct subject and body
+        self.assertEqual(sent_email['subject'], _subject, 'sent_email subject incorrect')
+        self.assertEqual(sent_email['body'], _mail_body1, 'sent_email body incorrect')
+        self.assertEqual(sent_email['body_alternative'], _mail_bodyalt1, 'sent_email body_alternative is incorrect')
         # Test: mail_message: partner_ids = group followers
-        message_pids = [partner.id for partner in message.partner_ids]
-        test_pids = [p_a_id, p_b_id, p_c_id]
-        self.assertTrue(all(pid in message_pids for pid in test_pids) and len(message_pids) == len(test_pids),
-            'mail.message partners are %s; should be %s' % (message_pids, test_pids))
+        message_pids = set([partner.id for partner in message.partner_ids])
+        test_pids = set([p_a_id, p_b_id, p_c_id])
+        self.assertEqual(test_pids, message_pids, 'mail.message partners incorrect')
         # Test: notification linked to this message = group followers = partner_ids
         notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
-        notif_pids = [notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)]
-        self.assertTrue(all(pid in notif_pids for pid in test_pids) and len(notif_pids) == len(test_pids),
-            'mail.message notification partners are %s; should be %s' % (notif_pids, test_pids))
-        # Test: send_email: email_to should contain b@b, not c@c (pref email), not a@a (writer)
-        test_emails = ['b@b']
-        self.assertTrue(all(email in send_email['email_to'] for email in test_emails) and len(send_email['email_to']) == len(test_emails),
-            'send_email email_to is %s; should be %s' % (send_email['email_to'], test_emails))
+        notif_pids = set([notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)])
+        self.assertEqual(notif_pids, test_pids, 'mail.message notification partners incorrect')
+        # Test: sent_email: email_to should contain b@b, not c@c (pref email), not a@a (writer)
+        self.assertEqual(sent_email['email_to'], ['b@b'], 'sent_email email_to is incorrect')
 
         # New post: test automatic subject, signature in html, add a partner, email preference, parent_id previous message
         msg_id2 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body2, msg_type='email', partner_ids=[(6, 0, [p_d_id])], parent_id=msg_id)
-        # Fetch: created mail_message, mail_mail, send_email
+        # Fetch: created mail_message, mail_mail, sent_email
         message = self.mail_message.browse(cr, uid, msg_id2)
         mail_ids = self.mail_mail.search(cr, uid, [], limit=1)
         mail = self.mail_mail.browse(cr, uid, mail_ids[0])
-        send_email = self._build_email_kwargs
+        sent_email = self._build_email_kwargs
 
         # Test: mail_message: subject is False, body is _body1 (no formatting done), parent_id is msg_id
-        self.assertEqual(message.subject, False,
-            'mail.message subject is %s; should be %s' % (message.subject, False))
-        self.assertEqual(message.body, _body2,
-            'mail.message body is %s; should be %s' % (message.body, _body2))
-        self.assertEqual(message.parent_id.id, msg_id,
-            'mail.message parent_id is %s; should be %s' % (message.parent_id.id, msg_id))
+        self.assertEqual(message.subject, False, 'mail.message subject incorrect')
+        self.assertEqual(message.body, _body2, 'mail.message body incorrect')
+        self.assertEqual(message.parent_id.id, msg_id, 'mail.message parent_id incorrect')
         # Test: mail_mail: subject is False, body_html is _mail_body1 (signature appended)
-        self.assertEqual(mail.subject, False,
-            'mail.mail subject is %s; should be %s' % (mail.subject, False))
-        self.assertEqual(mail.body_html, _mail_body2,
-            'mail.mail body_html is %s; should be %s' % (mail.body_html, _mail_body2))
-        self.assertTrue(mail.mail_message_id and mail.mail_message_id.id == msg_id2,
-            'mail_mail.mail_message_id is not the id of its related mail_message; got %s, should be %s' % (mail.mail_message_id.id, msg_id2))
-        # Test: send_email: email send by server: correct subject and body
-        self.assertEqual(send_email['subject'], _mail_subject,
-            'send_email subject is %s; should be %s' % (send_email['subject'], _mail_subject))
-        self.assertEqual(send_email['body'], _mail_body2,
-            'send_email body is %s; should be %s' % (send_email['body'], _mail_body2))
-        self.assertEqual(send_email['body_alternative'], _mail_bodyalt2,
-            'send_email body_alternative is %s; should be %s' % (send_email['body_alternative'], _mail_bodyalt2))
+        self.assertEqual(mail.subject, False, 'mail.mail subject is incorrect')
+        self.assertEqual(mail.body_html, _mail_body2, 'mail.mail body_html incorrect')
+        self.assertEqual(mail.mail_message_id.id, msg_id2, 'mail_mail.mail_message_id incorrect')
+        # Test: sent_email: email send by server: correct subject and body
+        self.assertEqual(sent_email['subject'], _mail_subject, 'sent_email subject incorrect')
+        self.assertEqual(sent_email['body'], _mail_body2, 'sent_email body incorrect')
+        self.assertEqual(sent_email['body_alternative'], _mail_bodyalt2, 'sent_email body_alternative incorrect')
         # Test: mail_message: partner_ids = group followers
-        message_pids = [partner.id for partner in message.partner_ids]
-        test_pids = [p_a_id, p_b_id, p_c_id, p_d_id]
-        self.assertTrue(all(pid in message_pids for pid in test_pids) and len(message_pids) == len(test_pids),
-            'mail.message partners are %s; should be %s' % (message_pids, test_pids))
+        message_pids = set([partner.id for partner in message.partner_ids])
+        test_pids = set([p_a_id, p_b_id, p_c_id, p_d_id])
+        self.assertEqual(message_pids, test_pids, 'mail.message partners incorrect')
         # Test: notification linked to this message = group followers = partner_ids
         notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
-        notif_pids = [notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)]
-        self.assertTrue(all(pid in notif_pids for pid in test_pids) and len(notif_pids) == len(test_pids),
-            'mail.message notification partners are %s; should be %s' % (notif_pids, test_pids))
-        # Test: send_email: email_to should contain b@b, c@c, not a@a (writer)
-        test_emails = ['b@b', 'c@c']
-        self.assertTrue(all(email in send_email['email_to'] for email in test_emails) and len(send_email['email_to']) == len(test_emails),
-            'send_email email_to is %s; should be %s' % (send_email['email_to'], test_emails))
+        notif_pids = set([notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)])
+        self.assertEqual(notif_pids, test_pids, 'mail.message notification partners incorrect')
+        # Test: sent_email: email_to should contain b@b, c@c, not a@a (writer)
+        self.assertEqual(set(sent_email['email_to']), set(['b@b', 'c@c']), 'sent_email email_to incorrect')
 
     def test_21_message_post_attachments(self):
         """ Tests designed for attachments. """

From 302cabfccb151480895cf9bd8759701667f3a999 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 30 Aug 2012 14:52:32 +0200
Subject: [PATCH 636/999] [IMP] Make CSV options (quoting and separator)
 customizable

Also autogen input ids so labels work correctly without collision risks, and make toggling links more flexible

bzr revid: xmo@openerp.com-20120830125232-d7g7s5oid4qivaq2
---
 addons/base_import/static/src/css/import.css |  8 ++++++
 addons/base_import/static/src/js/import.js   | 26 ++++++++++++--------
 addons/base_import/static/src/xml/import.xml | 22 ++++++++++++++---
 3 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css
index 4bb1fdeaea0..63b53a9e5c1 100644
--- a/addons/base_import/static/src/css/import.css
+++ b/addons/base_import/static/src/css/import.css
@@ -1,4 +1,5 @@
 .oe_import dd,
+.oe_import .oe_import_toggled,
 .oe_import .oe_import_grid,
 .oe_import .oe_import_error_report,
 .oe_import .oe_import_with_file,
@@ -25,3 +26,10 @@
 .oe_import .oe_import_noheaders {
     color: #888;
 }
+
+.oe_import a.oe_import_toggle {
+    display: block;
+}
+.oe_import a.oe_import_toggle:before {
+    content: '> '
+}
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 81b7397ba00..99397304d16 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -38,22 +38,26 @@ openerp.base_import = function (instance) {
     instance.web.DataImport = instance.web.Dialog.extend({
         template: 'ImportView',
         dialog_title: _lt("Import Data"),
+        defaults: {
+            quoting: '"',
+            separator: ',',
+        },
         events: {
             'change input.oe_import_file': 'file_update',
-            'click input.oe_import_has_header': function (e) {
-                this.$el.toggleClass(
-                    'oe_import_noheaders', !e.target.checked);
-                this.settings_updated();
-            },
+            'change input:not(.oe_import_file)': 'settings_updated',
             'click a.oe_import_csv': function (e) {
                 e.preventDefault();
             },
             'click a.oe_import_export': function (e) {
                 e.preventDefault();
             },
-            'click dt a': function (e) {
+            'click a.oe_import_toggle': function (e) {
                 e.preventDefault();
-                $(e.target).parent().next().toggle();
+                var $el = $(e.target);
+                ($el.next().length
+                        ? $el.next()
+                        : $el.parent().next())
+                    .toggle();
             }
         },
         init: function (parent, dataset) {
@@ -82,9 +86,8 @@ openerp.base_import = function (instance) {
 
         import_options: function () {
             return {
-                // TODO: customizable gangnam style
-                quote: '"',
-                separator: ',',
+                quote: this.$('input.oe_import_quoting').val(),
+                separator: this.$('input.oe_import_separator').val(),
                 headers: this.$('input.oe_import_has_header').prop('checked'),
             };
         },
@@ -106,6 +109,9 @@ openerp.base_import = function (instance) {
                 .then(this.proxy('preview'));
         },
         preview: function (result) {
+            this.$el.toggleClass(
+                'oe_import_noheaders',
+                !this.$('input.oe_import_has_header').prop('checked'));
             if (result.error) {
                 this.$el.addClass('oe_import_error');
                 this.$('.oe_import_error_report').html(
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index bb4f1d742d5..a85f8e960c1 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -1,5 +1,6 @@
 <templates>
     <t t-name="ImportView">
+        <t t-set="_id" t-value="_.uniqueId('export')"/>
         <form action="" method="post" enctype="multipart/form-data" class="oe_import">
             <input type="hidden" name="session_id"
                    t-att-value="widget.session.session_id"/>
@@ -9,8 +10,9 @@
             file to import. If you need a sample importable file, you
             can use <a href="#" class="oe_import_export">the export
             tool</a> to generate one.</p>
-            <label for="csvfile" autofocus="autofocus">CSV File:</label>
-            <input type="file" id="csvfile" name="file" class="oe_import_file"/>
+            <label t-attf-for="file_#{_id}" autofocus="autofocus">CSV File:</label>
+            <input type="file" id-attf-id="file_#{_id}"
+                   name="file" class="oe_import_file"/>
 
             <div class="oe_import_with_file">
                 <h2>Map your data to OpenERP</h2>
@@ -25,11 +27,23 @@
 
                 <div class="oe_import_error_report"></div>
                 <table class="oe_import_grid" width="100%"/>
-                <!-- TODO: other CSV options -->
+                <a href="#" class="oe_import_toggle">
+                    File Format Options…</a>
+                <div class="oe_import_toggled">
+                    <!-- no @name, avoid submission when file_update called -->
+                    <label t-attf-for="sep_#{_id}">Separator:</label>
+                    <input t-attf-id="sep_#{_id}" class="oe_import_separator"
+                           t-att-value="widget.defaults.separator"/>
+                    <br/>
+                    <label t-attf-for="quoting_#{_id}">Quoting:</label>
+                    <input t-attf-id="quoting_#{_id}" class="oe_import_quoting"
+                           t-att-value="widget.defaults.quoting"/>
+                </div>
 
                 <h2>Frequently Asked Questions</h2>
                 <dl>
-                    <dt><a href="#">Need to import data from an other application?</a></dt>
+                    <dt><a href="#" class="oe_import_toggle">
+                        Need to import data from an other application?</a></dt>
                     <dd>
                         <p>In order to re-create relationships between
                         different records, you should use the unique

From 16773839a48cf3dd9997a1343f789b39e0f37d2f Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Thu, 30 Aug 2012 15:05:24 +0200
Subject: [PATCH 637/999] Styling of group header in listview group by

bzr revid: mit@openerp.com-20120830130524-3szsbr80dltbenzm
---
 addons/web/static/src/css/base.css    | 14 +++++++++++---
 addons/web/static/src/css/base.sass   |  3 +++
 addons/web/static/src/js/view_list.js |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 06a37a54727..c3552811fd4 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -69,7 +69,6 @@
     display: none !important;
   }
 }
-
 .openerp.openerp_webclient_container {
   height: 100%;
   position: relative;
@@ -85,7 +84,7 @@
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */ */
+   */
 }
 .openerp :-moz-placeholder {
   color: #afafb6 !important;
@@ -2523,6 +2522,15 @@
   margin: 0 !important;
   padding: 0;
 }
+.openerp .oe_list .oe_list_content .oe_group_header {
+  background-color: #fcfcfc;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
+  background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -moz-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
+}
 .openerp .oe_list_content {
   width: 100%;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c238ef6ee07..0ac0d99def8 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1970,6 +1970,8 @@ $sheet-max-width: 860px
                 position: absolute
                 margin: 0 !important // dammit
                 padding: 0
+        .oe_list_content .oe_group_header
+            @include vertical-gradient(#fcfcfc, #dedede)
 
     .oe_list_content
         width: 100%
@@ -2028,6 +2030,7 @@ $sheet-max-width: 860px
             > tr:nth-child(odd)
                 background-color: #f0f0fa
                 @include vertical-gradient(#f0f0fa, #eeeef6)
+
         > tfoot
             border-top: 2px solid #cacaca
             border-bottom: 1px solid #cacaca
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index a2dccf2ec73..42a808c5e15 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1259,7 +1259,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
             self.bind_child_events(child);
             child.datagroup = group;
 
-            var $row = child.$row = $('<tr>');
+            var $row = child.$row = $('<tr class="oe_group_header">');
             if (group.openable && group.length) {
                 $row.click(function (e) {
                     if (!$row.data('open')) {

From c1dd4523fa385b1ede26484944837de8fd248514 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 30 Aug 2012 15:56:47 +0200
Subject: [PATCH 638/999] [WIP] company: better handling of the rml_footer
 field

bzr revid: abo@openerp.com-20120830135647-643sc9v3g0s8w821
---
 openerp/addons/base/res/res_company.py | 58 ++++++++++++++------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index edcc7335727..3f586abdbf9 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -88,7 +88,6 @@ class res_company(osv.osv):
                         result[company.id][field] = address[field] or False
         return result
 
-
     def _set_address_data(self, cr, uid, company_id, name, value, arg, context=None):
         """ Write the 'address' functional fields. """
         company = self.browse(cr, uid, company_id, context=context)
@@ -102,6 +101,35 @@ class res_company(osv.osv):
                 part_obj.create(cr, uid, {name: value or False, 'parent_id': company.partner_id.id}, context=context)
         return True
 
+    def _format_company_footer(self, cr, uid, ids, company, context=None):
+        """ Format the company's RML footer the right way """
+        val = []
+
+        if company.phone: val.append(_('Phone: ')+company.phone)
+        if company.fax: val.append(_('Fax: ')+company.fax)
+        if company.email: val.append(_('Email: ')+company.email)
+        if company.website: val.append(_('Website: ')+company.website)
+        if company.vat: val.append(_('TIN: ')+company.vat)
+        if company.company_registry: val.append(_('Reg: ')+company.company_registry)
+
+        bank_accounts = self.browse(cr, uid, company.id, context=context).bank_ids
+        bank_account_numbers = [bank_account.acc_number for bank_account in bank_accounts if bank_account.footer]
+        # append the account(s) in the footer and manage plural form of "account" if necessary
+        if bank_account_numbers:
+            val.append(_('Bank Account'+('s' if len(bank_account_numbers) > 1 else '')+': ')+', '.join(bank_account_numbers))
+
+        return ' | '.join(val)
+
+    def _get_rml_footer(self, cr, uid, ids, field_names, arg, context=None):
+        result = {}
+        for company in self.browse(cr, uid, ids, context=context):
+            if not company.customize_footer:
+                result[company.id] = self._format_company_footer(cr, uid, ids, company, context)
+
+        return result
+
+    def _set_rml_footer(self, cr, uid, ids, footer=False, context=None):
+        return 'todo'
 
     _columns = {
         'name': fields.related('partner_id', 'name', string='Company Name', size=128, required=True, store=True, type='char'),
@@ -109,7 +137,8 @@ class res_company(osv.osv):
         'parent_id': fields.many2one('res.company', 'Parent Company', select=True),
         'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
-        'rml_footer': fields.text('General Information Footer'),
+        #'rml_footer': fields.text('General Information Footer'),
+        'rml_footer': fields.function(_get_rml_footer, type='text', string='General Information Footer'),
         'rml_header': fields.text('RML Header and Footer', required=True),
         'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
         'rml_header2': fields.text('RML Internal Header', required=True),
@@ -138,31 +167,8 @@ class res_company(osv.osv):
         ('name_uniq', 'unique (name)', 'The company name must be unique !')
     ]
 
-    def _set_rml_footer(self, cr, uid, ids, footer=False, context=None):
-        return self.write(cr, uid, ids, {'rml_footer': footer}, context=context)
-
     def on_change_footer(self, cr, uid, ids, customize_footer, phone, email, fax, website, vat, company_registry=False, bank_ids=False, context=None):
-        val = []
-        if customize_footer:
-            return {}
-
-        if phone: val.append(_('Phone: ')+phone)
-        if fax: val.append(_('Fax: ')+fax)
-        if email: val.append(_('Email: ')+email)
-        if website: val.append(_('Website: ')+website)
-        if vat: val.append(_('TIN: ')+vat)
-        if company_registry: val.append(_('Reg: ')+company_registry)
-        # if the bank accounts got edited and at least one if flagged as "show in the footer"
-        if bank_ids:
-            bank_ids = self.browse(cr, uid, ids[0], context=context).bank_ids
-            bank_account_numbers = [bank_account.acc_number for bank_account in bank_ids if bank_account.footer]
-            # append the account(s) in the footer and manage plural form of "account" if necessary
-            val.append(_('Bank Account'+('s' if len(bank_account_numbers) > 1 else '')+': ')+', '.join(bank_account_numbers))
-
-        footer = ' | '.join(val)
-        self._set_rml_footer(cr, uid, ids, footer, context=context)
-
-        return {'value': {'rml_footer': footer}}
+        return 'todo'
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False, access_rights_uid=None):

From cdb686980986b0fc200483b90dbb18fbdda6c585 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 30 Aug 2012 16:12:26 +0200
Subject: [PATCH 639/999] [IMP] add encoding csv option

and generify handling of options a bit, imprive styling, and rename 'quote' to 'quoting'

bzr revid: xmo@openerp.com-20120830141226-exli9s1hh4vij6sd
---
 addons/base_import/models.py                 |  6 +++---
 addons/base_import/static/src/css/import.css | 10 ++++++++++
 addons/base_import/static/src/js/import.js   | 21 ++++++++++++--------
 addons/base_import/static/src/xml/import.xml | 18 ++++++++---------
 addons/base_import/tests/test_cases.py       | 18 ++++++++---------
 5 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/addons/base_import/models.py b/addons/base_import/models.py
index 0f1d8c5705e..51fac2af91c 100644
--- a/addons/base_import/models.py
+++ b/addons/base_import/models.py
@@ -124,10 +124,10 @@ class ir_import(orm.TransientModel):
         """
         csv_iterator = csv.reader(
             StringIO(record.file),
-            quotechar=options['quote'],
+            quotechar=options['quoting'],
             delimiter=options['separator'])
         csv_nonempty = itertools.ifilter(None, csv_iterator)
-        # TODO: guess encoding?
+        # TODO: guess encoding with chardet? Or https://github.com/aadsm/jschardet
         encoding = options.get('encoding', 'utf-8')
         return itertools.imap(
             lambda row: [item.decode(encoding) for item in row],
@@ -206,7 +206,7 @@ class ir_import(orm.TransientModel):
         :param id: identifier of the import
         :param int count: number of preview lines to generate
         :param options: format-specific options.
-                        CSV: {encoding, quote, separator, headers}
+                        CSV: {encoding, quoting, separator, headers}
         :type options: {str, str, str, bool}
         :returns: {fields, matches, headers, preview} | {error, preview}
         :rtype: {dict(str: dict(...)), dict(int, list(str)), list(str), list(list(str))} | {str, str}
diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css
index 63b53a9e5c1..207f2aed9c6 100644
--- a/addons/base_import/static/src/css/import.css
+++ b/addons/base_import/static/src/css/import.css
@@ -33,3 +33,13 @@
 .oe_import a.oe_import_toggle:before {
     content: '> '
 }
+
+.oe_import .oe_import_options p {
+    margin: 0;
+    padding: 0;
+}
+.oe_import .oe_import_options label {
+    display: inline-block;
+    width: 10em;
+    text-align: right;
+}
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 99397304d16..2853f36019a 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -38,10 +38,11 @@ openerp.base_import = function (instance) {
     instance.web.DataImport = instance.web.Dialog.extend({
         template: 'ImportView',
         dialog_title: _lt("Import Data"),
-        defaults: {
-            quoting: '"',
-            separator: ',',
-        },
+        opts: [
+            {name: 'encoding', label: _lt("Encoding:"), value: 'utf-8'},
+            {name: 'separator', label: _lt("Separator:"), value: ','},
+            {name: 'quoting', label: _lt("Quoting:"), value: '"'}
+        ],
         events: {
             'change input.oe_import_file': 'file_update',
             'change input:not(.oe_import_file)': 'settings_updated',
@@ -85,11 +86,15 @@ openerp.base_import = function (instance) {
         },
 
         import_options: function () {
-            return {
-                quote: this.$('input.oe_import_quoting').val(),
-                separator: this.$('input.oe_import_separator').val(),
-                headers: this.$('input.oe_import_has_header').prop('checked'),
+            var self = this;
+            var options = {
+                headers: this.$('input.oe_import_has_header').prop('checked')
             };
+            _(this.opts).each(function (opt) {
+                options[opt.name] =
+                    self.$('input.oe_import_' + opt.name).val();
+            });
+            return options;
         },
 
         //- File & settings change section
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index a85f8e960c1..a2844f8d7b9 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -29,15 +29,15 @@
                 <table class="oe_import_grid" width="100%"/>
                 <a href="#" class="oe_import_toggle">
                     File Format Options…</a>
-                <div class="oe_import_toggled">
-                    <!-- no @name, avoid submission when file_update called -->
-                    <label t-attf-for="sep_#{_id}">Separator:</label>
-                    <input t-attf-id="sep_#{_id}" class="oe_import_separator"
-                           t-att-value="widget.defaults.separator"/>
-                    <br/>
-                    <label t-attf-for="quoting_#{_id}">Quoting:</label>
-                    <input t-attf-id="quoting_#{_id}" class="oe_import_quoting"
-                           t-att-value="widget.defaults.quoting"/>
+                <div class="oe_import_toggled oe_import_options">
+                    <p t-foreach="widget.opts" t-as="option">
+                        <!-- no @name, avoid submission when file_update called -->
+                        <label t-attf-for="#{option.name}_#{_id}">
+                            <t t-esc="option.label"/></label>
+                        <input t-attf-id="#{option.name}_#{_id}"
+                               t-attf-class="oe_import_#{option.name}"
+                               t-att-value="option.value"/>
+                    </p>
                 </div>
 
                 <h2>Frequently Asked Questions</h2>
diff --git a/addons/base_import/tests/test_cases.py b/addons/base_import/tests/test_cases.py
index 420140cd2ac..5479ae94428 100644
--- a/addons/base_import/tests/test_cases.py
+++ b/addons/base_import/tests/test_cases.py
@@ -179,7 +179,7 @@ class test_preview(TransactionCase):
     def test_encoding(self):
         Import, id = self.make_import()
         result = Import.parse_preview(self.cr, self.uid, id, {
-                'quote': '"',
+                'quoting': '"',
                 'separator': ',',
         })
         self.assertTrue('error' in result)
@@ -188,7 +188,7 @@ class test_preview(TransactionCase):
         Import, id = self.make_import()
 
         result = Import.parse_preview(self.cr, self.uid, id, {
-                'quote': 'foo',
+                'quoting': 'foo',
                 'separator': ',',
                 'encoding': 'euc_kr',
         })
@@ -198,7 +198,7 @@ class test_preview(TransactionCase):
         Import, id = self.make_import()
 
         result = Import.parse_preview(self.cr, self.uid, id, {
-                'quote': '"',
+                'quoting': '"',
                 'separator': 'bob',
                 'encoding': 'euc_kr',
         })
@@ -215,7 +215,7 @@ class test_preview(TransactionCase):
         })
 
         result = Import.parse_preview(self.cr, self.uid, id, {
-            'quote': '"',
+            'quoting': '"',
             'separator': ',',
             'headers': True,
         })
@@ -253,7 +253,7 @@ class test_convert_import_data(TransactionCase):
         record = Import.browse(self.cr, self.uid, id)
         data, fields = Import._convert_import_data(
             record, ['name', 'somevalue', 'othervalue'],
-            {'quote': '"', 'separator': ',', 'headers': True,})
+            {'quoting': '"', 'separator': ',', 'headers': True,})
 
         self.assertItemsEqual(fields, ['name', 'somevalue', 'othervalue'])
         self.assertItemsEqual(data, [
@@ -277,7 +277,7 @@ class test_convert_import_data(TransactionCase):
         record = Import.browse(self.cr, self.uid, id)
         data, fields = Import._convert_import_data(
             record, ['name', False, 'othervalue'],
-            {'quote': '"', 'separator': ',', 'headers': True,})
+            {'quoting': '"', 'separator': ',', 'headers': True,})
 
         self.assertItemsEqual(fields, ['name', 'othervalue'])
         self.assertItemsEqual(data, [
@@ -301,7 +301,7 @@ class test_convert_import_data(TransactionCase):
         record = Import.browse(self.cr, self.uid, id)
         data, fields = Import._convert_import_data(
             record, ['name', False, 'othervalue'],
-            {'quote': '"', 'separator': ',', 'headers': True,})
+            {'quoting': '"', 'separator': ',', 'headers': True,})
 
         self.assertItemsEqual(fields, ['name', 'othervalue'])
         self.assertItemsEqual(data, [
@@ -323,7 +323,7 @@ class test_convert_import_data(TransactionCase):
             ValueError,
             Import._convert_import_data,
             record, [],
-            {'quote': '"', 'separator': ',', 'headers': True,})
+            {'quoting': '"', 'separator': ',', 'headers': True,})
 
     def test_falsefields(self):
         Import = self.registry('base_import.import')
@@ -339,4 +339,4 @@ class test_convert_import_data(TransactionCase):
             ValueError,
             Import._convert_import_data,
             record, [False, False, False],
-            {'quote': '"', 'separator': ',', 'headers': True,})
+            {'quoting': '"', 'separator': ',', 'headers': True,})

From 1dce0b1dc4a8c206b4c91de3cb85900fa1634645 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 30 Aug 2012 16:18:52 +0200
Subject: [PATCH 640/999] [FIX] all mail dependencies: replace message_post
 call by normal record + review misc wording

bzr revid: odo@openerp.com-20120830141852-ku8nql1sfkko8669
---
 .../account_accountant_data.xml               | 15 +++++-----
 .../account_voucher/account_voucher_data.xml  | 17 +++++------
 addons/crm/crm_data.xml                       | 17 ++++++-----
 addons/event/event_data.xml                   | 14 ++++++----
 addons/hr/hr_data.xml                         | 16 ++++++-----
 addons/hr_evaluation/hr_evaluation_data.xml   | 14 ++++++----
 addons/hr_expense/__openerp__.py              |  6 ++--
 addons/hr_expense/hr_expense_data.xml         | 16 +++++------
 addons/hr_holidays/__openerp__.py             |  6 ++--
 addons/hr_holidays/hr_holidays_data.xml       | 15 ++++++----
 addons/hr_recruitment/hr_recruitment_data.xml | 15 +++++-----
 addons/hr_timesheet_sheet/__openerp__.py      |  4 +--
 .../hr_timesheet_sheet_data.xml               | 28 +++++++++----------
 addons/mail/data/mail_demo.xml                | 23 ++++++++-------
 addons/mail/data/mail_group_data.xml          | 16 +++++------
 addons/mrp/mrp_data.xml                       | 16 ++++++-----
 addons/point_of_sale/point_of_sale_data.xml   | 15 +++++-----
 addons/project/project_data.xml               | 16 ++++++-----
 addons/project_gtd/project_gtd_data.xml       | 15 ++++++----
 addons/project_issue/__openerp__.py           |  4 +--
 addons/project_issue/project_issue_data.xml   | 16 ++++++-----
 addons/purchase/purchase_data.xml             | 15 +++++-----
 addons/sale/sale_data.xml                     | 15 +++++-----
 addons/stock/stock_data.xml                   | 14 ++++++----
 24 files changed, 188 insertions(+), 160 deletions(-)

diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index 7a666c8d344..5b563017c62 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -21,13 +21,14 @@
         </record>
 
         <!-- Notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>With OpenERP's accounting, you can get an instant access to all your financial data, setup your analytic accounting, forecast your taxes, control your budgets, easily create and send invoices, record bank statements, etc.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Accounting and Finance application installed!</field>
+            <field name="body">With OpenERP's accounting, you get instant access to your financial data, and can setup analytic accounting, forecast taxes, control budgets, easily create and send invoices, record bank statements, etc.
 
-The accounting features are fully integrated with others OpenERP applications to automate all your processes: creation of customer invoices, control of supplier invoices, point-of-sale integration, automated follow-ups, etc.</value>
-            <value>Module Accounting and Finance has been installed.</value>
-        </function>
+The accounting features are fully integrated with other OpenERP applications to automate all your processes: creation of customer invoices, control of supplier invoices, point-of-sale integration, automated follow-ups, etc.</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/account_voucher/account_voucher_data.xml b/addons/account_voucher/account_voucher_data.xml
index b497f4ee20e..656d2c2cd91 100644
--- a/addons/account_voucher/account_voucher_data.xml
+++ b/addons/account_voucher/account_voucher_data.xml
@@ -2,15 +2,16 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>OpenERP's electronic invoicing allows to ease and fasten the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">eInvoicing &amp; Payments application installed!</field>
+            <field name="body">OpenERP's electronic invoicing accelerates the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.
 
-You can track customer payments easily and automate the reminders. You get an overview of the discussion with your customers on each invoice to ensure a full traceability.
+You can track customer payments easily and automate follow-ups. You get an overview of the discussion with your customers on each invoice for easier traceability.
 
-If you want to use advanced accounting features, you should install the "Accounting and Finance" module.</value>
-            <value>Module eInvoicing &amp; Payments has been installed.</value>
-        </function>
+For advanced accounting features, you should install the "Accounting and Finance" module.</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 52d779f4584..5bf4b5ffbf9 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -55,21 +55,20 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>From the top menu Sales, you can: trace leads and opportunities, get accurate forecast on your sales pipeline, plan meetings and phonecalls, get realtime statistics and efficiently organize the communication with your prospects.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">CRM application installed!</field>
+            <field name="body">From the top Sales menu you can track leads and opportunities, get accurate forecast on your sales pipeline, plan meetings and phonecalls, get realtime statistics and efficiently organize the communication with your prospects.
+To manage quotations and sale orders, install the "Sales Management" application.</field>
+        </record>
 
-To manage quotations and sale orders, install the module "Sales Management".</value>
-            <value>Module CRM has been installed</value>
-        </function>
-        
         <record model="mail.alias" id="default_sales_alias">
             <field name="alias_name">sales</field>
             <field name="alias_model_id" ref="model_crm_lead"/>
             <field name="alias_user_id" ref="base.user_root"/>
             <field name="alias_defaults">{'type':'lead'}</field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/event/event_data.xml b/addons/event/event_data.xml
index 83af2f35cfb..2c19fdc574f 100644
--- a/addons/event/event_data.xml
+++ b/addons/event/event_data.xml
@@ -14,11 +14,13 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>From the top menu Events, you can organize events, manage registrations, automate communication around your event and sell events through your quotations.</value>
-            <value>Module Events Organisation has been installed</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Events Organisation application installed!</field>
+            <field name="body">From the top Events menu, you can organize events, manage registrations, automate communication around your event and sell events through your quotations.</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml
index 0f5bbdf2d26..514cf1f80f6 100644
--- a/addons/hr/hr_data.xml
+++ b/addons/hr/hr_data.xml
@@ -2,14 +2,16 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Manage your human resources in OpenERP: employees and hierarchy, HR departments and jobs.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Employee Directory application installed!</field>
+            <field name="body">Manage your human resources with OpenERP: employees and their hierarchy, HR departments and job positions.
 
-More HR features are available from the following modules: Recruitment Process (manage job positions and recruitment), Timesheets Validation (record timesheets and attendance), Leaves Management (keep track of employee leaves), Expenses Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager.)</value>
-            <value>Module Employee Directory has been installed</value>
-        </function>
+More HR features are available via extra applications: Recruitment Process (manage job positions and recruitment), Timesheet Validation (record timesheets and attendance),
+Leave Management (keep track of employee leaves), Expense Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager).</field>
+        </record>
 
         <record id="employee" model="hr.employee">
             <field name="name">Administrator</field>
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index 6f122e44e9b..2cf656a72bb 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -14,12 +14,14 @@
             <field name="sequence">100</field>
         </record>
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Create evaluations for your subordinates or manager. You can define a plan with several surveys, where you organize evaluation surveys related to the hierarchy levels. Evaluations filled by employees can exported as pdf files.</value>
-            <value>Module Employee Appraisals has been installed</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Employee Appraisals application installed!</field>
+            <field name="body">Manage employee reviews: you can define an appraisal campaign with several steps, with specific evaluation surveys according to hierarchy levels.
+Evaluations filled by employees may be exported as pdf files.</field>
+        </record>
 
         <record id="survey_2" model="survey">
             <field name="title">Self Appraisal</field>
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 9c148ad9019..63fca88b148 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -21,14 +21,14 @@
 
 
 {
-    'name': 'Expenses Management',
+    'name': 'Expense Management',
     'version': '1.0',
     'category': 'Human Resources',
     'sequence': 30,
     'summary': 'Expenses Validation, Invoicing',
     'description': """
-This module aims to manage employee's expenses.
-===============================================
+This module aims to manage employee expenses.
+=============================================
 
 The whole workflow is implemented:
 ----------------------------------
diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml
index d5123df7ee8..2a9f3ae0a56 100644
--- a/addons/hr_expense/hr_expense_data.xml
+++ b/addons/hr_expense/hr_expense_data.xml
@@ -2,20 +2,20 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Manage your employee's expenses, with validations by employee manager and accountant, creation and payment of invoices.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Expense Management application installed!</field>
+            <field name="body">Manage your employees' expenses, after due validation by their manager and the accountant, then generate and pay the corresponding invoices.
 
-This module also uses the analytic accounting and is compatible with the invoice on timesheet module so that you will be able to automatically re-invoice your customer's expenses if your work by project.</value>
-            <value>Module Expenses Management has been installed</value>
-        </function>
+This feature is also linked to analytic accounting and compatible with timesheet invoices, so you will be able to automatically re-invoice project-related expenses to your customers.</field>
+        </record>
 
         <!-- Resource: product.uom.categ -->
         <record id="cat_expense" model="product.category">
             <field name="parent_id" ref="product.product_category_all"/>
             <field name="name">Expenses</field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index d5a2728c763..070ae0344b0 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Leaves Management',
+    'name': 'Leave Management',
     'version': '1.5',
     'author': 'OpenERP SA',
     'category': 'Human Resources',
@@ -29,8 +29,8 @@
     'summary': 'Holidays, Allocation and Leave Requests',
     'website': 'http://www.openerp.com',
     'description': """
-This module allows you to manage leaves and leave's requests.
-=============================================================
+This module allows you to manage leaves and leave requests.
+===========================================================
 
 Implements a dashboard for human resource management that includes:
 -------------------------------------------------------------------
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index 5c8e4922259..1e534093eb3 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -13,12 +13,15 @@
             <field name="sequence">100</field>
         </record>
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Manage employee leaves from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR people.  Once validated, they are visible in the employee's calendar.  HR people can define leave types and allocate off-days for employees.</value>
-            <value>Module Leaves Management has been installed</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Leave Management application installed!</field>
+            <field name="body">Manage employee leaves from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR officers.
+Once validated, they are visible in the employee's calendar. HR officers can define leave types and allocate leaves to employees and employee categories.</field>
+        </record>
+
 
         <!-- Casual leave -->
         <record model="hr.holidays.status" id="holiday_status_cl">
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 58a0595c857..84289da7bae 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -2,14 +2,15 @@
 <openerp>
 <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Manage job positions and the recruitment process in your company.  This module is integrated with the module Survey to help you to define interviews for different jobs.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Recruitment Process application installed!</field>
+            <field name="body">Manage job positions and your company's recruitment process.  This application is integrated with the Survey application to help you define interviews for different jobs.
 
-You can automatically create application records from an email gateway, that you can configure in the Human Resources Settings.</value>
-            <value>Module Recruitment Process has been installed</value>
-        </function>
+You can automatically receive job application though an email gateway, see the Human Resources settings.</field>
+        </record>
 
     <!-- Meeting Types (for interview meetings) -->
     <record model="crm.meeting.type" id="categ_meet_interview">
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 34fbb602c9a..b1f03e7d6e0 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -27,8 +27,8 @@
     'sequence': 16,
     'summary': 'Timesheets, Attendances, Activities',
     'description': """
-This module helps you to easily encode and validate timesheet and attendances within the same view.
-===================================================================================================
+This module helps you to easily record and validate timesheets and attendances within the same view.
+====================================================================================================
 
     * It will maintain attendances and track (sign in/sign out) events.
     * Track the timesheet lines.
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index 046fd7fe3d0..87edf949972 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" ?>
 <openerp>
     <data noupdate="1">
-        <!-- Notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>From the top menu "Human Resources", encode and validate timesheets and attendances.</value>
-            <value>Module Timesheets Validation has been installed</value>
-        </function>
+        <!-- notify all employees of module installation -->
+        <record model="mail.message" id="hr_timesheet_module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Timesheet Validation application installed!</field>
+            <field name="body">From the top menu "Human Resources", enter and validate timesheets and attendances.</field>
+        </record>
 
         <record id="ir_actions_server_timsheet_sheet" model="ir.actions.server">
-            <field eval="5" name="sequence"/>
-            <field eval="&quot;&quot;&quot;code&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;ir.actions.server&quot;&quot;&quot;" name="type"/>
+            <field name="sequence" eval="5"/>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_hr_timesheet_current_open"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="&quot;&quot;&quot;action = pool.get('hr.timesheet.current.open').open_timesheet(cr, uid, None, context)&quot;&quot;&quot;" name="code"/>
-            <field eval="&quot;&quot;&quot;True&quot;&quot;&quot;" name="condition"/>
-            <field eval="&quot;&quot;&quot;My Timesheet&quot;&quot;&quot;" name="name"/>
+            <field name="code">action = pool.get('hr.timesheet.current.open').open_timesheet(cr, uid, None, context)</field>
+            <field name="condition">True</field>
+            <field name="name">My Timesheet</field>
         </record>
 
         <menuitem name="My Current Timesheet" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_attendance.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" sequence="1"/>
diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index ed30d38b8d3..1350fd33547 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -4,9 +4,9 @@
 
         <record id="message_blogpost0" model="mail.message">
             <field name="model">mail.group</field>
-            <field name="res_id" ref="group_all_employees"/>
-            <field name="body"><![CDATA[Your monthly meal vouchers arrived. You can get them at Christine's office.
-This month you also have 250 EUR of eco-checks for all employees that worked with us since 1 year minimum.]]></field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="body">Your monthly meal vouchers arrived. You can get them at Christine's office.
+This month you also get 250 EUR of eco-vouchers if you have been in the company for more than a year.</field>
             <field name="type">comment</field>
         </record>
 
@@ -21,7 +21,7 @@ This month you also have 250 EUR of eco-checks for all employees that worked wit
         <record id="message_blogpost0_comment1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body"><![CDATA[Yes, that's a good news.]]></field>
+            <field name="body">Thanks, but where is Christine's office, if I may ask? (I'm new here)</field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
         </record>
@@ -29,16 +29,19 @@ This month you also have 250 EUR of eco-checks for all employees that worked wit
         <record id="message_blogpost0_comment2" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel.
-
-In quis purus neque. Integer sodales dolor eu elit fringilla blandit. Maecenas lacus nisi, facilisis sit amet viverra eu, tristique vel augue.
-Donec viverra congue dui eu blandit. In lacinia molestie nulla, ut sagittis risus feugiat eu.
-
-Check the file in attachment for more information !  (third comment)]]></field>
+            <field name="body">Great news, I need to buy a new fridge, I think I can pay it with the eco-vouchers!</field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
         </record>
 
+        <record id="message_blogpost0_comment1_2" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_employees"/>
+            <field name="body">Building B3, second floor on the right :-)</field>
+            <field name="parent_id" ref="message_blogpost0_comment1"/>
+            <field name="type">comment</field>
+        </record>
+
         <record model="ir.config_parameter" id="user_mail_alias">
             <field name="key">mail.catchall.domain</field>
             <field name="value">demo.openerp.com</field>
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index c9ac97e6836..53720926a5c 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -13,16 +13,16 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- thread_id, body='', subject=False, msg_type='notification', parent_id=False -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Your homepage is a summary of messages you received and key information about documents you follow.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Welcome to OpenERP!</field>
+            <field name="body">Your homepage is a summary of messages you received and key information about documents you follow.
 
 The top menu bar contains all applications you installed. You can use this &lt;i&gt;Settings&lt;/i&gt; menu to install more applications, activate others features or give access to new users.
 
-To setup your preferences (name, email signature, avatar), click on the top right corner.</value>
-            <value>Welcome to OpenERP!</value>
-        </function>
-
+To setup your preferences (name, email signature, avatar), click on the top right corner.</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
index d8d7d2063dc..0bbf2d3b64c 100644
--- a/addons/mrp/mrp_data.xml
+++ b/addons/mrp/mrp_data.xml
@@ -2,14 +2,16 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Manage your manufacturing process in OpenERP by defining bill of materials (BoM), routings and work centers.  This module supports complete integration and planification of stockable goods, consumable, and services.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">MRP application installed!</field>
+            <field name="body">Manage your manufacturing process with OpenERP by defining your bills of materials (BoM), routings and work centers.
+This application supports complete integration and production scheduling for stockable goods, consumables, and services.
 
-From the Manufacturing Settings, you can choose to compute production schedules periodically or just-in-time.</value>
-            <value>Module MRP has been installed</value>
-        </function>
+From the Manufacturing Settings, you can choose to compute production schedules periodically or just-in-time.</field>
+        </record>
         
         <record id="sequence_mrp_prod_type" model="ir.sequence.type">
             <field name="name">Production order</field>
diff --git a/addons/point_of_sale/point_of_sale_data.xml b/addons/point_of_sale/point_of_sale_data.xml
index 33ea01a6f5e..35a2516da02 100644
--- a/addons/point_of_sale/point_of_sale_data.xml
+++ b/addons/point_of_sale/point_of_sale_data.xml
@@ -24,14 +24,15 @@
 
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Encode sale orders, register payments, compute money to return, create invoices, and manage refunds of former sales through a specific, web-based, touch-screen user interface.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Point of Sale application installed!</field>
+            <field name="body">Record sale orders, register payments, compute change to return, create invoices, and manage refunds through a specific web touch-screen interface.
 
-If you install the PoS proxy, you will be able to interface OpenERP with retail materials; barcode scanners, printers, cash registers, weighing machine, credit card payments.</value>
-            <value>Module Point of Sale has been installed</value>
-        </function>
+If you install the PoS proxy you will be able to interface OpenERP with retail hardware: barcode scanners, printers, cash registers, weighing machines, credit card payment terminals.</field>
+        </record>
 
         <record id="unreferenced_product" model="product.product">
           <field name="list_price">1.00</field>
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index d661ad2b68c..5cc4c99df1b 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -85,13 +85,15 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Manage multi-level projects and tasks.  You can delegate tasks, track the work done on tasks, and review your planning based on the entered data.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Project Management application installed!</field>
+            <field name="body">Manage multi-level projects and tasks.  You can delegate tasks, track task work, and review your planning.
 
-You can manage todo lists on tasks by installing the module "Todo Lists", which supports the methodology Getting Things Done (GTD).  You can also manage issues/bugs in projects by installing the module "Issues Tracker."</value>
-            <value>Module Project Management has been installed</value>
-        </function>
+You can manage todo lists on tasks by installing the "Todo Lists" application, supporting the Getting Things Done (GTD) methodology.
+You can also manage issues/bugs in projects by installing the "Issue Tracker" application.</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/project_gtd/project_gtd_data.xml b/addons/project_gtd/project_gtd_data.xml
index d46bc0fda14..61b2468329c 100644
--- a/addons/project_gtd/project_gtd_data.xml
+++ b/addons/project_gtd/project_gtd_data.xml
@@ -26,11 +26,14 @@
 
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Add todo items on project tasks, to help you organize your work.  This module supports the methodology Getting Things Done (GTD), created by David Allen, and described in the book of the same name.</value>
-            <value>Module Todo Lists has been installed</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Todo Lists application installed!</field>
+            <field name="body">Add todo items on project tasks, to help you organize your work.
+This application supports the Getting Things Done (GTD) methodology, based on David Allen's book.</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 07e453af885..3d005f3fad6 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -21,11 +21,11 @@
 ##############################################################################
 
 {
-    'name': 'Issues Tracker',
+    'name': 'Issue Tracker',
     'version': '1.0',
     'category': 'Project Management',
     'sequence': 22,
-    'summary': 'Support, Bug Traker, Helpdesk',
+    'summary': 'Support, Bug Tracker, Helpdesk',
     'description': """
 This module provides Issues/Bugs Management in Project.
 =======================================================
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index 5df09b683ca..ddb0d575e63 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -32,13 +32,15 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Manage the issues you might face in a project, like bugs in a system, client complaints or material breakdowns.  You can record issues, assign them to some responsible person, and keep track of their status as they evolve over time.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Issue Tracker application installed!</field>
+            <field name="body">Manage the issues you might face in a project, such as bugs in a system, client complaints or material breakdowns.
+You can record issues, assign them to a responsible person, and keep track of their status as they evolve over time.
+Access all issues from the top Project menu, and access the issues of a specific project via the projects gallery view.</field>
+        </record>
 
-You can access issues from the top menu Project, and access the issues of a specific project from the projects gallery view.</value>
-            <value>Module Issues Tracker has been installed.</value>
-        </function>
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index 802f415d01f..693d18eb1ba 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -3,14 +3,15 @@
     <data noupdate="1">
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>From the top menu Purchases, create purchase orders to buy products from your suppliers, encode supplier invoices and manage your payments.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Purchase Management application installed!</field>
+            <field name="body">From the top menu Purchases, create purchase orders to buy products from your suppliers, enter supplier invoices and manage payments.
 
-You can also manage purchase requisitions, see the Purchase Settings.</value>
-            <value>Module Purchase Management has been installed.</value>
-        </function>
+You can also manage purchase requisitions, see also the Purchase Settings.</field>
+        </record>
 
         <record id="req_link_purchase_order" model="res.request.link">
             <field name="name">Purchase Order</field>
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 95d7b6d21e2..a2ef6ddd802 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -41,13 +41,14 @@
         <function eval="('default',False,'shop_id', [('sale.order', False)], sale_shop_1, True, False, False, False, True)" id="sale_default_set" model="ir.values" name="set"/>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>This modules allows you to create and send easily quotations and process your sales orders; from the delivery to the invoicing.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Sales Management application installed!</field>
+            <field name="body">This application lets you create and send quotations and process your sales orders; from delivery to invoicing.
 
-If you need to manage your sales pipeline (leads, opportunities, phonecalls), you can install the module &lt;i&gt;CRM&lt;/i&gt; from the top menu Settings.</value>
-            <value>The Sales Management application has been installed.</value>
-        </function>
+If you need to manage your sales pipeline (leads, opportunities, phonecalls), the &lt;i&gt;CRM&lt;/i&gt; application may be useful. Use the Settings menu to install it.</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 282929ea6fb..77c82989a21 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -2,12 +2,14 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_post">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Manage your product inventoy and stock locations.  You can control your stock moves history and planning, perform stock valuation, and trace product lots upstream and downstream (based on serial numbers.)</value>
-            <value>Module Warehouse Management has been installed</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Warehouse Management application installed!</field>
+            <field name="body">Manage your product inventoy and stock locations: you can control stock moves history and planning,
+watch your stock valuation, and track production lots upstream and downstream (based on serial numbers).</field>
+        </record>
 
         <record id="stock_journal_sequence" model="ir.sequence">
             <field name="name">Stock Journal Sequence</field>

From 00fc7d1e88ddba7633ebc850f23c34a2ea858fe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 30 Aug 2012 16:35:49 +0200
Subject: [PATCH 641/999] [IMP] mail.compose.message: added basic mass_mail
 support back. Moved generation into a dedicated method, to be inherited in
 email_template. Added somes tests in mail to test mass_mailing without
 email_template.

bzr revid: tde@openerp.com-20120830143549-33sgtd30asvztg2c
---
 addons/mail/tests/test_mail.py                |  23 ++-
 addons/mail/wizard/mail_compose_message.py    | 134 ++++++++++--------
 .../mail/wizard/mail_compose_message_view.xml |  10 +-
 3 files changed, 104 insertions(+), 63 deletions(-)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 86f3997c6b7..12ae25e1815 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -97,7 +97,8 @@ class test_mail(common.TransactionCase):
                                                    'alias_model_id': self.mail_group_model_id})
         
         # create a 'pigs' group that will be used through the various tests
-        self.group_pigs_id = self.mail_group.create(self.cr, self.uid, {'name': 'pigs'})
+        self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
+            {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
 
     def test_00_message_process(self):
         cr, uid = self.cr, self.uid
@@ -375,6 +376,26 @@ class test_mail(common.TransactionCase):
         self.assertEqual(compose.parent_id.id, msg.id,
             'Wizard parent_id is %d; should be %d' % (compose.parent_id.id, msg.id))
 
+        # 3 - Create in mass_mail composition mode that should work with or without email_template installed
+        compose_id = mail_compose.create(cr, uid,
+            {'subject': _subject, 'body': '${object.description}'},
+            {'default_composition_mode': 'mass_mail', 'default_model': 'mail.group', 'default_res_id': -1,
+                'active_ids': [self.group_pigs_id]})
+        compose = mail_compose.browse(cr, uid, compose_id)
+
+        # Post the comment, get created message
+        mail_compose.send_mail(cr, uid, [compose_id], {'default_res_id': -1, 'active_ids': [self.group_pigs_id]})
+        group_pigs.refresh()
+        msg = group_pigs.message_ids[0]
+
+        # Test: last message on Pigs = last created message
+        test_msg = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [], limit=1))[0]
+        self.assertEqual(msg.id, test_msg.id, 'Pigs did not receive its mass mailing message')
+        # Test: mail.message: subject, body
+        self.assertEqual(msg.subject, _subject, 'mail.message subject is incorrect')
+        self.assertEqual(msg.body, group_pigs.description, 'mail.message body is incorrect')
+
+
     def test_30_message_read(self):
         """ Tests designed for message_read. """
         def _simplify_struct(read_dict):
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index b4d992c5d1b..ae597b509ee 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -68,7 +68,7 @@ class mail_compose_message(osv.TransientModel):
         result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
 
         # get some important values from context
-        composition_mode = context.get('mail.compose.message.mode')
+        composition_mode = context.get('default_composition_mode', context.get('mail.compose.message.mode'))
         model = context.get('default_model', context.get('active_model'))
         res_id = context.get('default_res_id', context.get('active_id'))
         active_id = context.get('active_id')
@@ -77,8 +77,10 @@ class mail_compose_message(osv.TransientModel):
         # get default values according to the composition mode
         if composition_mode in ['reply']:
             vals = self.get_message_data(cr, uid, active_id, context=context)
-        elif composition_mode in ['comment', 'mass_mail'] and model and res_id:
+        elif composition_mode in ['comment'] and model and res_id:
             vals = self.get_record_data(cr, uid, model, res_id, context=context)
+        elif composition_mode in ['mass_mail'] and model and active_ids:
+            vals = {'model': model, 'res_id': res_id, 'content_subtype': 'html'}
         else:
             vals = {'model': model, 'res_id': res_id}
         if composition_mode:
@@ -189,91 +191,107 @@ class mail_compose_message(osv.TransientModel):
         """ onchange_content_subtype (values: 'plain' or 'html'). This onchange
             on the subtype allows to have some specific behavior when switching
             between text or html mode.
-            Basically, subject is reset when going out of html mode.
             This method can be overridden for models that want to have their
-            specific behavior.
-        """
+            specific behavior. """
         return {'value': {'content_subtype': value}}
 
+    def _verify_partner_email(self, cr, uid, partner_ids, context=None):
+        """ Verify that selected partner_ids have an email_address defined.
+            Otherwise throw a warning. """
+        partner_wo_email_lst = []
+        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
+            if not partner.email:
+                partner_wo_email_lst.append(partner)
+        if not partner_wo_email_lst:
+            return {}
+        warning_msg = _('The following partners chosen as recipients for the email have no email address linked :')
+        for partner in partner_wo_email_lst:
+            warning_msg += '\n- %s' % (partner.name)
+        return {'warning': {
+                    'title': _('Partners email addresses not found'),
+                    'message': warning_msg }
+                }
+
     def onchange_partner_ids(self, cr, uid, ids, value, context=None):
         """ onchange_partner_ids (value format: [[6, False, [3, 4]]]). The
             basic purpose of this method is to check that destination partners
             effectively have email addresses. Otherwise a warning is thrown.
         """
-        partner_ids = value[0][2]
-        partner_wo_email_lst = []
-        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
-            if not partner.email:
-                partner_wo_email_lst.append(partner)
-        if not partner_wo_email_lst:
-            return {'value': {}}
-        warning_msg = _('The following partners chosen as recipients for the email have no email address linked :')
-        for partner in partner_wo_email_lst:
-            warning_msg += '\n- %s' % (partner.name)
-        warning = {
-            'title': _('Partners email addresses not found'),
-            'message': warning_msg,
-        }
-        return {'warning': warning, 'value': {}}
+        res = {'value': {}}
+        if not value or not value[0] or not value[0][0] == 6:
+            return 
+        res.update(self._verify_partner_email(cr, uid, value[0][2], context=context))
+        return res
 
     def send_mail(self, cr, uid, ids, context=None):
         """ Process the wizard content and proceed with sending the related
             email(s), rendering any template patterns on the fly if needed. """
         if context is None:
             context = {}
+        active_ids = context.get('active_ids')
 
         for wizard in self.browse(cr, uid, ids, context=context):
             mass_mail_mode = wizard.composition_mode == 'mass_mail'
-
-            attachment = {}
-            for attach in wizard.attachment_ids:
-                attachment[attach.datas_fname] = attach.datas and attach.datas or False
-
-            # default values, according to the wizard options
-            subject = wizard.subject if wizard.content_subtype == 'html' else False
-            partner_ids = [(4, partner.id) for partner in wizard.partner_ids]
-            body = wizard.body if wizard.content_subtype == 'html' else '<pre>%s</pre>' % tools.ustr(wizard.body_text)
-
             active_model_pool = self.pool.get(wizard.model if wizard.model else 'mail.thread')
-            
-            #TODO: TDE: WIP: have to check for mass mail and templates - no time anymore today
-            if context.get('mail.compose.message.mode') == 'mass_mail' and context.get('default_model', False) and context.get('default_res_id', False):
-                active_model = context.get('default_model', False)
-                active_model_pool = self.pool.get(active_model)
-                subject = self.render_template(cr, uid, subject, active_model, active_id)
-                body = self.render_template(cr, uid, wizard.body, active_model, active_id)
 
-                # TODO TDE: find partner_ids
-                # if email_to: find or create a partner
-                if values['email_to']:
-                    partner_id = self.pool.get('mail.thread').message_partner_by_email(cr, uid, values['email_to'], context=context)['partner_id']
-                    if not partner_id:
-                        partner_id = self.pool.get('res.partner').name_create(cr, uid, values['email_to'], context=context)
-                    values['partner_ids'] = [partner_id]
-
-            # determine the ids we are commenting
-            if mass_mail_mode:
-                res_ids = context.get('active_ids', [])
-            else:
-                res_ids = [wizard.res_id]
-            active_model_pool.message_post(cr, uid, res_ids, body=body, subject=subject, msg_type='comment', 
-                attachments=attachment, context=context, partner_ids=partner_ids)
+            # wizard works in batch mode: [res_id] or active_ids
+            res_ids = active_ids if mass_mail_mode and wizard.model and active_ids else [wizard.res_id]
+            for res_id in res_ids:
+                # default values, according to the wizard options
+                post_values = {
+                    'subject': wizard.subject if wizard.content_subtype == 'html' else False,
+                    'body': wizard.body if wizard.content_subtype == 'html' else '<pre>%s</pre>' % tools.ustr(wizard.body_text),
+                    'partner_ids': [(4, partner.id) for partner in wizard.partner_ids],
+                    'attachments': [(attach.datas_fname, attach.datas) for attach in wizard.attachment_ids],
+                }
+                # mass mailing: render and override default values
+                if mass_mail_mode and wizard.model:
+                    email_dict = self.render_message(cr, uid, wizard, wizard.model, res_id, context=context)
+                    post_values['subject'] = email_dict.get('subject', False)
+                    post_values['body'] = email_dict.get('body', '')
+                    if email_dict.get('partner_ids'):
+                        post_values['partner_ids'] += [(4, id) for id in email_dict.get('partner_ids')]
+                    if email_dict.get('attachments'):
+                        post_values['attachments'] += [(attach.datas_fname, attach.datas) for attach in email_dict.get('attachments')]
+                # post the message
+                active_model_pool.message_post(cr, uid, res_ids, msg_type='comment', context=context, **post_values)
 
         return {'type': 'ir.actions.act_window_close'}
 
+    def render_message(self, cr, uid, wizard, model, res_id, context=None):
+        """ Generate an email from the template for given (model, res_id) pair.
+            This method is meant to be inherited by email_template that will
+            produce a more complete dictionary, with email_to, ...
+        """
+        # TDE: TODO: to move into mail.compose.message in email template
+        # mails = tools.email_split(email_dict.get('email_to', '')) + tools.email_split(email_dict.get('email_cc', ''))
+        # for mail in mails:
+        #     partner_search_ids = self.pool.get('res.partner').search(cr, uid, [('email', 'ilike', email)], context=context)
+        #     if partner_search_ids:
+        #         partner_ids.append((4, 0, partner_search_ids[0]))
+        #     else:
+        #         partner_id = self.pool.get('res.partner').name_create(cr, uid, values['email_to'], context=context)
+        #         partner_ids.append((4, 0, partner_id))
+        return {
+            'subject': self.render_template(cr, uid, wizard.subject, model, res_id, context),
+            'body': self.render_template(cr, uid, wizard.body, model, res_id, context),
+            'partner_ids': [],
+            'attachment_ids': [],
+        }
+
     def render_template(self, cr, uid, template, model, res_id, context=None):
-        """Render the given template text, replace mako-like expressions ``${expr}``
-           with the result of evaluating these expressions with an evaluation context
-           containing:
+        """ Render the given template text, replace mako-like expressions ``${expr}``
+            with the result of evaluating these expressions with an evaluation context
+            containing:
 
                 * ``user``: browse_record of the current user
                 * ``object``: browse_record of the document record this mail is
                               related to
                 * ``context``: the context passed to the mail composition wizard
 
-           :param str template: the template text to render
-           :param str model: model name of the document record this mail is related to.
-           :param int res_id: id of the document record this mail is related to.
+            :param str template: the template text to render
+            :param str model: model name of the document record this mail is related to.
+            :param int res_id: id of the document record this mail is related to.
         """
         if context is None:
             context = {}
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 8bf8df24f59..4ce5db3f4e3 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -7,6 +7,7 @@
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
                     <group>
+                        <field name="composition_mode" invisible="1"/>
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
                         <field name="author_id"/>
@@ -38,11 +39,11 @@
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0" >
                     <group>
+                        <!-- truly invisible fields for control and options -->
                         <field name="composition_mode" colspan="2" nolabel="1" invisible="1"/>
                         <field name="model" colspan="2" nolabel="1" invisible="1"/>
                         <field name="res_id" colspan="2" nolabel="1" invisible="1"/>
                         <field name="parent_id" colspan="2" nolabel="1" invisible="1"/>
-                        <!-- truly invisible fields for control and options -->
                         <field name="content_subtype" colspan="2" nolabel="1" invisible="1"/>
                         <!-- visible wizard -->
                         <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
@@ -63,14 +64,15 @@
                                 class="oe_mail_compose_message_attachment_ids"/>
                         <!-- void div to display attachments, Chatter-controlled -->
                         <div colspan="2" class="oe_mail_compose_message_attachments"/>
-                        <!-- buttons, mostly Chatter-controlled -->
+                        <!-- buttons, with as few Chatter logic as possible -->
                         <div>
                             <button name="send_mail" string="Post" type="object"
                                 class="oe_mail_compose_message_button_send"/>
                         </div>
                         <div class='oe_mail_compose_message_icons'>
-                            <button icon="/mail/static/src/img/attachment.png" name="dummy"
+                            <button icon="/mail/static/src/img/attachment.png"
                                 class="oe_mail_compose_message_attachment" string=""
+                                name="dummy"
                                 help="Add an attachment"/>
                             <button icon="/mail/static/src/img/formatting.png"
                                 class="oe_mail_compose_message_formatting" string=""
@@ -100,6 +102,6 @@
                 target="new"
                 key2="client_action_multi"
                 id="base.action_partner_mass_mail"
-                context="{'mail.compose.message.mode':'mass_mail'}"/>
+                context="{'default_composition_mode': 'mass_mail'}"/>
     </data>
 </openerp>

From 0d89fe7b62f99db60370af4f3f3a67e9486d2b1a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 30 Aug 2012 17:10:51 +0200
Subject: [PATCH 642/999] [WIP] company: better handling of the rml_footer
 field

bzr revid: abo@openerp.com-20120830151051-dhucwac4r9m92di6
---
 openerp/addons/base/res/res_company.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 3f586abdbf9..04c0887b7e1 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -24,6 +24,7 @@ from osv import fields
 import os
 import tools
 import openerp
+from openerp import SUPERUSER_ID
 from tools.translate import _
 from tools.safe_eval import safe_eval as eval
 
@@ -101,7 +102,7 @@ class res_company(osv.osv):
                 part_obj.create(cr, uid, {name: value or False, 'parent_id': company.partner_id.id}, context=context)
         return True
 
-    def _format_company_footer(self, cr, uid, ids, company, context=None):
+    def _format_company_footer(self, cr, uid, company, context=None):
         """ Format the company's RML footer the right way """
         val = []
 
@@ -124,12 +125,15 @@ class res_company(osv.osv):
         result = {}
         for company in self.browse(cr, uid, ids, context=context):
             if not company.customize_footer:
-                result[company.id] = self._format_company_footer(cr, uid, ids, company, context)
+                result[company.id] = self._format_company_footer(cr, uid, company, context)
 
         return result
 
-    def _set_rml_footer(self, cr, uid, ids, footer=False, context=None):
-        return 'todo'
+    def _set_rml_footer(self, cr, uid, company_id, name, value, arg, context=None):
+        company = self.browse(cr, uid, [company_id], context=context)[0]
+        rml_footer = self._format_company_footer(cr, uid, company, context)
+
+        return cr.execute('UPDATE res_company SET rml_footer = %s WHERE id = %s', (rml_footer, company_id))
 
     _columns = {
         'name': fields.related('partner_id', 'name', string='Company Name', size=128, required=True, store=True, type='char'),
@@ -137,8 +141,7 @@ class res_company(osv.osv):
         'parent_id': fields.many2one('res.company', 'Parent Company', select=True),
         'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
-        #'rml_footer': fields.text('General Information Footer'),
-        'rml_footer': fields.function(_get_rml_footer, type='text', string='General Information Footer'),
+        'rml_footer': fields.function(_get_rml_footer, fnct_inv=_set_rml_footer, type='text', string='General Information Footer', store=True),
         'rml_header': fields.text('RML Header and Footer', required=True),
         'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
         'rml_header2': fields.text('RML Internal Header', required=True),
@@ -179,7 +182,7 @@ class res_company(osv.osv):
             # select only the currently visible companies (according to rules,
             # which are probably to allow to see the child companies) even if
             # she belongs to some other companies.
-            user = self.pool.get('res.users').browse(cr, 1, uid, context=context)
+            user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
             cmp_ids = list(set([user.company_id.id] + [cmp.id for cmp in user.company_ids]))
             return cmp_ids
         return super(res_company, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,

From 088dc6a3d3327b1f79904d0091ed28d8b5dcc849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 30 Aug 2012 17:51:54 +0200
Subject: [PATCH 643/999] [WIP] email_template: WIP on mail.compose.message in
 email_template. Cleaned a bit the code, the view. Added base for testing mail
 composer in tests. TODO: handle partners, email_cc, email_to, attachments,
 ... almost everything.

bzr revid: tde@openerp.com-20120830155154-419yn1aj0u6vq8yb
---
 addons/email_template/tests/__init__.py       |  27 ++++
 addons/email_template/tests/test_mail.py      | 103 ++++++++++++++
 .../wizard/mail_compose_message.py            | 134 ++++++++----------
 .../wizard/mail_compose_message_view.xml      |  11 +-
 4 files changed, 199 insertions(+), 76 deletions(-)
 create mode 100644 addons/email_template/tests/__init__.py
 create mode 100644 addons/email_template/tests/test_mail.py

diff --git a/addons/email_template/tests/__init__.py b/addons/email_template/tests/__init__.py
new file mode 100644
index 00000000000..d63c5634cc3
--- /dev/null
+++ b/addons/email_template/tests/__init__.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY 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
+#    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 . import test_mail
+
+checks = [
+    test_mail,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
new file mode 100644
index 00000000000..db2168a75d5
--- /dev/null
+++ b/addons/email_template/tests/test_mail.py
@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY 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
+#    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.tests import common
+import tools
+
+class test_message_compose(common.TransactionCase):
+
+    def _mock_smtp_gateway(self, *args, **kwargs):
+        return True
+
+    def _mock_build_email(self, *args, **kwargs):
+        self._build_email_args = args
+        self._build_email_kwargs = kwargs
+        return self.build_email_real(*args, **kwargs)
+
+    def setUp(self):
+        super(test_message_compose, self).setUp()
+        self.mail_group = self.registry('mail.group')
+        self.mail_mail = self.registry('mail.mail')
+        self.mail_message = self.registry('mail.message')
+        self.res_users = self.registry('res.users')
+        self.res_partner = self.registry('res.partner')
+
+        # Install mock SMTP gateway
+        self.build_email_real = self.registry('ir.mail_server').build_email
+        self.registry('ir.mail_server').build_email = self._mock_build_email
+        self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
+        
+        # create a 'pigs' group that will be used through the various tests
+        self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
+            {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
+
+    def test_00_message_compose_wizard(self):
+        """ Tests designed for the mail.compose.message wizard updated by email_template. """
+        cr, uid = self.cr, self.uid
+        mail_compose = self.registry('mail.compose.message')
+        self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a'})
+        user_admin = self.res_users.browse(cr, uid, uid)
+        group_model_id = self.registry('ir.model').search(cr, uid, [('model', '=', 'mail.group')])[0]
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+
+        # Create template on mail.group
+        email_template = self.registry('email.template')
+        email_template_id = email_template.create(cr, uid, {'model_id': group_model_id,
+            'name': 'Pigs Template', 'subject': '${record.name}',
+            'body_html': '${object.description}', 'user_signature': True,
+            'email_to': 'b@b c@c', 'email_cc': 'd@d'})
+        # import pdb
+        # pdb.set_trace()
+
+        # Mail data
+        _subject = 'Pigs'
+        _body_text = 'Pigs rules'
+
+        # 3 - Create in mass_mail composition mode that should work with or without email_template installed
+        compose_id = mail_compose.create(cr, uid,
+            {'subject': _subject, 'body': _body_text},
+            {'default_composition_mode': 'mass_mail', 'default_model': 'mail.group',
+                'default_res_id': -1, 'default_use_template': True,
+                'active_ids': [self.group_pigs_id], 'default_template_id': email_template_id})
+        compose = mail_compose.browse(cr, uid, compose_id)
+        # print compose.subject
+        
+
+        # Try the 'onchange_template_id'
+        values = mail_compose.onchange_template_id(cr, uid, [], compose.use_template, compose.template_id, compose.composition_mode, compose.res_id)
+        # print values
+        values = mail_compose.onchange_use_template(cr, uid, [], not compose.use_template, compose.template_id, compose.composition_mode, compose.res_id)
+        # print values
+
+        compose.refresh()
+
+
+        # # Post the comment, get created message
+        # mail_compose.send_mail(cr, uid, [compose_id], {'default_res_id': -1, 'active_ids': [self.group_pigs_id]})
+        # group_pigs.refresh()
+        # msg = group_pigs.message_ids[0]
+
+        # # Test: last message on Pigs = last created message
+        # test_msg = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [], limit=1))[0]
+        # self.assertEqual(msg.id, test_msg.id, 'Pigs did not receive its mass mailing message')
+        # # Test: mail.message: subject, body
+        # self.assertEqual(msg.subject, _subject, 'mail.message subject is incorrect')
+        # self.assertEqual(msg.body, group_pigs.description, 'mail.message body is incorrect')
\ No newline at end of file
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index a05aa232453..7dbb47e8380 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -20,62 +20,62 @@
 ##############################################################################
 
 import base64
+import tools
 
 from osv import osv
 from osv import fields
 from tools.translate import _
-import tools
-
 
 class mail_compose_message(osv.osv_memory):
+    """ Inherit mail_compose_message to add email template feature in the
+        message composer. """
+
     _inherit = 'mail.compose.message'
 
     def _get_templates(self, cr, uid, context=None):
-        """
-        Return Email Template of particular  Model.
-        """
+        """ Return Email Template of particular  Model. """
         if context is None:
             context = {}
-        record_ids = []
-        email_template= self.pool.get('email.template')
         model = False
-        if context.get('message_id'):
-            mail_message = self.pool.get('mail.message')
-            message_data = mail_message.browse(cr, uid, int(context.get('message_id')), context)
-            model = message_data.model
-        elif context.get('mail.compose.target.model') or context.get('active_model'):
-            model = context.get('mail.compose.target.model', context.get('active_model'))
+        email_template_obj= self.pool.get('email.template')
+
+        if context.get('default_composition_mode') == 'reply' and context.get('active_id'):
+            message_data = self.pool.get('mail.message').browse(cr, uid, int(context.get('active_id')), context)
+            if message_data:
+                model = message_data.model
+        else:
+            model = context.get('default_model', context.get('active_model'))
+
         if model:
-            record_ids = email_template.search(cr, uid, [('model', '=', model)])
-            return email_template.name_get(cr, uid, record_ids, context) + [(False,'')]
+            record_ids = email_template_obj.search(cr, uid, [('model', '=', model)], context=context)
+            return email_template_obj.name_get(cr, uid, record_ids, context) + [(False, '')]
         return []
 
+    def default_get(self, cr, uid, fields, context=None):
+        """ Override to handle templates. """
+        if context is None:
+            context = {}
+        result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
+        result['template_id'] = context.get('default_template_id', context.get('mail.compose.template_id', False))
+        return result
+
     _columns = {
         'use_template': fields.boolean('Use Template'),
-        'template_id': fields.selection(_get_templates, 'Template',
-                                        size=-1 # means we want an int db column
-                                        ),
-    }
-    
-    _defaults = {
-        'template_id' : lambda self, cr, uid, context={} : context.get('mail.compose.template_id', False)          
+        # incredible hack of the day: size=-1 means we want an int db column instead of an str one
+        'template_id': fields.selection(_get_templates, 'Template', size=-1),
     }
 
-    def on_change_template(self, cr, uid, ids, use_template, template_id, email_from=None, email_to=None, context=None):
-        if context is None:
-            context = {}
-        values = {}
-        if template_id:
-            res_id = context.get('active_id', False)
-            if context.get('mail.compose.message.mode') == 'mass_mail':
-                # use the original template values - to be rendered when actually sent
-                # by super.send_mail()
-                values = self.pool.get('email.template').read(cr, uid, template_id, self.fields_get_keys(cr, uid), context)
+    def onchange_template_id(self, cr, uid, ids, use_template, template_id, composition_mode, res_id, context=None):
+        """ onchange_template_id: read or render the template if set, get back
+            to default values if not. """
+        fields = ['body', 'body_html', 'subject', 'partner_ids', 'email_to', 'email_cc']
+        if use_template and template_id:
+            # use the original template values, to be rendered when actually sent
+            if composition_mode == 'mass_mail':
+                values = self.pool.get('email.template').read(cr, uid, template_id, fields, context)
+            # render the mail as one-shot
             else:
-                # render the mail as one-shot
                 values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
-                # get partner_ids back
-                values['dest_partner_ids'] = values['partner_ids']
                 # retrofit generated attachments in the expected field format
                 if values['attachments']:
                     attachment = values.pop('attachments')
@@ -92,65 +92,57 @@ class mail_compose_message(osv.osv_memory):
                         }
                         att_ids.append(attachment_obj.create(cr, uid, data_attach))
                     values['attachment_ids'] = att_ids
-        else:
-            # restore defaults
-            values = self.default_get(cr, uid, self.fields_get_keys(cr, uid), context)
-            values.update(use_template=use_template, template_id=template_id)
+        else: # restore defaults
+            values = self.default_get(cr, uid, fields, context=context)
+
+        if values.get('body_html') is not None:
+            values['body'] = values.get('body_html')
+        values.update(use_template=use_template, template_id=template_id)
 
         return {'value': values}
 
-    def template_toggle(self, cr, uid, ids, context=None):
+    def toggle_template(self, cr, uid, ids, context=None):
+        """ hit toggle template mode button: calls onchange_use_template to 
+            emulate an on_change, then writes the value to update the form. """
         for record in self.browse(cr, uid, ids, context=context):
-            values = {}
-            use_template = record.use_template
-            # simulate an on_change on use_template
-            values.update(self.onchange_use_template(cr, uid, ids, not use_template, context=context)['value'])
-            record.write(values)
-            return False
+            onchange_res = self.onchange_use_template(cr, uid, ids, not record.use_template, context=context)['value']
+            record.write(onchange_res)
+        return True
 
-    def onchange_use_template(self, cr, uid, ids, use_template, context=None):
-        values = {'use_template': use_template}
-        for record in self.browse(cr, uid, ids, context=context):
-            if not use_template:
-                # equivalent to choosing an empty template
-                onchange_template_values = self.on_change_template(cr, uid, record.id, use_template,
-                    False, email_from=record.email_from, email_to=record.email_to, context=context)
-                values.update(onchange_template_values['value'])
-        return {'value': values}
+    def onchange_use_template(self, cr, uid, ids, use_template, template_id, composition_mode, res_id, context=None):
+        """ onchange_use_template (values: True or False).  If use_template is
+            False, we do like an onchange with template_id False for values """
+        onchange_template_values = self.onchange_template_id(cr, uid, ids, use_template,
+            template_id, composition_mode, res_id, context=context)
+        return onchange_template_values
 
     def save_as_template(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
+        """ hit save as template button: current form value will be a new
+            template attached to the current document. """
         email_template = self.pool.get('email.template')
-        model_pool = self.pool.get('ir.model')
+        ir_model_pool = self.pool.get('ir.model')
         for record in self.browse(cr, uid, ids, context=context):
-            model = record.model or context.get('active_model')
-            model_ids = model_pool.search(cr, uid, [('model', '=', model)])
+            model = record.model
+            model_ids = ir_model_pool.search(cr, uid, [('model', '=', model)])
             model_id = model_ids and model_ids[0] or False
             model_name = ''
             if model_id:
-                model_name = model_pool.browse(cr, uid, model_id, context=context).name
+                model_name = ir_model_pool.browse(cr, uid, model_id, context=context).name
             template_name = "%s: %s" % (model_name, tools.ustr(record.subject))
             values = {
                 'name': template_name,
-                'email_from': record.email_from or False,
                 'subject': record.subject or False,
                 'body': record.body or False,
-                'email_to': record.email_to or False,
-                'email_cc': record.email_cc or False,
-                'reply_to': record.reply_to or False,
                 'model_id': model_id or False,
                 'attachment_ids': [(6, 0, [att.id for att in record.attachment_ids])]
             }
             template_id = email_template.create(cr, uid, values, context=context)
-            record.write({'template_id': template_id,
-                          'use_template': True})
+            record.write({'template_id': template_id, 'use_template': True})
+        return True
 
-        # _reopen same wizard screen with new template preselected
-        return False
-
-    # override the basic implementation 
     def render_template(self, cr, uid, template, model, res_id, context=None):
+        """ Override of mail.compose.message behavior: use the power of
+            templates ! """
         return self.pool.get('email.template').render_template(cr, uid, template, model, res_id, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index dff6f4a3ad4..f54ee0d3723 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -10,15 +10,16 @@
                 <data>
                     <xpath expr="//form/footer/button" position="before">
                         <field name="use_template" invisible="1"/>
-                        <button icon="gtk-paste" type="object" name="template_toggle"
+                        <button icon="gtk-paste" type="object" name="toggle_template"
                                 string="" help="Use a message template" />
                         <button icon="gtk-save" type="object" name="save_as_template"
                                 string="" help="Save as a new template"/>
                     </xpath>
                     <xpath expr="//form/notebook" position="after">
                         <group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4">
+                            <field name="use_template" invisible="1"/>
                             <field name="template_id" colspan="3"
-                                   on_change="on_change_template(use_template, template_id, email_from, email_to, context)"/>
+                                on_change="onchange_template_id(use_template, template_id, composition_mode, res_id, context)"/>
                         </group>
                     </xpath>
                 </data>
@@ -33,14 +34,14 @@
                 <data>
                     <xpath expr="//field[@name='partner_ids']" position="after">
                         <field name="use_template" colspan="2" nolabel="1" invisible="1"
-                            on_change="onchange_use_template(use_template, context)"/>
+                            on_change="onchange_use_template(use_template, template_id, composition_mode, res_id, context)"/>
                         <field name="template_id" colspan="2" nolabel="1"
                             attrs="{'invisible':[('use_template','=',False)]}"
-                            on_change="on_change_template(use_template, template_id, False, False, context)"/>
+                            on_change="onchange_template_id(use_template, template_id, composition_mode, res_id, context)"/>
                     </xpath>
                     <xpath expr="//button[@class='oe_mail_compose_message_attachment']" position="before">
                         <button icon="/email_template/static/src/img/email_template.png"
-                            type="object" name="template_toggle" string=""
+                            type="object" name="toggle_template" string=""
                             help="Use a message template"/>
                         <button icon="/email_template/static/src/img/email_template_save.png"
                             type="object" name="save_as_template" string=""

From 42f184bf6fdf4d06a74554f0e9987cec763f29b9 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 30 Aug 2012 18:12:37 +0200
Subject: [PATCH 644/999] [REM] Removed TranslateDialog. Use
 ir.translation#translate() instead

bzr revid: fme@openerp.com-20120830161237-twthb37lkbv6yn3t
---
 addons/web/static/src/js/view_form.js |  22 ++---
 addons/web/static/src/js/views.js     | 119 --------------------------
 addons/web/static/src/xml/base.xml    |  22 -----
 3 files changed, 12 insertions(+), 151 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0b0366a9ee4..2034bfb741f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -22,10 +22,6 @@ instance.web.form.FieldManagerMixin = {
      * Must return the asked field as in fields_get.
      */
     get_field: function(field_name) {},
-    /**
-     * Called by the field when the translate button is clicked.
-     */
-    open_translate_dialog: function(field) {},
     /**
      * Returns true when the view is in create mode.
      */
@@ -1049,9 +1045,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     is_create_mode: function() {
         return this.get("actual_mode") === "create";
     },
-    open_translate_dialog: function(field) {
-        return this._super(field);
-    },
 });
 
 /**
@@ -1882,6 +1875,10 @@ instance.web.form.FieldInterface = {
      * Must set the focus on the field. Return false if field is not focusable.
      */
     focus: function() {},
+    /**
+     * Called when the translate button is clicked.
+     */
+    on_translate: function() {},
 };
 
 /**
@@ -1936,9 +1933,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
         this._super();
         if (this.field.translate) {
             this.$el.addClass('oe_form_field_translatable');
-            this.$el.find('.oe_field_translate').click(_.bind(function() {
-                this.field_manager.open_translate_dialog(this);
-            }, this));
+            this.$el.find('.oe_field_translate').click(this.on_translate);
         }
         this.$label = this.view.$el.find('label[for=' + this.id_for_label + ']');
         if (instance.session.debug) {
@@ -2000,6 +1995,13 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
     set_input_id: function(id) {
         this.id_for_label = id;
     },
+    on_translate: function() {
+        var self = this;
+        var trans = new instance.web.DataSet(this, 'ir.translation', this.view.dataset.get_context());
+        return trans.call('translate', [this.view.dataset.model, this.view.datarecord.id, this.name]).then(function(action) {
+            self.do_action(action);
+        });
+    },
 });
 
 /**
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index e453ecbc905..b83ddb1cc3f 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1050,119 +1050,6 @@ instance.web.Sidebar = instance.web.Widget.extend({
     }
 });
 
-instance.web.TranslateDialog = instance.web.Dialog.extend({
-    dialog_title: {toString: function () { return _t("Translations"); }},
-    init: function(view) {
-        // TODO fme: should add the language to fields_view_get because between the fields view get
-        // and the moment the user opens the translation dialog, the user language could have been changed
-        this.view_language = view.session.user_context.lang;
-        this['on_button_' + _t("Save")] = this.on_btn_save;
-        this['on_button_' + _t("Close")] = this.on_btn_close;
-        this._super(view, {
-            width: '80%',
-            height: '80%',
-            destroy_on_close: false,
-        });
-        this.view = view;
-        this.view_type = view.fields_view.type || '';
-        this.$fields_form = null;
-        this.$view_form = null;
-        this.$sidebar_form = null;
-        this.translatable_fields_keys = _.map(this.view.translatable_fields || [], function(i) { return i.name; });
-        this.languages = null;
-        this.languages_loaded = $.Deferred();
-        (new instance.web.DataSetSearch(this, 'res.lang', this.view.dataset.get_context(),
-            [['translatable', '=', '1']])).read_slice(['code', 'name'], { sort: 'id' }).then(this.on_languages_loaded);
-    },
-    start: function() {
-        var self = this;
-        this._super();
-        return $.when(this.languages_loaded).then(function() {
-            self.$el.html(instance.web.qweb.render('TranslateDialog', { widget: self }));
-            self.$fields_form = self.$el.find('.oe_translation_form');
-            self.$fields_form.find('.oe_trad_field').change(function() {
-                $(this).toggleClass('touched', ($(this).val() != $(this).attr('data-value')));
-            });
-        });
-    },
-    on_languages_loaded: function(langs) {
-        this.languages = langs;
-        this.languages_loaded.resolve();
-    },
-    do_load_fields_values: function(callback) {
-        var self = this,
-            deffered = [];
-        this.$fields_form.find('.oe_trad_field').val('').removeClass('touched');
-        _.each(self.languages, function(lg) {
-            var deff = $.Deferred();
-            deffered.push(deff);
-            var callback = function(values) {
-                _.each(self.translatable_fields_keys, function(f) {
-                    var value = values[0][f] || '';
-                    self.$fields_form.find('.oe_trad_field[name="' + lg.code + '-' + f + '"]').val(value).attr('data-value', value);
-                });
-                deff.resolve();
-            };
-            if (lg.code === self.view_language) {
-                var values = {};
-                _.each(self.translatable_fields_keys, function(field) {
-                    values[field] = self.view.fields[field].get_value();
-                });
-                callback([values]);
-            } else {
-                self.view.dataset.read_ids([self.view.datarecord.id], self.translatable_fields_keys, {
-                    context: { 'lang': lg.code }
-                }).then(callback);
-            }
-        });
-        $.when.apply(null, deffered).then(callback);
-    },
-    open: function(field) {
-        var self = this;
-        this._super();
-        $.when(this.languages_loaded).then(function() {
-            if (self.view.translatable_fields && self.view.translatable_fields.length) {
-                self.do_load_fields_values(function() {
-                    if (field) {
-                        var $field_input = self.$el.find('tr[data-field="' + field.name + '"] td:nth-child(2) *:first-child');
-                        self.$el.scrollTo($field_input);
-                        $field_input.focus();
-                    }
-                });
-            } else {
-                sup.call(self);
-            }
-        });
-    },
-    on_btn_save: function() {
-        var trads = {};
-        var self = this;
-        var trads_mutex = new $.Mutex();
-        self.$fields_form.find('.oe_trad_field.touched').each(function() {
-            var field = $(this).attr('name').split('-');
-            if (!trads[field[0]]) {
-                trads[field[0]] = {};
-            }
-            trads[field[0]][field[1]] = $(this).val();
-        });
-        _.each(trads, function(data, code) {
-            if (code === self.view_language) {
-                _.each(data, function(value, field) {
-                    self.view.fields[field].set_value(value);
-                });
-            }
-            trads_mutex.exec(function() {
-                return self.view.dataset.write(self.view.datarecord.id, data, { context : { 'lang': code } });
-            });
-        });
-        this.close();
-        return trads_mutex;
-    },
-    on_btn_close: function() {
-        this.close();
-    }
-});
-
 instance.web.View = instance.web.Widget.extend({
     // name displayed in view switchers
     display_name: '',
@@ -1214,12 +1101,6 @@ instance.web.View = instance.web.Widget.extend({
             action_views_ids: {}
         });
     },
-    open_translate_dialog: function(field) {
-        if (!this.translate_dialog) {
-            this.translate_dialog = new instance.web.TranslateDialog(this);
-        }
-        this.translate_dialog.open(field);
-    },
     /**
      * Fetches and executes the action identified by ``action_data``.
      *
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 511e37f4ab4..d97cc57f5ea 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1202,28 +1202,6 @@
     </t>
 </t>
 
-<t t-name="TranslateDialog">
-    <table t-if="widget.view.translatable_fields" class="oe_form oe_translation_form" border="0" cellpadding="0" cellspacing="0" width="100%">
-    <tr>
-        <td class="oe_form_separator" width="1%" nowrap="nowrap">
-            <div class="oe_horizontal_separator">Field</div>
-        </td>
-        <th t-foreach="widget.languages" align="left">
-            <div class="oe_horizontal_separator"><t t-esc="name"/></div>
-        </th>
-    </tr>
-    <tr t-foreach="widget.view.translatable_fields" t-as="field" t-att-data-field="field.name">
-        <td class="oe_form_group_cell" width="1%" nowrap="nowrap">
-            <label class="oe_label"><t t-esc="field.string"/>:</label>
-        </td>
-        <td t-foreach="widget.languages" t-as="lg" class="oe_form_group_cell">
-            <input t-if="field.field.type == 'char'" type="text" t-attf-name="#{lg.code}-#{field.name}" value="" data-value="" class="oe_trad_field" style="width: 100%"/>
-            <textarea t-if="field.field.type == 'text'" t-attf-name="#{lg.code}-#{field.name}" data-value="" class="oe_trad_field" style="width: 100%"></textarea>
-        </td>
-    </tr>
-    </table>
-</t>
-
 <t t-name="AbstractFormPopup.render">
     <div>
         <table style="width:100%">

From df557637d1010cad27029405925333e121ea58a2 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 30 Aug 2012 18:15:53 +0200
Subject: [PATCH 645/999] [ADD] ir.translation#translate()

bzr revid: fme@openerp.com-20120830161553-hmf4fbsnqd2dhq7z
---
 openerp/addons/base/ir/ir_translation.py | 25 ++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index 61e40e807d4..78dda4ab5b5 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -318,6 +318,31 @@ class ir_translation(osv.osv):
         result = super(ir_translation, self).unlink(cursor, user, ids, context=context)
         return result
 
+    def translate(self, cr, uid, model, id, field=None, context=None):
+        trans_model = self.pool.get(model)
+        domain = ['&', ('res_id', '=', id), ('name', 'ilike', model + ',')]
+        for f, info in trans_model._all_columns.items():
+            if info.parent_model and info.column.translate:
+                domain_id = trans_model.read(cr, uid, [id], [info.parent_column], context=context)[0][info.parent_column][0]
+                domain.insert(0, '|')
+                domain.extend(['&', ('res_id', '=', domain_id), ('name', '=', "%s,%s" % (info.parent_model, f))])
+
+        action = {
+            'name': 'Translate',
+            'view_type': 'list',
+            'view_mode': 'list',
+            'res_model': 'ir.translation',
+            'type': 'ir.actions.act_window',
+            'domain': domain,
+            'views': [(False, 'list'), (False, 'form')],
+        }
+        if field:
+            info = trans_model._all_columns[field]
+            action['context'] = {
+                'search_default_name': "%s,%s" % (info.parent_model or model, field)
+            }
+        return action
+
     def _get_import_cursor(self, cr, uid, context=None):
         """ Return a cursor-like object for fast inserting translations
         """

From 296a931505bd7f416e6300efde2ebaaf6b56c2cb Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 30 Aug 2012 19:10:23 +0200
Subject: [PATCH 646/999] [WIP] company: better handling of the rml_footer
 field

bzr revid: abo@openerp.com-20120830171023-kqjciz53y8ep6ibp
---
 openerp/addons/base/res/res_company.py       | 52 +++++++++++++++-----
 openerp/addons/base/res/res_company_view.xml |  2 +-
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 04c0887b7e1..93e673bc1f9 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -103,18 +103,25 @@ class res_company(osv.osv):
         return True
 
     def _format_company_footer(self, cr, uid, company, context=None):
-        """ Format the company's RML footer the right way """
+        """
+        Format the company's RML footer the right way
+
+        @param company: compny's browse record OR dict with the required data
+
+        @return: string containing the formated footer
+        """
+
         val = []
 
-        if company.phone: val.append(_('Phone: ')+company.phone)
-        if company.fax: val.append(_('Fax: ')+company.fax)
-        if company.email: val.append(_('Email: ')+company.email)
-        if company.website: val.append(_('Website: ')+company.website)
-        if company.vat: val.append(_('TIN: ')+company.vat)
-        if company.company_registry: val.append(_('Reg: ')+company.company_registry)
+        if company['phone']: val.append(_('Phone: ')+company['phone'])
+        if company['fax']: val.append(_('Fax: ')+company['fax'])
+        if company['email']: val.append(_('Email: ')+company['email'])
+        if company['website']: val.append(_('Website: ')+company['website'])
+        if company['vat']: val.append(_('TIN: ')+company['vat'])
+        if company['company_registry']: val.append(_('Reg: ')+company['company_registry'])
 
-        bank_accounts = self.browse(cr, uid, company.id, context=context).bank_ids
-        bank_account_numbers = [bank_account.acc_number for bank_account in bank_accounts if bank_account.footer]
+        bank_accounts = self.browse(cr, uid, company['id'], context=context).bank_ids
+        bank_account_numbers = [bank_account.name_get() for bank_account in bank_accounts if bank_account.footer]
         # append the account(s) in the footer and manage plural form of "account" if necessary
         if bank_account_numbers:
             val.append(_('Bank Account'+('s' if len(bank_account_numbers) > 1 else '')+': ')+', '.join(bank_account_numbers))
@@ -124,14 +131,20 @@ class res_company(osv.osv):
     def _get_rml_footer(self, cr, uid, ids, field_names, arg, context=None):
         result = {}
         for company in self.browse(cr, uid, ids, context=context):
-            if not company.customize_footer:
+            if company.customize_footer:
+                result[company.id] = company.rml_footer
+            else:
                 result[company.id] = self._format_company_footer(cr, uid, company, context)
 
         return result
 
     def _set_rml_footer(self, cr, uid, company_id, name, value, arg, context=None):
         company = self.browse(cr, uid, [company_id], context=context)[0]
-        rml_footer = self._format_company_footer(cr, uid, company, context)
+
+        if company.customize_footer:
+            rml_footer = value
+        else:
+            rml_footer = self._format_company_footer(cr, uid, company, context)
 
         return cr.execute('UPDATE res_company SET rml_footer = %s WHERE id = %s', (rml_footer, company_id))
 
@@ -170,8 +183,21 @@ class res_company(osv.osv):
         ('name_uniq', 'unique (name)', 'The company name must be unique !')
     ]
 
-    def on_change_footer(self, cr, uid, ids, customize_footer, phone, email, fax, website, vat, company_registry=False, bank_ids=False, context=None):
-        return 'todo'
+    def on_change_footer(self, cr, uid, ids, customize_footer=None, phone=None, email=None, fax=None, website=None, vat=None, company_registry=None, bank_ids=None, context=None):
+        if not customize_footer:
+
+            company_values = {
+                'id': ids[0],
+                'customize_footer': customize_footer,
+                'phone': phone,
+                'email': email,
+                'fax': fax,
+                'website': website,
+                'vat': vat,
+                'company_registry': company_registry,
+                'bank_ids': bank_ids,
+            }
+            return {'value': {'rml_footer': self._format_company_footer(cr, uid, company_values, context)}}
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False, access_rights_uid=None):
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 5e447ebc995..79931475b08 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -69,7 +69,7 @@
                                 <field name="bank_ids" colspan="4" nolabel="1" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
                             </group>
                             <group string="Footer Configuration">
-                                <field name="customize_footer"/>
+                                <field name="customize_footer" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
                                 <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
                                 <label for="rml_footer"/>
                                 <div name="bank_acc">

From 9aabe91bbffcc84568796d8297b18713aeacf2c0 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 30 Aug 2012 19:44:52 +0200
Subject: [PATCH 647/999] [FIX] email_template: wip - trying to make templates
 work again

bzr revid: odo@openerp.com-20120830174452-59q43k1x13at4i37
---
 addons/email_template/email_template.py       | 22 +++++++------------
 addons/email_template/email_template_view.xml |  5 +----
 .../wizard/mail_compose_message.py            |  8 +++++--
 addons/mail/mail_mail.py                      |  6 ++---
 addons/mail/wizard/mail_compose_message.py    |  6 ++---
 5 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 9adab6d3976..d540971c3b4 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -28,6 +28,8 @@ from osv import osv
 from osv import fields
 import tools
 from tools.translate import _
+from tools.html_sanitize import html_sanitize
+from tools import html2plaintext
 from urllib import quote as quote
 _logger = logging.getLogger(__name__)
 
@@ -134,7 +136,7 @@ class email_template(osv.osv):
                                                    "This is useful for CRM leads for example"),
 
         # Overridden mail.message.common fields for technical reasons:
-        'model': fields.related('model_id','model', type='char', string='Related Document Model',
+        'model': fields.related('model_id', 'model', type='char', string='Related Document Model',
                                 size=128, select=True, store=True, readonly=True),
         # we need a separate m2m table to avoid ID collisions with the original mail.message entries
         #'attachment_ids': fields.many2many('ir.attachment', 'email_template_attachment_rel', 'email_template_id',
@@ -143,7 +145,7 @@ class email_template(osv.osv):
         #                                        "emails created from this template"),
 
         # Overridden mail.message.common fields to make tooltips more appropriate:
-        #'subject':fields.char('Subject', size=512, translate=True, help="Subject (placeholders may be used here)",),
+        'subject': fields.char('Subject', translate=True, help="Subject (placeholders may be used here)",),
         'email_from': fields.char('From', size=128, help="Sender address (placeholders may be used here)"),
         'email_to': fields.char('To', size=256, help="Comma-separated recipient addresses (placeholders may be used here)"),
         'email_cc': fields.char('Cc', size=256, help="Carbon copy recipients (placeholders may be used here)"),
@@ -151,13 +153,7 @@ class email_template(osv.osv):
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing Mail Server', readonly=False,
                                           help="Optional preferred server for outgoing mails. If not set, the highest "
                                                "priority one will be used."),
-        #'body': fields.text('Text Contents', translate=True, help="Plaintext version of the message (placeholders may be used here)"),
         'body_html': fields.text('Rich-text Contents', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"),
-        #'message_id': fields.char('Message-Id', size=256, help="Message-ID SMTP header to use in outgoing messages based on this template. "
-        #                                                       "Please note that this overrides the 'Resource Tracking' option, "
-        #                                                       "so if you simply need to track replies to outgoing emails, enable "
-        #                                                       "that option instead.\n"
-        #                                                       "Placeholders must be used here, as this value always needs to be unique!"),
 
         # Fake fields used to implement the placeholder assistant
         'model_object_field': fields.many2one('ir.model.fields', string="Field",
@@ -300,7 +296,6 @@ class email_template(osv.osv):
             context = {}
         values = {
                   'subject': False,
-                  'body': False,
                   'body_html': False,
                   'email_from': False,
                   'email_to': False,
@@ -314,7 +309,6 @@ class email_template(osv.osv):
                   'attachment_ids': False,
                   'message_id': False,
                   'state': 'outgoing',
-                  'content_subtype': 'plain',
         }
         if not template_id:
             return values
@@ -322,15 +316,15 @@ class email_template(osv.osv):
         report_xml_pool = self.pool.get('ir.actions.report.xml')
         template = self.get_email_template(cr, uid, template_id, res_id, context)
 
-        for field in ['subject', 'body', 'body_html', 'email_from',
-                      'email_to', 'email_cc', 'reply_to',
-                      'message_id']:
+        for field in ['subject', 'body_html', 'email_from',
+                      'email_to', 'email_cc', 'reply_to']:
             values[field] = self.render_template(cr, uid, getattr(template, field),
                                                  template.model, res_id, context=context) \
                                                  or False
 
         if values['body_html']:
-            values.update(content_subtype='html')
+            values['body'] = html_sanitize(values['body_html'])
+            values['body_text'] = html2plaintext(values['body_html'])
 
         if template.user_signature:
             signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index a03bd3351ed..cd75a719197 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -22,10 +22,7 @@
                                 <field name="reply_to"/>
                                 <field name="subject" required="1"/>
                                 <notebook  colspan="4">
-                                    <page string="Body (Text)">
-                                        <field name="body" colspan="4" width="250" height="250" nolabel="1"/>
-                                    </page>
-                                    <page string="Body (Rich/HTML)">
+                                    <page string="Body (HTML)">
                                         <field name="body_html" colspan="4" width="250" height="250" nolabel="1"/>
                                         <label string="Note: This is Raw HTML." colspan="4"/>
                                     </page>
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 7dbb47e8380..11e726c537b 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -95,17 +95,21 @@ class mail_compose_message(osv.osv_memory):
         else: # restore defaults
             values = self.default_get(cr, uid, fields, context=context)
 
-        if values.get('body_html') is not None:
+        if values.get('body_html') and not values.get('body'):
             values['body'] = values.get('body_html')
+        
         values.update(use_template=use_template, template_id=template_id)
 
+        print 'returning ', values
+
         return {'value': values}
 
     def toggle_template(self, cr, uid, ids, context=None):
         """ hit toggle template mode button: calls onchange_use_template to 
             emulate an on_change, then writes the value to update the form. """
         for record in self.browse(cr, uid, ids, context=context):
-            onchange_res = self.onchange_use_template(cr, uid, ids, not record.use_template, context=context)['value']
+            onchange_res = self.onchange_use_template(cr, uid, ids, not record.use_template,
+                record.template_id, record.composition_mode, record.res_id, context=context)['value']
             record.write(onchange_res)
         return True
 
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index f128662aac1..7f3a8a880ea 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -54,10 +54,10 @@ class mail_mail(osv.Model):
         'auto_delete': fields.boolean('Auto Delete',
             help="Permanently delete this email after sending it, to save space"),
         'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
-        'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences.'),
+        'email_from': fields.char('From', help='Message sender, taken from user preferences.'),
         'email_to': fields.text('To', help='Message recipients'),
-        'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
-        'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
+        'email_cc': fields.char('Cc', help='Carbon copy message recipients'),
+        'reply_to':fields.char('Reply-To', help='Preferred response address for the message'),
         'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML message"),
     }
 
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index ae597b509ee..e5748a723e6 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -75,11 +75,11 @@ class mail_compose_message(osv.TransientModel):
         active_ids = context.get('active_ids')
 
         # get default values according to the composition mode
-        if composition_mode in ['reply']:
+        if composition_mode == 'reply':
             vals = self.get_message_data(cr, uid, active_id, context=context)
-        elif composition_mode in ['comment'] and model and res_id:
+        elif composition_mode == 'comment' and model and res_id:
             vals = self.get_record_data(cr, uid, model, res_id, context=context)
-        elif composition_mode in ['mass_mail'] and model and active_ids:
+        elif composition_mode == 'mass_mail' and model and active_ids:
             vals = {'model': model, 'res_id': res_id, 'content_subtype': 'html'}
         else:
             vals = {'model': model, 'res_id': res_id}

From f874c66199ef3ce56b5cf5a9b6c1bfe2ca995868 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 30 Aug 2012 20:36:06 +0200
Subject: [PATCH 648/999] [IMP] company: cleaner code, better handling of
 translations

bzr revid: abo@openerp.com-20120830183606-pl7hbxz80komnjot
---
 openerp/addons/base/res/res_company.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 93e673bc1f9..e340734d0c9 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -111,6 +111,7 @@ class res_company(osv.osv):
         @return: string containing the formated footer
         """
 
+        # list of values required to compose the footer
         val = []
 
         if company['phone']: val.append(_('Phone: ')+company['phone'])
@@ -120,11 +121,16 @@ class res_company(osv.osv):
         if company['vat']: val.append(_('TIN: ')+company['vat'])
         if company['company_registry']: val.append(_('Reg: ')+company['company_registry'])
 
+        # fetch the company's bank accounts
+        # todo: make it work with the onchange
         bank_accounts = self.browse(cr, uid, company['id'], context=context).bank_ids
-        bank_account_numbers = [bank_account.name_get() for bank_account in bank_accounts if bank_account.footer]
+        bank_accounts_names = [bank_account.name_get()[0][1] for bank_account in bank_accounts if bank_account.footer]
+
         # append the account(s) in the footer and manage plural form of "account" if necessary
-        if bank_account_numbers:
-            val.append(_('Bank Account'+('s' if len(bank_account_numbers) > 1 else '')+': ')+', '.join(bank_account_numbers))
+        if len(bank_accounts_names) == 1:
+            val.append(_('Bank Account: ') + ', '.join(bank_accounts_names))
+        elif len(bank_accounts_names) > 1:
+            val.append(_('Bank Accounts: ') + ', '.join(bank_accounts_names))
 
         return ' | '.join(val)
 
@@ -185,7 +191,6 @@ class res_company(osv.osv):
 
     def on_change_footer(self, cr, uid, ids, customize_footer=None, phone=None, email=None, fax=None, website=None, vat=None, company_registry=None, bank_ids=None, context=None):
         if not customize_footer:
-
             company_values = {
                 'id': ids[0],
                 'customize_footer': customize_footer,

From 660553d40425c45e250d2b987a1dcf912c7d2e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 31 Aug 2012 10:01:03 +0200
Subject: [PATCH 649/999] [CLEAN] mail_thread: misc cleanup (comments, some var
 names).

bzr revid: tde@openerp.com-20120831080103-gdtitgzxfpddyws3
---
 addons/mail/mail_thread.py | 75 ++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 43 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 5c4ecbd48f6..e5f36156e0b 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -103,33 +103,25 @@ class many2many_reference(fields.many2many):
                 return super(many2many_reference, self).set(cr, model, id, name, values, user, context)
 
 class mail_thread(osv.Model):
-    '''Mixin model, meant to be inherited by any model that needs to
-       act as a discussion topic on which messages can be attached.
-       Public methods are prefixed with ``message_`` in order to avoid
-       name collisions with methods of the models that will inherit
-       from this mixin.
+    ''' mail_thread model is meant to be inherited by any model that needs to
+        act as a discussion topic on which messages can be attached. Public
+        methods are prefixed with ``message_`` in order to avoid name
+        collisions with methods of the models that will inherit from this class.
 
-       ``mail.thread`` is designed to work without adding any field
-       to the extended models. All functionalities and expected behavior
-       are managed by mail.thread, using model name and record ids.
-       A widget has been designed for the 6.1 and following version of OpenERP
-       web-client. However, due to technical limitations, ``mail.thread``
-       adds a simulated one2many field, to display the web widget by
-       overriding the default field displayed. Using this field
-       is not recommanded has it will disappeear in future version
-       of OpenERP, leading to a pure mixin class.
+        ``mail.thread`` defines fields used to handle and display the
+        communication history. ``mail.thread`` also manages followers of
+        inheriting classes. All features and expected behavior are managed
+        by mail.thread. Widgets has been designed for the 7.0 and following
+        versions of OpenERP.
 
-       Inheriting classes are not required to implement any method, as the
-       default implementation will work for any model. However it is common
-       to override at least the ``message_new`` and ``message_update``
-       methods (calling ``super``) to add model-specific behavior at
-       creation and update of a thread.
-       
-       #TODO: UPDATE WITH SUBTYPE / NEW FOLLOW MECHANISM
+        Inheriting classes are not required to implement any method, as the
+        default implementation will work for any model. However it is common
+        to override at least the ``message_new`` and ``message_update``
+        methods (calling ``super``) to add model-specific behavior at
+        creation and update of a thread when processing incoming emails.
     '''
     _name = 'mail.thread'
     _description = 'Email Thread'
-    # TODO: may be we should make it _inherit ir.needaction
 
     def _get_message_data(self, cr, uid, ids, name, args, context=None):
         res = dict( (id, dict(message_unread=False, message_summary='')) for id in ids)
@@ -179,8 +171,7 @@ class mail_thread(osv.Model):
             string='Related Messages', 
             help="All messages related to the current document."),
         'message_unread': fields.function(_get_message_data, fnct_search=_search_unread, 
-            string='Has Unread Messages',
-            type='boolean',
+            string='Has Unread Messages', type='boolean',
             help="When checked, new messages require your attention.",
             multi="_get_message_data"),
         'message_summary': fields.function(_get_message_data, method=True,
@@ -221,7 +212,6 @@ class mail_thread(osv.Model):
         if self._needaction:
             return [('message_unread', '=', True)]
         return []
-
     #------------------------------------------------------
     # Mail gateway
     #------------------------------------------------------
@@ -447,7 +437,6 @@ class mail_thread(osv.Model):
             self.write(cr, uid, ids, update_vals, context=context)
         return True
 
-
     def _message_extract_payload(self, message, save_original=False):
         """Extract body as HTML and attachments from the mail message"""
         attachments = []
@@ -519,8 +508,7 @@ class mail_thread(osv.Model):
                       'from': from,
                       'to': to,
                       'cc': cc,
-                      'body': unified_body, 
-                      'body_html': html_body,               --> to remove
+                      'body': unified_body,
                       'attachments': [('file1', 'bytes'),
                                       ('file2', 'bytes')}
                     }
@@ -590,27 +578,28 @@ class mail_thread(osv.Model):
 
     def message_post(self, cr, uid, thread_id, body='', subject=False,
             msg_type='notification', parent_id=False, attachments=None, context=None, **kwargs):
-        """Post a new message in an existing message thread, returning the new mail.message ID.
-           Extra keyword arguments will be used as default column values for the new
-           mail.message record.
+        """ Post a new message in an existing message thread, returning the new
+            mail.message ID. Extra keyword arguments will be used as default
+            column values for the new mail.message record.
 
-           :param int thread_id: thread ID to post into, or list with one ID
-           :param str body: body of the message, usually raw HTML
-           :param str subject: optional subject
-           :param str msg_type: message type, out of the possible values for mail_message.type,
-               currently one of ``email, 'comment', 'notification'``.
-           :param int parent_id: optional ID of parent message in this thread
-           :param tuple(str,str) attachments: list of attachment tuples in the form ``(name,content)``
-           :return: ID of newly created mail.message 
+            :param int thread_id: thread ID to post into, or list with one ID
+            :param str body: body of the message, usually raw HTML that will
+                be sanitized
+            :param str subject: optional subject
+            :param str msg_type: mail_message.type
+            :param int parent_id: optional ID of parent message in this thread
+            :param tuple(str,str) attachments: list of attachment tuples in the form
+                ``(name,content)``, where content is NOT base64 encoded
+            :return: ID of newly created mail.message 
         """
         context = context or {}
-        attachments = attachments or {}
+        attachments = attachments or []
         assert (not thread_id) or isinstance(thread_id, (int,long)) or \
             (isinstance(thread_id, (list, tuple)) and len(thread_id) == 1), "Invalid thread_id" 
         if isinstance(thread_id, (list, tuple)):
             thread_id = thread_id and thread_id[0]
 
-        to_attach = []
+        attachment_ids = []
         for name, content in attachments:
             if isinstance(content, unicode):
                 content = content.encode('utf-8')
@@ -622,7 +611,7 @@ class mail_thread(osv.Model):
                 'res_model': context.get('thread_model') or self._name,
                 'res_id': thread_id,
             }
-            to_attach.append((0,0, data_attach))
+            attachment_ids.append((0,0, data_attach))
 
         values = kwargs
         values.update( {
@@ -632,7 +621,7 @@ class mail_thread(osv.Model):
             'subject': subject,
             'type': msg_type,
             'parent_id': parent_id,
-            'attachment_ids': to_attach
+            'attachment_ids': attachment_ids,
         })
         for x in ('from','to','cc'): values.pop(x, None) # Avoid warnings 
         return self.pool.get('mail.message').create(cr, uid, values, context=context)

From b6eacb18e747f262b9ca0cd2db52b78f0d55e15c Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 31 Aug 2012 14:14:55 +0530
Subject: [PATCH 650/999] [IMP]Add multi currency field and tooltip messages
 are add

bzr revid: hsa@tinyerp.com-20120831084455-fnugi1p4q6hwb5r3
---
 addons/account/res_config.py           | 2 ++
 addons/account/res_config_view.xml     | 4 ++++
 addons/hr/security/hr_security.xml     | 3 +++
 addons/sale/security/sale_security.xml | 4 ++++
 4 files changed, 13 insertions(+)

diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 658f87962ff..79ab16ac6be 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -114,6 +114,8 @@ class account_config_settings(osv.osv_memory):
             help="This purchase tax will be assigned by default on new products."),
         'decimal_precision': fields.integer('Decimal precision on journal entries',
             help="""As an example, a decimal precision of 2 will allow journal entries  like: 9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: 0.0231 EUR."""),
+        'group_multi_currency': fields.boolean('allow multi currencies',
+            implied_group='base.group_multi_currency'),
     }
 
     def _default_company(self, cr, uid, context=None):
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 79a65f70414..2ae5f8ed5ac 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -121,6 +121,10 @@
                         </div>
                         <label for="id" string="Features"/>
                         <div>
+                            <div>
+                                <field name="group_multi_currency" class="oe_inline"/>
+                                <label for="group_multi_currency"/>
+                            </div>
                             <div>
                                 <field name="module_account_accountant" class="oe_inline"/>
                                 <label for="module_account_accountant"/>
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 5e4c3052858..39dd096b129 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -9,6 +9,9 @@
     </record>
     <record id="base.group_hr_manager" model="res.groups">
         <field name="name">Manager</field>
+        <field name="comment">
+        Officer: the user will be able to approve document created by employees
+        Manager: the user will have an access to the human resources configuration as well as statistic reports</field>
         <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 47a577e77c3..a9735c61b88 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -15,6 +15,10 @@
 
     <record id="base.group_sale_manager" model="res.groups">
         <field name="name">Manager</field>
+        <field name="comment">
+        User - Own Leads Only: the user will have access to his own data in the sales application.
+        User - All Leads: the user will have access to all records of everyone in the sales application.
+        Manager: the user will have an access to the sales configuration as well as statistic reports.</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>

From 525a0e6a8b347b32845a55703632e6c63e5b93db Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 31 Aug 2012 14:16:52 +0530
Subject: [PATCH 651/999] [IMP]Add tooltip and add multi currencies field into
 hidden fields

bzr revid: hsa@tinyerp.com-20120831084652-9qyud713yeagm4pi
---
 openerp/addons/base/res/res_users.py           | 2 +-
 openerp/addons/base/security/base_security.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 21fc5e2dc5b..439817b5518 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -815,7 +815,7 @@ class users_view(osv.osv):
                     'type': 'selection',
                     'string': app and app.name or _('Other'),
                     'selection': [(False, '')] + [(g.id, g.name) for g in gs],
-                    'help': '\n'.join(tips),
+                    'help': ''.join(tips),
                 }
             else:
                 # boolean group fields
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index 11be6e35bd1..2f55444828e 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -17,6 +17,8 @@
 
     <record model="res.groups" id="group_user">
         <field name="name">Employee</field>
+        <field name="comment">
+        Employee: the user will be able to manage his own human resources stuff (leave request, timesheets, ...), if he is linked to an employee in the system.</field>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
@@ -26,6 +28,7 @@
     
     <record model="res.groups" id="group_multi_currency">
         <field name="name">Multi Currencies</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
     <record model="res.groups" id="group_no_one">

From 3cc186cd4128cef9d05c89ac0de9f87058817cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 31 Aug 2012 11:01:20 +0200
Subject: [PATCH 652/999] [IMP] mail.message: check is now a check_access_rule
 override, allowing to remove explicit calls. Moved mail.notification
 inheritance in mail.message directly into mail.notification, because we are
 in the same module (no need to separate things too much when in the same
 module).

bzr revid: tde@openerp.com-20120831090120-s56984dg6wpbs0li
---
 addons/mail/mail_followers.py |   7 +++
 addons/mail/mail_message.py   | 109 ++++++++++------------------------
 2 files changed, 39 insertions(+), 77 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 10d33536136..5143871745b 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -59,6 +59,8 @@ class mail_notification(osv.Model):
         'partner_id': fields.many2one('res.partner', string='Contact',
                         ondelete='cascade', required=True, select=1),
         'read': fields.boolean('Read'),
+        'message_id': fields.many2one('mail.message', string='Message',
+                        ondelete='cascade', required=True, select=1),
     }
 
     _defaults = {
@@ -72,6 +74,11 @@ class mail_notification(osv.Model):
             return super(mail_notification, self).create(cr, uid, vals, context=context)
         return False
 
+    def set_message_read(self, cr, uid, msg_id, context=None):
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        notif_ids = self.search(cr, uid, [('partner_id', '=', partner_id), ('message_id', '=', msg_id)], context=context)
+        return self.write(cr, uid, notif_ids, {'read': True}, context=context)
+
     def notify(self, cr, uid, partner_ids, msg_id, context=None):
         """ Send by email the notification depending on the user preferences """
         context = context or {}
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 413606b9ed2..d1f6dab6077 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -34,11 +34,8 @@ def decode(text):
         return ''.join([tools.ustr(x[0], x[1]) for x in text])
 
 class mail_message(osv.Model):
-    """Model holding messages: system notification (replacing res.log
-    notifications), comments (for OpenChatter feature). This model also
-    provides facilities to parse new email messages. Type of messages are
-    differentiated using the 'type' column. """
-
+    """ Messages model: system notification (replacing res.log notifications),
+        comments (OpenChatter discussion) and incoming emails. """
     _name = 'mail.message'
     _description = 'Message'
     _inherit = ['ir.needaction_mixin']
@@ -76,9 +73,9 @@ class mail_message(osv.Model):
         return res
 
     def _search_unread(self, cr, uid, obj, name, domain, context=None):
-        """ Search for messages unread by the current user. """
-        read_value = not domain[0][2]
-        read_cond = '' if read_value else '!= true'
+        """ Search for messages unread by the current user. Condition is 
+            inversed because we search unread message on a read column. """
+        read_cond = '' if not domain[0][2] else '!= true'
         partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         cr.execute("""  SELECT mail_message.id \
                         FROM mail_message \
@@ -87,10 +84,7 @@ class mail_message(osv.Model):
                         WHERE mail_notification.partner_id = %%s AND \
                             mail_notification.read %s \
                     """ % read_cond, (partner_id,) )
-        res = cr.fetchall()
-        message_ids = [r[0] for r in res]
-        return [('id', 'in', message_ids)]
-
+        return [('id', 'in', [r[0] for r in cr.fetchall()])]
 
     def name_get(self, cr, uid, ids, context=None):
         # name_get may receive int id instead of an id list
@@ -103,9 +97,8 @@ class mail_message(osv.Model):
         return res
 
     _columns = {
-        # should we keep a distinction between email and comment ?
         'type': fields.selection([
-                        ('email', 'email'),
+                        ('email', 'Email'),
                         ('comment', 'Comment'),
                         ('notification', 'System notification'),
                         ], 'Type',
@@ -146,7 +139,6 @@ class mail_message(osv.Model):
         'author_id': _get_default_author
     }
 
-
     #------------------------------------------------------
     # Message loading for web interface
     #------------------------------------------------------
@@ -261,12 +253,11 @@ class mail_message(osv.Model):
                 break
 
         # Flatten the result
-        if thread_level > 0:
-            result = self.message_read_tree_flatten(cr, uid, result, 0, thread_level, context=context)
+        # if thread_level > 0:
+        #     result = self.message_read_tree_flatten(cr, uid, result, 0, thread_level, context=context)
 
         return result
 
-
     #------------------------------------------------------
     # Email api
     #------------------------------------------------------
@@ -276,52 +267,47 @@ class mail_message(osv.Model):
         if not cr.fetchone():
             cr.execute("""CREATE INDEX mail_message_model_res_id_idx ON mail_message (model, res_id)""")
 
-    def check(self, cr, uid, ids, mode, context=None):
-        """
-        You can read/write a message if:
-          - you received it (a notification exists) or
-          - you can read the related document (res_model, res_id)
-        If a message is not attached to a document, normal access rights on
-        the mail.message object apply.
-        """
-        if not ids:
-            return
+    def check_access_rule(self, cr, uid, ids, operation, context=None):
+        """ mail.message access rule check
+            - message received (a notification exists) -> ok
+            - check rules of related document if exists
+            - fallback on normal mail.message check """
         if isinstance(ids, (int, long)):
             ids = [ids]
 
-        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
-
         # check messages for which you have a notification
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         not_obj = self.pool.get('mail.notification')
         not_ids = not_obj.search(cr, uid, [
             ('partner_id', '=', partner_id),
             ('message_id', 'in', ids),
         ], context=context)
-        for notification in not_obj.browse(cr, uid, not_ids, context=context):
-            if notification.message_id.id in ids:
-                pass
-                # FP Note: we should put this again !!!
-                #ids.remove(notification.message_id.id)
+        notified_ids = [notification.message_id.id for notification in not_obj.browse(cr, uid, not_ids, context=context)
+            if notification.message_id.id in ids]
 
-        # check messages according to related documents
-        res_ids = {}
-        cr.execute('SELECT DISTINCT model, res_id FROM mail_message WHERE id = ANY (%s)', (ids,))
-        for rmod, rid in cr.fetchall():
+        # check messages linked to an existing document
+        model_record_ids = {}
+        document_ids = []
+        cr.execute('SELECT DISTINCT id, model, res_id FROM mail_message WHERE id = ANY (%s)', (ids,))
+        for id, rmod, rid in cr.fetchall():
             if not (rmod and rid):
                 continue
-            res_ids.setdefault(rmod,set()).add(rid)
+            document_ids.append(id)
+            model_record_ids.setdefault(rmod,set()).add(rid)
+        for model, mids in model_record_ids.items():
+            model_obj = self.pool.get(model)
+            mids = model_obj.exists(cr, uid, mids)
+            model_obj.check_access_rights(cr, uid, operation)
+            model_obj.check_access_rule(cr, uid, mids, operation, context=context)
 
-        ima_obj = self.pool.get('ir.model.access')
-        for model, mids in res_ids.items():
-            mids = self.pool.get(model).exists(cr, uid, mids)
-            ima_obj.check(cr, uid, model, mode)
-            self.pool.get(model).check_access_rule(cr, uid, mids, mode, context=context)
+        # fall back on classic operation for other ids
+        other_ids = set(ids).difference(set(notified_ids), set(document_ids))
+        super(mail_message, self).check_access_rule(cr, uid, other_ids, operation, context=None)
 
     def create(self, cr, uid, values, context=None):
         if not values.get('message_id') and values.get('res_id') and values.get('model'):
             values['message_id'] = tools.generate_tracking_message_id('%(model)s-%(res_id)s'% values)
         newid = super(mail_message, self).create(cr, uid, values, context)
-        self.check(cr, uid, [newid], mode='create', context=context)
         self.notify(cr, uid, newid, context=context)
         return newid
 
@@ -344,40 +330,9 @@ class mail_message(osv.Model):
             partners_to_notify |= extra_notified
         self.pool.get('mail.notification').notify(cr, uid, list(partners_to_notify), newid, context=context)
 
-    def read(self, cr, uid, ids, fields_to_read=None, context=None, load='_classic_read'):
-        self.check(cr, uid, ids, 'read', context=context)
-        return super(mail_message, self).read(cr, uid, ids, fields_to_read, context, load)
-
     def copy(self, cr, uid, id, default=None, context=None):
         """Overridden to avoid duplicating fields that are unique to each email"""
         if default is None:
             default = {}
-        self.check(cr, uid, [id], 'read', context=context)
         default.update(message_id=False, headers=False)
         return super(mail_message,self).copy(cr, uid, id, default=default, context=context)
-
-    def write(self, cr, uid, ids, vals, context=None):
-        result = super(mail_message, self).write(cr, uid, ids, vals, context)
-        self.check(cr, uid, ids, 'write', context=context)
-        return result
-
-    def unlink(self, cr, uid, ids, context=None):
-        self.check(cr, uid, ids, 'unlink', context=context)
-        return super(mail_message, self).unlink(cr, uid, ids, context)
-
-
-class mail_notification(osv.Model):
-    """ mail_notification is a relational table modeling messages pushed to partners.
-    """
-    _inherit = 'mail.notification'
-    _columns = {
-        'message_id': fields.many2one('mail.message', string='Message',
-                        ondelete='cascade', required=True, select=1),
-    }
-
-    def set_message_read(self, cr, uid, msg_id, context=None):
-        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
-        notif_ids = self.search(cr, uid, [('partner_id', '=', partner_id), ('message_id', '=', msg_id)], context=context)
-        return self.write(cr, uid, notif_ids, {'read': True}, context=context)
-
-

From 21f17ba8a57faf038f6a1f7ba650aced726d4626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 31 Aug 2012 11:31:39 +0200
Subject: [PATCH 653/999] [CLEAN] mail_mail: misc clean of comments and
 commented lines; also renamed message as mail in send, to have a more
 accurate variable name.

bzr revid: tde@openerp.com-20120831093139-9o8ui5h912rx9i13
---
 addons/mail/mail_mail.py | 88 +++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 47 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 7f3a8a880ea..36b71653556 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -31,11 +31,8 @@ from tools.translate import _
 _logger = logging.getLogger(__name__)
 
 class mail_mail(osv.Model):
-    """
-    Model holding RFC2822 email messages to send. This model also provides
-    facilities to queue and send new email messages. 
-    """
-
+    """ Model holding RFC2822 email messages to send. This model also provides
+        facilities to queue and send new email messages.  """
     _name = 'mail.mail'
     _description = 'Outgoing Mails'
     _inherits = {'mail.message': 'mail_message_id'}
@@ -64,9 +61,7 @@ class mail_mail(osv.Model):
     def _get_default_from(self, cr, uid, context=None):
         cur = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if not cur.alias_domain:
-            # TDE temp: impossible to install social module, because mail.group tries to send emails ...
-            # raise osv.except_osv(_('Invalid Action!'), _('Unable to send email, set an alias domain in your server settings.'))
-            pass
+            raise osv.except_osv(_('Invalid Action!'), _('Unable to send email, set an alias domain in your server settings.'))
         return cur.alias_name + '@' + cur.alias_domain
 
     _defaults = {
@@ -127,69 +122,68 @@ class mail_mail(osv.Model):
             message.unlink()
         return True
 
-    def send(self, cr, uid, ids, auto_commit=False, context=None):
-        """Sends the selected emails immediately, ignoring their current
-           state (mails that have already been sent should not be passed
-           unless they should actually be re-sent).
-           Emails successfully delivered are marked as 'sent', and those
-           that fail to be deliver are marked as 'exception', and the
-           corresponding error message is output in the server logs.
+    def _send_get_mail_subject(self, cr, uid, mail, force=False, context=None):
+        """ if void and related document: '<Author> posted on <Resource>'
+            :param mail: mail.mail browse_record """
+        if force or (not mail.subject and mail.model and mail.res_id):
+            return '%s posted on %s' % (mail.author_id.name, mail.record_name)
+        return mail.subject
 
-           :param bool auto_commit: whether to force a commit of the message
-                                    status after sending each message (meant
-                                    only for processing by the scheduler),
-                                    should never be True during normal
-                                    transactions (default: False)
-           :return: True
+    def send(self, cr, uid, ids, auto_commit=False, context=None):
+        """ Sends the selected emails immediately, ignoring their current
+            state (mails that have already been sent should not be passed
+            unless they should actually be re-sent).
+            Emails successfully delivered are marked as 'sent', and those
+            that fail to be deliver are marked as 'exception', and the
+            corresponding error mail is output in the server logs.
+
+            :param bool auto_commit: whether to force a commit of the mail status
+                after sending each mail (meant only for scheduler processing);
+                should never be True during normal transactions (default: False)
+            :return: True
         """
         ir_mail_server = self.pool.get('ir.mail_server')
-        for message in self.browse(cr, uid, ids, context=context):
+        for mail in self.browse(cr, uid, ids, context=context):
             try:
-                body = message.body_html
+                body = mail.body_html
+                subject = self._send_get_mail_subject(cr, uid, mail, context=context)
 
                 # handle attachments
                 attachments = []
-                for attach in message.attachment_ids:
+                for attach in mail.attachment_ids:
                     attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
 
-                # no subject, res_id, model: '<Author> posted on <Resource>'
-                if not message.subject and message.model and message.res_id:
-                    subject = '%s posted on %s' % (message.author_id.name, message.record_name)
-                else:
-                    subject = message.subject
-
                 # use only sanitized html and set its plaintexted version as alternative
                 body_alternative = tools.html2plaintext(body)
                 content_subtype_alternative = 'plain'
 
-                # build an RFC2822 email.message.Message object and send it
-                # without queuing
+                # build an RFC2822 email.message.Message object and send it without queuing
                 msg = ir_mail_server.build_email(
-                    email_from = message.email_from,
-                    email_to = tools.email_split(message.email_to),
+                    email_from = mail.email_from,
+                    email_to = tools.email_split(mail.email_to),
                     subject = subject,
                     body = body,
                     body_alternative = body_alternative,
-                    email_cc = tools.email_split(message.email_cc),
-                    reply_to = message.reply_to,
+                    email_cc = tools.email_split(mail.email_cc),
+                    reply_to = mail.reply_to,
                     attachments = attachments,
-                    message_id = message.message_id,
-                    references = message.references,
-                    object_id = message.res_id and ('%s-%s' % (message.res_id,message.model)),
+                    message_id = mail.message_id,
+                    references = mail.references,
+                    object_id = mail.res_id and ('%s-%s' % (mail.res_id, mail.model)),
                     subtype = 'html',
                     subtype_alternative = content_subtype_alternative)
                 res = ir_mail_server.send_email(cr, uid, msg,
-                    mail_server_id=message.mail_server_id.id, context=context)
+                    mail_server_id=mail.mail_server_id.id, context=context)
                 if res:
-                    message.write({'state':'sent', 'message_id': res})
+                    mail.write({'state':'sent', 'message_id': res})
                 else:
-                    message.write({'state':'exception'})
-                message.refresh()
-                if message.state == 'sent':
-                    self._postprocess_sent_message(cr, uid, message, context=context)
+                    mail.write({'state':'exception'})
+                mail.refresh()
+                if mail.state == 'sent':
+                    self._postprocess_sent_message(cr, uid, mail, context=context)
             except Exception:
-                _logger.exception('failed sending mail.mail %s', message.id)
-                message.write({'state':'exception'})
+                _logger.exception('failed sending mail.mail %s', mail.id)
+                mail.write({'state':'exception'})
 
             if auto_commit == True:
                 cr.commit()

From a652cc9ef0e78692b2c37e992acf7463580ab490 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 31 Aug 2012 11:54:00 +0200
Subject: [PATCH 654/999] [IMP] sale, sale_analytic_plans: add missing fields
 in sale order lines, and make list non-editable for group analytic accounting

bzr revid: rco@openerp.com-20120831095400-gaztg6293sz43pd1
---
 addons/sale/sale_view.xml                               | 4 ++--
 addons/sale_analytic_plans/sale_analytic_plans_view.xml | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 8e964fb5b88..922c3d90d8b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -262,8 +262,6 @@
                                     <field name="sequence" widget="handle"/>
                                     <field name="state" invisible="1"/>
                                     <field name="delay" invisible="1"/>
-                                    <field name="tax_id" invisible="1"/>
-                                    <field name="type" invisible="1"/>
                                     <field name="th_weight" invisible="1"/>
                                     <field name="product_packaging" invisible="1"/>
                                     <field name="product_id"
@@ -271,6 +269,7 @@
                                         groups="base.group_user" 
                                         on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, True, parent.date_order, False, parent.fiscal_position, False, context)"/>
                                     <field name="name"/>
+                                    <field name="type"/>
                                     <field name="product_uom_qty"
                                         context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                         on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, False, parent.fiscal_position, True, context)"/>
@@ -281,6 +280,7 @@
                                     <field name="product_uos" string="UoS" groups="product.group_uos"/>
                                     <field name="discount" groups="sale.group_discount_per_so_line"/>
                                     <field name="price_unit"/>
+                                    <field name="tax_id"/>
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>
diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index 6701ede5ae5..6c788866520 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -22,6 +22,11 @@
         </field>
     </record>
 
+    <!-- the presence of 'analytics_id' makes the order lines non-editable -->
+    <record id="sale.view_order_form_editable_list" model="ir.ui.view">
+        <field name="groups_id" eval="[(4, ref('analytic.group_analytic_accounting'))]"/>
+    </record>
+
     <record model="ir.ui.view" id="view_order_line_form2_inherit">
         <field name="name">sale.order.line.form2.inherit</field>
         <field name="model">sale.order.line</field>

From 5426eb7508768f954ac1d1e78ef20a9c0d8fd736 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 31 Aug 2012 12:05:35 +0200
Subject: [PATCH 655/999] [FIX] sale order: fix order lines in form

bzr revid: rco@openerp.com-20120831100535-1awx1kj0ezrzw38d
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 922c3d90d8b..a2f44034db3 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -280,7 +280,7 @@
                                     <field name="product_uos" string="UoS" groups="product.group_uos"/>
                                     <field name="discount" groups="sale.group_discount_per_so_line"/>
                                     <field name="price_unit"/>
-                                    <field name="tax_id"/>
+                                    <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>

From a2aa1dfdce68b3ef0ec41ad085b506fd8735c6b1 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 31 Aug 2012 12:12:13 +0200
Subject: [PATCH 656/999] [IMP] purchase: add missing fields in purchase order
 lines

bzr revid: rco@openerp.com-20120831101213-cueqapr741v9ntzo
---
 addons/purchase/purchase_view.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index dfa4c5a0651..35882574619 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -216,11 +216,14 @@
                             <field name="order_line">
                                 <tree string="Purchase Order Lines" editable="bottom">
                                     <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)"/>
-                                    <field name="date_planned"/>
                                     <field name="name"/>
+                                    <field name="date_planned"/>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    <field name="account_analytic_id" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                                     <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)"/>
                                     <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)"/>
                                     <field name="price_unit"/>
+                                    <field name="taxes_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>

From 86dd3bdc57b4498264900a498ac5f12e532a1109 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 31 Aug 2012 13:23:53 +0200
Subject: [PATCH 657/999] [FIX] mail_message: fixed and simplified unread
 messages query. Added an index on the read column of mail_notification.

bzr revid: tde@openerp.com-20120831112353-egmeetrnecp2kflp
---
 addons/mail/mail_followers.py |  2 +-
 addons/mail/mail_message.py   | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 5143871745b..9be82d077c6 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -58,7 +58,7 @@ class mail_notification(osv.Model):
     _columns = {
         'partner_id': fields.many2one('res.partner', string='Contact',
                         ondelete='cascade', required=True, select=1),
-        'read': fields.boolean('Read'),
+        'read': fields.boolean('Read', select=1),
         'message_id': fields.many2one('mail.message', string='Message',
                         ondelete='cascade', required=True, select=1),
     }
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index d1f6dab6077..d4dc66d75e0 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -75,15 +75,14 @@ class mail_message(osv.Model):
     def _search_unread(self, cr, uid, obj, name, domain, context=None):
         """ Search for messages unread by the current user. Condition is 
             inversed because we search unread message on a read column. """
-        read_cond = '' if not domain[0][2] else '!= true'
+        if domain[0][2]:
+            read_cond = '(read = false or read is null)'
+        else:
+            read_cond = 'read = true'
         partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
-        cr.execute("""  SELECT mail_message.id \
-                        FROM mail_message \
-                        JOIN mail_notification ON ( \
-                            mail_notification.message_id = mail_message.id ) \
-                        WHERE mail_notification.partner_id = %%s AND \
-                            mail_notification.read %s \
-                    """ % read_cond, (partner_id,) )
+        cr.execute("SELECT message_id FROM mail_notification "\
+                        "WHERE partner_id = %%s AND %s" % read_cond,
+                    (partner_id,))
         return [('id', 'in', [r[0] for r in cr.fetchall()])]
 
     def name_get(self, cr, uid, ids, context=None):

From 9e6cce28b80e64e7df2d8e350e02fa14566e0b6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 31 Aug 2012 13:27:21 +0200
Subject: [PATCH 658/999] [FIX] mail: tests: fixed followers test, because
 using set() allows to override a test that was precisely about not having a
 same value more than once in follower_ids.

bzr revid: tde@openerp.com-20120831112721-56qfnh9vk1xkbke0
---
 addons/mail/tests/test_mail.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 12ae25e1815..fd4b116b364 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -203,17 +203,19 @@ class test_mail(common.TransactionCase):
         user_raoul_id = self.res_users.create(cr, uid, {'name': 'Raoul Grosbedon', 'login': 'raoul'})
         user_raoul = self.res_users.browse(cr, uid, user_raoul_id)
 
-        # Subscribe Raoul twice (niak niak) through message_subscribe_users
+        # Subscribe Raoul three times (niak niak) through message_subscribe_users
         group_pigs.message_subscribe_users([user_raoul_id, user_raoul_id])
+        group_pigs.message_subscribe_users([user_raoul_id])
         group_pigs.refresh()
-        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
-        self.assertEqual(follower_ids, set([user_raoul.partner_id.id, user_admin.partner_id.id]), 'Admin and Raoul should be the only 2 Pigs group followers')
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertEqual(len(follower_ids), 2, 'There should be 2 Pigs fans')
+        self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]), 'Admin and Raoul should be the only 2 Pigs fans')
 
         # Unsubscribe Raoul twice through message_unsubscribe_users
         group_pigs.message_unsubscribe_users([user_raoul_id, user_raoul_id])
         group_pigs.refresh()
-        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
-        self.assertEqual(follower_ids,  set([user_admin.partner_id.id]), 'Admin must be the only Pigs fan')
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertEqual(follower_ids, [user_admin.partner_id.id], 'Admin must be the only Pigs fan')
 
     def test_20_message_post(self):
         """ Tests designed for message_post. """

From 8f59e1d906d623a4ac62c788e5d5792a69becb4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 31 Aug 2012 13:52:02 +0200
Subject: [PATCH 659/999] [IMP] mail_notification: removed select on columns,
 added creation of a combined index in init.

bzr revid: tde@openerp.com-20120831115202-q3fvj4tjoglaqw9c
---
 addons/mail/mail_followers.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 9be82d077c6..9646744fae8 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -57,16 +57,21 @@ class mail_notification(osv.Model):
 
     _columns = {
         'partner_id': fields.many2one('res.partner', string='Contact',
-                        ondelete='cascade', required=True, select=1),
-        'read': fields.boolean('Read', select=1),
+                        ondelete='cascade', required=True),
+        'read': fields.boolean('Read'),
         'message_id': fields.many2one('mail.message', string='Message',
-                        ondelete='cascade', required=True, select=1),
+                        ondelete='cascade', required=True),
     }
 
     _defaults = {
         'read': False,
     }
 
+    def init(self, cr):
+        cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = %s', ('mail_notification_partner_id_read_message_id',))
+        if not cr.fetchone():
+            cr.execute('CREATE INDEX mail_notification_partner_id_read_message_id ON mail_notification (partner_id, read, message_id)')
+
     def create(self, cr, uid, vals, context=None):
         """ Override of create to check that we can not create a notification
             for a message the user can not read. """

From 0b67a85725cf44ca130790638c1bda6acdb190ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 31 Aug 2012 14:56:05 +0200
Subject: [PATCH 660/999] [FIX] mail.message, mail.compose.message: fixed
 attachments management, added tests.

bzr revid: tde@openerp.com-20120831125605-1oizomm2pv3b5rse
---
 addons/mail/tests/test_mail.py             | 96 +++++++++++++---------
 addons/mail/wizard/mail_compose_message.py |  3 +-
 2 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index fd4b116b364..d288f522a72 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -19,9 +19,11 @@
 #
 ##############################################################################
 
-from openerp.tests import common
+import base64
 import tools
 
+from openerp.tests import common
+
 MAIL_TEMPLATE = """Return-Path: <whatever-2a840@postmaster.twitter.com>
 To: {to}
 Received: by mail1.openerp.com (Postfix, from userid 10002)
@@ -245,10 +247,10 @@ class test_mail(common.TransactionCase):
         _body2 = '<html>Pigs rules</html>'
         _mail_body2 = '<html>Pigs rules\n<pre>Admin</pre>\n</html>'
         _mail_bodyalt2 = 'Pigs rules\nAdmin\n'
+        _attachments = [('First', 'My first attachment'), ('Second', 'My second attachment')]
 
-        # Post comment with body and subject, comment preference
+        # CASE1: post comment, body and subject specified
         msg_id = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body1, subject=_subject, msg_type='comment')
-        # Fetch: created mail_message, mail_mail, sent_email
         message = self.mail_message.browse(cr, uid, msg_id)
         mail_ids = self.mail_mail.search(cr, uid, [], limit=1)
         mail = self.mail_mail.browse(cr, uid, mail_ids[0])
@@ -261,7 +263,7 @@ class test_mail(common.TransactionCase):
         self.assertEqual(mail.subject, _subject, 'mail.mail subject incorrect')
         self.assertEqual(mail.body_html, _mail_body1, 'mail.mail body_html incorrect')
         self.assertEqual(mail.mail_message_id.id, msg_id, 'mail_mail.mail_message_id is not the id of its related mail_message)')
-        # Test: sent_email: email send by server: correct subject and body
+        # Test: sent_email: email send by server: correct subject, body; body_alternative
         self.assertEqual(sent_email['subject'], _subject, 'sent_email subject incorrect')
         self.assertEqual(sent_email['body'], _mail_body1, 'sent_email body incorrect')
         self.assertEqual(sent_email['body_alternative'], _mail_bodyalt1, 'sent_email body_alternative is incorrect')
@@ -276,23 +278,24 @@ class test_mail(common.TransactionCase):
         # Test: sent_email: email_to should contain b@b, not c@c (pref email), not a@a (writer)
         self.assertEqual(sent_email['email_to'], ['b@b'], 'sent_email email_to is incorrect')
 
-        # New post: test automatic subject, signature in html, add a partner, email preference, parent_id previous message
-        msg_id2 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body2, msg_type='email', partner_ids=[(6, 0, [p_d_id])], parent_id=msg_id)
-        # Fetch: created mail_message, mail_mail, sent_email
+        # CASE2: post an email with attachments, parent_id, partner_ids
+        # TESTS: automatic subject, signature in body_html, attachments propagation
+        msg_id2 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body2, msg_type='email',
+            partner_ids=[(6, 0, [p_d_id])], parent_id=msg_id, attachments=_attachments)
         message = self.mail_message.browse(cr, uid, msg_id2)
         mail_ids = self.mail_mail.search(cr, uid, [], limit=1)
         mail = self.mail_mail.browse(cr, uid, mail_ids[0])
         sent_email = self._build_email_kwargs
 
-        # Test: mail_message: subject is False, body is _body1 (no formatting done), parent_id is msg_id
+        # Test: mail_message: subject is False, body is _body2 (no formatting done), parent_id is msg_id
         self.assertEqual(message.subject, False, 'mail.message subject incorrect')
         self.assertEqual(message.body, _body2, 'mail.message body incorrect')
         self.assertEqual(message.parent_id.id, msg_id, 'mail.message parent_id incorrect')
-        # Test: mail_mail: subject is False, body_html is _mail_body1 (signature appended)
+        # Test: mail_mail: subject is False, body_html is _mail_body2 (signature appended)
         self.assertEqual(mail.subject, False, 'mail.mail subject is incorrect')
         self.assertEqual(mail.body_html, _mail_body2, 'mail.mail body_html incorrect')
         self.assertEqual(mail.mail_message_id.id, msg_id2, 'mail_mail.mail_message_id incorrect')
-        # Test: sent_email: email send by server: correct subject and body
+        # Test: sent_email: email send by server: correct subject, body, body_alternative
         self.assertEqual(sent_email['subject'], _mail_subject, 'sent_email subject incorrect')
         self.assertEqual(sent_email['body'], _mail_body2, 'sent_email body incorrect')
         self.assertEqual(sent_email['body_alternative'], _mail_bodyalt2, 'sent_email body_alternative incorrect')
@@ -300,17 +303,20 @@ class test_mail(common.TransactionCase):
         message_pids = set([partner.id for partner in message.partner_ids])
         test_pids = set([p_a_id, p_b_id, p_c_id, p_d_id])
         self.assertEqual(message_pids, test_pids, 'mail.message partners incorrect')
-        # Test: notification linked to this message = group followers = partner_ids
+        # Test: notifications linked to this message = group followers = partner_ids
         notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
         notif_pids = set([notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)])
         self.assertEqual(notif_pids, test_pids, 'mail.message notification partners incorrect')
         # Test: sent_email: email_to should contain b@b, c@c, not a@a (writer)
         self.assertEqual(set(sent_email['email_to']), set(['b@b', 'c@c']), 'sent_email email_to incorrect')
+        # Test: attachments
+        for i in range(len(message.attachment_ids)):
+            self.assertEqual(message.attachment_ids[i].name, _attachments[i][0], 'mail.message attachment name incorrect')
+            self.assertEqual(message.attachment_ids[i].res_model, 'mail.group', 'mail.message attachment res_model incorrect')
+            self.assertEqual(message.attachment_ids[i].res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
+            self.assertEqual(base64.b64decode(message.attachment_ids[i].datas), _attachments[i][1], 'mail.message attachment data incorrect')
 
-    def test_21_message_post_attachments(self):
-        """ Tests designed for attachments. """
-
-    def test_22_message_compose_wizard(self):
+    def test_21_message_compose_wizard(self):
         """ Tests designed for the mail.compose.message wizard. """
         cr, uid = self.cr, self.uid
         mail_compose = self.registry('mail.compose.message')
@@ -325,6 +331,10 @@ class test_mail(common.TransactionCase):
         _msg_body1 = '<pre>Pigs rules</pre>'
         _body_html = '<html>Pigs rules</html>'
         _msg_body2 = '<html>Pigs rules</html>'
+        _attachments = [
+            {'name': 'First', 'datas': base64.b64encode('My first attachment')},
+            {'name': 'Second', 'datas': base64.b64encode('My second attachment')}
+            ]
 
         # Create partners
         # 0 - Admin
@@ -339,46 +349,54 @@ class test_mail(common.TransactionCase):
         # Subscribe #1
         group_pigs.message_subscribe([p_b_id])
 
-        # Comment group_pigs: body_text
+        # CASE1: comment group_pigs with body_text and subject
         compose_id = mail_compose.create(cr, uid,
             {'subject': _subject, 'body_text': _body_text, 'partner_ids': [(4, p_c_id), (4, p_d_id)]},
             {'mail.compose.message.mode': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_pigs_id})
         compose = mail_compose.browse(cr, uid, compose_id)
-
-        # Test: model, res_id
-        self.assertTrue(compose.model == 'mail.group' and compose.res_id == self.group_pigs_id,
-            'mail.compose.message has model %s and res_id %s; should be mail.group and %s' % (compose.model, compose.res_id, self.group_pigs_id))
+        # Test: mail.compose.message: model, res_id
+        self.assertEqual(compose.model,  'mail.group', 'mail.compose.message incorrect model')
+        self.assertEqual(compose.res_id, self.group_pigs_id, 'mail.compose.message incorrect res_id')
 
         # Post the comment, get created message
         mail_compose.send_mail(cr, uid, [compose_id])
         group_pigs.refresh()
-        msg = group_pigs.message_ids[0]
+        message = group_pigs.message_ids[0]
 
         # Test: mail.message: subject, body inside pre
-        self.assertTrue(msg.subject == False and msg.body == _msg_body1,
-            'mail.message subject is %s, body is %s; should be %s and %s' % (msg.subject, msg.body, False, _msg_body1))
-        # Test: mail.message partners = notified people: group_pigs followers (a, b) + mail.compose.message partner_ids (c, d)
-        msg_pids = [partner.id for partner in msg.partner_ids]
+        self.assertEqual(message.subject,  False, 'mail.message incorrect subject')
+        self.assertEqual(message.body, _msg_body1, 'mail.message incorrect body')
+        # Test: mail.message: partner_ids = entries in mail.notification: group_pigs fans (a, b) + mail.compose.message partner_ids (c, d)
+        msg_pids = [partner.id for partner in message.partner_ids]
         test_pids = [p_a_id, p_b_id, p_c_id, p_d_id]
-        notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', msg.id)])
-        self.assertTrue(len(msg_pids) == 4, 'There are %s partners linked to the newly posted comment; should be 4' % (len(msg_pids)))
-        self.assertTrue(len(notif_ids) == 4, 'There are %s entries in mail_notification: should be 4' % (len(notif_ids)))
-        self.assertTrue(all(id in msg_pids for id in test_pids) and len(msg_pids) == len(test_pids),
-            'Admin, Bert Raoul and Roger should be the 4 partners of the newly created message')
+        notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
+        self.assertEqual(len(notif_ids), 4, 'mail.message: too much notifications created')
+        self.assertEqual(set(msg_pids), set(test_pids), 'mail.message partner_ids incorrect')
 
-        # Create a reply to the last comment
+        # CASE2: reply to last comment with attachments
         compose_id = mail_compose.create(cr, uid,
-            {}, {'mail.compose.message.mode': 'reply', 'default_model': 'mail.thread', 'default_res_id': self.group_pigs_id,
-                'active_id': msg.id})
+            {'attachment_ids': [(0, 0, _attachments[0]), (0, 0, _attachments[1])]},
+            {'mail.compose.message.mode': 'reply', 'default_model': 'mail.thread', 'default_res_id': self.group_pigs_id, 'active_id': message.id})
         compose = mail_compose.browse(cr, uid, compose_id)
 
+        # Test: form view methods
         # Test: model, res_id, parent_id
-        self.assertTrue(compose.model == 'mail.group' and compose.res_id == self.group_pigs_id,
-            'Wizard message has model: %s and res_id:%s; should be mail.group and %s' % (compose.model, compose.res_id, self.group_pigs_id))
-        self.assertEqual(compose.parent_id.id, msg.id,
-            'Wizard parent_id is %d; should be %d' % (compose.parent_id.id, msg.id))
+        self.assertEqual(compose.model,  'mail.group', 'mail.compose.message incorrect model')
+        self.assertEqual(compose.res_id, self.group_pigs_id, 'mail.compose.message incorrect res_id')
+        self.assertEqual(compose.parent_id.id, message.id, 'mail.compose.message incorrect parent_id')
 
-        # 3 - Create in mass_mail composition mode that should work with or without email_template installed
+        # Post the comment, get created message
+        mail_compose.send_mail(cr, uid, [compose_id])
+        group_pigs.refresh()
+        message = group_pigs.message_ids[0]
+        # Test: attachments
+        for i in range(len(message.attachment_ids)):
+            self.assertEqual(message.attachment_ids[i].name, _attachments[i]['name'], 'mail.message attachment name incorrect')
+            self.assertEqual(message.attachment_ids[i].res_model, 'mail.group', 'mail.message attachment res_model incorrect')
+            self.assertEqual(message.attachment_ids[i].res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
+            self.assertEqual(base64.b64decode(message.attachment_ids[i].datas), base64.b64decode(_attachments[i]['datas']), 'mail.message attachment data incorrect')
+
+        # CASE3 - Create in mass_mail composition mode that should work with or without email_template installed
         compose_id = mail_compose.create(cr, uid,
             {'subject': _subject, 'body': '${object.description}'},
             {'default_composition_mode': 'mass_mail', 'default_model': 'mail.group', 'default_res_id': -1,
@@ -389,7 +407,6 @@ class test_mail(common.TransactionCase):
         mail_compose.send_mail(cr, uid, [compose_id], {'default_res_id': -1, 'active_ids': [self.group_pigs_id]})
         group_pigs.refresh()
         msg = group_pigs.message_ids[0]
-
         # Test: last message on Pigs = last created message
         test_msg = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [], limit=1))[0]
         self.assertEqual(msg.id, test_msg.id, 'Pigs did not receive its mass mailing message')
@@ -397,7 +414,6 @@ class test_mail(common.TransactionCase):
         self.assertEqual(msg.subject, _subject, 'mail.message subject is incorrect')
         self.assertEqual(msg.body, group_pigs.description, 'mail.message body is incorrect')
 
-
     def test_30_message_read(self):
         """ Tests designed for message_read. """
         def _simplify_struct(read_dict):
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index e5748a723e6..8698af42110 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import base64
 import re
 import tools
 
@@ -242,7 +243,7 @@ class mail_compose_message(osv.TransientModel):
                     'subject': wizard.subject if wizard.content_subtype == 'html' else False,
                     'body': wizard.body if wizard.content_subtype == 'html' else '<pre>%s</pre>' % tools.ustr(wizard.body_text),
                     'partner_ids': [(4, partner.id) for partner in wizard.partner_ids],
-                    'attachments': [(attach.datas_fname, attach.datas) for attach in wizard.attachment_ids],
+                    'attachments': [(attach.name or attach.datas_fname, base64.b64decode(attach.datas)) for attach in wizard.attachment_ids],
                 }
                 # mass mailing: render and override default values
                 if mass_mail_mode and wizard.model:

From a58d50225cc7c2db9f9dc187521ac95fc1f3b3a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 31 Aug 2012 15:15:03 +0200
Subject: [PATCH 661/999] [FIX] mail_message: fixed message_read. Issue was
 coming from 'expandable' messages, that are there for displaying the threads,
 but should not be processed.

bzr revid: tde@openerp.com-20120831131503-gvypj0z1jykjkpk9
---
 addons/mail/mail_message.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index d4dc66d75e0..2bf5f0ab078 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -166,12 +166,10 @@ class mail_message(osv.Model):
 
     def message_read_tree_flatten(self, cr, uid, messages, current_level, level, context=None):
         """ Given a tree with several roots of following structure :
-            [
-                {'id': 1, 'child_ids':[
-                    {'id': 11, 'child_ids': [...] },
-                ] },
-                {...}
-            ]
+            [   {'id': 1, 'child_ids': [
+                    {'id': 11, 'child_ids': [...] },],
+                },
+                {...}   ]
             Flatten it to have a maximum number of level, with 0 being
             completely flat.
             Perform the flattening at leafs if above the maximum depth, then get
@@ -186,6 +184,8 @@ class mail_message(osv.Model):
             return [msg_dict] + child_ids
         # Depth-first flattening
         for message in messages:
+            if message['type'] == 'expandable':
+                continue
             message['child_ids'] = self.message_read_tree_flatten(cr, uid, message['child_ids'], current_level+1, level, context=context)
         # Flatten if above maximum depth
         if current_level < level:
@@ -252,8 +252,8 @@ class mail_message(osv.Model):
                 break
 
         # Flatten the result
-        # if thread_level > 0:
-        #     result = self.message_read_tree_flatten(cr, uid, result, 0, thread_level, context=context)
+        if thread_level > 0:
+            result = self.message_read_tree_flatten(cr, uid, result, 0, thread_level, context=context)
 
         return result
 

From 6bc116cf6d8d3ff250b24f9d59ccd35df8c92bd2 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 31 Aug 2012 15:23:04 +0200
Subject: [PATCH 662/999] fixed avatar hover and shadow in kanban view

bzr revid: mit@openerp.com-20120831132304-qzmuvltopy1mdiwa
---
 addons/web_kanban/static/src/css/kanban.css  | 9 ++++++---
 addons/web_kanban/static/src/css/kanban.sass | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 53cad801b49..b2abba2b0ec 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -170,9 +170,9 @@
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-  -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
+  -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
 }
 .openerp .oe_kanban_view .oe_kanban_details {
   display: inline-block;
@@ -265,6 +265,9 @@
 .openerp .oe_kanban_view .oe_kanban_action_a {
   text-decoration: none;
 }
+.openerp .oe_kanban_view .oe_kanban_action_a:hover {
+  text-decoration: none;
+}
 .openerp .oe_kanban_view .oe_kanban_table {
   width: 100%;
   border: none;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 83b17dcfa4d..67039ac475b 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -178,7 +178,7 @@
         text-align: center
         overflow: hidden
         @include radius(3px)
-        @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.4))
+        @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3))
     .oe_kanban_details
         display: inline-block
         vertical-align: top
@@ -246,6 +246,8 @@
         margin: 0
     .oe_kanban_action_a
         text-decoration: none
+        &:hover
+            text-decoration: none
     .oe_kanban_table
         width: 100%
         border: none

From d37745559e951bed047bd293e293ce3087cf8f40 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 31 Aug 2012 15:23:37 +0200
Subject: [PATCH 663/999] [ADD] tools.misc: new function append_to_html, can be
 used to inject blocks (html or plaintext) to existing HTML snippets

bzr revid: odo@openerp.com-20120831132337-of2p1wlh5l4lpvez
---
 openerp/tests/__init__.py  |  3 ++-
 openerp/tests/test_misc.py | 21 +++++++++++++++++++++
 openerp/tools/misc.py      | 31 +++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 openerp/tests/test_misc.py

diff --git a/openerp/tests/__init__.py b/openerp/tests/__init__.py
index d3ab62ebc1c..aa3055f471c 100644
--- a/openerp/tests/__init__.py
+++ b/openerp/tests/__init__.py
@@ -9,7 +9,7 @@ See the :ref:`test-framework` section in the :ref:`features` list.
 """
 
 from . import test_expression, test_html_sanitize, test_ir_sequence, test_orm,\
-              test_view_validation, test_uninstall
+              test_view_validation, test_uninstall, test_misc
 
 fast_suite = [
     test_ir_sequence,
@@ -20,6 +20,7 @@ checks = [
     test_html_sanitize,
     test_orm,
     test_view_validation,
+    test_misc,
 ]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tests/test_misc.py b/openerp/tests/test_misc.py
new file mode 100644
index 00000000000..7661f253b17
--- /dev/null
+++ b/openerp/tests/test_misc.py
@@ -0,0 +1,21 @@
+# This test can be run stand-alone with something like:
+# > PYTHONPATH=. python2 openerp/tests/test_misc.py
+
+import unittest2
+
+class test_misc(unittest2.TestCase):
+    """ Test some of our generic utility functions """
+
+    def test_append_to_html(self):
+        from openerp.tools import append_content_to_html
+        test_samples = [
+            ('<!DOCTYPE...><HTML encoding="blah">some <b>content</b></HtMl>', '--\nYours truly', True,
+             '<!DOCTYPE...><html encoding="blah">some <b>content</b>\n<pre>--\nYours truly</pre>\n</html>'),
+            ('<html><body>some <b>content</b></body></html>', '<!DOCTYPE...>\n<html><body>\n<p>--</p>\n<p>Yours truly</p>\n</body>\n</html>', False,
+             '<html><body>some <b>content</b>\n\n\n<p>--</p>\n<p>Yours truly</p>\n\n\n</body></html>'),
+        ]
+        for html, content, flag, expected in test_samples:
+            self.assertEqual(append_content_to_html(html,content,flag), expected, 'append_content_to_html is broken')
+
+if __name__ == '__main__':
+    unittest2.main()
\ No newline at end of file
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index e86f189e9ca..39e86b1ec4a 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -400,6 +400,37 @@ def email_split(text):
     if not text: return []
     return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
 
+def append_content_to_html(html, content, plaintext=True):
+    """Append extra content at the end of an HTML snippet, trying
+       to locate the end of the HTML document (</body>, </html>, or
+       EOF), and wrapping the provided content in a <pre/> block
+       unless ``plaintext`` is False. A side-effect of this
+       method is to coerce all HTML tags to lowercase in ``html``,
+       and strips enclosing <html> or <body> tags in content if
+       ``plaintext`` is False.
+       
+       :param str html: html tagsoup (doesn't have to be XHTML)
+       :param str content: extra content to append
+       :param bool plaintext: whether content is plaintext and should
+           be wrapped in a <pre/> tag.
+    """
+    html = ustr(html)
+    if plaintext:
+        content = u'\n<pre>%s</pre>\n' % ustr(content)
+    else:
+        content = re.sub(r'(?i)(</?html.*>|</?body.*>|<!\W*DOCTYPE.*>)', '', content)
+        content = u'\n%s\n'% ustr(content)
+    # Force all tags to lowercase
+    html = re.sub(r'(</?)\W*(\w+)([ >])',
+        lambda m: '%s%s%s' % (m.group(1),m.group(2).lower(),m.group(3)), html)
+    insert_location = html.find('</body>')
+    if insert_location == -1:
+        insert_location = html.find('</html>')
+    if insert_location == -1:
+        return '%s%s' % (html, content)
+    return '%s%s%s' % (html[:insert_location], content, html[insert_location:])  
+
+
 #----------------------------------------------------------
 # SMS
 #----------------------------------------------------------

From c973288701bb5b79136ab828aec1bf2352b0e4ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 31 Aug 2012 15:28:03 +0200
Subject: [PATCH 664/999] [CLEAN] crm: convert_opportunity: removed dumb code
 about setting partner of messages when converting a lead into opportunity.

bzr revid: tde@openerp.com-20120831132803-wahvfkmg3typl90a
---
 addons/crm/crm_lead.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index bd321775078..8117ed22c6f 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -592,18 +592,9 @@ class crm_lead(base_stage, osv.osv):
         for lead in self.browse(cr, uid, ids, context=context):
             if lead.state in ('done', 'cancel'):
                 continue
-
             vals = self._convert_opportunity_data(cr, uid, lead, customer, section_id, context=context)
             self.write(cr, uid, [lead.id], vals, context=context)
-
             self.convert_opportunity_send_note(cr, uid, lead, context=context)
-            #TOCHECK: why need to change partner details in all messages of lead ?
-            # TDE FIXME: I propose to delete this, makes no sense to update partner of an already-send email ...
-            # if lead.partner_id:
-            #     msg_ids = [x.id for x in lead.message_ids]
-            #     mail_message.write(cr, uid, msg_ids, {
-            #             'partner_id': lead.partner_id.id
-            #         }, context=context)
 
         if user_ids or section_id:
             self.allocate_salesman(cr, uid, ids, user_ids, section_id, context=context)

From beb8a590e55bfc978112f7e2497c2d8212ece4cc Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 31 Aug 2012 15:50:10 +0200
Subject: [PATCH 665/999] [IMP] product view improvements

bzr revid: fp@tinyerp.com-20120831135010-zo37jb6nyngvqfpy
---
 addons/event_sale/event_sale_view.xml         |   3 +-
 addons/product/product.py                     |   6 +-
 addons/product/product_view.xml               |  81 ++++++++------
 addons/product_expiry/product_expiry_view.xml |   8 +-
 .../product_manufacturer_view.xml             |  32 +++---
 addons/purchase/purchase_view.xml             |   9 +-
 .../purchase_requisition_view.xml             |   2 -
 addons/stock/product_view.xml                 |  65 +++++------
 addons/stock_location/stock_location_view.xml | 101 +++++++++---------
 addons/warning/warning_view.xml               |  14 ++-
 10 files changed, 158 insertions(+), 163 deletions(-)

diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 53e8a4cc18f..c39cff04bd9 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -8,8 +8,9 @@
              <field name="arch" type="xml">
                 <field name="purchase_ok" position="after">
                     <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
+                    <label for="event_ok"/>
                 </field>
-                <field name='procure_method' position='before'>
+                <field name='default_code' position='before'>
                     <field name="event_type_id" attrs="{'readonly': [('event_ok', '=', False)]}"/>
                 </field>
              </field>
diff --git a/addons/product/product.py b/addons/product/product.py
index 214445204bb..699fa66dd8f 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -288,7 +288,7 @@ class product_template(osv.osv):
         'rental': fields.boolean('Can be Rent'),
         'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
         'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
-        'standard_price': fields.float('Cost Price', required=True, digits_compute=dp.get_precision('Product Price'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price.", groups="base.group_user"),
+        'standard_price': fields.float('Cost', required=True, digits_compute=dp.get_precision('Product Price'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price.", groups="base.group_user"),
         'volume': fields.float('Volume', help="The volume in m3."),
         'weight': fields.float('Gross Weight', digits_compute=dp.get_precision('Stock Weight'), help="The gross weight in Kg."),
         'weight_net': fields.float('Net Weight', digits_compute=dp.get_precision('Stock Weight'), help="The net weight in Kg."),
@@ -535,9 +535,9 @@ class product_product(osv.osv):
         'outgoing_qty': fields.function(_product_outgoing_qty, type='float', string='Outgoing'),
         'price': fields.function(_product_price, type='float', string='Pricelist', digits_compute=dp.get_precision('Product Price')),
         'lst_price' : fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Product Price')),
-        'code': fields.function(_product_code, type='char', string='Reference'),
+        'code': fields.function(_product_code, type='char', string='Internal Reference'),
         'partner_ref' : fields.function(_product_partner_ref, type='char', string='Customer ref'),
-        'default_code' : fields.char('Reference', size=64, select=True),
+        'default_code' : fields.char('Internal Reference', size=64, select=True),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the product without removing it."),
         'variants': fields.char('Variants', size=64),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade"),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index d341b5883d6..cc0b7073a58 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -71,6 +71,12 @@
                             </h1>
                             <label for="categ_id" class="oe_edit_only"/>
                             <h2><field name="categ_id"/></h2>
+                            <div name="options" groups="base.group_user">
+                                <field name="sale_ok"/>
+                                <label for="sale_ok"/>
+                                <field name="purchase_ok"/>
+                                <label for="purchase_ok"/>
+                            </div>
                         </div>
                         <div class="oe_right oe_button_box" name="buttons">
                         </div>
@@ -78,57 +84,60 @@
                             <page string="Information">
                                 <group>
                                     <group>
-                                        <field name="default_code"/>
-                                        <field name="ean13" placeholder="e.g. 5901234123457"/>
-                                        <field groups="product.group_product_variant" name="variants"/>
-                                    </group>
-                                    <group groups="base.group_user">
-                                        <field name="sale_ok"/>
-                                        <field name="purchase_ok"/>
-                                    </group>
-                                    <group string="Procurement">
-                                        <field name="type"/>
-                                        <field name="procure_method" groups="base.group_user" attrs="{'invisible':[('type','=', 'service')]}"/>
-                                    </group>
-                                    <group string="Prices">
                                         <field name="list_price"/>
                                         <field name="cost_method" groups="product.group_costing_method"/>
                                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                         <field name="price_margin" groups="product.group_product_variant"/>
                                         <field name="price_extra" groups="product.group_product_variant"/>
                                     </group>
+                                    <group>
+                                        <field name="default_code"/>
+                                        <field name="ean13" placeholder="e.g. 5901234123457"/>
+                                        <field groups="product.group_product_variant" name="variants"/>
+                                    </group>
+                                    <group>
+                                        <field name="type"/>
+                                        <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="product.group_uom"/>
+                                    </group>
+                                </group>
+                                <field name="description" placeholder="describe the product's characteristics..."/>
+                            </page>
+                            <page string="Procurements" groups="base.group_user">
+                                <group name="procurement">
+                                    <group>
+                                        <field name="procure_method" groups="base.group_user" attrs="{'invisible':[('type','=', 'service')]}"/>
+                                    </group>
+                                    <group>
+                                        <field name="uom_po_id"/>
 
+                                    </group>
+                                </group>
+
+                                <label for="description_purchase"/>
+                                <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
+                            </page>
+                            <page string="Inventory" groups="base.group_user">
+                                <group name="inventory">
                                     <group groups="product.group_stock_packaging" string="Weights">
                                         <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
                                         <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
                                         <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
                                     </group>
-
-                                    <group name="uom" groups="product.group_uom" string="Unit of Measure">
-                                        <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
-                                        <field name="uom_po_id"/>
-                                        <field name="uos_id"/>
-                                        <field name="uos_coeff"/>
-                                        <field name="mes_type"/>
-                                    </group>
-
                                     <group name="status" string="Status">
                                         <field name="state"/>
                                         <field name="product_manager"/>
                                     </group>
-
                                 </group>
                             </page>
-                            <page string="Descriptions" groups="base.group_user">
-                                <separator string="Description"/>
-                                <field name="description"/>
-                                <separator string="Sale Description"/>
-                                <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
-                                <separator string="Purchase Description"/>
-                                <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
-                            </page>
-                            <page groups="product.group_stock_packaging" string="Packaging">
-                                <field name="packaging">
+                            <page string="Sales">
+                                <group>
+                                    <group groups="product.group_uom">
+                                        <field name="uos_id"/>
+                                        <field name="uos_coeff"/>
+                                        <field name="mes_type"/>
+                                    </group>
+                                </group>
+                                <field name="packaging" groups="product.group_stock_packaging">
                                     <form string="Packaging" version="7.0">
                                         <group col="4">
                                             <field name="ean"/>
@@ -150,6 +159,8 @@
                                         <field name="name"/>
                                     </form>
                                 </field>
+                                <label for="description_sale"/>
+                                <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
                             </page>
                         </notebook>
                     </sheet>
@@ -534,7 +545,7 @@
             <field name="model">product.packaging</field>
             <field name="arch" type="xml">
                 <tree string="Packaging">
-                    <field name="sequence" invisible="1"/>
+                    <field name="sequence" widget="handle"/>
                     <field name="ean"/>
                     <field name="qty"/>
                     <field name="ul"/>
@@ -606,7 +617,7 @@
             <field name="model">product.supplierinfo</field>
             <field name="arch" type="xml">
                 <tree string="Supplier Information">
-                    <field name="sequence" string="Seq"/>
+                    <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="delay"/>
                     <field name="min_qty"/>
diff --git a/addons/product_expiry/product_expiry_view.xml b/addons/product_expiry/product_expiry_view.xml
index f883ca55fe0..88ea6f365e8 100644
--- a/addons/product_expiry/product_expiry_view.xml
+++ b/addons/product_expiry/product_expiry_view.xml
@@ -21,14 +21,14 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view" />
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Dates">
+                <group name="inventory">
+                    <group string="Dates">
                         <field name="life_time" />
                         <field name="use_time" />
                         <field name="removal_time" />
                         <field name="alert_time" />
-                    </page>
-                </notebook>
+                    </group>
+                </group>
             </field>
         </record>
     </data>
diff --git a/addons/product_manufacturer/product_manufacturer_view.xml b/addons/product_manufacturer/product_manufacturer_view.xml
index 5f620747d64..88f528693df 100644
--- a/addons/product_manufacturer/product_manufacturer_view.xml
+++ b/addons/product_manufacturer/product_manufacturer_view.xml
@@ -7,23 +7,21 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view" />
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Manufacturer">
-                        <group string="Manufacturer">
-                            <field name="manufacturer" />
-                            <field name="manufacturer_pname"/>
-                            <field name="manufacturer_pref"/>
-                        </group>
-                        <group string="Attributes">
-                            <field name="attribute_ids" colspan="4" nolabel="1">
-                                <tree string="Product Attributes" editable="bottom">
-                                    <field name="name"/>
-                                    <field name="value"/>
-                                </tree>
-                            </field>
-                        </group>
-                    </page>
-                </notebook>
+                <group name="procurement" position="inside">
+                    <group string="Manufacturer">
+                        <field name="manufacturer" />
+                        <field name="manufacturer_pname"/>
+                        <field name="manufacturer_pref"/>
+                    </group>
+                    <group string="Attributes">
+                        <field name="attribute_ids" colspan="4" nolabel="1">
+                            <tree string="Product Attributes" editable="bottom">
+                                <field name="name"/>
+                                <field name="value"/>
+                            </tree>
+                        </field>
+                    </group>
+                </group>
             </field>
         </record>
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index f513e2a60e8..2dee145145b 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -562,11 +562,10 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='Descriptions']" position="before">
-                    <page string="Suppliers" groups="base.group_user">
-                         <field name="seller_ids" context="{'uom_id': uom_id}"/>
-                    </page>
-                </xpath>
+                <group name="procurement" position="after">
+                     <label for="seller_ids"/>
+                     <field name="seller_ids" context="{'uom_id': uom_id}"/>
+                </group>
             </field>
         </record>
     </data>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index a1b270934e2..d4e8e3e20a9 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -183,9 +183,7 @@
         <field name="inherit_id" ref="product.product_normal_form_view"/>
         <field name="arch" type="xml">
             <field name="procure_method" position="before">
-                <group colspan="2" col="2" attrs="{'invisible': [('supply_method','&lt;&gt;','buy')]}">
                 <field name="purchase_requisition"/>
-                </group>
             </field>
         </field>
     </record>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 477c458da02..d146d5fa0fb 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -50,38 +50,33 @@
                 </page>
             </field>
         </record>
-        
+
         <record id="view_normal_procurement_locations_form" model="ir.ui.view">
             <field name="name">product.normal.procurement.locations.inherit</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Procurement &amp; Locations" groups="base.group_user">
-                                <group>
-                                    <group name="delay" string="Delays">
-                                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                                        <field name="warranty"/>
-                                    </group>
-                                    <group name="store" string="Storage Localisation">
-                                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}"/>
-                                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
-                                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
-                                    </group>
-                                    <group name="store" groups="stock.group_locations">
-				                        <separator string="Counter-Part Locations Properties" colspan="2"/>
-				                        <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
-				                        <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
-				                        <field name="property_stock_inventory"  attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','inventory')]"/>
-				                    </group>
-                                    <group name="misc" string="Miscellaneous">
-                                        <field name="active"/>
-                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                    </group>
-                                </group>
-                            </page>
-                </notebook>
+                <group name="procurement" position="inside">
+                    <group name="delay" string="Delays">
+                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                        <field name="warranty"/>
+                    </group>
+                    <group name="store" string="Storage Localisation">
+                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}"/>
+                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
+                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
+                    </group>
+                    <group name="store" groups="stock.group_locations" string="Counter-Part Locations Properties">
+                        <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
+                        <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
+                        <field name="property_stock_inventory"  attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','inventory')]"/>
+                    </group>
+                    <group name="misc" string="Miscellaneous">
+                        <field name="active"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                </group>
             </field>
         </record>
 
@@ -93,8 +88,8 @@
                 <field name="standard_price" position="replace" version="7.0">
                     <label string="Cost Price" for="standard_price" align="1.0" groups="base.group_user"/>
                     <div groups="base.group_user">
-                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/> - 
-                        <button name="%(action_view_change_standard_price)d" string="update"
+                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
+                        <button name="%(action_view_change_standard_price)d" string="- update"
                             type="action" attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"
                             class="oe_link"/>
                     </div>
@@ -132,19 +127,17 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="status" position="before" version="7.0">
-                    <group string="Stock and Expected Variations" attrs="{'invisible': [('type', '=', 'service')]}">
+                    <group string="Stock and Expected Variations" attrs="{'invisible': [('type', '=', 'service')]}" groups="base.group_user">
                         <label for="qty_available"/>
                         <div>
                             <field name="qty_available" class="oe_inline"/>
                             <button name="%(action_view_change_product_quantity)d" string="update"
-                                type="action" groups="stock.group_stock_manager,stock.group_stock_user"
+                                type="action"
                                 class="oe_link"/>
                         </div>
-                        <label for="virtual_available" groups="base.group_user"/>
-                        <div groups="base.group_user">
-                            <field name="virtual_available" class="oe_inline"/>
-                            (+<field name="incoming_qty" class="oe_inline"/> -<field name="outgoing_qty" class="oe_inline"/>)
-                        </div>
+                        <field name="incoming_qty" class="oe_inline"/>
+                        <field name="outgoing_qty" class="oe_inline"/>
+                        <field name="virtual_available" class="oe_inline"/>
                     </group>
                     <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
                         <field name="track_production" groups="stock.group_production_lot"/>
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index 720c7753df6..ddb2efc21e5 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -38,62 +38,59 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Logistics Flows">
-                        <field name="flow_pull_ids" colspan="4" nolabel="1">
-                            <tree string="Pulled flows">
-                                <field name="name"/>
-                                <field name="location_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
-                                <field name="type_proc"/>
-                                <field name="journal_id"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
-                            </tree>
-                            <form string="Pulled Paths">
-                                <group>
-                                    <group string="Conditions">
-                                        <field name="name" placeholder="Fulfill needs on location X from location Y "/>
-                                        <field name="location_id"/>
-                                    </group>
-                                    <group string="Action Type">
-                                        <field name="type_proc"/>
-                                        <field name="company_id"/>
-                                    </group>
+                <group name="inventory" position="after">
+                    <field name="flow_pull_ids" colspan="4" nolabel="1">
+                        <tree string="Pulled flows">
+                            <field name="name"/>
+                            <field name="location_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
+                            <field name="type_proc"/>
+                            <field name="journal_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </tree>
+                        <form string="Pulled Paths">
+                            <group>
+                                <group string="Conditions">
+                                    <field name="name" placeholder="Fulfill needs on location X from location Y "/>
+                                    <field name="location_id"/>
                                 </group>
-                                <group attrs="{'invisible':[('type_proc','!=','move')]}">
-                                    <field name="location_src_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
-                                    <field name="picking_type"/>
-                                    <field name="partner_address_id"/>
-                                    <field name="procure_method"/>
-                                    <field name="cancel_cascade"/>
-                                    <field name="invoice_state"/>
-                                    <field name="journal_id"/>
+                                <group string="Action Type">
+                                    <field name="type_proc"/>
+                                    <field name="company_id"/>
                                 </group>
-                            </form>
-                        </field>
-                        <field name="path_ids">
-                        <field name="name"/>
-                            <tree string="Pushed flows">
-                                <field name="location_from_id"/>
-                                <field name="location_dest_id"/>
-                                <field name="auto"/>
-                                <field name="name"/>
-                                <field name="invoice_state"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
-                            </tree>
-                            <form string="Pushed flows">
-                                <field name="name" placeholder="When receiving at location X, move to location Y"/>
-                                <field name="location_from_id"/>
-                                <field name="location_dest_id"/>
-                                <field name="auto"/>
-                                <field name="delay"/>
-                                <field name="journal_id"/>
+                            </group>
+                            <group attrs="{'invisible':[('type_proc','!=','move')]}">
+                                <field name="location_src_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
                                 <field name="picking_type"/>
+                                <field name="partner_address_id"/>
+                                <field name="procure_method"/>
+                                <field name="cancel_cascade"/>
                                 <field name="invoice_state"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
-                            </form>
-                        </field>
-                    </page>
-                </notebook>
+                                <field name="journal_id"/>
+                            </group>
+                        </form>
+                    </field>
+                    <field name="path_ids">
+                        <tree string="Pushed flows">
+                            <field name="location_from_id"/>
+                            <field name="location_dest_id"/>
+                            <field name="auto"/>
+                            <field name="name"/>
+                            <field name="invoice_state"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </tree>
+                        <form string="Pushed flows">
+                            <field name="name" placeholder="When receiving at location X, move to location Y"/>
+                            <field name="location_from_id"/>
+                            <field name="location_dest_id"/>
+                            <field name="auto"/>
+                            <field name="delay"/>
+                            <field name="journal_id"/>
+                            <field name="picking_type"/>
+                            <field name="invoice_state"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </form>
+                    </field>
+                </group>
             </field>
        </record>
     </data>
diff --git a/addons/warning/warning_view.xml b/addons/warning/warning_view.xml
index 3f3bbefdbab..fd12ce53ac9 100644
--- a/addons/warning/warning_view.xml
+++ b/addons/warning/warning_view.xml
@@ -45,16 +45,14 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Warnings">
-                        <group colspan="2" col="2">
-                            <separator string="Warning when Selling this Product" colspan="4"/>
-                            <field name="sale_line_warn"  nolabel="1" />
-                            <field name="sale_line_warn_msg" colspan="3" nolabel="1" 
+                        <group string="Warning when Selling this Product">
+                            <field name="sale_line_warn"/>
+                            <field name="sale_line_warn_msg"
                                     attrs="{'required':[('sale_line_warn','!=','no-message')],'readonly':[('sale_line_warn','=','no-message')]}"/>
                         </group>
-                        <group colspan="2" col="2">
-                            <separator string="Warning when Purchasing this Product" colspan="4" />
-                            <field name="purchase_line_warn"  nolabel="1" />
-                            <field name="purchase_line_warn_msg" colspan="3" nolabel="1" 
+                        <group string="Warning when Purchasing this Product">
+                            <field name="purchase_line_warn"/>
+                            <field name="purchase_line_warn_msg"
                                     attrs="{'required':[('purchase_line_warn','!=','no-message')],'readonly':[('purchase_line_warn','=','no-message')]}"/>
                         </group>
                     </page>

From 7829c44833ef624d8e3d24369655164312366c41 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 31 Aug 2012 15:50:29 +0200
Subject: [PATCH 666/999] [IMP] account: make the lines in invoice form
 editable, and add missing fields

bzr revid: rco@openerp.com-20120831135029-dki57juih0qcw5as
---
 addons/account/account_invoice_view.xml | 33 ++++++++++++++++---------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index f638b51b4e1..610485ec3a0 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -191,17 +191,23 @@
                         <page string="Invoice">
                             <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
                                 <tree string="Invoice lines" editable="bottom">
-                                    <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)" groups="base.group_account_user"/>
-                                    <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
-                                    <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                                    <field name="product_id"
+                                        on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+                                    <field name="name"/>
+                                    <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                                    <field name="account_id" groups="account.group_account_user"
+                                        domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '!=', 'view')]"
+                                        on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
+                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"
+                                        domain="[('type','!=','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]"/>
                                     <field name="quantity"/>
+                                    <field name="uos_id" groups="product.group_uom"
+                                        on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                                     <field name="price_unit"/>
+                                    <field name="discount" groups="sale.group_discount_per_so_line"/>
+                                    <field name="invoice_line_tax_id" widget="many2many_tags" context="{'type':parent.type}"
+                                        domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
                                     <field name="price_subtotal"/>
-                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)" invisible="1"/>
-                                    <!-- Removed if subtotal is set -->
-                                    <field name="name" invisible="1"/>
-                                    <field name="uos_id" invisible="1"/>
                                 </tree>
                             </field>
                             <group class="oe_subtotal_footer oe_right">
@@ -342,17 +348,22 @@
                         <page string="Invoice Lines">
                             <field name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}">
                                 <tree string="Invoice Lines" editable="bottom">
-                                    <field name="invoice_line_tax_id" invisible="1"/>
-                                    <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+                                    <field name="product_id"
+                                        on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                                     <field name="name"/>
+                                    <field name="company_id" groups="base.group_multi_company" readonly="1"/>
                                     <field name="account_id" groups="account.group_account_user"
-                                        domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]"
+                                        domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '!=', 'view')]"
                                         on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
+                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"
+                                        domain="[('type','!=','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]"/>
                                     <field name="quantity"/>
                                     <field name="uos_id" groups="product.group_uom"
                                         on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                                     <field name="price_unit"/>
                                     <field name="discount" groups="sale.group_discount_per_so_line"/>
+                                    <field name="invoice_line_tax_id" widget="many2many_tags" context="{'type':parent.type}"
+                                        domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>

From 846ec67adc911b32712039c09225142195aa70ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 31 Aug 2012 16:31:59 +0200
Subject: [PATCH 667/999] [WIP] point_of_sale: disable validation button when
 order not fully paid

bzr revid: fva@openerp.com-20120831143159-a64527c3a1a8chk0
---
 addons/point_of_sale/static/src/js/screens.js |  2 ++
 addons/point_of_sale/static/src/js/widgets.js | 24 ++++++++++++++++---
 addons/point_of_sale/static/src/xml/pos.xml   |  4 ++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 4d4e09575ea..ff07da30822 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -735,6 +735,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             
             this.validate_button = this.add_action_button({
                     label: 'Validate',
+                    name: 'validation',
                     icon: '/point_of_sale/static/src/img/icons/png48/validate.png',
                     click: function(){
                         self.validateCurrentOrder();
@@ -806,6 +807,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this.$('#payment-paid-total').html(paidTotal.toFixed(2));
             this.$('#payment-remaining').html(remaining.toFixed(2));
             this.$('#payment-change').html(change.toFixed(2));
+            this.pos_widget.action_bar.set_button_disabled('validation', remaining > 0);
         },
         set_numpad_state: function(numpadState) {
         	if (this.numpadState) {
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 5b98865a971..5de1fd8b3fe 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -370,14 +370,21 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.label = options.label || 'button';
             this.rightalign = options.rightalign || false;
             this.click_action = options.click;
+            this.disabled = options.disabled || false;
             if(options.icon){
                 this.icon = options.icon;
                 this.template = this.icon_template;
             }
         },
+        set_disabled: function(disabled){
+            if(this.disabled != disabled){
+                this.disabled = !!disabled;
+                this.renderElement();
+            }
+        },
         renderElement: function(){
             this._super();
-            if(this.click_action){
+            if(this.click_action && !this.disabled){
                 this.$el.click(_.bind(this.click_action, this));
             }
         },
@@ -388,12 +395,12 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         init: function(parent, options){
             this._super(parent,options);
             this.button_list = [];
-            this.fake_buttons  = {};
+            this.buttons = {};
             this.visibility = {};
         },
         set_element_visible: function(element, visible, action){
             if(visible != this.visibility[element]){
-                this.visibility[element] = visible;
+                this.visibility[element] = !!visible;
                 if(visible){
                     this.$('.'+element).show();
                 }else{
@@ -401,14 +408,22 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 }
             }
             if(visible && action){
+                this.action[element] = action;
                 this.$('.'+element).off('click').click(action);
             }
         },
+        set_button_disabled: function(name, disabled){
+            var b = this.buttons[name];
+            if(b){
+                b.set_disabled(disabled);
+            }
+        },
         destroy_buttons:function(){
             for(var i = 0; i < this.button_list.length; i++){
                 this.button_list[i].destroy();
             }
             this.button_list = [];
+            this.buttons = {};
             return this;
         },
         get_button_count: function(){
@@ -417,6 +432,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         add_new_button: function(button_options){
             var button = new module.ActionButtonWidget(this,button_options);
             this.button_list.push(button);
+            if(button_options.name){
+                this.buttons[name] = button;
+            }
             button.appendTo(this.$('.pos-actionbar-button-list'));
             return button;
         },
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 81f929d50e2..bbe278758d5 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -540,7 +540,7 @@
     </t>
 
     <t t-name="ActionButtonWidget">
-        <li t-att-class=" 'button '+ (widget.rightalign  ? 'rightalign ' : '')">
+        <li t-att-class=" 'button '+ (widget.rightalign  ? 'rightalign ' : '') + (widget.disabled ? 'disabled ' : '')">
             <div class='label'>
                 <t t-esc="widget.label" />
             </div>
@@ -548,7 +548,7 @@
     </t>
 
     <t t-name="ActionButtonWidgetWithIcon">
-        <li t-att-class=" 'button '+ (widget.rightalign  ? 'rightalign ' : '')">
+        <li t-att-class=" 'button '+ (widget.rightalign  ? 'rightalign ' : '') + (widget.disabled ? 'disabled ' : '')">
             <div class='icon'>
                 <img t-att-src="widget.icon" />
                 <div class='iconlabel'><t t-esc="widget.label" /></div>

From bdd972e3c92709bb0f739baba9af63077e7a9012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 31 Aug 2012 16:37:07 +0200
Subject: [PATCH 668/999] [FIX] mail.message: message_read: fixed a call to a
 dict keyu not necessarily existing. Cleaned a bit the code, as well as the
 code of the related tests.

bzr revid: tde@openerp.com-20120831143707-ezcn17g5u39tcepq
---
 addons/mail/mail_message.py    | 36 ++++++++----------------
 addons/mail/tests/test_mail.py | 50 +++++++++++-----------------------
 2 files changed, 27 insertions(+), 59 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 2bf5f0ab078..8fc9fb27b86 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -184,42 +184,29 @@ class mail_message(osv.Model):
             return [msg_dict] + child_ids
         # Depth-first flattening
         for message in messages:
-            if message['type'] == 'expandable':
+            if message.get('type') == 'expandable':
                 continue
             message['child_ids'] = self.message_read_tree_flatten(cr, uid, message['child_ids'], current_level+1, level, context=context)
         # Flatten if above maximum depth
         if current_level < level:
             return messages
         new_list = []
-        for x in range(0, len(messages)):
-            flatenned = _flatten(messages[x])
-            for flat in flatenned:
-                new_list.append(flat)
-        messages = new_list
-        return messages
-
-    def _debug_print_tree(self, tree, prefix=''):
-        for elem in tree:
-            print '%s%s (%s childs: %s)' % (prefix, elem['id'], len(elem['child_ids']), [xelem['id'] for xelem in elem['child_ids']])
-            if elem['child_ids']:
-                self._debug_print_tree(elem['child_ids'], prefix+'--')
+        for message in messages:
+            for flat_message in _flatten(message):
+                new_list.append(flat_message)
+        return new_list
 
     def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, limit=None, context=None):
-        """ 
-            If IDS are provided, fetch these records, otherwise use the domain to
-            fetch the matching records. After having fetched the records provided
-            by IDS, it will fetch children (according to thread_level).
-            
-            Return [
-            
-            ]
+        """ If IDs are provided, fetch these records. Otherwise use the domain
+            to fetch the matching records.
+            After having fetched the records provided by IDs, it will fetch the
+            parents to have well-formed threads.
+            :return list: list of trees of messages
         """
         limit = limit or self._message_read_limit
         context = context or {}
-        if ids is False:
+        if not ids:
             ids = self.search(cr, uid, domain, context=context, limit=limit)
-
-        # FP Todo: flatten to max X level of mail_thread
         messages = self.browse(cr, uid, ids, context=context)
 
         result = []
@@ -254,7 +241,6 @@ class mail_message(osv.Model):
         # Flatten the result
         if thread_level > 0:
             result = self.message_read_tree_flatten(cr, uid, result, 0, thread_level, context=context)
-
         return result
 
     #------------------------------------------------------
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index d288f522a72..f7f9e2e8a3e 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -416,15 +416,6 @@ class test_mail(common.TransactionCase):
 
     def test_30_message_read(self):
         """ Tests designed for message_read. """
-        def _simplify_struct(read_dict):
-            res = []
-            for val in read_dict:
-                current = {'_id': val['id']}
-                if val.get('child_ids'):
-                    current['child_ids'] = _simplify_struct(val.get('child_ids'))
-                res.append(current)
-            return res
-
         # TDE NOTE: this test is not finished, as the message_read method is not fully specified.
         # It wil be updated as soon as we have fixed specs !
         cr, uid  = self.cr, self.uid
@@ -432,38 +423,31 @@ class test_mail(common.TransactionCase):
 
         # Test message_read_tree_flatten that flattens a thread according to a given thread_level
         import copy
-        tree = [
-            {'id': 1, 'child_ids':[
-                {'id': 3, 'child_ids': [] },
-                {'id': 4, 'child_ids': [
-                    {'id': 5, 'child_ids': []},
-                    {'id': 12, 'child_ids': []},
+        tree = [{'id': 1, 'child_ids':[
+                    {'id': 3, 'child_ids': [] },
+                    {'id': 4, 'child_ids': [
+                        {'id': 5, 'child_ids': []},
+                        {'id': 12, 'child_ids': []},
+                        ] },
+                    {'id': 8, 'child_ids': [
+                        {'id': 10, 'child_ids': []},
+                        ] },
                     ] },
-                {'id': 8, 'child_ids': [
-                    {'id': 10, 'child_ids': []},
+                {'id': 2, 'child_ids': [
+                    {'id': 7, 'child_ids': [
+                        {'id': 9, 'child_ids': []},
+                        ] },
                     ] },
-                ] },
-            {'id': 2, 'child_ids': [
-                {'id': 7, 'child_ids': [
-                    {'id': 9, 'child_ids': []},
+                {'id': 6, 'child_ids': [
+                    {'id': 11, 'child_ids': [] },
                     ] },
-                ] },
-            {'id': 6, 'child_ids': [
-                {'id': 11, 'child_ids': [] },
-                ] },
-            ]
+                ]
         new_tree = self.mail_message.message_read_tree_flatten(cr, uid, copy.deepcopy(tree), 0, 0)
-        # self.mail_message._debug_print_tree(new_tree)
-        # print '-------------------'
         self.assertTrue(len(new_tree) == 12, 'Flattening wrongly produced')
         new_tree = self.mail_message.message_read_tree_flatten(cr, uid, copy.deepcopy(tree), 0, 1)
-        # self.mail_message._debug_print_tree(new_tree)
-        # print '-------------------'
         self.assertTrue(len(new_tree) == 3 and len(new_tree[0]['child_ids']) == 6 and len(new_tree[1]['child_ids']) == 2 and len(new_tree[2]['child_ids']) == 1,
             'Flattening wrongly produced')
         new_tree = self.mail_message.message_read_tree_flatten(cr, uid, copy.deepcopy(tree), 0, 2)
-        # self.mail_message._debug_print_tree(new_tree)
-        # print '-------------------'
         self.assertTrue(len(new_tree) == 3 and len(new_tree[0]['child_ids']) == 3 and len(new_tree[0]['child_ids'][1]) == 2,
             'Flattening wrongly produced')
 
@@ -483,12 +467,10 @@ class test_mail(common.TransactionCase):
 
         # Second try: read with thread_level 1
         tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=1)
-        # self.mail_message._debug_print_tree(tree)
         self.assertTrue(len(tree) == 2 and len(tree[1]['child_ids']) == 3, 'Incorrect number of child in message_read')
 
         # Third try: read with thread_level 2
         tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=2)
-        # self.mail_message._debug_print_tree(tree)
         self.assertTrue(len(tree) == 2 and len(tree[1]['child_ids']) == 2 and len(tree[1]['child_ids'][0]['child_ids']) == 1, 'Incorrect number of child in message_read')
 
     def test_40_needaction(self):

From 5110f42c0930faff97506f3c4727cdabd4ca60b7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 31 Aug 2012 16:50:17 +0200
Subject: [PATCH 669/999] [IMP] product form

bzr revid: fp@tinyerp.com-20120831145017-xu8y4oz7t6buua3h
---
 addons/product/product_view.xml   | 25 +++++++++++++++----------
 addons/purchase/purchase_view.xml |  2 +-
 addons/stock/product_view.xml     |  8 +++-----
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index cc0b7073a58..da10dcbb429 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -108,29 +108,34 @@
                                         <field name="procure_method" groups="base.group_user" attrs="{'invisible':[('type','=', 'service')]}"/>
                                     </group>
                                     <group>
-                                        <field name="uom_po_id"/>
-
+                                        <field name="uom_po_id" groups="product.group_uom"/>
                                     </group>
                                 </group>
-
-                                <label for="description_purchase"/>
+                                <separator string="Notes for Suppliers"/>
                                 <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
                             </page>
                             <page string="Inventory" groups="base.group_user">
                                 <group name="inventory">
+                                    <group name="status" string="Status">
+                                        <field name="state"/>
+                                        <field name="product_manager"/>
+                                    </group>
                                     <group groups="product.group_stock_packaging" string="Weights">
                                         <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
                                         <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
                                         <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
                                     </group>
-                                    <group name="status" string="Status">
-                                        <field name="state"/>
-                                        <field name="product_manager"/>
-                                    </group>
                                 </group>
                             </page>
-                            <page string="Sales">
+                            <page string="Sales" attrs="{'readonly':[('sale_ok','=',0)]}">
                                 <group>
+                                    <group>
+                                        <label for="sale_delay"/>
+                                        <div>
+                                            <field name="sale_delay"/> days
+                                        </div>
+                                        <field name="warranty"/>
+                                    </group>
                                     <group groups="product.group_uom">
                                         <field name="uos_id"/>
                                         <field name="uos_coeff"/>
@@ -159,7 +164,7 @@
                                         <field name="name"/>
                                     </form>
                                 </field>
-                                <label for="description_sale"/>
+                                <separator string="Notes on Quotations"/>
                                 <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
                             </page>
                         </notebook>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 2dee145145b..683724cbb6a 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -563,7 +563,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="procurement" position="after">
-                     <label for="seller_ids"/>
+                     <separator string="Suppliers"/>
                      <field name="seller_ids" context="{'uom_id': uom_id}"/>
                 </group>
             </field>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index d146d5fa0fb..ea0d9b2ce5e 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -58,11 +58,13 @@
             <field name="arch" type="xml">
                 <group name="procurement" position="inside">
                     <group name="delay" string="Delays">
-                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                        <field name="active"/>
                         <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
                         <field name="warranty"/>
                     </group>
                     <group name="store" string="Storage Localisation">
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}"/>
                         <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
                         <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
@@ -72,10 +74,6 @@
                         <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
                         <field name="property_stock_inventory"  attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','inventory')]"/>
                     </group>
-                    <group name="misc" string="Miscellaneous">
-                        <field name="active"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
                 </group>
             </field>
         </record>

From 9cfe5665a5648693547da4bf0b0b9d2fb0547aaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 31 Aug 2012 16:56:06 +0200
Subject: [PATCH 670/999] [DONE] point_of_sale: disable validation button when
 order not fully paid

bzr revid: fva@openerp.com-20120831145606-nrk44gs60lab4k3l
---
 addons/point_of_sale/static/src/css/pos.css   | 6 ++++--
 addons/point_of_sale/static/src/js/screens.js | 6 +++++-
 addons/point_of_sale/static/src/js/widgets.js | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index a9baf041942..bfe2ef7f9dc 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -1072,12 +1072,14 @@
     -webkit-transition-timing-function: ease-out;
 }
 
-.point-of-sale .pos-actionbar .button.disabled{
-    color:#AAA;
+.point-of-sale .pos-actionbar .button.disabled *{
+    opacity: 0.5;
 }
 .point-of-sale .pos-actionbar .button.disabled:hover{
     border: 1px solid #cacaca;
     border-radius: 4px;
+    color: #555;
+    cursor: default;
 
     background: #e2e2e2;
     background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index ff07da30822..9a2071c6335 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -741,6 +741,8 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                         self.validateCurrentOrder();
                     },
                 });
+
+            this.updatePaymentSummary();
         },
         close: function(){
             this._super();
@@ -807,7 +809,9 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this.$('#payment-paid-total').html(paidTotal.toFixed(2));
             this.$('#payment-remaining').html(remaining.toFixed(2));
             this.$('#payment-change').html(change.toFixed(2));
-            this.pos_widget.action_bar.set_button_disabled('validation', remaining > 0);
+            if(this.pos_widget.action_bar){
+                this.pos_widget.action_bar.set_button_disabled('validation', remaining > 0);
+            }
         },
         set_numpad_state: function(numpadState) {
         	if (this.numpadState) {
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 5de1fd8b3fe..6de31c88dfd 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -433,7 +433,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             var button = new module.ActionButtonWidget(this,button_options);
             this.button_list.push(button);
             if(button_options.name){
-                this.buttons[name] = button;
+                this.buttons[button_options.name] = button;
             }
             button.appendTo(this.$('.pos-actionbar-button-list'));
             return button;

From 901ee0683c669c26e24b396c6d4b24eb55e429df Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 31 Aug 2012 16:57:07 +0200
Subject: [PATCH 671/999] imp_layout_wizard

bzr revid: fp@tinyerp.com-20120831145707-ft72ykd90a43p3gl
---
 .../wizard/make_procurement_view.xml          | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 4d2e7553371..b415675400f 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -9,13 +9,21 @@
             <field name="model">make.procurement</field>
             <field name="arch" type="xml">
                 <form string="Procurement Request" version="7.0">
-                    <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders."/>
-                     <group>
-                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                        <field name="qty"/>
-                        <field name="uom_id" groups="product.group_uom"/>
-                        <field name="date_planned"/>
+                    <p class="oe_gray">
+                        Fill is this for to launch a procurement request for this
+                        product. According to the product configuration, this may
+                        trigger a draft purchase order, a manufacturing order or
+                        a new task.
+                    </p>
+                    <group>
                         <field name="warehouse_id" groups="stock.group_locations"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                        <label for="qty"/>
+                        <div>
+                            <field name="qty" class="oe_inline"/>
+                            <field name="uom_id" groups="product.group_uom"/>
+                        </div>
+                        <field name="date_planned"/>
                     </group>
                     <footer>
                         <button name="make_procurement" string="Ask New Products" type="object"  class="oe_highlight"  />

From 1d04c6b7dfd2c9e9687dad50d609d42a3a827eec Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 31 Aug 2012 17:04:19 +0200
Subject: [PATCH 672/999] imp

bzr revid: fp@tinyerp.com-20120831150419-dk2t02ey0lcoycl0
---
 addons/product/product.py       | 2 +-
 addons/product/product_view.xml | 2 +-
 addons/stock/product_view.xml   | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 699fa66dd8f..6acf1ac526b 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -294,7 +294,7 @@ class product_template(osv.osv):
         'weight_net': fields.float('Net Weight', digits_compute=dp.get_precision('Stock Weight'), help="The net weight in Kg."),
         'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True,
             help="Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."),
-        'warranty': fields.float('Warranty (months)'),
+        'warranty': fields.float('Warranty'),
         'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
         'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
         'state': fields.selection([('',''),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index da10dcbb429..3ae82a07efd 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -134,7 +134,7 @@
                                         <div>
                                             <field name="sale_delay"/> days
                                         </div>
-                                        <field name="warranty"/>
+                                        <field name="warranty"/> months
                                     </group>
                                     <group groups="product.group_uom">
                                         <field name="uos_id"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index ea0d9b2ce5e..e5986318fbd 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -60,8 +60,6 @@
                     <group name="delay" string="Delays">
                         <field name="active"/>
                         <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                        <field name="warranty"/>
                     </group>
                     <group name="store" string="Storage Localisation">
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>

From 3e5c6a4d95f1957bcc64f43603228f8e744cfc87 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 31 Aug 2012 17:37:58 +0200
Subject: [PATCH 673/999] [IMP] fix code spacing and indentation

bzr revid: rco@openerp.com-20120831153758-3l46jbvtifix5s9v
---
 addons/web/static/src/js/view_form.js              | 14 +++++++-------
 addons/web/static/src/js/view_list.js              |  4 ++--
 addons/web/static/src/js/views.js                  | 10 +++++-----
 addons/web_diagram/static/src/xml/base_diagram.xml | 10 +++++-----
 addons/web_gantt/static/src/js/gantt.js            |  2 +-
 addons/web_kanban/static/src/js/kanban.js          |  4 ++--
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 2e577e740f8..a38a71d638c 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -145,15 +145,15 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         if (!this.sidebar && this.options.$sidebar) {
             this.sidebar = new instance.web.Sidebar(this);
             this.sidebar.appendTo(this.$sidebar);
-            if(this.fields_view.toolbar) {
+            if (this.fields_view.toolbar) {
                 this.sidebar.add_toolbar(this.fields_view.toolbar);
             }
-            if (self._is_action_enabled('delete')){
+            if (self._is_action_enabled('delete')) {
                 this.sidebar.add_items('other', [
-                    { label: _t('Delete'), callback: self.on_button_delete },
+                    { label: _t('Delete'), callback: self.on_button_delete }
                 ]);
             }
-            if (self._is_action_enabled('create')){
+            if (self._is_action_enabled('create')) {
                 this.sidebar.add_items('other', [
                     { label: _t('Duplicate'), callback: self.on_button_duplicate }
                 ]);
@@ -3469,8 +3469,8 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
         }
     },
     do_activate_record: function(index, id) {
-        var self = this, 
-            attr_readonly = (_.has(this.fields_view.arch.attrs, 'edit'))?JSON.parse(this.fields_view.arch.attrs.edit):true;
+        var self = this;
+        var attr_readonly = (_.has(this.fields_view.arch.attrs, 'edit')) ? JSON.parse(this.fields_view.arch.attrs.edit) : true;
         var pop = new instance.web.form.FormOpenPopup(self.o2m.view);
         pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(), {
             title: _t("Open: ") + self.o2m.string,
@@ -3587,7 +3587,7 @@ instance.web.form.One2ManyList = instance.web.ListView.List.extend({
         }).length;
         if (this.options.selectable) { columns++; }
         if (this.options.deletable) { columns++; }
-        if (this.view._is_action_enabled('create')){
+        if (this.view._is_action_enabled('create')) {
             var $cell = $('<td>', {
                 colspan: columns,
                 'class': 'oe_form_field_one2many_list_row_add'
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index a0e903c7205..e3006a31757 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -351,7 +351,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         if (!this.sidebar && this.options.$sidebar) {
             this.sidebar = new instance.web.Sidebar(this);
             this.sidebar.appendTo(this.options.$sidebar);
-            if (self._is_action_enabled('create')){
+            if (self._is_action_enabled('create')) {
                 this.sidebar.add_items('other', [
                     { label: _t("Import"), callback: this.on_sidebar_import }
                 ]);
@@ -359,7 +359,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
             this.sidebar.add_items('other', [
                 { label: _t("Export"), callback: this.on_sidebar_export }
             ]);
-            if (self._is_action_enabled('delete')){
+            if (self._is_action_enabled('delete')) {
                 this.sidebar.add_items('other', [
                     { label: _t('Delete'), callback: this.do_delete_selected }
                 ]);
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 6ec579e59e4..183b63a218e 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1358,13 +1358,13 @@ instance.web.View = instance.web.Widget.extend({
     reload: function () {
         return $.when();
     },
-    _is_action_enabled: function(action) {
     /**
-     * Takes action (e.g. create/edit/delete) and return the tag attribute from
-     * the view (e.g. <from string="" create="false" edit="false" delete="false">)
-     * will help to check access ui of the view.
+     * Return whether the user can perform the action ('create', 'edit', 'delete') in this view.
+     * An action is disabled by setting the corresponding attribute in the view's main element,
+     * like: <form string="" create="false" edit="false" delete="false">
      */
-        return (_.has(this.fields_view.arch.attrs, action))?JSON.parse(this.fields_view.arch.attrs[action]):true;
+    _is_action_enabled: function(action) {
+        return (_.has(this.fields_view.arch.attrs, action)) ? JSON.parse(this.fields_view.arch.attrs[action]) : true;
     }
 });
 
diff --git a/addons/web_diagram/static/src/xml/base_diagram.xml b/addons/web_diagram/static/src/xml/base_diagram.xml
index f883f949457..619ebb241f4 100644
--- a/addons/web_diagram/static/src/xml/base_diagram.xml
+++ b/addons/web_diagram/static/src/xml/base_diagram.xml
@@ -2,11 +2,11 @@
 <t t-name="DiagramView">
     <div class="oe_diagram_header" t-att-id="element_id + '_header'">
         <h3 class="oe_diagram_title"/>
-            <t t-if="widget._is_action_enabled('create')">
-                <div class="oe_diagram_buttons">
-                        <button type="button" id="new_node" class="oe_button oe_diagram_button_new">New Node</button>
-                </div>
-            </t>
+        <t t-if="widget._is_action_enabled('create')">
+            <div class="oe_diagram_buttons">
+                <button type="button" id="new_node" class="oe_button oe_diagram_button_new">New Node</button>
+            </div>
+        </t>
         <div class="oe_diagram_pager">
             <t t-call="ViewPager">
                 <span class="oe_pager_index">0</span> / <span class="oe_pager_count">0</span>
diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
index 4d678810980..44adbc41b10 100644
--- a/addons/web_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -183,7 +183,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({
                 self.on_task_display(task_info.internal_task);
             }
         });
-        if (this._is_action_enabled('create')){        
+        if (this._is_action_enabled('create')) {        
             // insertion of create button
             var td = $($("table td", self.$el)[0]);
             var rendered = QWeb.render("GanttView-create-button");
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 1b1442faf6d..f599342541c 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -742,7 +742,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
             var $action = $(this),
                 type = $action.data('type') || 'button',
                 method = 'do_action_' + (type === 'action' ? 'object' : type);
-            if ((type === 'edit' || type === 'delete') && ! self.view._is_action_enabled(type)){
+            if ((type === 'edit' || type === 'delete') && ! self.view._is_action_enabled(type)) {
                 self.view.open_record(self.id);
             } else if (_.str.startsWith(type, 'switch_')) {
                 self.view.do_switch_view(type.substr(7));
@@ -916,7 +916,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
         return instance.web.form.compute_domain(domain, this.values);
     },
     _is_action_enabled: function(action) {
-        return (_.has(this.fields_view.arch.attrs, action))?JSON.parse(this.fields_view.arch.attrs[action]):true;
+        return (_.has(this.fields_view.arch.attrs, action)) ? JSON.parse(this.fields_view.arch.attrs[action]) : true;
     }
 });
 

From 8de272801dd4a0e76ec5464285441d346b86d152 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 31 Aug 2012 17:45:30 +0200
Subject: [PATCH 674/999] [FIX] base, res.company: split the rml_footer field
 by '\n', to allow the users to display them on several (at least 3, by
 default) lines if the footer becomes too long

bzr revid: qdp-launchpad@openerp.com-20120831154530-ptq3tz7n0aw58l6m
---
 openerp/addons/base/res/res_company.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index e340734d0c9..5380835307f 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -154,6 +154,12 @@ class res_company(osv.osv):
 
         return cr.execute('UPDATE res_company SET rml_footer = %s WHERE id = %s', (rml_footer, company_id))
 
+    def _get_rml_footer_by_line(self, cr, uid, ids, rml_footer, line=0, context=None):
+        rml_split = rml_footer.split('\n')
+        if len(rml_split) < line + 1:
+            return False
+        return rml_split[line]
+
     _columns = {
         'name': fields.related('partner_id', 'name', string='Company Name', size=128, required=True, store=True, type='char'),
         'customize_footer': fields.boolean('Customize Footer', help="If it is true then general information footer will not update automatically."),
@@ -326,7 +332,7 @@ class res_company(osv.osv):
     _header_main = """
 <header>
 <pageTemplate>
-    <frame id="first" x1="1.3cm" y1="2.5cm" height="%s" width="19.0cm"/>
+    <frame id="first" x1="1.3cm" y1="3.0cm" height="%s" width="19.0cm"/>
     <pageGraphics>
         <!-- You Logo - Change X,Y,Width and Height -->
         <image x="1.3cm" y="%s" height="40.0" >[[ company.logo or removeParentNode('image') ]]</image>
@@ -349,9 +355,10 @@ class res_company(osv.osv):
 
         <!--page bottom-->
 
-        <lines>1.2cm 2.15cm 19.9cm 2.15cm</lines>
-
-        <drawCentredString x="10.5cm" y="1.7cm">[[ company.rml_footer ]]</drawCentredString>
+        <lines>1.2cm 2.65cm 19.9cm 2.65cm</lines>
+        <drawCentredString x="10.5cm" y="2.3cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=0) ]]</drawCentredString>
+        <drawCentredString x="10.5cm" y="1.8cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=1) ]]</drawCentredString>
+        <drawCentredString x="10.5cm" y="1.3cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=2) ]]
         <drawCentredString x="10.5cm" y="0.8cm">Contact : [[ user.name ]] - Page: <pageNumber/></drawCentredString>
     </pageGraphics>
 </pageTemplate>

From 73492badc56dc0e524e910d321e913027b20d8b5 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 31 Aug 2012 17:50:39 +0200
Subject: [PATCH 675/999] [IMP] base, res.company: by default, put the bank
 accounts on a second line

bzr revid: qdp-launchpad@openerp.com-20120831155039-7teu5u6fv395t2z8
---
 openerp/addons/base/res/res_company.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 5380835307f..a013c963042 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -122,17 +122,18 @@ class res_company(osv.osv):
         if company['company_registry']: val.append(_('Reg: ')+company['company_registry'])
 
         # fetch the company's bank accounts
-        # todo: make it work with the onchange
+        # todo #TODO: make it work with the onchange
         bank_accounts = self.browse(cr, uid, company['id'], context=context).bank_ids
         bank_accounts_names = [bank_account.name_get()[0][1] for bank_account in bank_accounts if bank_account.footer]
 
+        res = ' | '.join(val)
         # append the account(s) in the footer and manage plural form of "account" if necessary
         if len(bank_accounts_names) == 1:
-            val.append(_('Bank Account: ') + ', '.join(bank_accounts_names))
+            res += _('\nBank Account: ') + ', '.join(bank_accounts_names)
         elif len(bank_accounts_names) > 1:
-            val.append(_('Bank Accounts: ') + ', '.join(bank_accounts_names))
+            res += _('\nBank Accounts: ') + ', '.join(bank_accounts_names)
 
-        return ' | '.join(val)
+        return res
 
     def _get_rml_footer(self, cr, uid, ids, field_names, arg, context=None):
         result = {}

From 24fab3ca7d378eea5357807d896ea0aa41028e83 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 31 Aug 2012 17:51:03 +0200
Subject: [PATCH 676/999] [IMP] mail: refactor various places where we append
 content to HTML

bzr revid: odo@openerp.com-20120831155103-t13p33p7232g0128
---
 addons/email_template/email_template.py       | 11 +++++-----
 .../wizard/mail_compose_message.py            |  2 --
 addons/mail/mail_followers.py                 |  7 +------
 addons/mail/mail_thread.py                    | 20 +++----------------
 4 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index d540971c3b4..3c124f740f4 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -29,7 +29,7 @@ from osv import fields
 import tools
 from tools.translate import _
 from tools.html_sanitize import html_sanitize
-from tools import html2plaintext
+from tools import html2plaintext, append_content_to_html
 from urllib import quote as quote
 _logger = logging.getLogger(__name__)
 
@@ -322,13 +322,12 @@ class email_template(osv.osv):
                                                  template.model, res_id, context=context) \
                                                  or False
 
-        if values['body_html']:
-            values['body'] = html_sanitize(values['body_html'])
-            values['body_text'] = html2plaintext(values['body_html'])
-
         if template.user_signature:
             signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
-            values['body'] += '\n\n' + signature
+            values['body_html'] = append_content_to_html(values['body_html'], signature)
+
+        if values['body_html']:
+            values['body'] = html_sanitize(values['body_html'])
 
         values.update(mail_server_id = template.mail_server_id.id or False,
                       auto_delete = template.auto_delete,
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 11e726c537b..a6fb2a00646 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -100,8 +100,6 @@ class mail_compose_message(osv.osv_memory):
         
         values.update(use_template=use_template, template_id=template_id)
 
-        print 'returning ', values
-
         return {'value': values}
 
     def toggle_template(self, cr, uid, ids, context=None):
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 9646744fae8..9205aa0b933 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -98,12 +98,7 @@ class mail_notification(osv.Model):
         body_html = msg.body
         signature = msg.author_id and msg.author_id.user_ids[0].signature or ''
         if signature:
-            signature_block = u'\n<pre>%s</pre>\n' % signature
-            insertion_point = body_html.find('</html>')
-            if insertion_point > -1:
-                body_html = body_html[:insertion_point] + signature_block + body_html[insertion_point:]
-            else:
-                body_html += signature_block
+            body_html = tools.append_content_to_html(body_html, signature)
 
         towrite = {
             'mail_message_id': msg.id,
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index e5f36156e0b..99f6f187428 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -460,29 +460,15 @@ class mail_thread(osv.Model):
                     continue
                 # 2) text/plain -> <pre/>
                 if part.get_content_type() == 'text/plain' and (not alternative or not body):
-                    insertion_point = body.find('</html>')
-                    # plain text is wrapped in <pre/> to preserve formatting
-                    text = u'<pre>%s</pre>' % tools.ustr(part.get_payload(decode=True),
-                                                         encoding, errors='replace')
-                    if insertion_point != -1:
-                        body = body[:insertion_point] + text + body[insertion_point:]
-                    else:
-                        body += text
+                    body = tools.append_content_to_html(body, tools.ustr(part.get_payload(decode=True),
+                                                                         encoding, errors='replace'))
                 # 3) text/html -> raw
                 elif part.get_content_type() == 'text/html':
                     html = tools.ustr(part.get_payload(decode=True), encoding, errors='replace')
                     if alternative:
                         body = html
-                        # force </html> tag to lowercase, for easier matching
-                        body = re.sub(r'(?i)</html>', r'</html>', body)
                     else:
-                        # strip enclosing html/body tags and append to existing body
-                        html = re.sub(r'(?i)(</?html>|</?body>)', '', html)
-                        insertion_point = body.find('</html>')
-                        if insertion_point != -1:
-                            body = body[:insertion_point] + html + body[insertion_point:]
-                        else:
-                            body += html
+                        body = tools.append_content_to_html(body, html, plaintext=False)
                 # 4) Anything else -> attachment
                 else:
                     attachments.append((filename or 'attachment', part.get_payload(decode=True)))

From 04c6823a99442d34fe1c4f2ca9be12bbb0cbbdb3 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 31 Aug 2012 17:58:05 +0200
Subject: [PATCH 677/999] [IMP] email_template: email.template does not inherit
 from mail.mail anymore, they had almost nothing left in common

+ minor lint cleanup

bzr revid: odo@openerp.com-20120831155805-bs8jmpt3eh52zwfb
---
 addons/email_template/email_template.py | 41 ++++++-------------------
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 3c124f740f4..17b7004be41 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -40,7 +40,6 @@ except ImportError:
 
 class email_template(osv.osv):
     "Templates for sending email"
-    _inherit = 'mail.mail'
     _name = "email.template"
     _description = 'Email Templates'
     _rec_name = 'name' # override mail.message's behavior
@@ -111,6 +110,8 @@ class email_template(osv.osv):
     _columns = {
         'name': fields.char('Name', size=250),
         'model_id': fields.many2one('ir.model', 'Related document model'),
+        'model': fields.related('model_id', 'model', type='char', string='Related Document Model',
+                                size=128, select=True, store=True, readonly=True),
         'lang': fields.char('Language Selection', size=250,
                             help="Optional translation language (ISO code) to select when sending out an email. "
                                  "If not set, the english version will be used. "
@@ -134,16 +135,12 @@ class email_template(osv.osv):
                                                    "in outgoing emails so you can identify replies and link "
                                                    "them back to the corresponding resource record. "
                                                    "This is useful for CRM leads for example"),
-
-        # Overridden mail.message.common fields for technical reasons:
-        'model': fields.related('model_id', 'model', type='char', string='Related Document Model',
-                                size=128, select=True, store=True, readonly=True),
         # we need a separate m2m table to avoid ID collisions with the original mail.message entries
-        #'attachment_ids': fields.many2many('ir.attachment', 'email_template_attachment_rel', 'email_template_id',
-        #                                   'attachment_id', 'Files to attach',
-        #                                   help="You may attach files to this template, to be added to all "
-        #                                        "emails created from this template"),
-
+        'attachment_ids': fields.many2many('ir.attachment', 'email_template_attachment_rel', 'email_template_id',
+                                           'attachment_id', 'Files to attach',
+                                           help="You may attach files to this template, to be added to all "
+                                                "emails created from this template"),
+        'auto_delete': fields.boolean('Auto Delete', help="Permanently delete this email after sending it, to save space"),
         # Overridden mail.message.common fields to make tooltips more appropriate:
         'subject': fields.char('Subject', translate=True, help="Subject (placeholders may be used here)",),
         'email_from': fields.char('From', size=128, help="Sender address (placeholders may be used here)"),
@@ -289,32 +286,14 @@ class email_template(osv.osv):
            :param res_id: id of the record to use for rendering the template (model
                           is taken from template definition)
            :returns: a dict containing all relevant fields for creating a new
-                     mail.message entry, with the addition one additional
-                     special key ``attachments`` containing a list of
+                     mail.mail entry, with one extra key ``attachments``, in the
+                     format expected by :py:meth:`mail_thread.message_post`.
         """
         if context is None:
             context = {}
-        values = {
-                  'subject': False,
-                  'body_html': False,
-                  'email_from': False,
-                  'email_to': False,
-                  'email_cc': False,
-                  'reply_to': False,
-                  'auto_delete': False,
-                  'model': False,
-                  'res_id': False,
-                  'mail_server_id': False,
-                  'attachments': False,
-                  'attachment_ids': False,
-                  'message_id': False,
-                  'state': 'outgoing',
-        }
-        if not template_id:
-            return values
-
         report_xml_pool = self.pool.get('ir.actions.report.xml')
         template = self.get_email_template(cr, uid, template_id, res_id, context)
+        values = {'model': template.model_id.model}
 
         for field in ['subject', 'body_html', 'email_from',
                       'email_to', 'email_cc', 'reply_to']:

From e95c8b2b1c87b5bff0a3587b9d503a6819250eb3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 31 Aug 2012 18:04:52 +0200
Subject: [PATCH 678/999] [IMP] product form

bzr revid: fp@tinyerp.com-20120831160452-346w4c64e1joa4m8
---
 addons/product/product_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 3ae82a07efd..2a9d3892dd8 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -132,11 +132,11 @@
                                     <group>
                                         <label for="sale_delay"/>
                                         <div>
-                                            <field name="sale_delay"/> days
+                                            <field name="sale_delay" class="oe_inline"/> days
                                         </div>
-                                        <field name="warranty"/> months
+                                        <field name="warranty" class="oe_inline"/> months
                                     </group>
-                                    <group groups="product.group_uom">
+                                    <group groups="product.group_uos">
                                         <field name="uos_id"/>
                                         <field name="uos_coeff"/>
                                         <field name="mes_type"/>

From 6eb0b6af71245f4c8dfa68938cf139d66ee5ff50 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 31 Aug 2012 18:28:31 +0200
Subject: [PATCH 679/999] fix

bzr revid: fp@tinyerp.com-20120831162831-qn2ai0258pki7fxp
---
 addons/point_of_sale/point_of_sale_view.xml | 7 +++----
 addons/product/product_view.xml             | 7 +++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 0e906186285..2f3b949fee0 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -628,15 +628,14 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
             <field name="arch" type="xml">
-                <group name="misc" position="after">
-                    <group name="pos" colspan="2" col="2">
-                        <separator string="Point of Sale" colspan="2"/>
+                <group name="sale" position="inside">
+                    <group name="pos" string="Point of Sale">
                         <field name="income_pdt"/>
                         <field name="expense_pdt"/>
                     </group>
                 </group>
                 <field name="ean13" position="after">
-                    <button name="edit_ean" type="object" string="Edit" />
+                    <button name="edit_ean" type="object" string="Custom EAN" class="oe_link"/>
                 </field>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 2a9d3892dd8..6a837f4bbc0 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -92,7 +92,10 @@
                                     </group>
                                     <group>
                                         <field name="default_code"/>
-                                        <field name="ean13" placeholder="e.g. 5901234123457"/>
+                                        <label for="ean13"/>
+                                        <div name="ean">
+                                            <field name="ean13" placeholder="e.g. 5901234123457" class="oe_inline"/>
+                                        </div>
                                         <field groups="product.group_product_variant" name="variants"/>
                                     </group>
                                     <group>
@@ -128,7 +131,7 @@
                                 </group>
                             </page>
                             <page string="Sales" attrs="{'readonly':[('sale_ok','=',0)]}">
-                                <group>
+                                <group name="sale">
                                     <group>
                                         <label for="sale_delay"/>
                                         <div>

From 723d2ee1daaf2d709926f0ea1bce6c5ba334285d Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 31 Aug 2012 18:31:53 +0200
Subject: [PATCH 680/999] uniformization of avatar box-shadow

bzr revid: mit@openerp.com-20120831163153-8515c0vfr6sw09n1
---
 addons/web/static/src/css/base.css           | 12 ++++++------
 addons/web/static/src/css/base.sass          |  4 ++--
 addons/web_kanban/static/src/css/kanban.css  |  6 +++---
 addons/web_kanban/static/src/css/kanban.sass |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c3552811fd4..dcb3fd958f4 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -498,9 +498,9 @@
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
-  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
   border: none;
 }
 .openerp .oe_avatar + div {
@@ -866,9 +866,9 @@
   font-family: "Lucida Grande", Helvetica, Verdana, Arial;
   border: 1px solid #999999;
   background: whitesmoke;
-  -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
-  -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
-  box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
+  -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4);
+  -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4);
+  box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4);
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 0ac0d99def8..43b8ace724b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -420,7 +420,7 @@ $sheet-max-width: 860px
             max-height: 90px
             max-width: 90px
             @include radius(3px)
-            @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3))
+            @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.4))
             border: none
     .oe_avatar + div
         margin-left: 5px
@@ -687,7 +687,7 @@ $sheet-max-width: 860px
             font-family: "Lucida Grande", Helvetica, Verdana, Arial
             border: 1px solid #999999
             background: whitesmoke
-            @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.3))
+            @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.4))
             @include radius(3px)
         input
             margin-bottom: 9px
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index b2abba2b0ec..299aba737e6 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -170,9 +170,9 @@
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
-  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
-  -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+  -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
 }
 .openerp .oe_kanban_view .oe_kanban_details {
   display: inline-block;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 67039ac475b..30bfe9b364f 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -178,7 +178,7 @@
         text-align: center
         overflow: hidden
         @include radius(3px)
-        @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3))
+        @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.4))
     .oe_kanban_details
         display: inline-block
         vertical-align: top

From 67da3486c7c0785d1b9130ba4d9eb2c574eb8958 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cto@openerp.com>
Date: Fri, 31 Aug 2012 18:33:50 +0200
Subject: [PATCH 681/999] [IMP] Remove demo users

bzr revid: cto@openerp.com-20120831163350-gfi23hw34ltw7v5o
---
 addons/hr/hr_demo.xml           | 115 +-------------------------------
 addons/project/project_demo.xml |  85 ++++++-----------------
 2 files changed, 23 insertions(+), 177 deletions(-)

diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 20d3e093505..8cb5ade52fe 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -4,107 +4,6 @@
 
     <!--Users-->
 
-      <record id="base.user_root" model="res.users">
-          <field name="image">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</field>
-      </record>
-
-
-      <record id="base.user_fp" model="res.users">
-          <field name="name">Fabien</field>
-          <field name="login">fp</field>
-          <field name="password">fp</field>
-          <field name="image">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</field>
-      </record>
-
-      <record id="base.user_al" model="res.users">
-          <field name="name">Antony</field>
-          <field name="login">al</field>
-          <field name="password">al</field>
-          <field name="image">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</field>
-      </record>
-
-      <record id="base.user_mit" model="res.users">
-          <field name="name">Minh</field>
-          <field name="login">mit</field>
-          <field name="password">mit</field>
-          <field name="image">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</field>
-      </record>
-
-      <record id="base.user_niv" model="res.users">
-          <field name="name">Nicolas</field>
-          <field name="login">niv</field>
-          <field name="password">niv</field>
-          <field name="image">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</field>
-      </record>
-
-      <record id="base.user_stw" model="res.users">
-          <field name="name">Stéphane</field>
-          <field name="login">stw</field>
-          <field name="password">stw</field>
-          <field name="image">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</field>
-      </record>
-
-      <record id="base.user_chs" model="res.users">
-          <field name="name">Christophe</field>
-          <field name="login">chs</field>
-          <field name="password">chs</field>
-          <field name="image">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</field>
-      </record>
-
-      <record id="base.user_qdp" model="res.users">
-          <field name="name">Quentin</field>
-          <field name="login">qdp</field>
-          <field name="password">qdp</field>
-          <field name="image">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</field>
-      </record>
-
-      <record id="base.user_fme" model="res.users">
-          <field name="name">Fabien M.</field>
-          <field name="login">fme</field>
-          <field name="password">fme</field>
-      </record>
-
-      <record id="base.user_fpi" model="res.users">
-          <field name="name">Francois</field>
-          <field name="login">fpi</field>
-          <field name="password">fpi</field>
-          <field name="image">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</field>
-      </record>
-
-      <record id="base.user_jth" model="res.users">
-          <field name="name">Julien</field>
-          <field name="login">jth</field>
-          <field name="password">jth</field>
-          <field name="image">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</field>
-      </record>
-
-      <record id="base.user_ngh" model="res.users">
-          <field name="name">Nicoleta</field>
-          <field name="login">ngh</field>
-          <field name="password">ngh</field>
-          <field name="image">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</field>
-      </record>
-
-      <record id="base.user_vad" model="res.users">
-          <field name="name">Valérie</field>
-          <field name="login">vad</field>
-          <field name="password">vad</field>
-          <field name="image">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</field>
-      </record>
-
-      <record id="base.user_apr" model="res.users">
-          <field name="name">Aline</field>
-          <field name="login">apr</field>
-          <field name="password">apr</field>
-          <field name="image">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</field>
-      </record>
-
-      <record id="base.user_phu" model="res.users">
-          <field name="name">Phuong</field>
-          <field name="login">phu</field>
-          <field name="password">phu</field>
-      </record>
-
     <!--Department-->
 
       <record id="dep_management" model="hr.department">
@@ -193,7 +92,7 @@
 
       <record id="employee_fp" model="hr.employee">
           <field name="name">Fabien Pinckaers</field>
-          <field name="user_id" ref="base.user_fp"/>
+          <field name="user_id" ref="base.user_root"/>
           <field name="department_id" ref="dep_management"/>
           <field name="job_id" ref="hr.job_ceo"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_2')])]"/>
@@ -205,7 +104,6 @@
 
       <record id="employee_al" model="hr.employee">
           <field name="name">Antony Lesuisse</field>
-          <field name="user_id" ref="base.user_al"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="job_id" ref="hr.job_cto"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_3')])]"/>
@@ -217,7 +115,6 @@
 
       <record id="employee_mit" model="hr.employee">
           <field name="name">Minh Tran</field>
-          <field name="user_id" ref="base.user_mit"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -231,7 +128,6 @@
 
       <record id="employee_niv" model="hr.employee">
           <field name="name">Nicolas Vanhoren</field>
-          <field name="user_id" ref="base.user_niv"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -244,7 +140,6 @@
 
       <record id="employee_stw" model="hr.employee">
           <field name="name">Stéphane Wirtel</field>
-          <field name="user_id" ref="base.user_stw"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -257,7 +152,6 @@
 
       <record id="employee_chs" model="hr.employee">
           <field name="name">Christophe Simonis</field>
-          <field name="user_id" ref="base.user_chs"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -270,7 +164,7 @@
 
       <record id="employee_qdp" model="hr.employee">
           <field name="name">Quentin De Paoli</field>
-          <field name="user_id" ref="base.user_qdp"/>
+          <field name="user_id" ref="base.user_demo"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -283,7 +177,6 @@
 
       <record id="employee_fme" model="hr.employee">
           <field name="name">Fabien Meghazi</field>
-          <field name="user_id" ref="base.user_fme"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -295,7 +188,6 @@
 
       <record id="employee_fpi" model="hr.employee">
           <field name="name">Francois Pietquin</field>
-          <field name="user_id" ref="base.user_fpi"/>
           <field name="department_id" ref="dep_ps"/>
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_consultant"/>
@@ -308,7 +200,6 @@
 
       <record id="employee_jth" model="hr.employee">
           <field name="name">Julien Thewys</field>
-          <field name="user_id" ref="base.user_jth"/>
           <field name="department_id" ref="dep_ps"/>
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_consultant"/>
@@ -321,7 +212,6 @@
 
       <record id="employee_ngh" model="hr.employee">
           <field name="name">Nicoleta Gherlea</field>
-          <field name="user_id" ref="base.user_ngh"/>
           <field name="department_id" ref="dep_sales"/>
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_marketing"/>
@@ -334,7 +224,6 @@
 
       <record id="employee_vad" model="hr.employee">
           <field name="name">Valérie Descamps</field>
-          <field name="user_id" ref="base.user_vad"/>
           <field name="department_id" ref="dep_administration"/>
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_hrm"/>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index aaad6b167a0..320ad72c0d3 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -7,49 +7,6 @@
             <field name="groups_id" eval="[(4, ref('base.group_sale_salesman')),(4, ref('group_project_user'))]"/>
         </record>
 
-        <record id="base.user_niv" model="res.users">
-            <field name="name">Nicolas</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]"/>
-            <field name="login">niv</field>
-            <field name="password">niv</field>
-        </record>
-        <record id="base.user_al" model="res.users">
-            <field name="name">Antony</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]"/>
-            <field name="login">al</field>
-            <field name="password">al</field>
-        </record>
-        <record id="base.user_qdp" model="res.users">
-            <field name="name">Quentin</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
-            <field name="login">qdp</field>
-            <field name="password">qdp</field>
-        </record>
-        <record id="base.user_fpi" model="res.users">
-            <field name="name">Francois</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
-            <field name="login">fpi</field>
-            <field name="password">fpi</field>
-        </record>
-        <record id="base.user_jth" model="res.users">
-            <field name="name">Julien</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
-            <field name="login">jth</field>
-            <field name="password">jth</field>
-        </record>
-        <record id="base.user_mit" model="res.users">
-            <field name="name">Minh</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
-            <field name="login">mit</field>
-            <field name="password">mit</field>
-        </record>
-        <record id="base.user_vad" model="res.users">
-            <field name="name">Valérie</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user')])]"/>
-            <field name="login">vad</field>
-            <field name="password">vad</field>
-        </record>
-
         <!-- Categories -->
         <record id="project_category_01" model="project.category">
             <field name="name">Contact's suggestion</field>
@@ -93,7 +50,7 @@
                     ref('base.user_niv'),
                     ref('base.user_al'),
                     ref('base.user_qdp')])]"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="description">Implement new website for Sale and Warehouse Management for a customer.</field>
             <field name="alias_model">project.task</field>
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_analysis'),ref('project_tt_specification'),ref('project_tt_negotiation'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_deployment')])]"/>
@@ -102,7 +59,7 @@
         <record id="project_project_2" model="project.project">
             <field name="name">Research &amp; Development</field>
             <field name="parent_id" ref="all_projects_account"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
         </record>
@@ -149,7 +106,7 @@
         <record id="project_task_1" model="project.task">
             <field name="planned_hours" eval="40.0"/>
             <field name="remaining_hours" eval="40.0"/>
-            <field name="user_id" ref="base.user_niv"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Prepare Requirements Document</field>
@@ -159,7 +116,7 @@
         <record id="project_task_2" model="project.task">
             <field name="planned_hours" eval="32.0"/>
             <field name="remaining_hours" eval="32.0"/>
-            <field name="user_id" ref="base.user_niv"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Make SRS</field>
@@ -168,7 +125,7 @@
         <record id="project_task_3" model="project.task">
             <field name="planned_hours" eval="10.0"/>
             <field name="remaining_hours" eval="10.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Budget Planning</field>
@@ -179,7 +136,7 @@
         <record id="project_task_4" model="project.task">
             <field name="planned_hours" eval="60.0"/>
             <field name="remaining_hours" eval="60.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Develop module for Sale Management</field>
@@ -193,7 +150,7 @@
         <record id="project_task_5" model="project.task">
             <field name="planned_hours" eval="76.0"/>
             <field name="remaining_hours" eval="76.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Develop module for Warehouse</field>
@@ -207,7 +164,7 @@
         <record id="project_task_6" model="project.task">
             <field name="planned_hours" eval="24.0"/>
             <field name="remaining_hours" eval="24.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Integrate Modules</field>
@@ -216,7 +173,7 @@
         <record id="project_task_7" model="project.task">
             <field name="planned_hours" eval="15.0"/>
             <field name="remaining_hours" eval="5.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Internal testing + Software Install</field>
@@ -225,7 +182,7 @@
         <record id="project_task_8" model="project.task">
             <field name="planned_hours" eval="22.0"/>
             <field name="remaining_hours" eval="22.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">New portal system</field>
@@ -237,7 +194,7 @@
         <record id="project_task_9" model="project.task">
             <field name="planned_hours" eval="18.0"/>
             <field name="remaining_hours" eval="18.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Document history management</field>
@@ -246,7 +203,7 @@
         <record id="project_task_10" model="project.task">
             <field name="planned_hours" eval="38.0"/>
             <field name="remaining_hours" eval="38.0"/>
-            <field name="user_id" ref="base.user_fpi"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Social network integration</field>
@@ -256,7 +213,7 @@
         <record id="project_task_11" model="project.task">
             <field name="planned_hours" eval="16.0"/>
             <field name="remaining_hours" eval="16.0"/>
-            <field name="user_id" ref="base.user_fpi"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">User interface improvements</field>
@@ -270,7 +227,7 @@
         <record id="project_task_12" model="project.task">
             <field name="planned_hours" eval="40.0"/>
             <field name="remaining_hours" eval="40.0"/>
-            <field name="user_id" ref="base.user_fpi"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Improve+clean code and functionality</field>
@@ -282,7 +239,7 @@
         <record id="project_task_13" model="project.task">
             <field name="planned_hours" eval="12.0"/>
             <field name="remaining_hours" eval="12.0"/>
-            <field name="user_id" ref="base.user_mit"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Design Use Cases</field>
@@ -293,7 +250,7 @@
         <record id="project_task_14" model="project.task">
             <field name="planned_hours" eval="12.0"/>
             <field name="remaining_hours" eval="12.0"/>
-            <field name="user_id" ref="base.user_mit"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Dataflow Design</field>
@@ -302,7 +259,7 @@
         <record id="project_task_15" model="project.task">
             <field name="planned_hours" eval="55.0"/>
             <field name="remaining_hours" eval="55.0"/>
-            <field name="user_id" ref="base.user_fpi"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">User Interface design</field>
@@ -316,7 +273,7 @@
             <field name="sequence" eval="10"/>
             <field name="planned_hours" eval="80.0"/>
             <field name="remaining_hours" eval="80.0"/>
-            <field name="user_id" ref="base.user_mit"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Set target for all deparments</field>
@@ -327,7 +284,7 @@
         <record id="project_task_17" model="project.task">
             <field name="planned_hours" eval="34.0"/>
             <field name="remaining_hours" eval="34.0"/>
-            <field name="user_id" ref="base.user_niv"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Integration of core components</field>
@@ -338,7 +295,7 @@
         <record id="project_task_18" model="project.task">
             <field name="planned_hours" eval="16.0"/>
             <field name="remaining_hours" eval="16.0"/>
-            <field name="user_id" ref="base.user_niv"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Deploy and review on live system</field>
@@ -458,7 +415,7 @@ Thanks,</field>
             <field name="body_text">Ok, I have checked the mail,
 I will update the document and let you know.</field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_qdp"/>
+            <field name="user_id" ref="base.user_demo"/>
         </record>
 
 

From 349c24a1cdbb784951227257811c091fdbebefaa Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 31 Aug 2012 18:35:17 +0200
Subject: [PATCH 682/999] [IMP] usability

bzr revid: fp@tinyerp.com-20120831163517-vqatk8mzl7u2vuym
---
 addons/point_of_sale/point_of_sale.py       |  2 +-
 addons/point_of_sale/point_of_sale_view.xml | 14 +++++++++++---
 addons/product/product_view.xml             |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index b17e672cb9c..108db6063ef 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1306,7 +1306,7 @@ class product_product(osv.osv):
 
     def edit_ean(self, cr, uid, ids, context):
         return {
-            'name': "Edit Ean",
+            'name': _("Assign a Custom EAN"),
             'type': 'ir.actions.act_window',
             'view_type': 'form',
             'view_mode': 'form',
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 2f3b949fee0..c51ec3d6043 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -635,7 +635,7 @@
                     </group>
                 </group>
                 <field name="ean13" position="after">
-                    <button name="edit_ean" type="object" string="Custom EAN" class="oe_link"/>
+                    <button name="edit_ean" type="object" string="Set a Custom EAN" class="oe_link oe_edit_only"/>
                 </field>
             </field>
         </record>
@@ -1069,9 +1069,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Ean13 Generator" version="7.0">  
-                    <field name="ean13_pattern"/>
+                    <p class="oe_grey">
+                        Enter a reference for this product, it will be converted
+                        automatically to a valid EAN number.
+                    </p>
+                    <group>
+                        <field name="ean13_pattern"/>
+                    </group>
                     <footer>
-                        <button name="sanitize_ean13" type="object" string="Apply"/>
+                        <button name="sanitize_ean13" type="object" string="Apply" class="oe_highlight"/> or 
+                         <button icon="gtk-stop" special="cancel"
+                            string="Cancel" class="oe_link"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 6a837f4bbc0..005b1ac7262 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -94,7 +94,7 @@
                                         <field name="default_code"/>
                                         <label for="ean13"/>
                                         <div name="ean">
-                                            <field name="ean13" placeholder="e.g. 5901234123457" class="oe_inline"/>
+                                            <field name="ean13" placeholder="e.g. 5901234123457"/>
                                         </div>
                                         <field groups="product.group_product_variant" name="variants"/>
                                     </group>

From fb7491ed709c159da9e5337c0a2bd6b1187cfffc Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 31 Aug 2012 18:39:04 +0200
Subject: [PATCH 683/999] [FIX] email_template: fix template views + preview
 after latest model changes

bzr revid: odo@openerp.com-20120831163904-jh76tko9hwd2a06y
---
 addons/email_template/email_template_view.xml |  1 -
 .../wizard/email_template_preview.py          |  8 +++----
 .../wizard/email_template_preview_view.xml    | 21 ++++++-------------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index cd75a719197..15164c22752 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -67,7 +67,6 @@
                                     <separator string="Advanced Options" colspan="2"/>
                                     <field name="mail_server_id"/>
                                     <field name="track_campaign_item"/>
-                                    <field name="message_id"/>
                                     <field name="auto_delete"/>
                                     <field name="lang"/>
                                 </group>
diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py
index 2c1866a53c4..d1a398cf3e6 100644
--- a/addons/email_template/wizard/email_template_preview.py
+++ b/addons/email_template/wizard/email_template_preview.py
@@ -74,19 +74,19 @@ class email_template_preview(osv.osv_memory):
         vals = {}
         email_template = self.pool.get('email.template')
         template_id = context and context.get('template_id')
+        
+        # FIXME ODO: replace everything below with a call to template.generate_email
         template = email_template.get_email_template(cr, uid, template_id=template_id, record_id=res_id, context=context)
         model = template.model
         vals['email_to'] = self.render_template(cr, uid, template.email_to, model, res_id, context)
         vals['email_cc'] = self.render_template(cr, uid, template.email_cc, model, res_id, context)
         vals['reply_to'] = self.render_template(cr, uid, template.reply_to, model, res_id, context)
         vals['subject'] = self.render_template(cr, uid, template.subject, model, res_id, context)
-        description = self.render_template(cr, uid, template.body, model, res_id, context) or ''
+        description = self.render_template(cr, uid, template.body_html, model, res_id, context) or ''
         if template.user_signature:
             signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
             description += '\n' + signature
-        vals['body'] = description
-        if template.body_html:
-            vals['body_html'] = self.render_template(cr, uid, template.body_html, model, res_id, context) or ''
+        vals['body_html'] = description
         vals['report_name'] = self.render_template(cr, uid, template.report_name, model, res_id, context)
         return {'value': vals}
 
diff --git a/addons/email_template/wizard/email_template_preview_view.xml b/addons/email_template/wizard/email_template_preview_view.xml
index 708ca2b0406..e621ec446ff 100644
--- a/addons/email_template/wizard/email_template_preview_view.xml
+++ b/addons/email_template/wizard/email_template_preview_view.xml
@@ -6,26 +6,17 @@
             <field name="name">email_template.preview.form</field>
             <field name="model">email_template.preview</field>
             <field name="arch" type="xml">
-                <form string="Email Preview">
-                    <field name="model_id" invisible="1"/>
-                    <field name="res_id" on_change="on_change_res_id(res_id, context)"/>
-                    <group col="2" colspan="4">
+                <form string="Email Preview" version="7.0">
+                    <group>
+                        <field name="model_id" invisible="1"/>
+                        <field name="res_id" on_change="on_change_res_id(res_id, context)"/>
                         <field name="email_to" readonly="1"/>
                         <field name="email_cc" readonly="1" attrs="{'invisible': [('email_cc','=',False)]}"/>
                         <field name="reply_to" readonly="1" attrs="{'invisible': [('reply_to','=',False)]}"/>
                         <field name="subject" readonly="1"/>
+                        <field name="body_html" nolabel="1" colspan="4" height="350" width="350" readonly="1" widget="html"/>
+                        <field name="report_name" colspan="4" readonly="1"/>
                     </group>
-                    <group col="4" colspan="4">
-                        <notebook>
-                            <page string="Body (Text)">
-                                <field name="body" nolabel="1" colspan="4" height="350" width="350" readonly="1"/>
-                            </page>
-                            <page string="Body (Rich/HTML)" attrs="{'invisible': [('body_html','=', False)]}">
-                                <field name="body_html" nolabel="1" colspan="4" height="350" width="350" readonly="1"/>
-                            </page>
-                        </notebook>
-                    </group>
-                    <field name="report_name" colspan="4" readonly="1"/>
                 </form>
             </field>
         </record>

From 33897328bca497ee6fff755da885f53053a40e6a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 31 Aug 2012 18:40:18 +0200
Subject: [PATCH 684/999] [IMP] product view

bzr revid: fp@tinyerp.com-20120831164018-b8m7xhxi2na5eraj
---
 addons/point_of_sale/point_of_sale.py       | 2 +-
 addons/point_of_sale/point_of_sale_view.xml | 2 +-
 addons/project_mrp/project_mrp_view.xml     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 108db6063ef..24c482bd53c 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1242,7 +1242,7 @@ import io, StringIO
 class ean_wizard(osv.osv_memory):
     _name = 'pos.ean_wizard'
     _columns = {
-        'ean13_pattern': fields.char('Ean13 Pattern', size=32, required=True, translate=True),
+        'ean13_pattern': fields.char('Reference', size=32, required=True, translate=True),
     }
     def sanitize_ean13(self, cr, uid, ids, context):
         for r in self.browse(cr,uid,ids):
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index c51ec3d6043..f672d90616e 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -1074,7 +1074,7 @@
                         automatically to a valid EAN number.
                     </p>
                     <group>
-                        <field name="ean13_pattern"/>
+                        <field name="ean13_pattern" class="oe_inline"/>
                     </group>
                     <footer>
                         <button name="sanitize_ean13" type="object" string="Apply" class="oe_highlight"/> or 
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index 841a61e6c31..f9e761117b6 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -16,8 +16,8 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
             <field name="arch" type="xml">
-                <field name="active" position="after">
-                    <field name="project_id" attrs="{'readonly':[('type','!=','service')]}" />
+                <field name="type" position="after">
+                    <field name="project_id" attrs="{'invisible':[('type','!=','service')]}" />
                 </field>
             </field>
         </record>

From 4da6c7b2bc55dba63d9b80417f35c79fe61e7b85 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cto@openerp.com>
Date: Fri, 31 Aug 2012 18:55:21 +0200
Subject: [PATCH 685/999] [FIX] make tests works

bzr revid: cto@openerp.com-20120831165521-6h5q0r2abgt0nlpt
---
 addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml | 6 +++---
 addons/project/project_demo.xml                            | 4 ++--
 addons/project/test/task_process.yml                       | 2 +-
 addons/project_timesheet/test/work_timesheet.yml           | 5 +++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
index f4f9326890f..bf6f19b653c 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -9,7 +9,7 @@
 -
   I assign this product(Service on Timesheet) and journal(Timesheet Journal) to employee "Quentin Paolino"
 -
-  !record {model: hr.employee, id: hr.employee_qdp}:
+  !record {model: hr.employee, id: hr.employee_demo}:
     product_id: product.product_product_consultant
     journal_id: hr_timesheet.analytic_journal
 -
@@ -69,7 +69,7 @@
       - account_id: account.analytic_agrolait
         date: !eval time.strftime('%Y-%m-%d')
         name: 'Develop yaml for hr module'
-        user_id: base.user_qdp
+        user_id: base.user_demo
         unit_amount: 6.00
         amount: -90.00
         product_id: product.product_product_consultant
@@ -97,7 +97,7 @@
         date: !eval time.strftime('%Y-%m-%d')
         name: 'Develop yaml for hr module'
         unit_amount: 2.00
-        user_id: base.user_qdp
+        user_id: base.user_demo
         amount: -90.00
         product_id: product.product_product_consultant
         general_account_id: account.a_expense
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 320ad72c0d3..51dedd61c63 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -106,7 +106,7 @@
         <record id="project_task_1" model="project.task">
             <field name="planned_hours" eval="40.0"/>
             <field name="remaining_hours" eval="40.0"/>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Prepare Requirements Document</field>
@@ -203,7 +203,7 @@
         <record id="project_task_10" model="project.task">
             <field name="planned_hours" eval="38.0"/>
             <field name="remaining_hours" eval="38.0"/>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Social network integration</field>
diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
index ad4bbe53bb3..e37b2116714 100644
--- a/addons/project/test/task_process.yml
+++ b/addons/project/test/task_process.yml
@@ -11,7 +11,7 @@
     - state == "pending"
 -
   !record {model: project.task.delegate, id: delegate_id}:
-    user_id: base.user_niv
+    user_id: base.user_demo
     planned_hours: 12.0
     planned_hours_me: 2.0
 -
diff --git a/addons/project_timesheet/test/work_timesheet.yml b/addons/project_timesheet/test/work_timesheet.yml
index 2f75f908735..4867f92b4b1 100644
--- a/addons/project_timesheet/test/work_timesheet.yml
+++ b/addons/project_timesheet/test/work_timesheet.yml
@@ -6,7 +6,7 @@
     name: Test Timesheet records
     task_id: project.project_task_10
     hours: 20.0
-    user_id: base.user_fpi
+    user_id: base.user_demo
     company_id: base.main_company
 -
   I check Timesheet line for employee in current Timesheet
@@ -16,6 +16,7 @@
     start = (datetime.date.today().strftime('%Y-%m-%d'))
     task_work = self.search(cr, uid, [("name","=","Social network integration: Test Timesheet records")],context)[0]
     task_ids = self.browse(cr, uid, task_work, context)
-    assert task_ids.user_id.id == ref("base.user_fpi"), 'Error, The User in Timesheet is not Correct'
+    assert task_ids.user_id.id == ref("base.user_demo"), 'Error, The User in Timesheet is not Correct'
     assert task_ids.date == start, 'Error, The Date in Timesheet is not ok'
     assert task_ids.product_uom_id.name == "Hour", 'Error, The Hour in Timesheet is not ok'
+

From 86e9df4c9cb030d2ff4d2a58409cd7dfe51a1c14 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cto@openerp.com>
Date: Fri, 31 Aug 2012 19:03:56 +0200
Subject: [PATCH 686/999] [FIX] Multicompany demo users

bzr revid: cto@openerp.com-20120831170356-tgtyr7mipknzpohm
---
 addons/multi_company/multi_company_demo.xml | 43 ++-------------------
 1 file changed, 4 insertions(+), 39 deletions(-)

diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 462a355e789..d120550e3b9 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -52,47 +52,12 @@
 
 <!--                      User                        -->
 
-        <record id="res_users_editor_demo" model="res.users">
-            <field name="password">editor_demo</field>
-            <field name="name">OpenERP Editor</field>
-            <field name="login">editor_demo</field>
-            <field name="company_id" ref="res_company_oerp_editor"/>
-            <field name="company_ids" eval="[(4, ref('res_company_oerp_editor'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
+        <record id="base.user_root" model="res.users">
+            <field name="company_ids" eval="[(4, ref('res_company_oerp_editor')),(4, ref('res_company_oerp_us')),(4, ref('res_company_oerp_be'))]"/>
         </record>
-        <record id="res_users_sales_demo_us" model="res.users">
-            <field name="password">sales_demo_us</field>
-            <field name="name">OpenERP Salesman US</field>
-            <field name="login">sales_demo_us</field>
-            <field name="company_id" ref="res_company_oerp_us"/>
-            <field name="company_ids" eval="[(4, ref('res_company_oerp_us'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
+        <record id="base.user_demo" model="res.users">
+            <field name="company_ids" eval="[(4, ref('res_company_oerp_us')),(4, ref('res_company_oerp_be')),(4, ref('res_company_odoo'))]"/>
         </record>
-        <record id="res_users_sales_demo_be" model="res.users">
-            <field name="password">sales_demo_be</field>
-            <field name="name">OpenERP Salesman BE</field>
-            <field name="login">sales_demo_be</field>
-            <field name="company_id" ref="res_company_oerp_be"/>
-            <field name="company_ids" eval="[(4, ref('res_company_oerp_be'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
-        </record>
-        <record id="res_users_sales_demo_in" model="res.users">
-            <field name="password">sales_demo_in</field>
-            <field name="name">OpenERP Salesman IN</field>
-            <field name="login">sales_demo_in</field>
-            <field name="company_id" ref="res_company_oerp_in"/>
-            <field name="company_ids" eval="[(4, ref('res_company_oerp_in'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
-        </record>
-        <record id="res_users_odoo_demo" model="res.users">
-            <field name="password">odoo_demo</field>
-            <field name="name">Odoo</field>
-            <field name="login">odoo_demo</field>
-            <field name="company_id" ref="res_company_odoo"/>
-            <field name="company_ids" eval="[(4, ref('res_company_odoo'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
-        </record>
-
 
         <!--
     Resource: product.product

From 4785fc109e1f0bfc9e0cd5a267976dfea08b63d9 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cto@openerp.com>
Date: Fri, 31 Aug 2012 19:07:47 +0200
Subject: [PATCH 687/999] [FIX] Point of Sales Users Demo

bzr revid: cto@openerp.com-20120831170747-iyptvo6iy96d12w4
---
 addons/point_of_sale/point_of_sale_demo.xml | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 47256279c59..7d80dd493ad 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -11,30 +11,14 @@
         <record id="account.cash_journal" model="account.journal">
             <field eval="True" name="journal_user"/>
         </record>
-        <record id="base.user_jsmith" model="res.users">
-            <field name="name">John Smith (Cashier)</field>
-            <field name="login">jsmith</field>
+        <record id="base.user_root" model="res.users">
             <field name="ean13">0410300000004</field>
             <field name="groups_id" eval="[(4,ref('group_pos_manager'))]"/>
         </record>
-        <record id="base.user_jdoe" model="res.users">
-            <field name="name">John Doe (Cashier)</field>
-            <field name="login">jdoe</field>
+        <record id="base.user_demo" model="res.users">
             <field name="ean13">0410400000003</field>
             <field name="groups_id" eval="[(4,ref('group_pos_manager'))]"/>
         </record>
-        <record id="base.user_jbloggs" model="res.users">
-            <field name="name">Joe Bloggs (Client)</field>
-            <field name="login">jbloggs</field>
-            <field name="ean13">0420100000005</field>
-            <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
-        </record>
-        <record id="base.user_bsoap" model="res.users">
-            <field name="name">Bob Soap (Client)</field>
-            <field name="login">bsoap</field>
-            <field name="ean13">0420200000004</field>
-            <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
-        </record>
 
         <record model="pos.config" id="pos_config_main">
             <field name="journal_ids" eval="[(6, 0, [ref('account.cash_journal'), ref('account.bank_journal')])]" />

From 0de195b893ffca38a8bbe8be015e15147377bfa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 31 Aug 2012 19:12:47 +0200
Subject: [PATCH 688/999] [IMP] res_partner: moved regex of name_create of
 res.partner into a dedicated method, allowing ot use it outside of the
 name_create. Cleaned a bit the code, updated comments to the method.

bzr revid: tde@openerp.com-20120831171247-uc0babnzfk4logoa
---
 openerp/addons/base/res/res_partner.py | 32 +++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 30255d93ec3..42ddd1d40cd 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -351,27 +351,27 @@ class res_partner(osv.osv):
             res.append((record.id, name))
         return res
 
+    def parse_partner_name(self, cr, uid, name, context=None):
+        """ Supported syntax:
+            - 'Raoul <raoul@grosbedon.fr>', available with '  ', '<>', '{}',
+                '()', '[]': will find name and email address
+            - otherwise: default, everything is set as the name """
+        regex = re.compile('^(.*?)(?: ?[\<{(\[]?([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8})[\>})\]]?)?$')
+        result = regex.match(name)
+        return (result.group(1).strip(), result.group(2))
+
     def name_create(self, cr, uid, name, context=None):
         """ Override of orm's name_create method for partners. The purpose is
             to handle some basic formats to create partners using the
             name_create.
-            Supported syntax:
-            - 'raoul@grosbedon.fr': create a partner with name raoul@grosbedon.fr
-              and sets its email to raoul@grosbedon.fr
-            - 'Raoul Grosbedon <raoul@grosbedon.fr>': create a partner with name
-              Raoul Grosbedon, and set its email to raoul@grosbedon.fr
-            - anything else: fall back on the default name_create
-            Regex :
-            - ([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8}): raoul@grosbedon.fr
-            - ([\w\s.\\-]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8})[\>]:
-              Raoul Grosbedon, raoul@grosbedon.fr
-        """
-        regex = re.compile('^(.*?)(?: ?[\<]?([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8})[\>]?)?$')
-        result = regex.match(name)
-        if not result or (context.get('force_create',False) and result.group(2) is None):
+            If only an email address is received and that the regex cannot find
+            a name, the name will have the email value.
+            If 'force_email' key in context: must find the email address. """
+        name, email = self.parse_partner_name(cr, uid, name, context=context)
+        if context.get('force_email') and not email:
             raise osv.except_osv(_('Warning'), _("Couldn't create contact without email address !"))
-        name = result.group(1).strip()
-        email = result.group(2)
+        if not name and email:
+            name = email
         rec_id = self.create(cr, uid, {self._rec_name: name or email, 'email': email or False}, context=context)
         return self.name_get(cr, uid, [rec_id], context)[0]
 

From 0f3101cec515347e6fe98034cf5e6a6ba54d249b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 31 Aug 2012 19:15:07 +0200
Subject: [PATCH 689/999] [FIX] mail.compose.message: fixed send_mail about
 getting mass_mail values from template; fixed generated body that was adding
 a signature in reply mode; added the test that trigerred that bug.

bzr revid: tde@openerp.com-20120831171507-1prt4h46zsj77m23
---
 addons/mail/mail_thread.py                 |  3 +-
 addons/mail/tests/test_mail.py             | 18 ++++--
 addons/mail/wizard/mail_compose_message.py | 75 +++++++++-------------
 3 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 99f6f187428..4e35f3fd197 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -208,10 +208,11 @@ class mail_thread(osv.Model):
     # mail.message wrappers and tools
     #------------------------------------------------------
 
-    def _needaction_domain_get(self, cr, uid, context={}):
+    def _needaction_domain_get(self, cr, uid, context=None):
         if self._needaction:
             return [('message_unread', '=', True)]
         return []
+
     #------------------------------------------------------
     # Mail gateway
     #------------------------------------------------------
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index f7f9e2e8a3e..fa30c76aa1e 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -326,6 +326,7 @@ class test_mail(common.TransactionCase):
 
         # Mail data
         _subject = 'Pigs'
+        _subject_reply = 'Re: Pigs'
         _mail_subject = '%s posted on %s' % (user_admin.name, group_pigs.name)
         _body_text = 'Pigs rules'
         _msg_body1 = '<pre>Pigs rules</pre>'
@@ -373,22 +374,27 @@ class test_mail(common.TransactionCase):
         self.assertEqual(len(notif_ids), 4, 'mail.message: too much notifications created')
         self.assertEqual(set(msg_pids), set(test_pids), 'mail.message partner_ids incorrect')
 
-        # CASE2: reply to last comment with attachments
+        # CASE2: reply to last comment (update its subject) with attachments
+        message.write({'subject': _subject})
         compose_id = mail_compose.create(cr, uid,
             {'attachment_ids': [(0, 0, _attachments[0]), (0, 0, _attachments[1])]},
             {'mail.compose.message.mode': 'reply', 'default_model': 'mail.thread', 'default_res_id': self.group_pigs_id, 'active_id': message.id})
         compose = mail_compose.browse(cr, uid, compose_id)
 
         # Test: form view methods
-        # Test: model, res_id, parent_id
+        # Test: model, res_id, parent_id, content_subtype
         self.assertEqual(compose.model,  'mail.group', 'mail.compose.message incorrect model')
         self.assertEqual(compose.res_id, self.group_pigs_id, 'mail.compose.message incorrect res_id')
         self.assertEqual(compose.parent_id.id, message.id, 'mail.compose.message incorrect parent_id')
+        self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message incorrect content_subtype')
 
         # Post the comment, get created message
         mail_compose.send_mail(cr, uid, [compose_id])
         group_pigs.refresh()
         message = group_pigs.message_ids[0]
+        # Test: subject as Re:.., body in html
+        self.assertEqual(message.subject, _subject_reply, 'mail.message incorrect subject')
+        self.assertIn('Administrator wrote:<blockquote><pre>Pigs rules</pre></blockquote></div>', message.body, 'mail.message body is incorrect')
         # Test: attachments
         for i in range(len(message.attachment_ids)):
             self.assertEqual(message.attachment_ids[i].name, _attachments[i]['name'], 'mail.message attachment name incorrect')
@@ -406,13 +412,13 @@ class test_mail(common.TransactionCase):
         # Post the comment, get created message
         mail_compose.send_mail(cr, uid, [compose_id], {'default_res_id': -1, 'active_ids': [self.group_pigs_id]})
         group_pigs.refresh()
-        msg = group_pigs.message_ids[0]
+        message = group_pigs.message_ids[0]
         # Test: last message on Pigs = last created message
         test_msg = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [], limit=1))[0]
-        self.assertEqual(msg.id, test_msg.id, 'Pigs did not receive its mass mailing message')
+        self.assertEqual(message.id, test_msg.id, 'Pigs did not receive its mass mailing message')
         # Test: mail.message: subject, body
-        self.assertEqual(msg.subject, _subject, 'mail.message subject is incorrect')
-        self.assertEqual(msg.body, group_pigs.description, 'mail.message body is incorrect')
+        self.assertEqual(message.subject, _subject, 'mail.message subject is incorrect')
+        self.assertEqual(message.body, group_pigs.description, 'mail.message body is incorrect')
 
     def test_30_message_read(self):
         """ Tests designed for message_read. """
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 8698af42110..d141b3cf1e0 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -72,12 +72,12 @@ class mail_compose_message(osv.TransientModel):
         composition_mode = context.get('default_composition_mode', context.get('mail.compose.message.mode'))
         model = context.get('default_model', context.get('active_model'))
         res_id = context.get('default_res_id', context.get('active_id'))
-        active_id = context.get('active_id')
+        message_id = context.get('default_parent_id', context.get('message_id', context.get('active_id')))
         active_ids = context.get('active_ids')
 
         # get default values according to the composition mode
         if composition_mode == 'reply':
-            vals = self.get_message_data(cr, uid, active_id, context=context)
+            vals = self.get_message_data(cr, uid, message_id, context=context)
         elif composition_mode == 'comment' and model and res_id:
             vals = self.get_record_data(cr, uid, model, res_id, context=context)
         elif composition_mode == 'mass_mail' and model and active_ids:
@@ -155,7 +155,7 @@ class mail_compose_message(osv.TransientModel):
         message_data = self.pool.get('mail.message').browse(cr, uid, message_id, context=context)
 
         # create subject
-        re_prefix = _("Re:")
+        re_prefix = _('Re:')
         reply_subject = tools.ustr(message_data.subject or '')
         if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)):
             reply_subject = "%s %s" % (re_prefix, reply_subject)
@@ -163,7 +163,7 @@ class mail_compose_message(osv.TransientModel):
         reply_header = _('On %(date)s, %(sender_name)s wrote:') % {
             'date': message_data.date if message_data.date else '',
             'sender_name': message_data.author_id.name }
-        reply_body = '<div>%s<blockquote>%s</blockquote></div>%s' % (reply_header, message_data.body, current_user.signature)
+        reply_body = '<div>%s<blockquote>%s</blockquote></div>' % (reply_header, message_data.body)
         # get partner_ids from original message
         partner_ids = [partner.id for partner in message_data.partner_ids] if message_data.partner_ids else []
 
@@ -224,6 +224,22 @@ class mail_compose_message(osv.TransientModel):
         res.update(self._verify_partner_email(cr, uid, value[0][2], context=context))
         return res
 
+    def unlink(self, cr, uid, ids, context=None):
+        # Cascade delete all attachments, as they are owned by the composition wizard
+        for wizard in self.read(cr, uid, ids, ['attachment_ids'], context=context):
+            self.pool.get('ir.attachment').unlink(cr, uid, wizard['attachment_ids'], context=context)
+        return super(mail_compose_message,self).unlink(cr, uid, ids, context=context)
+
+    def dummy(self, cr, uid, ids, context=None):
+        """ TDE: defined to have buttons that do basically nothing. It is
+            currently impossible to have buttons that do nothing special
+            in views (if type not specified, considered as 'object'). """
+        return True
+
+    #------------------------------------------------------
+    # Wizard validation and send
+    #------------------------------------------------------
+
     def send_mail(self, cr, uid, ids, context=None):
         """ Process the wizard content and proceed with sending the related
             email(s), rendering any template patterns on the fly if needed. """
@@ -248,14 +264,13 @@ class mail_compose_message(osv.TransientModel):
                 # mass mailing: render and override default values
                 if mass_mail_mode and wizard.model:
                     email_dict = self.render_message(cr, uid, wizard, wizard.model, res_id, context=context)
-                    post_values['subject'] = email_dict.get('subject', False)
-                    post_values['body'] = email_dict.get('body', '')
-                    if email_dict.get('partner_ids'):
-                        post_values['partner_ids'] += [(4, id) for id in email_dict.get('partner_ids')]
-                    if email_dict.get('attachments'):
-                        post_values['attachments'] += [(attach.datas_fname, attach.datas) for attach in email_dict.get('attachments')]
+                    new_partner_ids = email_dict.pop('partner_ids', [])
+                    post_values['partner_ids'] += new_partner_ids
+                    new_attachments = email_dict.pop('attachments', [])
+                    post_values['attachments'] += new_attachments
+                    post_values.update(email_dict)
                 # post the message
-                active_model_pool.message_post(cr, uid, res_ids, msg_type='comment', context=context, **post_values)
+                active_model_pool.message_post(cr, uid, [res_id], msg_type='comment', context=context, **post_values)
 
         return {'type': 'ir.actions.act_window_close'}
 
@@ -264,20 +279,9 @@ class mail_compose_message(osv.TransientModel):
             This method is meant to be inherited by email_template that will
             produce a more complete dictionary, with email_to, ...
         """
-        # TDE: TODO: to move into mail.compose.message in email template
-        # mails = tools.email_split(email_dict.get('email_to', '')) + tools.email_split(email_dict.get('email_cc', ''))
-        # for mail in mails:
-        #     partner_search_ids = self.pool.get('res.partner').search(cr, uid, [('email', 'ilike', email)], context=context)
-        #     if partner_search_ids:
-        #         partner_ids.append((4, 0, partner_search_ids[0]))
-        #     else:
-        #         partner_id = self.pool.get('res.partner').name_create(cr, uid, values['email_to'], context=context)
-        #         partner_ids.append((4, 0, partner_id))
         return {
             'subject': self.render_template(cr, uid, wizard.subject, model, res_id, context),
             'body': self.render_template(cr, uid, wizard.body, model, res_id, context),
-            'partner_ids': [],
-            'attachment_ids': [],
         }
 
     def render_template(self, cr, uid, template, model, res_id, context=None):
@@ -298,25 +302,10 @@ class mail_compose_message(osv.TransientModel):
             context = {}
         def merge(match):
             exp = str(match.group()[2:-1]).strip()
-            result = eval(exp,
-                          {
-                            'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
-                            'object' : self.pool.get(model).browse(cr, uid, res_id, context=context),
-                            'context': dict(context), # copy context to prevent side-effects of eval
-                          })
-            if result in (None, False):
-                return ""
-            return tools.ustr(result)
+            result = eval(exp, {
+                'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
+                'object' : self.pool.get(model).browse(cr, uid, res_id, context=context),
+                'context': dict(context), # copy context to prevent side-effects of eval
+                })
+            return result and tools.ustr(result) or ''
         return template and EXPRESSION_PATTERN.sub(merge, template)
-
-    def unlink(self, cr, uid, ids, context=None):
-        # Cascade delete all attachments, as they are owned by the composition wizard
-        for wizard in self.read(cr, uid, ids, ['attachment_ids'], context=context):
-            self.pool.get('ir.attachment').unlink(cr, uid, wizard['attachment_ids'], context=context)
-        return super(mail_compose_message,self).unlink(cr, uid, ids, context=context)
-
-    def dummy(self, cr, uid, ids, context=None):
-        """ TDE: defined to have buttons that do basically nothing. It is
-            currently impossible to have buttons that do nothing special
-            in views (if type not specified, considered as 'object'). """
-        return True

From 7eb5b82950cc2dac83056e3b66d5d77283ef68fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 31 Aug 2012 19:16:22 +0200
Subject: [PATCH 690/999] [FIX] email_template: generate_email now returns a
 standard-looking attachments in values (list of tuples).

bzr revid: tde@openerp.com-20120831171622-ibrrz5us0lunoi0q
---
 addons/email_template/email_template.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 17b7004be41..19344acf233 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -313,8 +313,8 @@ class email_template(osv.osv):
                       model=template.model,
                       res_id=res_id or False)
 
-        attachments = {}
-        # Add report as a Document
+        attachments = []
+        # Add report in attachments
         if template.report_template:
             report_name = self.render_template(cr, uid, template.report_name, template.model, res_id, context=context)
             report_service = 'report.' + report_xml_pool.browse(cr, uid, template.report_template.id, context).report_name
@@ -330,12 +330,11 @@ class email_template(osv.osv):
             ext = "." + format
             if not report_name.endswith(ext):
                 report_name += ext
-            attachments[report_name] = result
+            attachments.append(report_name, result)
 
-        # Add document attachments
+        # Add template attachments
         for attach in template.attachment_ids:
-            # keep the bytes as fetched from the db, base64 encoded
-            attachments[attach.datas_fname] = attach.datas
+            attachments.append(attach.datas_fname, attach.datas)
 
         values['attachments'] = attachments
         return values

From 761864c11c9ad3c3216ee191f5f4bfd37d4706bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 31 Aug 2012 19:19:00 +0200
Subject: [PATCH 691/999] [FIX] [WIP] email_template: composition wizard: added
 render_message that get back the values generated by the template in
 mass_mail mode; email_template overrides the basic behavior of mail, to use
 the templating power (niak). Various fixes in the wizard, mostly in
 onchange_template_id. Some code cleaning. Updated the view, because
 onchange_template_id now take an extr argument (model). Added some tests used
 during this WIP. Will be updated next week.

bzr revid: tde@openerp.com-20120831171900-ii0ucshjnf8vjc3z
---
 addons/email_template/tests/test_mail.py      | 62 ++++++------
 .../wizard/mail_compose_message.py            | 96 +++++++++++--------
 .../wizard/mail_compose_message_view.xml      |  6 +-
 3 files changed, 94 insertions(+), 70 deletions(-)

diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
index db2168a75d5..5ca608e6b81 100644
--- a/addons/email_template/tests/test_mail.py
+++ b/addons/email_template/tests/test_mail.py
@@ -53,51 +53,59 @@ class test_message_compose(common.TransactionCase):
         """ Tests designed for the mail.compose.message wizard updated by email_template. """
         cr, uid = self.cr, self.uid
         mail_compose = self.registry('mail.compose.message')
-        self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a'})
+        self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a.a'})
         user_admin = self.res_users.browse(cr, uid, uid)
-        group_model_id = self.registry('ir.model').search(cr, uid, [('model', '=', 'mail.group')])[0]
         group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        group_bird_id = self.mail_group.create(cr, uid, {'name': 'Bird', 'description': 'I am angry !'})
+        group_bird = self.mail_group.browse(cr, uid, group_bird_id)
 
         # Create template on mail.group
+        group_model_id = self.registry('ir.model').search(cr, uid, [('model', '=', 'mail.group')])[0]
         email_template = self.registry('email.template')
         email_template_id = email_template.create(cr, uid, {'model_id': group_model_id,
-            'name': 'Pigs Template', 'subject': '${record.name}',
+            'name': 'Pigs Template', 'subject': '${object.name}',
             'body_html': '${object.description}', 'user_signature': True,
-            'email_to': 'b@b c@c', 'email_cc': 'd@d'})
-        # import pdb
-        # pdb.set_trace()
+            'email_to': 'b@b.b c@c.c', 'email_cc': 'd@d.d'})
 
         # Mail data
-        _subject = 'Pigs'
-        _body_text = 'Pigs rules'
+        _subject1 = 'Pigs'
+        _subject2 = 'Bird'
+        _body_text1 = 'Pigs rules'
+        _body_text_html1 = 'Pigs rules<pre>Admin</pre>'
+        _body_text2 = 'I am angry !'
+        _body_text_html2 = 'I am angry !<pre>Admin</pre>'
 
-        # 3 - Create in mass_mail composition mode that should work with or without email_template installed
+        # CASE1: create in mass_mail composition mode that should work with email_template installed
         compose_id = mail_compose.create(cr, uid,
-            {'subject': _subject, 'body': _body_text},
+            {'subject': 'Forget me subject', 'body': 'Dummy body'},
             {'default_composition_mode': 'mass_mail', 'default_model': 'mail.group',
                 'default_res_id': -1, 'default_use_template': True,
-                'active_ids': [self.group_pigs_id], 'default_template_id': email_template_id})
+                'active_ids': [self.group_pigs_id, group_bird_id], 'default_template_id': email_template_id})
         compose = mail_compose.browse(cr, uid, compose_id)
         # print compose.subject
         
 
         # Try the 'onchange_template_id'
-        values = mail_compose.onchange_template_id(cr, uid, [], compose.use_template, compose.template_id, compose.composition_mode, compose.res_id)
-        # print values
-        values = mail_compose.onchange_use_template(cr, uid, [], not compose.use_template, compose.template_id, compose.composition_mode, compose.res_id)
-        # print values
+        values = mail_compose.onchange_template_id(cr, uid, [], compose.use_template, compose.template_id, compose.composition_mode, compose.model, compose.res_id)
+        print values
+        # compose.write(values['value'])
+        values = mail_compose.onchange_use_template(cr, uid, [], not compose.use_template, compose.template_id, compose.composition_mode, compose.model, compose.res_id)
+        print values
 
         compose.refresh()
 
-
-        # # Post the comment, get created message
-        # mail_compose.send_mail(cr, uid, [compose_id], {'default_res_id': -1, 'active_ids': [self.group_pigs_id]})
-        # group_pigs.refresh()
-        # msg = group_pigs.message_ids[0]
-
-        # # Test: last message on Pigs = last created message
-        # test_msg = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [], limit=1))[0]
-        # self.assertEqual(msg.id, test_msg.id, 'Pigs did not receive its mass mailing message')
-        # # Test: mail.message: subject, body
-        # self.assertEqual(msg.subject, _subject, 'mail.message subject is incorrect')
-        # self.assertEqual(msg.body, group_pigs.description, 'mail.message body is incorrect')
\ No newline at end of file
+        # Post the comment, get created message
+        mail_compose.send_mail(cr, uid, [compose_id],  {'default_res_id': -1, 'active_ids': [self.group_pigs_id, group_bird_id]})
+        group_pigs.refresh()
+        group_bird.refresh()
+        message_pigs = group_pigs.message_ids[0]
+        message_bird = group_bird.message_ids[0]
+        # Test: subject, body
+        self.assertEqual(message_pigs.subject, _subject1, 'mail.message subject on Pigs incorrect')
+        self.assertEqual(message_bird.subject, _subject2, 'mail.message subject on Bird incorrect')
+        self.assertEqual(message_pigs.body, _body_text_html1, 'mail.message body on Pigs incorrect')
+        self.assertEqual(message_bird.body, _body_text_html2, 'mail.message body on Bird incorrect')
+        # Test: partner_ids
+        print message_pigs.partner_ids
+        print message_pigs.partner_ids
+        self.assertEqual(len(message_pigs.partner_ids), 6, 'mail.message partner_ids incorrect')
\ No newline at end of file
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index a6fb2a00646..71586649f37 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -27,13 +27,9 @@ from osv import fields
 from tools.translate import _
 
 class mail_compose_message(osv.osv_memory):
-    """ Inherit mail_compose_message to add email template feature in the
-        message composer. """
-
     _inherit = 'mail.compose.message'
 
     def _get_templates(self, cr, uid, context=None):
-        """ Return Email Template of particular  Model. """
         if context is None:
             context = {}
         model = False
@@ -52,7 +48,6 @@ class mail_compose_message(osv.osv_memory):
         return []
 
     def default_get(self, cr, uid, fields, context=None):
-        """ Override to handle templates. """
         if context is None:
             context = {}
         result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
@@ -65,39 +60,34 @@ class mail_compose_message(osv.osv_memory):
         'template_id': fields.selection(_get_templates, 'Template', size=-1),
     }
 
-    def onchange_template_id(self, cr, uid, ids, use_template, template_id, composition_mode, res_id, context=None):
-        """ onchange_template_id: read or render the template if set, get back
-            to default values if not. """
+    def onchange_template_id(self, cr, uid, ids, use_template, template_id, composition_mode, model, res_id, context=None):
+        """ - use_template not set: return default_get
+            - use_template set:
+                - mass_mailing: we cannot render, so return the template values
+                - else: return rendered values """
         fields = ['body', 'body_html', 'subject', 'partner_ids', 'email_to', 'email_cc']
-        if use_template and template_id:
-            # use the original template values, to be rendered when actually sent
-            if composition_mode == 'mass_mail':
-                values = self.pool.get('email.template').read(cr, uid, template_id, fields, context)
-            # render the mail as one-shot
-            else:
-                values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
-                # retrofit generated attachments in the expected field format
-                if values['attachments']:
-                    attachment = values.pop('attachments')
-                    attachment_obj = self.pool.get('ir.attachment')
-                    att_ids = []
-                    for fname, fcontent in attachment.iteritems():
-                        data_attach = {
-                            'name': fname,
-                            'datas': fcontent,
-                            'datas_fname': fname,
-                            'description': fname,
-                            'res_model' : self._name,
-                            'res_id' : ids[0] if ids else False
-                        }
-                        att_ids.append(attachment_obj.create(cr, uid, data_attach))
-                    values['attachment_ids'] = att_ids
-        else: # restore defaults
+        if use_template and template_id and composition_mode == 'mass_mail':
+            values = self.pool.get('email.template').read(cr, uid, template_id, fields, context)
+        elif use_template and template_id:
+            values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
+
+            values['attachment_ids'] = []
+            attachment_obj = self.pool.get('ir.attachment')
+            for attach_fname, attach_datas in values.get('attachments', []):
+                data_attach = {
+                    'name': attach_fname,
+                    'datas': attach_datas,
+                    'datas_fname': attach_fname,
+                    'description': fname,
+                    'res_model': model,
+                    'res_id': res_id,
+                }
+                values['attachment_ids'].append(attachment_obj.create(cr, uid, data_attach), context=context)
+        else:
             values = self.default_get(cr, uid, fields, context=context)
 
         if values.get('body_html') and not values.get('body'):
             values['body'] = values.get('body_html')
-        
         values.update(use_template=use_template, template_id=template_id)
 
         return {'value': values}
@@ -107,16 +97,15 @@ class mail_compose_message(osv.osv_memory):
             emulate an on_change, then writes the value to update the form. """
         for record in self.browse(cr, uid, ids, context=context):
             onchange_res = self.onchange_use_template(cr, uid, ids, not record.use_template,
-                record.template_id, record.composition_mode, record.res_id, context=context)['value']
+                record.template_id, record.composition_mode, record.model, record.res_id, context=context)['value']
             record.write(onchange_res)
         return True
 
-    def onchange_use_template(self, cr, uid, ids, use_template, template_id, composition_mode, res_id, context=None):
+    def onchange_use_template(self, cr, uid, ids, use_template, template_id, composition_mode, model, res_id, context=None):
         """ onchange_use_template (values: True or False).  If use_template is
             False, we do like an onchange with template_id False for values """
-        onchange_template_values = self.onchange_template_id(cr, uid, ids, use_template,
-            template_id, composition_mode, res_id, context=context)
-        return onchange_template_values
+        return self.onchange_template_id(cr, uid, ids, use_template,
+            template_id, composition_mode, model, res_id, context=context)
 
     def save_as_template(self, cr, uid, ids, context=None):
         """ hit save as template button: current form value will be a new
@@ -142,9 +131,36 @@ class mail_compose_message(osv.osv_memory):
             record.write({'template_id': template_id, 'use_template': True})
         return True
 
+    #------------------------------------------------------
+    # Wizard validation and send
+    #------------------------------------------------------
+
+    def render_message(self, cr, uid, wizard, model, res_id, context=None):
+        """ Generate an email from the template for given (model, res_id) pair.
+            This method is meant to be inherited by email_template that will
+            produce a more complete dictionary, with email_to, ...
+        """
+        # render the template to get the email
+        template_values = self.pool.get('email.template').generate_email(cr, uid, wizard.template_id, res_id, context=context)
+        # TDE TODO: handle fields to update / not to update (mail_server_id, auto_delete, ...)
+        # transform email_to, email_cc into partner_ids
+        partner_ids = []
+        mails = tools.email_split(template_values.pop('email_to', '') + ' ' + template_values.pop('email_cc', ''))
+        for mail in mails:
+            partner_search_ids = self.pool.get('res.partner').search(cr, uid, [('email', 'ilike', mail)], context=context)
+            if partner_search_ids:
+                partner_ids.append((4, partner_search_ids[0]))
+            else:
+                partner_id = self.pool.get('res.partner').name_create(cr, uid, mail, context=context)[0]
+                partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+                partner_ids.append((4, partner_id))
+        # get values to return
+        email_dict = super(mail_compose_message, self).render_message(cr, uid, wizard, model, res_id, context)
+        email_dict.update(template_values)
+        email_dict.update(partner_ids=partner_ids, attachments=template_values.get('attachments'))
+        return email_dict
+
     def render_template(self, cr, uid, template, model, res_id, context=None):
-        """ Override of mail.compose.message behavior: use the power of
-            templates ! """
         return self.pool.get('email.template').render_template(cr, uid, template, model, res_id, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index f54ee0d3723..228dcc2745a 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -19,7 +19,7 @@
                         <group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4">
                             <field name="use_template" invisible="1"/>
                             <field name="template_id" colspan="3"
-                                on_change="onchange_template_id(use_template, template_id, composition_mode, res_id, context)"/>
+                                on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
                         </group>
                     </xpath>
                 </data>
@@ -34,10 +34,10 @@
                 <data>
                     <xpath expr="//field[@name='partner_ids']" position="after">
                         <field name="use_template" colspan="2" nolabel="1" invisible="1"
-                            on_change="onchange_use_template(use_template, template_id, composition_mode, res_id, context)"/>
+                            on_change="onchange_use_template(use_template, template_id, composition_mode, model, res_id, context)"/>
                         <field name="template_id" colspan="2" nolabel="1"
                             attrs="{'invisible':[('use_template','=',False)]}"
-                            on_change="onchange_template_id(use_template, template_id, composition_mode, res_id, context)"/>
+                            on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
                     </xpath>
                     <xpath expr="//button[@class='oe_mail_compose_message_attachment']" position="before">
                         <button icon="/email_template/static/src/img/email_template.png"

From 7fc09a829869f71d59c6c69f3981d06c61ab340a Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cto@openerp.com>
Date: Fri, 31 Aug 2012 19:25:38 +0200
Subject: [PATCH 692/999] .

bzr revid: cto@openerp.com-20120831172538-2lp2sv2g6g5lh9n0
---
 addons/crm/crm_lead_demo.xml                  | 26 +++++++++----------
 addons/project/project_demo.xml               | 16 +++++-------
 .../project_timesheet_demo.xml                |  6 -----
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index a274dadfe01..6118c08c0e5 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -23,7 +23,7 @@
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">1</field>
             <field name="section_id" ref="crm_case_section_4"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hello,
 I am Jason from Le Club SARL,
@@ -47,7 +47,7 @@ Can you send details,</field>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">4</field>
             <field name="section_id" ref="crm_case_section_3"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field eval="1" name="active"/>
         </record>
@@ -108,7 +108,7 @@ Can you send details,</field>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">3</field>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hi, Can you send a quotation for 20 Computers with speakers? 
 Regards,
@@ -135,7 +135,7 @@ Contact: +1 813 494 5005</field>
             <field name="channel_id" ref=""/>
             <field name="priority">3</field>
             <field name="section_id" ref="crm_case_section_4"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field eval="1" name="active"/>
         </record>
@@ -194,7 +194,7 @@ Contact: +1 813 494 5005</field>
             <field name="channel_id" ref="crm_case_channel_phone"/>
             <field name="priority">2</field>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field eval="1" name="active"/>
         </record>
@@ -297,7 +297,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-12')" name="date_action"/>
             <field name="title_action">Meeting for pricing information.</field>
             <field name="section_id" ref="crm_case_section_3"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="1" name="active"/>
         </record>
@@ -342,7 +342,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Call to ask system requirement</field>
             <field name="section_id" ref="crm_case_section_3"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="1" name="active"/>
         </record>
@@ -411,7 +411,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-4')" name="date_action"/>
             <field name="title_action">Call to define real needs about training</field>
             <field name="section_id" ref="crm_case_section_2"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="1" name="active"/>
         </record>
@@ -434,7 +434,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-5')" name="date_action"/>
             <field name="title_action">Ask for the good receprion of the proposition</field>
             <field name="section_id" ref="crm_case_section_1"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="1" name="active"/>
         </record>
@@ -466,7 +466,7 @@ Andrew</field>
             <field name="channel_id" ref="crm_case_channel_phone"/>
             <field name="priority">3</field>
             <field name="section_id" ref="crm_case_section_4"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead8"/>
             <field eval="1" name="active"/>
         </record>
@@ -484,7 +484,7 @@ Andrew</field>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">3</field>
             <field name="section_id" ref="crm_case_section_4"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead8"/>
             <field eval="1" name="active"/>
         </record>
@@ -519,7 +519,7 @@ Andrew</field>
             <field name="priority">5</field>
             <field eval="time.strftime('%Y-%m-6')" name="date_deadline"/>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
         </record>
@@ -542,7 +542,7 @@ Andrew</field>
             <field name="priority">2</field>
             <field name="title_action">Conf call with technical service</field>
             <field name="section_id" ref="crm_case_section_2"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="1" name="active"/>
         </record>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 51dedd61c63..0f0af017e0c 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -47,9 +47,8 @@
             <field name="parent_id" ref="all_projects_account"/>
             <field name="privacy_visibility">followers</field>
             <field name="members" eval="[(6, 0, [
-                    ref('base.user_niv'),
-                    ref('base.user_al'),
-                    ref('base.user_qdp')])]"/>
+                    ref('base.user_root'),
+                    ref('base.user_demo')])]"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="description">Implement new website for Sale and Warehouse Management for a customer.</field>
             <field name="alias_model">project.task</field>
@@ -71,9 +70,8 @@
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
             <field name="members" eval="[(6, 0, [
-                    ref('base.user_fpi'),
-                    ref('base.user_jth'),
-                    ref('base.user_mit')])]"/>
+                    ref('base.user_root'),
+                    ref('base.user_demo')])]"/>
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
         </record>
 
@@ -85,8 +83,8 @@
             <field name="alias_model">project.task</field>
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_design'),ref('project_tt_development'),ref('project_tt_testing')])]"/>
             <field name="members" eval="[(6, 0, [
-                    ref('base.user_niv'),
-                    ref('base.user_mit')])]"/>
+                    ref('base.user_root'),
+                    ref('base.user_demo')])]"/>
         </record>
 
         <record id="project_project_5" model="project.project">
@@ -98,7 +96,7 @@
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_development')])]"/>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
-                    ref('base.user_qdp')])]"/>
+                    ref('base.user_demo')])]"/>
         </record>
 
 
diff --git a/addons/project_timesheet/project_timesheet_demo.xml b/addons/project_timesheet/project_timesheet_demo.xml
index 6d3dfb23767..90873d2a418 100644
--- a/addons/project_timesheet/project_timesheet_demo.xml
+++ b/addons/project_timesheet/project_timesheet_demo.xml
@@ -3,13 +3,11 @@
     <data noupdate="1">
         <!-- Example employee -->
         <record id="hr.employee_qdp" model="hr.employee">
-            <field name="user_id" ref="base.user_qdp"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
 
         <record id="hr.employee_al" model="hr.employee">
-            <field name="user_id" ref="base.user_al"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
@@ -17,7 +15,6 @@
         <record id="hr.employee_phu" model="hr.employee">
             <field name="name">Phuong</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="base.user_phu"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.employee_category_4')])]"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
@@ -26,7 +23,6 @@
         <record id="hr.employee_fpi" model="hr.employee">
             <field name="name">Francois</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="base.user_fpi"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.employee_category_4')])]"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
@@ -34,7 +30,6 @@
         <record id="hr.employee_jth" model="hr.employee">
             <field name="name">Julien</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="base.user_jth"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.employee_category_4')])]"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
@@ -42,7 +37,6 @@
         <record id="hr.employee7" model="hr.employee">
             <field name="name">Aline</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="base.user_apr"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.employee_category_4')])]"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>

From 7ebf462e07baf92c87cc31a6f5f25c8edcd3109f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 31 Aug 2012 19:47:46 +0200
Subject: [PATCH 693/999] [IMP] product view

bzr revid: fp@tinyerp.com-20120831174746-7bfitkd45m73r6oz
---
 addons/point_of_sale/point_of_sale_view.xml | 17 ++---------------
 addons/product/product_view.xml             | 20 ++++++++++++++++----
 addons/stock/product_view.xml               | 13 ++++++-------
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index f672d90616e..42abaf96418 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -608,21 +608,6 @@
             <field name="domain">[('date_order','like',time.strftime('%Y-%m'))]</field>
         </record>
 
-        <record id="product_normal_form_pos_view" model="ir.ui.view">
-            <field name="name">product.normal.pos.form.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                  <group name="status" position="after">
-                      <group name="pos" string="Point of Sale">
-                          <field name="pos_categ_id"/>
-                          <field name="to_weight" />
-                      </group>
-                  </group>
-            </field>
-        </record>
-
-
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
             <field name="model">product.product</field>
@@ -630,6 +615,8 @@
             <field name="arch" type="xml">
                 <group name="sale" position="inside">
                     <group name="pos" string="Point of Sale">
+                        <field name="pos_categ_id"/>
+                        <field name="to_weight" />
                         <field name="income_pdt"/>
                         <field name="expense_pdt"/>
                     </group>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 005b1ac7262..8d77a9844b0 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -123,6 +123,12 @@
                                         <field name="state"/>
                                         <field name="product_manager"/>
                                     </group>
+                                    <group name="store" string="Storage Localisation">
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                        <field name="loc_rack" attrs="{'invisible':[('type','=','service')]}"/>
+                                        <field name="loc_row" attrs="{'invisible':[('type','=','service')]}"/>
+                                        <field name="loc_case" attrs="{'invisible':[('type','=','service')]}"/>
+                                    </group>
                                     <group groups="product.group_stock_packaging" string="Weights">
                                         <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
                                         <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
@@ -132,14 +138,17 @@
                             </page>
                             <page string="Sales" attrs="{'readonly':[('sale_ok','=',0)]}">
                                 <group name="sale">
-                                    <group>
+                                    <group string="Sale Conditions">
                                         <label for="sale_delay"/>
                                         <div>
                                             <field name="sale_delay" class="oe_inline"/> days
                                         </div>
-                                        <field name="warranty" class="oe_inline"/> months
+                                        <label for="warranty"/>
+                                        <div>
+                                            <field name="warranty" class="oe_inline"/> months
+                                        </div>
                                     </group>
-                                    <group groups="product.group_uos">
+                                    <group groups="product.group_uos" string="Unit of Measure">
                                         <field name="uos_id"/>
                                         <field name="uos_coeff"/>
                                         <field name="mes_type"/>
@@ -735,7 +744,10 @@
                             <group>
                                 <group name="delay" string="Delays">
                                     <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                    <field name="produce_delay"/>
+                                    <label for="produce_delay"/>
+                                    <div>
+                                        <field name="produce_delay" class="oe_inline"/> days
+                                    </div>
                                     <field name="warranty"/>
                                 </group>
                                 <group name="store" string="Storage Localisation">
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index e5986318fbd..43e00c5a238 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -58,15 +58,14 @@
             <field name="arch" type="xml">
                 <group name="procurement" position="inside">
                     <group name="delay" string="Delays">
+                        <label for="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                        <div attrs="{'invisible':[('type','=','service')]}">
+                            <field name="produce_delay" class="oe_inline"/> days
+                        </div>
                         <field name="active"/>
-                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                    </group>
-                    <group name="store" string="Storage Localisation">
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}"/>
-                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
-                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
                     </group>
+                </group>
+                <group name="inventory" position="inside">
                     <group name="store" groups="stock.group_locations" string="Counter-Part Locations Properties">
                         <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
                         <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>

From da1a7acba9d19a396f931a1f197abe3410c57231 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 31 Aug 2012 19:51:53 +0200
Subject: [PATCH 694/999] [IMP] lower menu elements

bzr revid: fp@tinyerp.com-20120831175153-65cj3e9krj5u62cr
---
 addons/purchase/purchase_view.xml | 6 +++---
 addons/purchase/stock_view.xml    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 683724cbb6a..a607783e226 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -73,7 +73,7 @@
         parent="base.menu_purchase_root" sequence="6"/>
 
     <record id="action_invoice_pending" model="ir.actions.act_window">
-        <field name="name">Based on Draft Invoices</field>
+        <field name="name">On Draft Invoices</field>
         <field name="res_model">account.invoice</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,calendar,graph</field>
@@ -95,7 +95,7 @@
         </field>
     </record>
 
-     <menuitem name="Based on Draft Invoices"
+     <menuitem
           id="menu_procurement_management_pending_invoice"
           action="action_invoice_pending"
           parent="menu_procurement_management_invoice"
@@ -508,7 +508,7 @@
 
 
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
-            <field name="name">Based on Purchase Order Lines</field>
+            <field name="name">On Purchase Order Lines</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order.line</field>
             <field name="domain">[('order_id.invoice_method','&lt;&gt;','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index ad1c26a84c1..b522618ed2e 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -109,7 +109,7 @@
         </record>
 
         <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
-            <field name="name">Based on Incoming Shipments</field>
+            <field name="name">On Incoming Shipments</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>

From 68038627119f4a590f16caa983a0e821198d9361 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 1 Sep 2012 00:52:05 +0200
Subject: [PATCH 695/999] [IMP] res.partner: simplified+corrected parsing of
 partner name and email in name_create, added tests, made this internal method
 private

bzr revid: odo@openerp.com-20120831225205-04l4udn95cz3n72o
---
 openerp/addons/base/res/res_partner.py | 17 ++++++++++-------
 openerp/addons/base/tests/__init__.py  |  4 ++--
 openerp/addons/base/tests/test_base.py | 26 ++++++++++++++++++++++++++
 openerp/tools/misc.py                  |  2 +-
 4 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 openerp/addons/base/tests/test_base.py

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 42ddd1d40cd..931497004ec 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -351,14 +351,17 @@ class res_partner(osv.osv):
             res.append((record.id, name))
         return res
 
-    def parse_partner_name(self, cr, uid, name, context=None):
+    def _parse_partner_name(self, text, context=None):
         """ Supported syntax:
-            - 'Raoul <raoul@grosbedon.fr>', available with '  ', '<>', '{}',
-                '()', '[]': will find name and email address
+            - 'Raoul <raoul@grosbedon.fr>': will find name and email address
             - otherwise: default, everything is set as the name """
-        regex = re.compile('^(.*?)(?: ?[\<{(\[]?([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8})[\>})\]]?)?$')
-        result = regex.match(name)
-        return (result.group(1).strip(), result.group(2))
+        match = re.search(r'([^\s,<@]+@[^>\s,]+)', text)
+        if match:
+            email = match.group(1) 
+            name = text[:text.index(email)].replace('"','').replace('<','').strip()
+        else:
+            name, email = text, ''
+        return name, email
 
     def name_create(self, cr, uid, name, context=None):
         """ Override of orm's name_create method for partners. The purpose is
@@ -367,7 +370,7 @@ class res_partner(osv.osv):
             If only an email address is received and that the regex cannot find
             a name, the name will have the email value.
             If 'force_email' key in context: must find the email address. """
-        name, email = self.parse_partner_name(cr, uid, name, context=context)
+        name, email = self._parse_partner_name(name, context=context)
         if context.get('force_email') and not email:
             raise osv.except_osv(_('Warning'), _("Couldn't create contact without email address !"))
         if not name and email:
diff --git a/openerp/addons/base/tests/__init__.py b/openerp/addons/base/tests/__init__.py
index 5ea7654c008..42fef2eb39d 100644
--- a/openerp/addons/base/tests/__init__.py
+++ b/openerp/addons/base/tests/__init__.py
@@ -1,5 +1,5 @@
-import test_ir_values
+import test_ir_values, test_base
 
 checks = [
-    test_ir_values,
+    test_ir_values, test_base
 ]
diff --git a/openerp/addons/base/tests/test_base.py b/openerp/addons/base/tests/test_base.py
new file mode 100644
index 00000000000..1ff200a8b68
--- /dev/null
+++ b/openerp/addons/base/tests/test_base.py
@@ -0,0 +1,26 @@
+import unittest2
+
+import openerp.tests.common as common
+
+class test_base(common.TransactionCase):
+
+    def setUp(self):
+        super(test_base,self).setUp()
+        self.res_partner = self.registry('res.partner')
+
+    def test_00_res_partner_name_parse(self):
+        parse = self.res_partner._parse_partner_name
+        # samples use effective TLDs from the Mozilla public suffix
+        # list at http://publicsuffix.org
+        test_samples = [
+            ('"Raoul Grosbedon" <raoul@chirurgiens-dentistes.fr> ', 'Raoul Grosbedon', 'raoul@chirurgiens-dentistes.fr'),
+            ('ryu+giga-Sushi@aizubange.fukushima.jp', '', 'ryu+giga-Sushi@aizubange.fukushima.jp'),
+            ('Raoul chirurgiens-dentistes.fr', 'Raoul chirurgiens-dentistes.fr', ''),
+            (" Raoul O'hara  <!@historicalsociety.museum>", "Raoul O'hara", '!@historicalsociety.museum')
+        ]
+        for text, name, mail in test_samples:
+            self.assertEqual((name,mail), parse(text), 'Partner name parsing failed')
+
+
+if __name__ == '__main__':
+    unittest2.main()
\ No newline at end of file
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 39e86b1ec4a..875fa7a9c09 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -406,7 +406,7 @@ def append_content_to_html(html, content, plaintext=True):
        EOF), and wrapping the provided content in a <pre/> block
        unless ``plaintext`` is False. A side-effect of this
        method is to coerce all HTML tags to lowercase in ``html``,
-       and strips enclosing <html> or <body> tags in content if
+       and strip enclosing <html> or <body> tags in content if
        ``plaintext`` is False.
        
        :param str html: html tagsoup (doesn't have to be XHTML)

From 9d16f324e929960ae70d5c524998eae351cac252 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 1 Sep 2012 03:09:07 +0200
Subject: [PATCH 696/999] [IMP] email.template: review/adapt form to 7.0-style
 + continue refactoring polishing

bzr revid: odo@openerp.com-20120901010907-703t6vx6n99tnyzq
---
 addons/email_template/email_template.py       |  72 ++++------
 addons/email_template/email_template_view.xml | 133 +++++++-----------
 .../security/ir.model.access.csv              |   4 +-
 .../wizard/email_template_preview.py          |  24 +---
 .../wizard/email_template_preview_view.xml    |  21 +--
 5 files changed, 102 insertions(+), 152 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 19344acf233..73dc5ed2754 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -29,7 +29,7 @@ from osv import fields
 import tools
 from tools.translate import _
 from tools.html_sanitize import html_sanitize
-from tools import html2plaintext, append_content_to_html
+from tools import append_content_to_html
 from urllib import quote as quote
 _logger = logging.getLogger(__name__)
 
@@ -42,7 +42,6 @@ class email_template(osv.osv):
     "Templates for sending email"
     _name = "email.template"
     _description = 'Email Templates'
-    _rec_name = 'name' # override mail.message's behavior
 
     def render_template(self, cr, uid, template, model, res_id, context=None):
         """Render the given template text, replace mako expressions ``${expr}``
@@ -102,55 +101,44 @@ class email_template(osv.osv):
             mod_name = self.pool.get('ir.model').browse(cr, uid, model_id, context).model
         return {'value':{'model': mod_name}}
 
-    def name_get(self, cr, uid, ids, context=None):
-        """ Override name_get of mail.message: return directly the template
-            name, and not the generated name from mail.message.common."""
-        return [(record.id, record.name) for record in self.browse(cr, uid, ids, context=context)]
-
     _columns = {
-        'name': fields.char('Name', size=250),
-        'model_id': fields.many2one('ir.model', 'Related document model'),
+        'name': fields.char('Name'),
+        'model_id': fields.many2one('ir.model', 'Applies to', help="The kind of document with with this template can be used"),
         'model': fields.related('model_id', 'model', type='char', string='Related Document Model',
                                 size=128, select=True, store=True, readonly=True),
-        'lang': fields.char('Language Selection', size=250,
+        'lang': fields.char('Language',
                             help="Optional translation language (ISO code) to select when sending out an email. "
                                  "If not set, the english version will be used. "
                                  "This should usually be a placeholder expression "
                                  "that provides the appropriate language code, e.g. "
-                                 "${object.partner_id.lang.code}."),
+                                 "${object.partner_id.lang.code}.",
+                            placeholder="${object.partner_id.lang.code}"),
         'user_signature': fields.boolean('Add Signature',
                                          help="If checked, the user's signature will be appended to the text version "
                                               "of the message"),
-        'report_name': fields.char('Report Filename', size=200, translate=True,
-                                   help="Name to use for the generated report file (may contain placeholders)\n"
-                                        "The extension can be omitted and will then come from the report type."),
-        'report_template':fields.many2one('ir.actions.report.xml', 'Optional report to print and attach'),
-        'ref_ir_act_window':fields.many2one('ir.actions.act_window', 'Sidebar action', readonly=True,
-                                            help="Sidebar action to make this template available on records "
-                                                 "of the related document model"),
-        'ref_ir_value':fields.many2one('ir.values', 'Sidebar Button', readonly=True,
-                                       help="Sidebar button to open the sidebar action"),
-        'track_campaign_item': fields.boolean('Resource Tracking',
-                                              help="Enable this is you wish to include a special tracking marker "
-                                                   "in outgoing emails so you can identify replies and link "
-                                                   "them back to the corresponding resource record. "
-                                                   "This is useful for CRM leads for example"),
-        # we need a separate m2m table to avoid ID collisions with the original mail.message entries
-        'attachment_ids': fields.many2many('ir.attachment', 'email_template_attachment_rel', 'email_template_id',
-                                           'attachment_id', 'Files to attach',
-                                           help="You may attach files to this template, to be added to all "
-                                                "emails created from this template"),
-        'auto_delete': fields.boolean('Auto Delete', help="Permanently delete this email after sending it, to save space"),
-        # Overridden mail.message.common fields to make tooltips more appropriate:
         'subject': fields.char('Subject', translate=True, help="Subject (placeholders may be used here)",),
-        'email_from': fields.char('From', size=128, help="Sender address (placeholders may be used here)"),
-        'email_to': fields.char('To', size=256, help="Comma-separated recipient addresses (placeholders may be used here)"),
-        'email_cc': fields.char('Cc', size=256, help="Carbon copy recipients (placeholders may be used here)"),
-        'reply_to': fields.char('Reply-To', size=250, help="Preferred response address (placeholders may be used here)"),
+        'email_from': fields.char('From', help="Sender address (placeholders may be used here)"),
+        'email_to': fields.char('To', help="Comma-separated recipient addresses (placeholders may be used here)"),
+        'email_cc': fields.char('Cc', help="Carbon copy recipients (placeholders may be used here)"),
+        'reply_to': fields.char('Reply-To', help="Preferred response address (placeholders may be used here)"),
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing Mail Server', readonly=False,
                                           help="Optional preferred server for outgoing mails. If not set, the highest "
                                                "priority one will be used."),
-        'body_html': fields.text('Rich-text Contents', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"),
+        'body_html': fields.text('Body', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"),
+        'report_name': fields.char('Report Filename', translate=True,
+                                   help="Name to use for the generated report file (may contain placeholders)\n"
+                                        "The extension can be omitted and will then come from the report type."),
+        'report_template': fields.many2one('ir.actions.report.xml', 'Optional report to print and attach'),
+        'ref_ir_act_window': fields.many2one('ir.actions.act_window', 'Sidebar action', readonly=True,
+                                            help="Sidebar action to make this template available on records "
+                                                 "of the related document model"),
+        'ref_ir_value': fields.many2one('ir.values', 'Sidebar Button', readonly=True,
+                                       help="Sidebar button to open the sidebar action"),
+        'attachment_ids': fields.many2many('ir.attachment', 'email_template_attachment_rel', 'email_template_id',
+                                           'attachment_id', 'Attachments',
+                                           help="You may attach files to this template, to be added to all "
+                                                "emails created from this template"),
+        'auto_delete': fields.boolean('Auto Delete', help="Permanently delete this email after sending it, to save space"),
 
         # Fake fields used to implement the placeholder assistant
         'model_object_field': fields.many2one('ir.model.fields', string="Field",
@@ -164,12 +152,8 @@ class email_template(osv.osv):
                                                   help="When a relationship field is selected as first field, "
                                                        "this field lets you select the target field within the "
                                                        "destination document model (sub-model)."),
-        'null_value': fields.char('Null value', help="Optional value to use if the target field is empty", size=128),
-        'copyvalue': fields.char('Expression', size=256, help="Final placeholder expression, to be copy-pasted in the desired template field."),
-    }
-
-    _defaults = {
-        'track_campaign_item': True
+        'null_value': fields.char('Default Value', help="Optional value to use if the target field is empty"),
+        'copyvalue': fields.char('Placeholder Expression', help="Final placeholder expression, to be copy-pasted in the desired template field."),
     }
 
     def create_action(self, cr, uid, ids, context=None):
@@ -214,7 +198,7 @@ class email_template(osv.osv):
                 if template.ref_ir_value:
                     ir_values_obj = self.pool.get('ir.values')
                     ir_values_obj.unlink(cr, uid, template.ref_ir_value.id, context)
-            except:
+            except Exception:
                 raise osv.except_osv(_("Warning"), _("Deletion of the action record failed."))
         return True
 
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 15164c22752..448655a3121 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -1,94 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-
         <record model="ir.ui.view" id="email_template_form">
             <field name="name">email.template.form</field>
             <field name="model">email.template</field>
             <field name="arch" type="xml">
                 <form string="Templates" version="7.0">
-                  <sheet>
-                    <group col="4">
-                        <field name="name" required="1"/>
-                        <field name="model_id" required="1" on_change="onchange_model_id(model_id)"/>
-                        <field name="model" invisible="1"/>
-                    </group>
-                    <notebook>
-                        <page string="Email Details">
-                            <group>
-                                <field name="email_from" required="1"/>
-                                <field name="email_to" required="1"/>
-                                <field name="email_cc"/>
-                                <field name="reply_to"/>
-                                <field name="subject" required="1"/>
-                                <notebook  colspan="4">
-                                    <page string="Body (HTML)">
-                                        <field name="body_html" colspan="4" width="250" height="250" nolabel="1"/>
-                                        <label string="Note: This is Raw HTML." colspan="4"/>
-                                    </page>
-                                </notebook>
-                                <field name="user_signature"/>
-                            <notebook colspan="4">
-                                <page string="Dynamic Values Builder">
-                                    <group>
-                                        <field name="model_object_field"
-                                            domain="[('model_id','=',model_id),('ttype','!=','one2many'),('ttype','!=','many2many')]"
-                                            on_change="onchange_sub_model_object_value_field(model_object_field)"/>
-                                        <field name="sub_object" readonly="1"/>
-                                        <field name="sub_model_object_field"
-                                            domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
-                                            attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
-                                            on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
-                                        <field name="null_value" on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)"/>
-                                        <field name="copyvalue"/>
+                    <sheet>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/><h1><field name="name" required="1"/></h1>
+                            <h3><label for="model_id"/><field name="model_id" required="1" on_change="onchange_model_id(model_id)" class="oe_inline"/></h3>
+                            <field name="model" invisible="1"/>
+                        </div>
+                        <div class="oe_right oe_button_box" name="buttons">
+                            <field name="ref_ir_act_window" invisible="1"/>
+                            <button name="create_action" string="Add context action" type="object"
+                                    attrs="{'invisible':[('ref_ir_act_window','!=',False)]}"
+                                    help="Display an option on related documents to open a composition wizard with this template"/>
+                            <button name="unlink_action" string="Remove context action" type="object" 
+                                    attrs="{'invisible':[('ref_ir_act_window','=',False)]}"
+                                    help="Remove the contextual action to use this template on related documents"/>
+                            <button name="%(wizard_email_template_preview)d" string="Preview"
+                                    type="action" target="new"
+                                    context="{'template_id':active_id}"/>
+                        </div>
+                        <notebook>
+                            <page string="Email Details">
+                                <group>
+                                    <group string="Addressing">
+                                      <field name="email_from" required="1"/>
+                                      <field name="email_to" required="1"/>
+                                      <field name="email_cc"/>
+                                      <field name="reply_to"/>
+                                      <field name="user_signature"/>
+                                    </group>
+                                    <group string="Dynamic Value Builder" class="oe_edit_only">
+                                            <field name="model_object_field" domain="[('model_id','=',model_id),('ttype','!=','one2many'),('ttype','!=','many2many')]" on_change="onchange_sub_model_object_value_field(model_object_field)"/>
+                                            <field name="sub_object" readonly="1"/>
+                                            <field name="sub_model_object_field" domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]" attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}" on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
+                                            <field name="null_value" on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)"/>
+                                            <field name="copyvalue"/>
+                                    </group>
+                                    <group string="Contents" colspan="2">
+                                       <field name="subject" required="1"/>
+                                       <field name="body_html" width="250" height="450" nolabel="1" colspan="2" placeholder="Email contents (in raw HTML format)"/>
                                     </group>
-                                </page>
-                            </notebook>
-                            <button name="%(wizard_email_template_preview)d" string="Preview Template"
-                                type="action" colspan="4" target="new" icon="gtk-zoom-fit" context="{'template_id':active_id}"/>
-                            </group>
-                        </page>
-                        <page string="Advanced">
-                            <group colspan="2" col="2">
-                                <group colspan="2" col="2">
-                                    <separator string="Sidebar Button" colspan="2"/>
-                                    <button name="create_action" string="Add sidebar button" type="object" icon="gtk-execute"
-                                            colspan="2" attrs="{'invisible':[('ref_ir_act_window','!=',False)]}"
-                                            help="Display a button in the sidebar of related documents to open a composition wizard with this template"
-                                            />
-                                    <field name="ref_ir_act_window" attrs="{'invisible':[('ref_ir_act_window','=',False)]}"/>
-                                    <field name="ref_ir_value" attrs="{'invisible':[('ref_ir_act_window','=',False)]}"/>
-                                    <button name="unlink_action" string="Remove sidebar button" type="object" icon="gtk-delete"
-                                            colspan="2" attrs="{'invisible':[('ref_ir_act_window','=',False)]}"
-                                            help="Remove the sidebar button currently displayed on related documents"
-                                            />
                                 </group>
-                                <group colspan="2" col="2">
-                                    <separator string="Advanced Options" colspan="2"/>
-                                    <field name="mail_server_id"/>
-                                    <field name="track_campaign_item"/>
-                                    <field name="auto_delete"/>
+                            </page>
+                            <page string="Advanced">
+                                <group>
                                     <field name="lang"/>
+                                    <field name="mail_server_id"/>
+                                    <field name="auto_delete"/>
+                                    <field name="report_template" domain="[('model','=',model)]"/>
+                                    <field name="report_name" class="oe_inline"
+                                           attrs="{'invisible':[('report_template','=',False)]}"/>
+                                    <field name="attachment_ids">
+                                       <tree><field name="name"/></tree>
+                                    </field>
                                 </group>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Attachments" colspan="2"/>
-                                <notebook colspan="2">
-                                    <page string="Attach Report">
-                                        <group>
-                                            <field name="report_template" colspan="4"
-                                                domain="[('model','=',model)]"/>
-                                            <field name="report_name" colspan="4" />
-                                        </group>
-                                    </page>
-                                    <page string="Attach existing files">
-                                        <field name="attachment_ids" colspan="4" nolabel="1" height="350"/>
-                                    </page>
-                                </notebook>
-                            </group>
-                        </page>
-                    </notebook>
-                   </sheet>
+                            </page>
+                        </notebook>
+                       </sheet>
                 </form>
             </field>
         </record>
@@ -98,9 +71,9 @@
             <field name="model">email.template</field>
             <field name="arch" type="xml">
                 <tree string="Templates">
-                    <field name="model_id"/>
                     <field name="mail_server_id" invisible="1"/>
                     <field name="name"/>
+                    <field name="model_id"/>
                     <field name="subject"/>
                     <field name="email_from"/>
                     <field name="email_to"/>
diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv
index d2d6adf3bf3..adce0420793 100644
--- a/addons/email_template/security/ir.model.access.csv
+++ b/addons/email_template/security/ir.model.access.csv
@@ -1,5 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_email_template,email.template,model_email_template,,1,0,0,0
+access_email_template,email.template,model_email_template,,1,1,1,0
 access_email_template_system,email.template system,model_email_template,base.group_system,1,1,1,1
-access_email_template_manager,email.template,model_email_template,,1,1,1,1
-access_email_template_preview_system,email.template.preview system,model_email_template_preview,base.group_system,1,1,1,1
diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py
index d1a398cf3e6..862c34cc426 100644
--- a/addons/email_template/wizard/email_template_preview.py
+++ b/addons/email_template/wizard/email_template_preview.py
@@ -65,29 +65,19 @@ class email_template_preview(osv.osv_memory):
         return result
 
     _columns = {
-        'res_id':fields.selection(_get_records, 'Sample Document'),
+        'res_id': fields.selection(_get_records, 'Sample Document'),
     }
 
     def on_change_res_id(self, cr, uid, ids, res_id, context=None):
-        if not res_id:
-            return {}
+        if not res_id: return {}
         vals = {}
         email_template = self.pool.get('email.template')
         template_id = context and context.get('template_id')
-        
-        # FIXME ODO: replace everything below with a call to template.generate_email
-        template = email_template.get_email_template(cr, uid, template_id=template_id, record_id=res_id, context=context)
-        model = template.model
-        vals['email_to'] = self.render_template(cr, uid, template.email_to, model, res_id, context)
-        vals['email_cc'] = self.render_template(cr, uid, template.email_cc, model, res_id, context)
-        vals['reply_to'] = self.render_template(cr, uid, template.reply_to, model, res_id, context)
-        vals['subject'] = self.render_template(cr, uid, template.subject, model, res_id, context)
-        description = self.render_template(cr, uid, template.body_html, model, res_id, context) or ''
-        if template.user_signature:
-            signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
-            description += '\n' + signature
-        vals['body_html'] = description
-        vals['report_name'] = self.render_template(cr, uid, template.report_name, model, res_id, context)
+        template = email_template.browse(cr, uid, template_id, context=context)
+        vals['name'] = template.name
+        mail_values = email_template.generate_email(cr, uid, template_id, res_id, context=context)
+        for k in ('email_from','email_to','email_cc','reply_to','subject','body_html'):
+            vals[k] = mail_values[k]
         return {'value': vals}
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/wizard/email_template_preview_view.xml b/addons/email_template/wizard/email_template_preview_view.xml
index e621ec446ff..f4f75567a42 100644
--- a/addons/email_template/wizard/email_template_preview_view.xml
+++ b/addons/email_template/wizard/email_template_preview_view.xml
@@ -7,15 +7,20 @@
             <field name="model">email_template.preview</field>
             <field name="arch" type="xml">
                 <form string="Email Preview" version="7.0">
-                    <group>
+                    <div>
+                        <h2>Preview of <field name="name" readonly="1" class="oe_inline"/></h2>
                         <field name="model_id" invisible="1"/>
-                        <field name="res_id" on_change="on_change_res_id(res_id, context)"/>
-                        <field name="email_to" readonly="1"/>
-                        <field name="email_cc" readonly="1" attrs="{'invisible': [('email_cc','=',False)]}"/>
-                        <field name="reply_to" readonly="1" attrs="{'invisible': [('reply_to','=',False)]}"/>
-                        <field name="subject" readonly="1"/>
-                        <field name="body_html" nolabel="1" colspan="4" height="350" width="350" readonly="1" widget="html"/>
-                        <field name="report_name" colspan="4" readonly="1"/>
+                        <h3>Using sample document
+                        <field name="res_id" on_change="on_change_res_id(res_id, context)" class="oe_inline"/>
+                        </h3>
+                    </div>
+                    <group>
+                      <field name="email_from" readonly="1"/>
+                      <field name="email_to" readonly="1"/>
+                      <field name="email_cc" readonly="1" attrs="{'invisible':[('email_cc','=',False)]}"/>
+                      <field name="reply_to" readonly="1" attrs="{'invisible':[('reply_to','=',False)]}"/>
+                      <field name="subject" readonly="1"/>
+                      <field name="body_html" widget="html" readonly="1"/>
                     </group>
                 </form>
             </field>

From a97ac7649f997edd0a67820edc82c26da58c10c1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 1 Sep 2012 03:16:12 +0200
Subject: [PATCH 697/999] [IMP] mail.mail: fix search view, as mail.mail !=
 mail.message and meant for outgoing emails only now

bzr revid: odo@openerp.com-20120901011612-y1iab42s3g2gr8l0
---
 addons/mail/mail_mail_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index dc4f68b22c7..f6846954ec0 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -59,7 +59,7 @@
         </record>
 
         <record model="ir.ui.view" id="view_mail_tree">
-            <field name="name">mail.message.tree</field>
+            <field name="name">mail.mail.tree</field>
             <field name="model">mail.mail</field>
             <field name="arch" type="xml">
                 <tree string="Emails" colors="grey:state in ('sent', 'cancel');blue:state=='outgoing';red:state=='exception';black:state=='received'">
@@ -113,15 +113,15 @@
         </record>
 
         <record id="action_view_mail_mail" model="ir.actions.act_window">
-            <field name="name">Messages</field>
+            <field name="name">Emails</field>
             <field name="res_model">mail.mail</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_received': 1, 'search_default_type_email': 1}</field>
+            <field name="context">{'search_default_outgoing': 1, 'search_default_type_email': 1}</field>
             <field name="search_view_id" ref="view_mail_search"/>
         </record>
 
         <!-- Add menu entry in Settings/Email -->
-        <menuitem name="Mails" id="menu_mail_mail" parent="base.menu_email" action="action_view_mail_mail" />
+        <menuitem name="Emails" id="menu_mail_mail" parent="base.menu_email" action="action_view_mail_mail" />
     </data>
 </openerp>

From da7c583359814825c2169003f779d31f9788da6f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Sep 2012 09:21:37 +0200
Subject: [PATCH 698/999] [IMP] contracts

bzr revid: fp@tinyerp.com-20120901072137-le4el67es4zhw8n7
---
 addons/account/project/project_view.xml       | 32 ++++++++-----------
 .../account_analytic_analysis_view.xml        | 11 +++----
 addons/analytic/analytic_view.xml             | 16 +++++++---
 addons/hr_timesheet/hr_timesheet_view.xml     | 18 ++++++++++-
 .../report/report_analytic_view.xml           | 14 ++++----
 5 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e3b902a000f..77e987f24d4 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -186,19 +186,23 @@
                 <search string="Search Analytic Lines">
                     <field name="name" string="Analytic Line"/>
                     <field name="date"/>
-                    <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
-                    <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
-                    <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
+                    <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" help="Analytic Journal Items related to a sale journal."/>
+                    <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" help="Analytic Journal Items related to a purchase journal."/>
+                    <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]"/>
                     <separator/>
-                    <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
+                    <filter string="My Entries" domain="[('user_id','=',uid)]"/>
                     <field name="account_id"/>
                     <field name="user_id"/>
                     <group string="Group By..." expand="0">
-                        <filter string="Account" context="{'group_by':'account_id'}" icon="terp-folder-green"/>
-                        <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
-                        <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
-                        <filter string="Fin.Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/>
-                        <filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
+                        <filter string="Analytic Account" context="{'group_by':'account_id'}"/>
+                        <filter string="Fin. Account" context="{'group_by':'general_account_id'}"/>
+                        <filter string="Journal" context="{'group_by':'journal_id'}" name="group_journal"/>
+                        <separator/>
+                        <filter string="Product" context="{'group_by':'product_id'}"/>
+                        <filter string="User" context="{'group_by':'user_id'}"/>
+                        <separator/>
+                        <filter string="Date" context="{'group_by':'date'}" name="group_date"/>
+
                     </group>
                 </search>
             </field>
@@ -357,16 +361,6 @@
             action="action_account_analytic_journal_tree"
             id="account_analytic_journal_print" parent="account.next_id_40"/>
 
-
-        <act_window
-            context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'default_account_id': active_id}"
-            id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal"
-            name="All Analytic Entries"
-            res_model="account.analytic.line"
-            src_model="account.analytic.account"
-            view_mode="tree,form"
-            view_type="form"/>
-
         <record id="view_account_journal_1" model="ir.ui.view">
             <field name="name">account.journal.form.1</field>
             <field name="model">account.journal</field>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 63a8e6c7add..12d8fad1b95 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -6,12 +6,11 @@
         Analytic Account form
         -->
 
-        <act_window
-            id="action_sales_order"
-            name="Sales Orders"
-            res_model="sale.order"
-            src_model="account.analytic.account"
-        />
+        <record model="ir.actions.act_window" id="action_sales_order">
+            <field name="name">Sales Orders</field>
+            <field name="res_model">sale.order</field>
+            <field name="src_model">account.analytic.account</field>
+        </record>
 
         <record id="account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index c1e59cf3ba3..704d9bb8244 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -8,12 +8,18 @@
             <field name="arch" type="xml">
                 <form string="Analytic Account" version="7.0">
                     <sheet string="Analytic Account">
+                        <div class="oe_right oe_button_box" name="buttons">
+                        </div>
+
+                        <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
-                        <h1>
-                            <field name="name" class="oe_inline"/>
-                        </h1>
-                        <div name="project"/>
-                        <group>
+                            <h1>
+                                <field name="name" class="oe_inline"/>
+                            </h1>
+                            <div name="project"/>
+                        </div>
+
+                        <group name="main">
                             <group>
                                 <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}"/>
                                 <field name="manager_id"/>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 6ece274fea1..f4b3e437b27 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -77,7 +77,17 @@
                 </search>
             </field>
         </record>
-        
+
+        <record model="ir.actions.act_window" id="act_analytic_cost_revenue">
+            <field name="context">{'search_default_account_id': [active_id], 'default_account_id': active_id, 'search_default_group_date': 1, 'search_default_group_journal': 1}</field>
+            <field name="name">Costs &amp; Revenues</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="src_model">account.analytic.account</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_type">form</field>
+        </record>
+
+ 
         <record id="account_analytic_account_timesheet_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form</field>
             <field name="model">account.analytic.account</field>
@@ -87,6 +97,12 @@
                     <field name="use_timesheets"/>
                     <label for="use_timesheets"/>
                 </xpath>
+                <xpath expr='//div[@name="buttons"]' position='inside'>
+                    <button string="Costs and Revenues"
+                        name="%(act_analytic_cost_revenue)d"
+                        type="action"/>
+
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index 9e0b8dd59ee..a2566688799 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -122,13 +122,13 @@
             <field name="search_view_id" ref="account_analytic_line_to_invoice_view_filter"/>
         </record>
 
-        <act_window
-        domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False), ('journal_id.type', '=', 'general')]"
-        context="{'search_default_account_id': [active_id], 'default_account_id': active_id,'search_default_to_invoice': 1}"
-        id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice"
-        name="Timesheet Lines to Invoice"
-        res_model="account.analytic.line"
-        src_model="account.analytic.account"/>
+        <record id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" model="ir.actions.act_window">
+            <field name="domain">[]</field>
+            <field name="context">{'search_default_account_id': [active_id], 'default_account_id': active_id,'search_default_to_invoice': 1}</field>
+            <field name="name">To Invoice</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="src_model">account.analytic.account</field>
+        </record>
 
     </data>
 </openerp>

From fde00740e2926659e96947ba62ab7e6dc8cbb4af Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 2 Sep 2012 14:32:45 +0200
Subject: [PATCH 699/999] imp_product_form

bzr revid: fp@openerp.com-20120902123245-rxvdeg75bkw5re5q
---
 addons/product/product.py       | 4 ++--
 addons/product/product_view.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 6acf1ac526b..3e5a65925f0 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -288,7 +288,7 @@ class product_template(osv.osv):
         'rental': fields.boolean('Can be Rent'),
         'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
         'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
-        'standard_price': fields.float('Cost', required=True, digits_compute=dp.get_precision('Product Price'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price.", groups="base.group_user"),
+        'standard_price': fields.float('Cost', digits_compute=dp.get_precision('Product Price'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price.", groups="base.group_user"),
         'volume': fields.float('Volume', help="The volume in m3."),
         'weight': fields.float('Gross Weight', digits_compute=dp.get_precision('Stock Weight'), help="The gross weight in Kg."),
         'weight_net': fields.float('Net Weight', digits_compute=dp.get_precision('Stock Weight'), help="The net weight in Kg."),
@@ -354,7 +354,7 @@ class product_template(osv.osv):
         'list_price': lambda *a: 1,
         'cost_method': lambda *a: 'standard',
         'supply_method': lambda *a: 'buy',
-        'standard_price': lambda *a: 1,
+        'standard_price': lambda *a: 0.0,
         'sale_ok': lambda *a: 1,
         'sale_delay': lambda *a: 7,
         'produce_delay': lambda *a: 1,
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8d77a9844b0..702fa98060b 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -85,8 +85,6 @@
                                 <group>
                                     <group>
                                         <field name="list_price"/>
-                                        <field name="cost_method" groups="product.group_costing_method"/>
-                                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                         <field name="price_margin" groups="product.group_product_variant"/>
                                         <field name="price_extra" groups="product.group_product_variant"/>
                                     </group>
@@ -109,6 +107,8 @@
                                 <group name="procurement">
                                     <group>
                                         <field name="procure_method" groups="base.group_user" attrs="{'invisible':[('type','=', 'service')]}"/>
+                                        <field name="cost_method" groups="product.group_costing_method"/>
+                                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                     </group>
                                     <group>
                                         <field name="uom_po_id" groups="product.group_uom"/>

From 4d2d2ee443797ca1e4d9c1a9e99ec9b3507c6fd0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 2 Sep 2012 15:14:13 +0200
Subject: [PATCH 700/999] [IMP] useability form views reviewed: product, mrp

bzr revid: fp@openerp.com-20120902131413-6sba369b26rbxvfd
---
 addons/mrp/mrp_view.xml                       | 54 ++++++++-----------
 .../wizard/make_procurement_view.xml          | 14 ++---
 addons/product/product.py                     |  2 +-
 addons/product/product_view.xml               | 10 ++--
 addons/purchase/purchase_view.xml             |  2 +-
 5 files changed, 37 insertions(+), 45 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 52b79e2ade0..9485222bd97 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -647,50 +647,42 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
                 </header>
                 <sheet>
-                    <label for="product_id" class="oe_edit_only"/>
-                    <h1>
-                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','&lt;&gt;',False),('bom_ids.bom_id','=',False)]" class="oe_inline"/>
-                    </h1>
-                    <label for="product_qty" class="oe_edit_only"/>
-                    <h2>
-                        <field name="product_qty" class="oe_inline"/>
-                        <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
-                        <button type="action"
-                            icon="terp-accessories-archiver+"
-                            name="%(mrp.action_change_production_qty)d"
-                            string="Change Qty" states="ready,confirmed" class="oe_inline"/>
-                    </h2>
-                    <div groups="mrp.group_mrp_routings">
-                        <label for="routing_id" class="oe_edit_only"/>
-                        <h2><field name="routing_id" class="oe_inline"/></h2>
+                    <div class="oe_title">
+                        <h1>Manufacturing Order <field name="name" class="oe_inline"/></h1>
                     </div>
                     <group>
                         <group>
-                            <field name="name"/>
-                            <field name="date_planned"/>
-                            <field name="origin"/>
-                        </group>
-                        <group>
-                            <field name="user_id"/>
+                            <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','&lt;&gt;',False),('bom_ids.bom_id','=',False)]" class="oe_inline"/>
+                            <label for="product_qty"/>
+                            <div>
+                                <field name="product_qty" class="oe_inline"/>
+                                <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
+                                <button type="action"
+                                    icon="terp-accessories-archiver+"
+                                    name="%(mrp.action_change_production_qty)d"
+                                    string="(Update)" states="ready,confirmed" class="oe_edit_only oe_link"/>
+                            </div>
                             <label for="product_uos_qty" groups="product.group_uos"/>
                             <div groups="product.group_uos">
                                 <field name="product_uos_qty" class="oe_inline"/>
                                 <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
                                 <field name="product_uos" class="oe_inline"/>
                             </div>
+                            <field name="date_planned"/>
+                        </group>
+                        <group>
+                            <field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)"/>
+                            <field name="routing_id" class="oe_inline" groups="mrp.group_mrp_routings"/>
+                            <field name="user_id"/>
+                            <field name="origin"/>
+                        </group>
+                        <group groups="stock.group_locations">
+                            <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
+                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Consumed Products">
-                            <group>
-                                <group>
-                                    <field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)"/>
-                                </group>
-                                <group groups="stock.group_locations">
-                                    <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
-                                    <field name="location_dest_id" domain="[('usage','=','internal')]"/>
-                                </group>
-                            </group>
                             <group>
                                 <group string="Products to Consume">
                                     <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index b415675400f..9228fcc323b 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -34,13 +34,13 @@
             </field>
         </record>
 
-        <act_window name="Procurement Request"
-            res_model="make.procurement"
-            src_model="product.product"
-            view_mode="form"
-            target="new"
-            key2="client_action_multi"
-            id="act_make_procurement"/>
+        <record model="ir.actions.act_window" id="act_make_procurement">
+            <field name="name">Procurement Request</field>
+            <field name="res_model">make.procurement</field>
+            <field name="src_model">product.product</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/product/product.py b/addons/product/product.py
index 3e5a65925f0..1b8c69b7d5b 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -302,7 +302,7 @@ class product_template(osv.osv):
             ('sellable','Normal'),
             ('end','End of Lifecycle'),
             ('obsolete','Obsolete')], 'Status', help="Tells the user if he can use the product or not."),
-        'uom_id': fields.many2one('product.uom', 'Default Unit of Measure', required=True, help="Default Unit of Measure used for all stock operation."),
+        'uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True, help="Default Unit of Measure used for all stock operation."),
         'uom_po_id': fields.many2one('product.uom', 'Purchase Unit of Measure', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."),
         'uos_id' : fields.many2one('product.uom', 'Unit of Sale',
             help='Used by companies that manage two units of measure: invoicing and inventory management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default Unit of Measure.'),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 702fa98060b..3e0432f135e 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -84,9 +84,9 @@
                             <page string="Information">
                                 <group>
                                     <group>
+                                        <field name="type"/>
+                                        <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="product.group_uom"/>
                                         <field name="list_price"/>
-                                        <field name="price_margin" groups="product.group_product_variant"/>
-                                        <field name="price_extra" groups="product.group_product_variant"/>
                                     </group>
                                     <group>
                                         <field name="default_code"/>
@@ -94,11 +94,11 @@
                                         <div name="ean">
                                             <field name="ean13" placeholder="e.g. 5901234123457"/>
                                         </div>
-                                        <field groups="product.group_product_variant" name="variants"/>
                                     </group>
                                     <group>
-                                        <field name="type"/>
-                                        <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="product.group_uom"/>
+                                        <field groups="product.group_product_variant" name="variants"/>
+                                        <field name="price_margin" groups="product.group_product_variant"/>
+                                        <field name="price_extra" groups="product.group_product_variant"/>
                                     </group>
                                 </group>
                                 <field name="description" placeholder="describe the product's characteristics..."/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index a607783e226..ba5a3c283ff 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -177,7 +177,7 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order" version="7.0">
                 <header>
-                    <button name="purchase_confirm" states="draft,sent" string="Confirm Quotation" class="oe_highlight"/>
+                    <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_highlight"/>
                     <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
                     <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object" class="oe_highlight"/>
                     <button name="action_cancel" states="except_picking,except_invoice" string="Cancel" type="object" />

From d0db8f930d962b6ce10d67fc23f72eda24d3f1d4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 2 Sep 2012 15:16:19 +0200
Subject: [PATCH 701/999] imp

bzr revid: fp@openerp.com-20120902131619-to09idu73evgf2re
---
 addons/mrp/mrp_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9485222bd97..acb51ea6388 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -501,7 +501,7 @@
             <field name="res_model">mrp.bom</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_bom_component_tree_view"/>
-            <field name="domain">[('bom_id','!=',False)]</field>
+            <field name="domain">[]</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to add a component to a bill of material.
@@ -524,6 +524,7 @@
             action="mrp_bom_form_action2"
             id="menu_mrp_bom_form_action2"
             parent="menu_mrp_configuration"
+            groups="base.group_no_one"
             sequence="20"/>
 
         <record id="action2" model="ir.actions.act_window">

From ca262a813412cf68534b2cebd9a8f3e6b966468f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 2 Sep 2012 15:30:14 +0200
Subject: [PATCH 702/999] [IMP] useability form views: bom, hr employee

bzr revid: fp@openerp.com-20120902133014-37zyyrxwf3gqkswi
---
 addons/hr/hr_view.xml                       | 2 +-
 addons/hr_attendance/hr_attendance_view.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 99d7af027e9..e8ed1d61157 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -20,7 +20,7 @@
             <field name="arch" type="xml">
                 <form string="Employee" version="7.0">
                     <sheet>
-                        <field name="image_small" widget='image' class="oe_right oe_image_small"/>
+                        <field name="image_medium" widget='image' class="oe_right oe_avatar"/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index bda89fd9d63..1d0122d55fa 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -126,9 +126,9 @@
                 <field name="active" position="before">
                     <label for="state"/>
                     <div>
-                        <field name="state" class="oe_inline"/>
-                        <button class="oe_inline oe_right" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
-                        <button class="oe_inline oe_right" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
+                        <field name="state" class="oe_inline"/> - 
+                        <button class="oe_link" name="attendance_action_change" states="present" string="Sign Out" type="object" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
+                        <button class="oe_link" name="attendance_action_change" states="absent" string="Sign In" type="object" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
                     </div>
                 </field>
             </field>

From abc50dbb060d750dbf02ce6bc2e1e0832f48bb37 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 2 Sep 2012 21:13:54 +0200
Subject: [PATCH 703/999] [IMP  usability

bzr revid: fp@openerp.com-20120902191354-snehwp4w3euzs6uq
---
 addons/stock/product_view.xml |  2 -
 addons/stock/stock_view.xml   | 70 +++++++----------------------------
 2 files changed, 14 insertions(+), 58 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 43e00c5a238..af11c3fafbb 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -152,7 +152,6 @@
             <field name="domain">[('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context" eval="'{\'search_default_product_id\': [active_id]}'"/>
-            <field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to register a reception for this product. 
@@ -173,7 +172,6 @@
             <field name="domain">[('picking_id.type','=','out')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context" eval="'{\'search_default_product_id\': [active_id]}'"/>
-            <field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to add a delivery order for this product.
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6927bf68c25..78beffaf8a2 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1333,10 +1333,11 @@
             <field eval="3" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
-                    <field name="origin" string="Stock Moves"/>
+                    <field name="origin" domain="['|',('origin','ilike',self),('picking_id','ilike',self)]" string="Reference"/>
                     <field name="date" groups="base.group_no_one"/>
+
                     <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
-                    <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
+                    <filter icon="terp-stock" string="To Do" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
                     <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
                     <separator/>
                     <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
@@ -1389,8 +1390,10 @@
             <field name="priority" eval="6"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state == 'cancel'" string="Moves">
-                    <field name="picking_id" string="Reference"/>
+                    <field name="date" widget="date"/>
+                    <field name="picking_id" string="Reference" invisible="1"/>
                     <field name="origin"/>
+                    <field name="partner_id" string="Supplier"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
@@ -1413,8 +1416,13 @@
                         groups="product.group_stock_packaging"
                         icon="terp-stock_effects-object-colorize"
                         states="draft,assigned,confirmed,done"/>
-                    <field name="date" groups="base.group_no_one"/>
                     <field name="state"/>
+                    <button name="%(action_partial_move_server)d"
+                        icon="terp-stock_effects-object-colorize" type="action"
+                        states="assigned" class="oe_highlight"/>
+                    <button name="action_done" states="draft,assigned,confirmed"
+                        icon="gtk-go-forward" type="object"
+                        class="oe_highlight"/>
                 </tree>
             </field>
         </record>
@@ -1435,54 +1443,6 @@
             </field>
         </record>
 
-        <record id="view_move_search_reception_incoming_picking" model="ir.ui.view">
-            <field name="name">stock.move.incoming.search2</field>
-            <field name="model">stock.move</field>
-            <field eval="6" name="priority"/>
-            <field name="arch" type="xml">
-                <search string="Stock Moves">
-                    <field name="origin" string="Stock Moves"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
-                    <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
-                    <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
-                    <separator/>
-                    <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
-                    <field name="product_id"/>
-                    <field name="prodlot_id"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="view_move_search_reception_outcoming_picking" model="ir.ui.view">
-            <field name="name">stock.move.outgoing.search2</field>
-            <field name="model">stock.move</field>
-            <field eval="6" name="priority"/>
-            <field name="arch" type="xml">
-                <search string="Stock Moves">
-                    <field name="origin" string="Stock Moves"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
-                    <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
-                    <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
-                    <separator/>
-                    <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
-                    <field name="product_id"/>
-                    <field name="prodlot_id"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
         <record id="action_reception_picking_move" model="ir.actions.act_window">
             <field name="name">Receive Products</field>
             <field name="res_model">stock.move</field>
@@ -1491,8 +1451,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context" eval="'{\'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
-            <field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
+            <field name="context" eval="'{\'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d, \'search_default_future\': 1}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
             <field name="help" type="html">
               <p>
                 Click to register a product reception. 
@@ -1627,8 +1586,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context" eval="'{\'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
-            <field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
+            <field name="context" eval="'{\'default_location_id\':%d, \'default_location_dest_id\':%d, \'search_default_future\': 1}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
             <field name="help" type="html">
               <p>
                 You will find in this list all products you have to deliver to

From e0d37e333a64fe3d8b0516c0f4f4a1ce4ee87931 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 2 Sep 2012 21:24:16 +0200
Subject: [PATCH 704/999] [IMP] Usability Inventory Form

bzr revid: fp@openerp.com-20120902192416-26j9sxwh07p03qbz
---
 addons/hr/res_config.py     |  8 ++++----
 addons/stock/stock_view.xml | 13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 4973417ec88..9ac5f7c54d6 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -32,15 +32,15 @@ class hr_config_settings(osv.osv_memory):
             help ="""This installs the module hr_attendance."""),
         'module_hr_timesheet': fields.boolean('manage timesheets',
             help ="""This installs the module hr_timesheet."""),
-        'module_hr_holidays': fields.boolean('manage leaves and allocation requests',
+        'module_hr_holidays': fields.boolean('manage holidays, leaves and allocation requests',
             help ="""This installs the module hr_holidays."""),
         'module_hr_expense': fields.boolean('manage employees expenses',
             help ="""This installs the module hr_expense."""),
-        'module_hr_recruitment': fields.boolean('manage the recruitment pipe',
+        'module_hr_recruitment': fields.boolean('manage the recruitment process',
             help ="""This installs the module hr_recruitment."""),
-        'module_hr_contract': fields.boolean('manage contract per employee',
+        'module_hr_contract': fields.boolean('manage contracts per employee',
             help ="""This installs the module hr_contract."""),
-        'module_hr_evaluation': fields.boolean('manage employees periodic evaluation',
+        'module_hr_evaluation': fields.boolean('organize employees periodic evaluation',
             help ="""This installs the module hr_evaluation."""),
         'module_hr_payroll': fields.boolean('manage payroll',
             help ="""This installs the module hr_payroll."""),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 78beffaf8a2..703b1de05aa 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -113,13 +113,14 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
-                    <div>
-                        <label for="name" class="oe_edit_only"/>
-                        <field name="name" placeholder="e.g. Annual inventory" class="oe_inline"/> -
-                        <field name="date" class="oe_inline"/>
-                    </div>
                     <group>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <group>
+                            <field name="name" placeholder="e.g. Annual inventory"/>
+                        </group>
+                        <group>
+                            <field name="date"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
                     </group>
                     <notebook>
                     <page string="General Informations">

From 0793149ee70f9d6c9e6c5657fda927af204e0ebf Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 2 Sep 2012 21:34:49 +0200
Subject: [PATCH 705/999] [IMP] usability: config of HR

bzr revid: fp@openerp.com-20120902193449-xctby8h4alr5fw3l
---
 addons/hr/res_config.py       |  2 +-
 addons/hr/res_config_view.xml | 45 +++++++++++++++++++----------------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 9ac5f7c54d6..411040f45b8 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -38,7 +38,7 @@ class hr_config_settings(osv.osv_memory):
             help ="""This installs the module hr_expense."""),
         'module_hr_recruitment': fields.boolean('manage the recruitment process',
             help ="""This installs the module hr_recruitment."""),
-        'module_hr_contract': fields.boolean('manage contracts per employee',
+        'module_hr_contract': fields.boolean('record contracts per employee',
             help ="""This installs the module hr_contract."""),
         'module_hr_evaluation': fields.boolean('organize employees periodic evaluation',
             help ="""This installs the module hr_evaluation."""),
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index ad36818e525..32f96fb2abb 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -33,6 +33,19 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <separator string="Human Resources Management"/>
+                    <group name="recruitment_grp">
+                        <label for="id" string="Talent Management"/>
+                        <div name="recruitment">
+                            <div>
+                                <field name="module_hr_recruitment" class="oe_inline"/>
+                                <label for="module_hr_recruitment"/>
+                            </div>
+                            <div>
+                                <field name="module_hr_evaluation" class="oe_inline"/>
+                                <label for="module_hr_evaluation"/>
+                            </div>
+                        </div>
+                    </group>
                     <group>
                         <label for="id" string="Additional Features"/>
                         <div>
@@ -44,21 +57,6 @@
                                 <field name="module_hr_expense" class="oe_inline"/>
                                 <label for="module_hr_expense"/>
                             </div>
-                            <div>
-                                <field name="module_hr_evaluation" class="oe_inline"/>
-                                <label for="module_hr_evaluation"/>
-                            </div>
-                            <div>
-                                <field name="module_hr_contract" class="oe_inline"/>
-                                <label for="module_hr_contract"/>
-                            </div>
-                            <div name="hr_payroll">
-                                <field name="module_hr_payroll" class="oe_inline"/>
-                                <label for="module_hr_payroll"/>
-                                <button name="%(open_payroll_modules)d" type="action"
-                                    string="Install your country's payroll" icon="gtk-go-forward"
-                                    attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
-                            </div>
                         </div>
                     </group>
                     <group name="timesheet_grp">
@@ -78,12 +76,19 @@
                             </div>
                         </div>
                     </group>
-                    <group name="recruitment_grp">
-                        <label for="id" string="Recruitment"/>
-                        <div name="recruitment">
+                    <group name="contract_grp">
+                        <label for="id" string="Contracts"/>
+                        <div>
                             <div>
-                                <field name="module_hr_recruitment" class="oe_inline"/>
-                                <label for="module_hr_recruitment"/>
+                                <field name="module_hr_contract" class="oe_inline"/>
+                                <label for="module_hr_contract"/>
+                            </div>
+                            <div name="hr_payroll">
+                                <field name="module_hr_payroll" class="oe_inline"/>
+                                <label for="module_hr_payroll"/>
+                                <button name="%(open_payroll_modules)d" type="action"
+                                    string="Install your country's payroll" icon="gtk-go-forward"
+                                    attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
                             </div>
                         </div>
                     </group>

From 7e06f1e1ff8dca630b4a2eec02ea2041b2fb5842 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 2 Sep 2012 21:38:35 +0200
Subject: [PATCH 706/999] [IMP] typo

bzr revid: fp@openerp.com-20120902193835-2kad810gv6po993x
---
 addons/crm/res_config.py  | 2 +-
 addons/sale/res_config.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index c6d33b4bec2..1d30abdc33c 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -38,7 +38,7 @@ class crm_configuration(osv.osv_memory):
         'module_import_google': fields.boolean("Google (Contacts and Calendar)",
             help="""Import google contact in partner address and add google calendar events details in Meeting.
                 This installs the module import_google."""),
-        'module_google_map': fields.boolean("add google maps on customer",
+        'module_google_map': fields.boolean("add google maps on customers",
             help="""Locate customers on Google Map.
                 This installs the module google_map."""),
         'group_fund_raising': fields.boolean("Manage Fund Raising",
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 0a2e3a49f62..1e7b5b67c53 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -56,7 +56,7 @@ class sale_configuration(osv.osv_memory):
             help ="""Allows you to add delivery methods in sale orders and delivery orders.
                 You can define your own carrier and delivery grids for prices.
                 This installs the module delivery."""),
-        'time_unit': fields.many2one('product.uom', 'The default working time unit for services is'),
+        'time_unit': fields.many2one('product.uom', 'the default working time unit for services is'),
         'default_picking_policy' : fields.boolean("deliver all at once when all products are available.",
             help = "Sales order by default will be configured to deliver all products at once instead of delivering each product when it is available. This may have an impact on the shipping price."),
         'group_sale_pricelist':fields.boolean("use pricelists to adapt your price per customers",

From bc3e03782498f60ad3629639c28d45140d118a63 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 2 Sep 2012 22:18:18 +0200
Subject: [PATCH 707/999] imp

bzr revid: fp@openerp.com-20120902201818-ralmbhmxvejbc9kf
---
 addons/stock/stock_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 703b1de05aa..a2c966fdb7f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -268,7 +268,8 @@
               </p>
             </field>
         </record>
-        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
+        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" 
+            sequence="3" groups="stock.group_stock_tracking_lot,stock.group_stock_production_lot"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
             groups="product.group_stock_packaging"
             sequence="6"

From 4deba0a548978f164f6a23759d8b6d0b2bb20eb2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Mon, 3 Sep 2012 08:02:00 +0200
Subject: [PATCH 708/999] [IMP] removed unused actions

bzr revid: fp@openerp.com-20120903060200-4p32jlxqeq2pn30h
---
 .../wizard/crm_partner_to_opportunity_view.xml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 765a22de0a6..7f0b5957071 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -23,23 +23,5 @@
           </field>
        </record>
 
-<!-- partner To Opportunity Action -->
-
-      <record model="ir.actions.act_window" id="action_view_crm_partner2opportunity">
-            <field name="name">Create Opportunity</field>
-            <field name="res_model">crm.partner2opportunity</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree,kanban,calendar</field>
-            <field name="target">new</field>
-     </record>
-
-        <!-- partner To Opportunity wizard -->
-
-     <act_window id="crm_partner2opportunity"
-            key2="client_action_multi" name="Create Opportunity"
-            res_model="crm.partner2opportunity" src_model="res.partner"
-            view_id="view_crm_partner2opportunity"
-            view_mode="form" target="new" view_type="form"
-            groups="base.group_sale_salesman"/>
      </data>
 </openerp>

From 61ff37d19c97ae0b6a11433c19e6f0f94027b5ab Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Mon, 3 Sep 2012 08:22:46 +0200
Subject: [PATCH 709/999] [IMP] membership usability form view

bzr revid: fp@openerp.com-20120903062246-s4nwewrzmepqmj7t
---
 addons/membership/membership.py       | 10 +---------
 addons/membership/membership_view.xml | 16 ++--------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 3439f97f833..2a006814629 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -146,7 +146,7 @@ class membership_line(osv.osv):
         'date_to': fields.date('To', readonly=True),
         'date_cancel': fields.date('Cancel date'),
         'date': fields.date('Join Date', help="Date on which member has joined the membership"),
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Product Price'), required=True, help='Amount for the membership'),
+        'member_price': fields.float('Membership Fee', digits_compute= dp.get_precision('Product Price'), required=True, help='Amount for the membership'),
         'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
         'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
         'state': fields.function(_state,
@@ -444,14 +444,6 @@ class Partner(osv.osv):
 
 Partner()
 
-class product_template(osv.osv):
-    _inherit = 'product.template'
-    _columns = {
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Product Price')),
-    }
-
-product_template()
-
 class Product(osv.osv):
 
     def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index fb128585fd2..ce0e55e37c9 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -88,11 +88,11 @@
             <field name="arch" type="xml">
                 <page string="Information" position="after">
                     <page string="Membership">
-                        <group>
+                        <group col="1">
                             <group>
                                 <field name="membership" readonly="0"/>
                             </group>
-                            <group>
+                            <group attrs="{'invisible':[('membership','=',False)]}">
                                 <field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
                                 <field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
                             </group>
@@ -270,17 +270,5 @@
         <!-- MEMBERSHIP/REPORTING -->
         <menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
 
-        <!-- View for product.product object inherited from product module -->
-        <record model="ir.ui.view" id="view_product_form_inherit1">
-            <field name="name">product.normal.form</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <field name="list_price" position="after">
-                    <field name="member_price" groups="base.group_user"/>
-                </field>
-            </field>
-        </record>
-
     </data>
 </openerp>

From 01887ce1f3ca1778d192d8a56e17679582a17f9c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 3 Sep 2012 09:07:25 +0200
Subject: [PATCH 710/999] [FIX] in One2ManyListView, use method
 _is_action_enabled() instead of specific code

bzr revid: rco@openerp.com-20120903070725-qpwseju4ryuh9bc2
---
 addons/web/static/src/js/view_form.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index a38a71d638c..cca3d410a50 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3470,7 +3470,6 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
     },
     do_activate_record: function(index, id) {
         var self = this;
-        var attr_readonly = (_.has(this.fields_view.arch.attrs, 'edit')) ? JSON.parse(this.fields_view.arch.attrs.edit) : true;
         var pop = new instance.web.form.FormOpenPopup(self.o2m.view);
         pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(), {
             title: _t("Open: ") + self.o2m.string,
@@ -3486,7 +3485,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
                 return self.o2m.dataset.read_ids.apply(self.o2m.dataset, arguments);
             },
             form_view_options: {'not_interactible_on_create':true},
-            readonly: attr_readonly ? self.o2m.get("effective_readonly") : true,
+            readonly: !this._is_action_enabled('edit') || self.o2m.get("effective_readonly")
         });
     },
     do_button_action: function (name, id, callback) {

From 00b8441f0a71547586499ab517fe8c4ce476a488 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 3 Sep 2012 09:24:39 +0200
Subject: [PATCH 711/999] [IMP] web_kanban: use proper inheritance for method
 _is_action_enabled

bzr revid: rco@openerp.com-20120903072439-yh0ncl8nbxcg47um
---
 addons/web_kanban/static/src/js/kanban.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index f599342541c..6efd8593deb 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -72,11 +72,9 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         return !! this.group_by;
     },
     _is_action_enabled: function(action) {
-        if (! this.options.creatable)
+        if (action === 'create' && !this.options.creatable)
             return false;
-        if (_.has(this.fields_view.arch.attrs, action))
-            return JSON.parse(this.fields_view.arch.attrs[action]);
-        return true;
+        return this._super(action);
     },
     add_qweb_template: function() {
         for (var i=0, ii=this.fields_view.arch.children.length; i < ii; i++) {
@@ -637,9 +635,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
             });
     },
     _is_action_enabled: function(action) {
-        if (_.has(this.fields_view.arch.attrs, action))
-            return JSON.parse(this.fields_view.arch.attrs[action]);
-        return true;
+        return (_.has(this.fields_view.arch.attrs, action)) ? JSON.parse(this.fields_view.arch.attrs[action]) : true;
     }    
 });
 

From 7c599159a584c74115a65aa632c2078c17f1b3c0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 3 Sep 2012 11:12:11 +0200
Subject: [PATCH 712/999] [ADD] match display and field autocompletion UI

bzr revid: xmo@openerp.com-20120903091211-0r0jwe786olxg8ll
---
 addons/base_import/static/src/js/import.js | 63 +++++++++++++++++++---
 1 file changed, 57 insertions(+), 6 deletions(-)

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 2853f36019a..efcb756feb5 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -45,7 +45,7 @@ openerp.base_import = function (instance) {
         ],
         events: {
             'change input.oe_import_file': 'file_update',
-            'change input:not(.oe_import_file)': 'settings_updated',
+            'change input.oe_import_has_header, .oe_import_options input': 'settings_updated',
             'click a.oe_import_csv': function (e) {
                 e.preventDefault();
             },
@@ -74,6 +74,7 @@ openerp.base_import = function (instance) {
             // import object id
             this.id = null;
             this.Import = new instance.web.Model('base_import.import');
+            this.field_label_to_name = {};
         },
         start: function () {
             var self = this;
@@ -121,17 +122,67 @@ openerp.base_import = function (instance) {
                 this.$el.addClass('oe_import_error');
                 this.$('.oe_import_error_report').html(
                     QWeb.render('ImportView.preview.error', result));
-            } else {
-                this.$el.addClass('oe_import_preview');
-                this.$('table').html(
-                    QWeb.render('ImportView.preview', result));
+                return;
             }
+            this.$el.addClass('oe_import_preview');
+            this.$('table').html(QWeb.render('ImportView.preview', result));
+
+            var $fields = this.$('.oe_import_fields input');
+            this.render_fields_matches(result, $fields);
+            $fields.autocomplete({
+                minLength: 0,
+                source: this.generate_fields_completion(result)
+            });
+        },
+        generate_fields_completion: function (root) {
+            // Display nice names to user, but send logical names to server
+            this.field_label_to_name = {};
+            var completions = [];
+            var self = this;
+            function traverse(field, ancestors) {
+                var field_path = ancestors.concat(field);
+                var label = _(field_path).pluck('string').join(' / ');
+                self.field_label_to_name[label] = _(field_path).pluck('name').join('/');
+                completions.push(label);
+
+                var subfields = field.fields;
+                for(var i=0, end=subfields.length; i<end; ++i) {
+                    traverse(subfields[i], field_path);
+                }
+            }
+            _(root.fields).each(function (field) {
+                traverse(field, []);
+            });
+
+            return completions;
+        },
+        render_fields_matches: function (result, $fields) {
+            if (_(result.matches).isEmpty()) { return; }
+            $fields.each(function (index, input) {
+                var match = result.matches[index];
+                if (!match) { return; }
+
+                var current_field = result;
+                input.value = _(match).chain()
+                    .map(function (name) {
+                        // WARNING: does both mapping and folding (over the
+                        //          ``field`` iterator variable)
+                        return current_field = _(current_field.fields).find(function (subfield) {
+                            return subfield.name === name;
+                        });
+                    })
+                    .pluck('string')
+                    .value()
+                    .join(' / ');
+            });
         },
 
         //- import itself
         do_import: function () {
+            var self = this;
             var fields = this.$('.oe_import_fields input').map(function (index, el) {
-                return el.value || false;
+                // Convert user-readable field label to logical db-backed name
+                return self.field_label_to_name[el.value] || false;
             }).get();
             this.Import.call(
                 'do', [this.id, fields, this.import_options()], {

From c895c53341c21a06d6a00bfb7045b1353d708d3d Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 3 Sep 2012 15:01:27 +0530
Subject: [PATCH 713/999] [IMP] crm, project, hr_recruitment: made stages
 accute on view according to state

bzr revid: cha@tinyerp.com-20120903093127-vao5eoi61is1pqfx
---
 addons/crm/crm_lead.py                        | 2 +-
 addons/hr_recruitment/hr_recruitment.py       | 2 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 addons/project/project.py                     | 2 +-
 addons/project/project_view.xml               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 25a47ecbadc..8f857c28556 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -213,7 +213,7 @@ class crm_lead(base_stage, osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'date_closed': fields.datetime('Closed', readonly=True),
         'stage_id': fields.many2one('crm.case.stage', 'Stage',
-                        domain="['&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"),
+                        domain="['&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '&', ('fold', '=', False), '|', ('type', '=', type), ('type', '=', 'both')]"),
         'user_id': fields.many2one('res.users', 'Salesperson'),
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 6b4839b7b2b..2a3fab58730 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -185,7 +185,7 @@ class hr_applicant(base_stage, osv.Model):
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage',
-                        domain="['|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
+                        domain="['&', ('fold', '=', False), '|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=AVAILABLE_STATES, string="State", readonly=True,
                 help='The state is set to \'Draft\', when a case is created.\
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index d1866f124af..8fd2db3425a 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -107,7 +107,7 @@
           <form string="Jobs - Recruitment Form" version="7.0">
             <header>
                 <button name="case_close_with_emp" string="Hire" type="object"
-                        states="open,pending" class="oe_highlight"/>
+                        states="draft,open,pending" class="oe_highlight"/>
                 <button name="case_cancel" string="Refuse" type="object"
                         states="draft,open,pending" class="oe_highlight"/>
                 <field name="stage_id" widget="statusbar" clickable="True"/>
diff --git a/addons/project/project.py b/addons/project/project.py
index f16cb905807..c9bcb643150 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -739,7 +739,7 @@ class task(base_stage, osv.osv):
         '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',
-                        domain="['|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=_TASK_STATE, string="State", readonly=True,
                 help='The state is set to \'Draft\', when a case is created.\
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f864e207141..9fe87479ce6 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -424,7 +424,7 @@
                             <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                     states="cancelled,done" context="{'button_reactivate':True}"/>
                             <button name="action_close" string="Done" type="object"
-                                    states="draft,open,pending" class="oe_highlight"/>
+                                    states="draft,open,pending"/>
                             <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
                                     states="pending,open,draft" groups="project.group_delegate_task"/>
                             <button name="do_cancel" string="Cancel" type="object"

From 1be5a4d452f63e5c005e278b99a2390a1c5da682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 3 Sep 2012 11:55:26 +0200
Subject: [PATCH 714/999] [FIX] hr_holidays: fixed wrong condition due to bad
 merge of trunk.

bzr revid: tde@openerp.com-20120903095526-su8jionaltao0x2k
---
 addons/hr_holidays/hr_holidays.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 4843393e19d..759170224bd 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -379,7 +379,7 @@ class hr_holidays(osv.osv):
             
     def holidays_validate_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids):
-            if obj.holiday_status_id.double_validation:
+            if obj.double_validation:
                 self.message_post(cr, uid, [obj.id], 
                     _("The request has been <b>double validated</b>. The validation process is now over."), context=context)
             else:
@@ -391,6 +391,7 @@ class hr_holidays(osv.osv):
             self.message_post(cr, uid, [obj.id],
                 _("The request has been <b>refused</b>. The validation process is now over."),  context=context)
 
+
 class resource_calendar_leaves(osv.osv):
     _inherit = "resource.calendar.leaves"
     _description = "Leave Detail"

From f29be675e2b63a85c0e2d1032fb448dc9714b6a4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 3 Sep 2012 11:55:27 +0200
Subject: [PATCH 715/999] [FIX] all image stuff on groups, users, partners

bzr revid: fp@tinyerp.com-20120903095527-7rk7wxuldv80fj4v
---
 openerp/addons/base/res/res_partner.py        |  28 ++++++++----------
 openerp/addons/base/res/res_users.py          |   1 +
 openerp/addons/base/res/res_users_view.xml    |   6 ++--
 openerp/addons/base/static/src/img/avatar.png | Bin 10341 -> 22372 bytes
 .../base/static/src/img/company_image.png     | Bin 4127 -> 22053 bytes
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index e4d6d0341b0..56cb08fa41d 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -225,14 +225,16 @@ class res_partner(osv.osv):
             return [context['category_id']]
         return False
 
-    def _get_default_image(self, cr, uid, is_company, context=None):
+    def _get_default_image(self, cr, uid, is_company, context=None, colorize=False):
         if is_company:
             image = open(openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')).read()
         else:
             from PIL import Image
             from StringIO import StringIO
-            from random import random
-            color = (int(random() * 192 + 32), int(random() * 192 + 32), int(random() * 192 + 32))
+            color = (255,255,255)
+            if colorize:
+                from random import random
+                color = (int(random() * 192 + 32), int(random() * 192 + 32), int(random() * 192 + 32))
             face = Image.open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png'))
             avatar = Image.new('RGB', face.size)
             avatar.paste(color)
@@ -240,7 +242,7 @@ class res_partner(osv.osv):
             buffer = StringIO()
             avatar.save(buffer, 'PNG')
             image = buffer.getvalue()
-        return tools.image_resize_image_big(image.encode('base64'))
+        return image.encode('base64')
 
     _defaults = {
         'active': True,
@@ -253,9 +255,7 @@ class res_partner(osv.osv):
         'is_company': False,
         'type': 'default',
         'use_parent_address': True,
-        'image': lambda self, cr, uid, context: self._get_default_image(cr, uid, False, context),
-        'image_small': lambda self, cr, uid, context: self._get_default_image(cr, uid, False, context),
-        'image_medium': lambda self, cr, uid, context: self._get_default_image(cr, uid, False, context),
+        'image': lambda self, cr, uid, context: self._get_default_image(cr, uid, context.get('default_is_company', False), context),
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -333,9 +333,6 @@ class res_partner(osv.osv):
             domain_siblings = [('parent_id', '=', vals['parent_id']), ('use_parent_address', '=', True)]
             update_ids = [vals['parent_id']] + self.search(cr, uid, domain_siblings, context=context)
             self.update_address(cr, uid, update_ids, vals, context)
-        if 'image' not in vals :
-            image_value = self._get_default_image(cr, uid, vals.get('is_company', False) or context.get('default_is_company'), context)
-            vals.update(tools.image_get_resized_images(image_value, return_big=True))
         return super(res_partner,self).create(cr, uid, vals, context=context)
 
     def update_address(self, cr, uid, ids, vals, context=None):
@@ -379,18 +376,17 @@ class res_partner(osv.osv):
         email_regex = re.compile('([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8})')
         contact_regex_res = contact_regex.findall(name)
         email_regex_res = email_regex.findall(name)
+        email = False
         if contact_regex_res:
             name = contact_regex_res[0][0].rstrip(' ') # remove extra spaces on the right
             email = contact_regex_res[0][1]
-            rec_id = self.create(cr, uid, {self._rec_name: name, 'email': email}, context);
-            return self.name_get(cr, uid, [rec_id], context)[0]
         elif email_regex_res:
             email = '%s' % (email_regex_res[0])
-            rec_id = self.create(cr, uid, {self._rec_name: email, 'email': email}, context);
-            return self.name_get(cr, uid, [rec_id], context)[0]
         else:
-            rec_id = super(res_partner, self).create(cr, uid, {self._rec_name: name}, context)
-            return self.name_get(cr, uid, [rec_id], context)[0]
+            pass
+        data = {self._rec_name: name, 'email': email}
+        rec_id = self.create(cr, uid, data, context);
+        return self.name_get(cr, uid, [rec_id], context)[0]
 
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index ca45f03258c..d0f07daa004 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -251,6 +251,7 @@ class res_users(osv.osv):
         'company_id': _get_company,
         'company_ids': _get_companies,
         'groups_id': _get_group,
+        'image': lambda self, cr, uid, context: self.pool.get('res.partner')._get_default_image(cr, uid, False, context, colorize=True),
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 9c32d32287c..a1d0b0d5f2e 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -88,7 +88,7 @@
                 <form string="Users" version="7.0">
                     <field name="id" invisible="1"/>
                     <sheet>
-                        <field name="image_medium" widget='image' class="oe_avatar oe_left"/>
+                        <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
@@ -195,9 +195,7 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Users" version="7.0">
-                    <div class="oe_right oe_avatar">
-                        <field name="image_small" widget='image' class="oe_image_small"/>
-                    </div>
+                    <field name="image" widget='image' class="oe_right oe_avatar" options='{"preview_image": "image_small"}'/>
                     <h1>
                         <field name="name" readonly="1" class="oe_inline"/>
                         (<field name="login" readonly="1" class="oe_inline"/>)
diff --git a/openerp/addons/base/static/src/img/avatar.png b/openerp/addons/base/static/src/img/avatar.png
index 93235db8afa7085e727ea6dc04fb3170ee0d92c1..0965da9de9985808e647a0f5d38c3eb7e63530f0 100644
GIT binary patch
literal 22372
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
R#(Dq%002ovPDHLkV1iFhl?ng=

literal 10341
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

diff --git a/openerp/addons/base/static/src/img/company_image.png b/openerp/addons/base/static/src/img/company_image.png
index 2995ba1264474a44a30f2c092840683c39effca3..0a52179c77986bcadca6d9011d8d5e476b1eb9d1 100644
GIT binary patch
literal 22053
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
O5OrlOc%|ZV^nU<Xe=&~$

literal 4127
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


From a4f40c0ce513558db983188ad0084508d63ba1d3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 3 Sep 2012 13:24:18 +0200
Subject: [PATCH 716/999] [ADD] autocompletion sections, partitioning

bzr revid: xmo@openerp.com-20120903112418-nhgmb6fs50ju0cfz
---
 addons/base_import/static/src/css/import.css | 13 ++++++
 addons/base_import/static/src/js/import.js   | 46 +++++++++++++++++---
 2 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css
index 207f2aed9c6..c613357537b 100644
--- a/addons/base_import/static/src/css/import.css
+++ b/addons/base_import/static/src/css/import.css
@@ -43,3 +43,16 @@
     width: 10em;
     text-align: right;
 }
+
+.ui-menu .oe_import_completion_category {
+    background-color: #f0f0f0;
+    /* jquery-ui requirements otherwise background color is buggy */
+    float: left;
+    zoom: 1;
+    width: 100%;
+    padding: 0;
+    margin: 0;
+}
+.ui-menu .ui-menu-item .oe_import_completion_required {
+    color: #2962ff;
+}
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index efcb756feb5..797a094b390 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -131,30 +131,62 @@ openerp.base_import = function (instance) {
             this.render_fields_matches(result, $fields);
             $fields.autocomplete({
                 minLength: 0,
+                html: true,
                 source: this.generate_fields_completion(result)
-            });
+            }).data('autocomplete')._renderItem = function (ul, item) {
+                var $item = $('<li>').data('item.autocomplete', item).appendTo(ul);
+
+                if (item.category) {
+                    return $item
+                        .addClass('oe_import_completion_category')
+                        .text(item.label);
+                } else {
+                    return $item.append(
+                        $('<a>')
+                            .toggleClass('oe_import_completion_required', !!item.required)
+                            .text(item.label));
+                }
+            };
         },
         generate_fields_completion: function (root) {
             // Display nice names to user, but send logical names to server
             this.field_label_to_name = {};
-            var completions = [];
+            var basic = [];
+            var regulars = [{label: _t("Normal Fields"), category: true}];
+            var o2m = [{label: _t("Relation Fields (o2m)"), category: true}];
             var self = this;
-            function traverse(field, ancestors) {
+            function traverse(field, ancestors, collection) {
+                var subfields = field.fields;
                 var field_path = ancestors.concat(field);
                 var label = _(field_path).pluck('string').join(' / ');
                 self.field_label_to_name[label] = _(field_path).pluck('name').join('/');
-                completions.push(label);
 
-                var subfields = field.fields;
+                // If non-relational, m2o or m2m, collection is regulars
+                if (!collection) {
+                    if (field.name === 'id') {
+                        collection = basic
+                    } else if (_.isEmpty(subfields)
+                            || _.isEqual(_.pluck(subfields, 'name'), ['id', '.id'])) {
+                        collection = regulars;
+                    } else {
+                        collection = o2m;
+                    }
+                }
+
+                collection.push({
+                    label: label,
+                    required: field.required
+                });
+
                 for(var i=0, end=subfields.length; i<end; ++i) {
-                    traverse(subfields[i], field_path);
+                    traverse(subfields[i], field_path, collection);
                 }
             }
             _(root.fields).each(function (field) {
                 traverse(field, []);
             });
 
-            return completions;
+            return basic.concat(regulars, o2m);
         },
         render_fields_matches: function (result, $fields) {
             if (_(result.matches).isEmpty()) { return; }

From df6668cd7896956e11fc03dc035e2591cb5ecd41 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 3 Sep 2012 13:30:59 +0200
Subject: [PATCH 717/999] [REM] Session remove on_session

bzr revid: al@openerp.com-20120903113059-8jts6776xryjeadl
---
 addons/web/static/src/js/corelib.js   |  6 ------
 addons/web/static/src/js/coresetup.js | 20 +-------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 8a28c0a8a4d..c74c2d5dc03 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -1323,12 +1323,6 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
                     deferred.resolve(response["result"], textStatus, jqXHR);
                 } else if (response.error.data.type === "session_invalid") {
                     self.uid = false;
-                    // TODO deprecate or use a deferred on login.do_ask_login()
-                    self.on_session_invalid(function() {
-                        self.rpc(url, payload.params,
-                            function() { deferred.resolve.apply(deferred, arguments); },
-                            function() { deferred.reject.apply(deferred, arguments); });
-                    });
                 } else {
                     deferred.reject(response.error, $.Event());
                 }
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 38cf57387d1..0c10d40f0ca 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -113,20 +113,6 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
         this.set_cookie('session_id', '');
         return this.rpc("/web/session/destroy", {});
     },
-    on_session_valid: function() {
-    },
-    /**
-     * Called when a rpc call fail due to an invalid session.
-     * By default, it's a noop
-     */
-    on_session_invalid: function(retry_callback) {
-    },
-    /**
-     * Fetches a cookie stored by an openerp session
-     *
-     * @private
-     * @param name the cookie's name
-     */
     get_cookie: function (name) {
         if (!this.name) { return null; }
         var nameEQ = this.name + '|' + name + '=';
@@ -160,9 +146,8 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
     /**
      * Load additional web addons of that instance and init them
      *
-     * @param {Boolean} [no_session_valid_signal=false] prevents load_module from triggering ``on_session_valid``.
      */
-    load_modules: function(no_session_valid_signal) {
+    load_modules: function() {
         var self = this;
         return this.rpc('/web/session/modules', {}).pipe(function(result) {
             var lang = self.user_context.lang,
@@ -195,9 +180,6 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
             return loaded.then(function() {
                 self.on_modules_loaded();
                 self.trigger('module_loaded');
-                if (!no_session_valid_signal) {
-                    self.on_session_valid();
-                }
             });
         });
     },

From 66093c96489660f11edcf7f27842bf8986094e21 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 3 Sep 2012 17:17:04 +0530
Subject: [PATCH 718/999] [IMP] project_issue: solved stage issue of stage
 cancelled

bzr revid: cha@tinyerp.com-20120903114704-9tddgq7zo0w969wy
---
 addons/project_issue/project_issue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index c2ff76d05a6..368ec2cb9d7 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -240,7 +240,7 @@ 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',
-                        domain="['|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),

From 716651c27df1757f26a3bef9a1de229c8253dd43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 3 Sep 2012 13:59:54 +0200
Subject: [PATCH 719/999] [IMP] point_of_sale: alternative css without hover
 effects for resistive screens

bzr revid: fva@openerp.com-20120903115954-t26j8qx54a6o9pta
---
 addons/point_of_sale/__openerp__.py         | 3 ++-
 addons/point_of_sale/static/src/js/TODO.txt | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index bcc1eeda001..ec5add595a7 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -92,7 +92,8 @@ Main features:
         'static/src/js/main.js',
     ],
     'css': [
-        'static/src/css/pos.css',
+        'static/src/css/pos.css', # this is the default css with hover effects
+        #'static/src/css/pos_nohover.css', # this css has no hover effects (for resistive touchscreens)
         'static/src/css/keyboard.css'
     ],
     'qweb': ['static/src/xml/pos.xml'],
diff --git a/addons/point_of_sale/static/src/js/TODO.txt b/addons/point_of_sale/static/src/js/TODO.txt
index 5eeb4c2606a..1696f0b117d 100644
--- a/addons/point_of_sale/static/src/js/TODO.txt
+++ b/addons/point_of_sale/static/src/js/TODO.txt
@@ -47,6 +47,7 @@ TODO AUG 20
         v supprimer l'écran
         v bloquer sur l'impression
         v L'impression est foireuse
+        - description_sales
 
 * CLIENT
     v create a new branch

From ad9e544f047eb8759ab7b362e6e81042eba04c3a Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cto@openerp.com>
Date: Mon, 3 Sep 2012 14:06:00 +0200
Subject: [PATCH 720/999] [FIX] Bad employeee demo

bzr revid: cto@openerp.com-20120903120600-dpeq5gnnmn5qd500
---
 addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
index bf6f19b653c..352861263b8 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -9,7 +9,7 @@
 -
   I assign this product(Service on Timesheet) and journal(Timesheet Journal) to employee "Quentin Paolino"
 -
-  !record {model: hr.employee, id: hr.employee_demo}:
+  !record {model: hr.employee, id: hr.employee_qdp}:
     product_id: product.product_product_consultant
     journal_id: hr_timesheet.analytic_journal
 -

From e20d096a2654fb4987ba4178ce1819779bf10c50 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 3 Sep 2012 14:06:21 +0200
Subject: [PATCH 721/999] [IMP] class on projects

bzr revid: fp@tinyerp.com-20120903120621-cv1k580qiexrq1i7
---
 addons/mail/mail_group_view.xml | 2 +-
 addons/project/project_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index d21d32a3893..67327c28f2e 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -58,7 +58,7 @@
             <field name="arch" type="xml">
                 <form string="Group Form" version="7.0">
                     <sheet class="openerp_mail_group_sheet">
-                        <field name="image_small" widget='image' class="oe_avatar oe_left"/>
+                        <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
                         <div class="oe_title">
                             <div class="oe_edit_only">
                                 <label for="name" string="Group Name"/> 
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f864e207141..56d1b27561c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -218,7 +218,7 @@
             <field name="name">project.project.kanban</field>
             <field name="model">project.project</field>
             <field name="arch" type="xml">
-                <kanban>
+                <kanban version="7.0" class="oe_background_grey">
                     <field name="effective_hours"/>
                     <field name="planned_hours"/>
                     <field name="name"/>

From 2a980a13f652f4a90a0994451fc0bcd02d43bc4d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 3 Sep 2012 14:10:16 +0200
Subject: [PATCH 722/999] [IMP] grey background for projects

bzr revid: fp@tinyerp.com-20120903121016-4d4fm4q976c3ha9d
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f864e207141..56d1b27561c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -218,7 +218,7 @@
             <field name="name">project.project.kanban</field>
             <field name="model">project.project</field>
             <field name="arch" type="xml">
-                <kanban>
+                <kanban version="7.0" class="oe_background_grey">
                     <field name="effective_hours"/>
                     <field name="planned_hours"/>
                     <field name="name"/>

From 279ef4d7490d7d4318c2cab1439a0c715876693b Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 3 Sep 2012 14:10:21 +0200
Subject: [PATCH 723/999] resizing of product picture

bzr revid: mit@openerp.com-20120903121021-ilstibfz2oybqpc9
---
 addons/stock/static/src/css/stock.css | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/stock/static/src/css/stock.css b/addons/stock/static/src/css/stock.css
index 449c1102fce..1efbaf5e3c4 100644
--- a/addons/stock/static/src/css/stock.css
+++ b/addons/stock/static/src/css/stock.css
@@ -9,8 +9,8 @@
 }
 
 .oe_product_img {
-    width: 150px;
-    height: 150px;
+    width: 80px;
+    height: 80px;
     text-align: center;
     overflow: hidden;
     -moz-border-radius: 3px;
@@ -25,15 +25,15 @@
 }
 
 .oe_product_photo {
-    width: 150px;
+    width: 80px;
     height: auto;
-    clip: rect(5px, 100px, 105px, 0px);
+    clip: rect(5px, 70px, 75px, 0px);
 }
 
 .oe_product_photo_wide {
-    height: 150px;
+    height: 80px;
     width: auto;
-    clip: rect(0px, 110px, 100px, 10px);
+    clip: rect(0px, 80px, 70px, 10px);
 }
 
 .oe_product_desc {

From 5fd5a8acce375e2406ade46645f0a99abbba90dd Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 3 Sep 2012 17:44:32 +0530
Subject: [PATCH 724/999] [IMP] hr_recruitment: added fold field in form
 viewfor stages

bzr revid: cha@tinyerp.com-20120903121432-xla6t3m0lskq866q
---
 addons/hr_recruitment/hr_recruitment_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 8fd2db3425a..dd3c00d4514 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -375,11 +375,12 @@
         <field name="model">hr.recruitment.stage</field>
         <field name="arch" type="xml">
             <form string="Stage" version="7.0">
-                <group string="Stage Definition">
+                <group string="Stage Definition" col="4">
                     <field name="name"/>
                     <field name="department_id"/>
                     <field name="sequence"/>
                     <field name="state"/>
+                    <field name="fold"/>
                 </group>
                 <separator string="Requirements"/>
                 <field name="requirements"/>

From d961735db09a7bc24c02f7744ed8e653b3de55a0 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Mon, 3 Sep 2012 14:23:21 +0200
Subject: [PATCH 725/999] [FIX] hr_holidays: remove the `confirm` signal call
 since that transition was removed in rev. 7335.

bzr revid: vmt@openerp.com-20120903122321-y7f4r35b7b11iv5m
---
 addons/hr_holidays/test/test_hr_holiday.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
index 9228a7a381e..f0e85d552cb 100644
--- a/addons/hr_holidays/test/test_hr_holiday.yml
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -10,10 +10,6 @@
     date_to: !eval time.strftime('%Y-%m-11 19:00:00')
     employee_id: hr.employee_fp
     type: remove
--
-  I confirmed the holiday request by clicking on "Confirm" button.
--
-  !workflow {model: hr.holidays, action: confirm, ref: hr_holidays_employee1_cl}
 -
   I find a small mistake on my leave request to I click on "Refuse" button to correct a mistake.
 -

From 81115666a1a195919e7d24fcf8fd0b3214e758e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 3 Sep 2012 14:26:49 +0200
Subject: [PATCH 726/999] [IMP] point_of_sale: only sell products that can be
 sold ...

bzr revid: fva@openerp.com-20120903122649-etypfgvdjo3s8p0s
---
 addons/point_of_sale/static/src/js/models.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index a1f6def6bf3..2dd13638300 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -143,7 +143,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                     return fetch(
                         'product.product', 
                         ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type'],
-                        [['pos_categ_id','!=', false]],
+                        [['pos_categ_id','!=', false],['sale_ok','=',true]],
                         {pricelist: self.get('shop').pricelist_id[0]} // context for price
                     );
                 }).pipe(function(products){

From b5c60844da1d54dacc75f77ac3f6031849b8621b Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Mon, 3 Sep 2012 14:29:02 +0200
Subject: [PATCH 727/999] [FIX] yaml_import: really raise YamlImportExceptions.

bzr revid: vmt@openerp.com-20120903122902-djhju2raxkmaspik
---
 openerp/tools/yaml_import.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 6171b2ebd21..f487070fea0 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -811,8 +811,6 @@ class YamlInterpreter(object):
             is_preceded_by_comment = self._log_node(node, is_preceded_by_comment)
             try:
                 self._process_node(node)
-            except YamlImportException, e:
-                _logger.exception(e)
             except Exception, e:
                 _logger.exception(e)
                 raise

From 9c5c637b60f02a39a3e6a11ea45d705a38e85a74 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 3 Sep 2012 18:03:09 +0530
Subject: [PATCH 728/999] [IMP] Improved the 'hr.recruitment.stage' form view.

bzr revid: mdi@tinyerp.com-20120903123309-1x804zlvztjw5r2m
---
 addons/hr_recruitment/hr_recruitment_view.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index dd3c00d4514..1ded2e67db9 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -375,12 +375,16 @@
         <field name="model">hr.recruitment.stage</field>
         <field name="arch" type="xml">
             <form string="Stage" version="7.0">
-                <group string="Stage Definition" col="4">
-                    <field name="name"/>
-                    <field name="department_id"/>
-                    <field name="sequence"/>
-                    <field name="state"/>
-                    <field name="fold"/>
+                <group string="Stage Definition">
+                    <group>
+                        <field name="name"/>
+                        <field name="department_id"/>
+                    </group>
+                    <group>
+                        <field name="state"/>
+                        <field name="sequence"/>
+                        <field name="fold"/>
+                    </group>
                 </group>
                 <separator string="Requirements"/>
                 <field name="requirements"/>

From 8295b4f18192e97ce30cc75f7b41d0306a9e4b23 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 3 Sep 2012 14:48:18 +0200
Subject: [PATCH 729/999] [IMP] ir.tranlsation#translate: create ir.translation
 entries for a particular record

bzr revid: fme@openerp.com-20120903124818-myjy2616uv3blyki
---
 openerp/addons/base/ir/ir_translation.py | 28 ++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index 231b9ba0e93..05f5071a2d7 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -331,11 +331,31 @@ class ir_translation(osv.osv):
     def translate(self, cr, uid, model, id, field=None, context=None):
         trans_model = self.pool.get(model)
         domain = ['&', ('res_id', '=', id), ('name', 'ilike', model + ',')]
+        langs_ids = self.pool.get('res.lang').search(cr, uid, [], context=context)
+        langs = [lg.get('code') for lg in self.pool.get('res.lang').read(cr, uid, langs_ids, ['code'], context=context)]
+        main_lang = langs.pop(0)
+        translatable_fields = []
         for f, info in trans_model._all_columns.items():
-            if info.parent_model and info.column.translate:
-                domain_id = trans_model.read(cr, uid, [id], [info.parent_column], context=context)[0][info.parent_column][0]
-                domain.insert(0, '|')
-                domain.extend(['&', ('res_id', '=', domain_id), ('name', '=', "%s,%s" % (info.parent_model, f))])
+            if info.column.translate:
+                if info.parent_model:
+                    domain_id = trans_model.read(cr, uid, [id], [info.parent_column], context=context)[0][info.parent_column][0]
+                    translatable_fields.append({ 'name': f, 'id': domain_id, 'model': info.parent_model })
+                    domain.insert(0, '|')
+                    domain.extend(['&', ('res_id', '=', domain_id), ('name', '=', "%s,%s" % (info.parent_model, f))])
+                else:
+                    translatable_fields.append({ 'name': f, 'id': id, 'model': model })
+        if len(langs):
+            fields = [f.get('name') for f in translatable_fields]
+            record = trans_model.read(cr, uid, [id], fields, context={ 'lang': main_lang })[0]
+            for lg in langs:
+                for f in translatable_fields:
+                    # Check if record exists, else create it (at once)
+                    sql = """INSERT INTO ir_translation (lang, src, name, type, res_id, value)
+                        SELECT %s, %s, %s, 'field', %s, %s WHERE NOT EXISTS
+                        (SELECT 1 FROM ir_translation WHERE lang=%s AND name=%s AND res_id=%s);
+                        """
+                    name = "%s,%s" % (f['model'], f['name'])
+                    cr.execute(sql, (lg, record[f['name']], name, f['id'], record[f['name']], lg, name, f['id']))
 
         action = {
             'name': 'Translate',

From 6040787bb01b0b02b4d0708bd4f3c6e8dfe6d93a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 3 Sep 2012 14:48:38 +0200
Subject: [PATCH 730/999] [FIX] point_of_sale: forgot to add the nohover css
 file

bzr revid: fva@openerp.com-20120903124838-gmn4wsjrbqnhbi9m
---
 .../static/src/css/pos_nohover.css            | 1168 +++++++++++++++++
 1 file changed, 1168 insertions(+)
 create mode 100644 addons/point_of_sale/static/src/css/pos_nohover.css

diff --git a/addons/point_of_sale/static/src/css/pos_nohover.css b/addons/point_of_sale/static/src/css/pos_nohover.css
new file mode 100644
index 00000000000..6f24abda53b
--- /dev/null
+++ b/addons/point_of_sale/static/src/css/pos_nohover.css
@@ -0,0 +1,1168 @@
+@font-face{
+    font-family: 'Inconsolata';
+    src: url(../fonts/Inconsolata.otf);
+}
+
+.point-of-sale {
+    padding: 0;
+    margin: 0;
+    background-color: #f0eeee;
+    font-family: "Lucida Grande", Helvetica, Verdana, Arial;
+    color: #555555;
+    font-size: 12px;
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    -webkit-user-select: none;
+       -moz-user-select: none;
+            user-select: none;
+}
+
+.point-of-sale .shadow-top{
+    position: absolute;
+    top:0;
+    left:0;
+    right:0;
+    height:10px;
+    background: -webkit-linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+    background:    -moz-linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+    background:     -ms-linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+    background:         linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+}
+
+.point-of-sale .darker-shadow-top{
+    position: absolute;
+    top:0;
+    left:0;
+    right:0;
+    height:10px;
+    background: -webkit-linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+    background:    -moz-linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+    background:     -ms-linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+    background:         linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+}
+
+/*  ********* The black loading screen ********* */
+
+.point-of-sale .loader{
+    background-color: #222;
+    position:absolute;
+    left:0px;
+    top:0px;
+    width:100%;
+    height:100%;
+    z-index: 999;
+    text-align: center;
+}
+.point-of-sale .loader img{
+    position:absolute;
+    top:50%;
+    left:50%;
+}
+
+/*  ********* Generic element styling  ********* */
+
+.point-of-sale a {
+    text-decoration: none;
+    color: #555555;
+}
+.point-of-sale button, .point-of-sale a.button {
+    display: inline-block;
+    cursor: pointer;
+    padding: 4px 10px;
+    font-size: 11px;
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+    background: #e2e2e2;
+    background: -webkit-gradient(linear, left top, left bottom, from(#f0f0f0), to(#e2e2e2));
+    background: -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background:  -ms-linear-gradient(#f0f0f0, #e2e2e2);
+    background:      linear-gradient(#f0f0f0, #e2e2e2);
+}
+.point-of-sale ul, .point-of-sale ol {
+    padding: 0;
+    margin: 0;
+}
+.point-of-sale li {
+    list-style-type: none;
+}
+.point-of-sale .pos-right-align {
+    text-align: right;
+}
+.point-of-sale .pos-right-align input {
+    text-align: right;
+    border: 1px solid #cecbcb;
+    border-radius: 4px;
+}
+
+/*  ********* The black header bar ********* */
+
+
+.point-of-sale #topheader {
+    position:absolute;
+    left:0;
+    top:0;
+    width: 100%;
+    height: 33px;
+    margin:0;
+    padding:0;
+    color: gray;
+    border-top: solid 1px #d3d3d3;
+    border-bottom: solid 1px black;
+    background: #393939;
+    background: -moz-linear-gradient(#7b7979, #393939);
+    background: -webkit-gradient(linear, left top, left bottom, from(#7b7979), to(#393939));
+}
+
+/*  a) The left part of the top-bar */
+
+.point-of-sale #branding{
+    position: absolute;
+    display: table-cell;
+    left:0;
+    top:0;
+    width:439px;
+    height:100%;
+    margin:0;
+    padding:0;
+    border-right: 1px solid #373737;
+    text-align:left;
+    line-height:100%;
+    vertical-align: middle;
+}
+.point-of-sale #branding img {
+    height: 32px;
+    width: 116px;
+    margin-left:5px;
+    vertical-align:middle;
+} 
+.point-of-sale #branding .username{
+    float:right;
+    color:#DDD;
+    font-size:16px;
+    margin-right:32px;
+    margin-top:10px;
+    font-style:italic;
+}
+
+/*  b) The right part of the top-bar */
+
+.point-of-sale #rightheader {
+    position: absolute;
+    left:440px;
+    right:0;
+    top:0;
+    height:100%;
+}
+
+.point-of-sale #rightheader button {
+    color: #273072;
+    height:27px;
+    margin:3px;
+    margin-right:0px;
+    border: 1px solid #353A7E;
+    background: #7f82ac;
+    background: -webkit-gradient(linear, left top, left bottom, from(#b2b3d7), to(#7f82ac));
+    background: -moz-linear-gradient(#b2b3d7, #7f82ac);
+    background:  -ms-linear-gradient(#b2b3d7, #7f82ac);
+    background:      linear-gradient(#b2b3d7, #7f82ac);
+}
+
+.point-of-sale #rightheader button.neworder-button {
+    width: 32px;
+    margin-left:4px;
+    margin-right:4px;
+}
+
+.point-of-sale div#order-selector {
+    display: inline;
+}
+.point-of-sale ol#orders {
+    display: inline;
+}
+.point-of-sale li.order-selector-button {
+    display: inline;
+}
+.point-of-sale li.selected-order button {
+    font-weight: 900;
+}
+
+/*  c) The session buttons */
+
+.point-of-sale #rightheader .header-button{
+    float:right;
+    height:32px;
+    padding-left:10px;
+    padding-right:10px;
+    border-right:  1px solid #3a3a3a;
+    border-left:  1px solid #3a3a3a;
+    color:#DDD;
+    line-height:32px;
+    text-align:center;
+    cursor: pointer;
+
+    -webkit-transition-property: background;
+    -webkit-transition-duration: 0.2s;
+    -webkit-transition-timing-function: ease-out;
+}
+.point-of-sale #rightheader .header-button:last-child{
+    border-left:  1px solid #3a3a3a;
+}
+
+/*  c) The notifications indicator */
+
+.point-of-sale .oe_pos_synch-notification{
+    float:right; 
+    color: rgba(255,255,255,0.4);
+    padding: 8px;
+    line-height:16px;
+    font-size:16px;
+    vertical-align:middle;
+    font-style: italic;
+    cursor:pointer;
+}
+
+.point-of-sale .oe_pos_synch-notification .oe_status_red{
+    display:inline-block;
+    cursor:pointer;
+    width:16px; height:16px;
+    background: url("../img/gtk-no.png") no-repeat ;
+}
+
+.point-of-sale .oe_pos_synch-notification .oe_status_green{
+    display:inline-block;
+    width:16px; height:16px;
+    background: url("../img/gtk-yes.png") no-repeat;
+}
+
+/*  ********* Contains everything below the  bar ********* */
+
+.point-of-sale #content {
+    width: 100%;
+    position: absolute;
+    top: 35px;
+    bottom: 0;
+    background: #F0EEEE;
+}
+
+/*  ********* The leftpane contains the order, numpad and paypad ********* */
+
+.point-of-sale #leftpane {
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    position:absolute;
+    left:0;
+    width:440px;
+    top:0px;
+    /*bottom:105px;*/
+    bottom:0;
+    border-right: solid 1px #CECBCB;
+    background-color: white;
+}
+.point-of-sale #leftpane footer {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    background: #F0EEEE;
+    white-space: nowrap;
+}
+
+/*  ********* The paypad contains the payment buttons ********* */
+
+.point-of-sale #paypad {
+    padding: 8px 4px 8px 8px;
+    display: inline-block;
+    text-align: center;
+    vertical-align: top;
+}
+.point-of-sale #paypad button {
+    height: 54px;
+    width: 208px;
+    margin: 0 -3px;
+    font-weight: bold;
+    vertical-align: middle;
+    color: #555555;
+    border-top: 1px solid #efefef;
+    font-size: 14px;
+}
+
+/*  ********* The Numpad ********* */
+
+.point-of-sale #numpad {
+    padding: 8px 8px 8px 4px;
+    display: inline-block;
+    text-align: center;
+}
+.point-of-sale #numpad button {
+    height: 54px;
+    width: 54px;
+    margin: 0 -3px;
+    font-weight: bold;
+    vertical-align: middle;
+    color: #555555;
+    border-top: 1px solid #efefef;
+}
+.point-of-sale #numpad .selected-mode {
+    color: white;
+    background: #7f82ac;
+    background: -webkit-gradient(linear, left top, left bottom, from(#9d9fc5), to(#7f82ac));
+    background: -moz-linear-gradient(#9d9fc5, #7f82ac);
+    background:  -ms-linear-gradient(#9d9fc5, #7f82ac);
+    background:      linear-gradient(#9d9fc5, #7f82ac);
+}
+.point-of-sale .input-button {
+    font-size: 24px;
+}
+.point-of-sale .mode-button, .point-of-sale #numpad-delete, .point-of-sale #numpad-minus {
+    font-size: 14px;
+}
+
+/*  ********* The right pane contains the screens and headers ********* */
+
+.point-of-sale #rightpane {
+    position: absolute;
+    top: 0;
+    /*bottom: 105px;*/
+    bottom:0;
+    left: 440px;
+    right: 0;
+    vertical-align: top;
+}
+
+.point-of-sale #rightpane header {
+    padding: 0;
+    height: 32px;
+    border-bottom: 1px solid #cecbcb;
+    background: #d3d3d3;
+    background: -moz-linear-gradient(white, #d3d3d3);
+    background: -webkit-gradient(linear, left top, left bottom, from(white), to(#d3d3d3));
+}
+
+/*  ********* The product list  ********* */
+
+.point-of-sale .product-list {
+    padding:10px;
+}
+
+.point-of-sale .product-list-scroller{
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    width:100%;
+    height:100%;
+    overflow: hidden;
+}
+.point-of-sale .product-list-container {
+    position:absolute;
+    top:0px;
+    bottom:0px;
+    left:0px;
+    right:0px;
+    background: #eeedff;
+}
+
+/*  a) the product list navigation bar */
+
+.point-of-sale .breadcrumb li {
+    float: left;
+    line-height: 32px;
+    height: 32px;
+}
+.point-of-sale .breadcrumb li:last-child {
+    padding-right: 3px;
+    border-right: 1px solid #c5c5c5;
+}
+.point-of-sale .breadcrumb a {
+    display: inline-block;
+    padding: 0 9px;
+    vertical-align: top;
+    text-shadow: #f7f7f7 0 1px 1px;
+    color: #555555;
+    font-weight: bold;
+}
+.point-of-sale .bc-arrow {
+    height: 33px;
+}
+.point-of-sale .homeimg {
+    width: 19px;
+    height: 19px;
+    margin: 6px 0;
+}
+
+/*  b) the search box */
+
+.point-of-sale .searchbox {
+    position: absolute;
+    right: 2px;
+}
+.point-of-sale .searchbox input {
+    width: 130px;
+    border-radius: 11px;
+    border: 1px solid #cecbcb;
+    padding: 3px 19px;
+    margin: 6px;
+    background: url("../img/search.png") no-repeat 5px;
+    background-color: white;
+}
+.point-of-sale .search-clear {
+    position: absolute;
+    top: 11px;
+    right: 11px;
+    cursor: pointer;
+    display: none;
+}
+
+/*  c) the categories list */
+
+.point-of-sale #categories {
+    /*background:#f0f0f0;*/
+    position: relative;
+    background-image: url('../img/bg.png');
+    border-bottom: 1px solid #cecbcb;
+}
+.point-of-sale #categories .white-gradient{
+    position: absolute;
+    top:50%;
+    left:0;
+    right:0;
+    bottom:0;
+    background: -webkit-linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+    background:    -moz-linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+    background:     -ms-linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+    background:         linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+}
+.point-of-sale #categories h4 {
+    display: inline-block;
+    margin: 9px 5px;
+}
+
+.point-of-sale .category-list{
+    padding:10px;
+}
+/*  d) the category button */
+
+.point-of-sale .category-button {
+    position: relative;
+    vertical-align: top;
+    display: inline-block;
+    font-size: 11px;
+    margin: 5px;
+    width: 120px;
+    height:120px;
+    background:#fff;
+    border: 1px solid #fff;
+    border-radius: 3px;
+    -webkit-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+       -moz-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+            box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+    cursor: pointer;
+}
+
+.point-of-sale .category-simple-button{
+    position: relative;
+    display: inline-block;
+    font-size: 14px;
+    margin-right:10px;
+    padding:5px;
+
+    cursor: pointer;
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+
+    background: #e2e2e2;
+    background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
+    background:    -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background:     -ms-linear-gradient(#f0f0f0, #e2e2e2);
+    background:         linear-gradient(#f0f0f0, #e2e2e2);
+    -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+       -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+            box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+}
+
+.point-of-sale .category-button .category-img {
+    position: relative;
+    width: 120px;
+    height: 100px;
+    text-align: center;
+    cursor: pointer;
+}
+
+.point-of-sale .category-button .category-img img {
+    max-height: 100px;
+    max-width:  120px;
+}
+
+.point-of-sale .category-button .category-name {
+    position: absolute;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    top:auto;
+    left: 2px;
+    right: 2px;
+    bottom: 2px;
+    background: #8a89ba; /*-webkit-linear-gradient(-90deg,rgba(138,137,186,0),rgba(138,137,186,1), rgba(138,137,186,1));*/
+    padding: 3px;
+    /*color:#8a89ba;*/
+    color: #FFF;
+    cursor: pointer;
+    border-radius: 3px;
+}
+
+/*  e) the product */
+
+.point-of-sale .product {
+    position:relative;
+    vertical-align: top;
+    display: inline-block;
+    line-height: 100px;
+    font-size: 11px;
+    margin: 5px;
+    width: 120px;
+    height:120px;
+    background:#fff;
+    border: 1px solid #fff;
+    border-radius: 3px;
+    -webkit-box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
+       -moz-box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
+            box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
+}
+
+.point-of-sale .product .product-img {
+    position: relative;
+    width: 120px;
+    height: 100px;
+    background: white;
+    text-align: center;
+}
+
+.point-of-sale .product .product-img img {
+    max-height: 100px;
+    max-width:  120px;
+}
+
+.point-of-sale .product .price-tag {
+    position: absolute;
+    top: 2px;
+    right: 2px;
+    vertical-align: top;
+    color: white;
+    line-height: 14px;
+    background: #7f82ac;
+    padding: 2px 5px;
+    border-radius: 3px;
+}
+
+.point-of-sale .product .product-name {
+    position: absolute;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    bottom:0;
+    top:auto;
+    line-height: 14px;
+    width:100%;
+    background: -webkit-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    background:    -moz-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    background:     -ms-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    background:         linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    /*background:#FFF;*/
+    padding: 3px;
+    padding-top:15px;
+}
+
+
+/*  ********* The Screens  ********* */
+
+.point-of-sale .screen {
+    position:absolute;
+    text-align: center;
+    top:0px;
+    bottom:0px;
+    width:100%;
+}
+.point-of-sale .screen header h2 {
+    margin-top: 0px;
+    padding-top: 7px;
+}
+.point-of-sale .screen p{
+    font-size: 18px;
+}
+
+/* a) Layout for the Product Screen */
+
+.point-of-sale .screen .layout-table {
+    border:none;
+    width:100%;
+    height:100%;
+}
+
+.point-of-sale .screen .header-row {
+    border:none;
+    width:100%;
+    height:0px;
+}
+
+.point-of-sale .screen .header-cell{
+    border:none;
+    width:100%;
+    height:0px;
+}
+.point-of-sale .screen .content-row {
+    width:100%;
+    height:100%;
+}
+.point-of-sale .screen .content-cell{
+    width:100%;
+}
+.point-of-sale .screen .content-cell .content-container{
+    height:100%;
+    position:relative;
+}
+
+/* b) The payment screen */
+
+.point-of-sale .pos-step-container {
+    display: inline-block;
+    font-size: 1.5em;
+}
+.point-of-sale .greyed-out{
+    color: #AAA;
+}
+.point-of-sale .pos-step-container input{
+    font-size: 1em;
+}
+
+.point-of-sale .pos-payment-container {
+    text-align: left;
+    min-width: 500px;
+}
+.point-of-sale .pos-payment-container .left-block{
+    display: inline-block;
+    width:49%;
+    margin:0;
+    padding:0;
+    text-align:left;
+}
+.point-of-sale .pos-payment-container .header{
+    margin-top: 50px;
+    margin-bottom:20px;
+    font-weight: bold;
+}
+.point-of-sale .pos-payment-container .infoline{
+    margin-top:5px;
+    margin-bottom:5px;
+}
+.point-of-sale .pos-payment-container .right-block{
+    display: inline-block;
+    width:49%;
+    margin:0;
+    padding:0;
+    text-align:right;
+}
+.point-of-sale .pos-payment-container table {
+    width: 100%;
+    margin-bottom: 20px;
+}
+.point-of-sale .pos-payment-container td {
+    vertical-align: middle;
+}
+.point-of-sale .pos-payment-container .paymentline-type {
+    font-size: 1em;
+    font-weight: bold;
+    margin-right:10px;
+}
+
+/* c) The receipt screen */
+
+.point-of-sale .pos-receipt-container {
+    font-size: 0.75em;
+}
+
+.point-of-sale .pos-sale-ticket {
+    text-align: left;
+    width: 300px;
+    background-color: white;
+    margin: 20px;
+    padding: 15px;
+    padding-bottom:30px;
+    display: inline-block;
+    font-family: "Inconsolata";
+    -webkit-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+            box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+}
+.point-of-sale .pos-sale-ticket .emph{
+    font-size: 20px;
+    margin:5px;
+}
+.point-of-sale .pos-sale-ticket table {
+    width: 100%;
+    border: 0;
+}
+.point-of-sale .pos-sale-ticket table td {
+    border: 0;
+}
+
+@media print {
+    .point-of-sale #topheader, .point-of-sale #leftpane {
+        display: none !important;
+    }
+    .point-of-sale #content {
+        top: 0px !important;
+    }
+    .point-of-sale #rightpane {
+        left: 0px !important;
+        background-color: white;
+    }
+    #receipt-screen header {
+        display: none !important;
+    }
+    #receipt-screen {
+        text-align: left;
+    }
+    .pos-sale-ticket {
+        margin: 0;
+    }
+}
+
+/* d) The Scale screen */
+
+.point-of-sale .scale-screen .display{
+    position:relative;
+    width:600px;
+    height:190px;
+    margin-top: 100px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.point-of-sale .scale-screen .product-picture {
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    display: float;
+    float: right;
+    margin: 5px;
+    width: 180px;
+    height:180px;
+    line-height:180px;
+    cursor:pointer;
+
+    background:#fff;
+    border: 1px solid #fff;
+    border-radius: 3px;
+    -webkit-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+       -moz-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+            box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+}
+
+.point-of-sale .scale-screen .product-picture img{
+    vertical-align: middle;
+    cursor:pointer;
+}
+
+.point-of-sale .scale-screen .product-picture .product-price{
+    position: absolute;
+    top:8px;
+    right:8px;
+    width:auto;
+    height:auto;
+    line-height:1;
+    color:white;
+    background: #7f82ac;
+    padding: 2px 5px;
+    border-radius: 3px;
+    cursor:pointer;
+}
+
+.point-of-sale .scale-screen .product-name {
+    position: absolute;
+    left:0;
+    top:20px;
+    height:50px;
+    font-size:40px;
+    line-height:50px;
+    text-align:right;
+    right:225px;
+}
+.point-of-sale .scale-screen .weight{
+    position: absolute;
+    left:0;
+    height:90px;
+    bottom:15px;
+    right:220px;
+    padding:5px;
+}
+.point-of-sale .scale-screen .weight p{
+    display: inline-block;
+    text-align:right;
+    line-height: 90px;
+    font-size: 80px;
+    width:100%;
+    height:100%;
+    margin:0;
+    font-family: "Inconsolata";
+}
+
+/* e) The Welcome Screen */
+.point-of-sale .goodbye-message{
+    position: absolute;
+    left:50%;
+    top:30%;
+    width:500px;
+    height:400px;
+    margin-left: -250px;
+    margin-top: -200px;
+    padding:10px;
+    padding-top:20px;
+    text-align:center;
+    font-size:20px;
+    font-weight:bold;
+    background-color: #F0EEEE;
+    border: 1px solid #E0DDDD;
+    -webkit-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+        -ms-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+    z-index:1150;
+}
+
+/*  ********* The OrderWidget  ********* */
+
+.point-of-sale .order-container{
+    position: absolute;
+    top: 0px;
+    bottom: 232px;
+    width:100%;
+    background: #F0EEEE;
+}
+
+.point-of-sale .order-scroller{
+    width:100%;
+    height:100%;
+    overflow:hidden;
+}
+
+.point-of-sale .order{
+    background: #F00;
+    background: -webkit-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+    background:    -moz-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+    background:     -ms-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+    background:         linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+    padding-bottom:15px;
+    padding-top:15px;
+    margin-left:16px;
+    margin-right:16px;
+    margin-top:16px;
+    margin-bottom:16px;
+    font-size:16px;
+    -webkit-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+            box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+
+}
+
+.point-of-sale .order .empty{
+    text-align:center;
+    margin-top: 15px;
+    margin-bottom: 5px;
+    color:#999;
+    font-weight: normal;
+}
+
+.point-of-sale .order .summary{
+    width:100%;
+    text-align:right;
+    font-weight: bold;
+    margin-top:20px;
+    margin-bottom:10px;
+}
+.point-of-sale .order .summary .line{
+    margin-right:15px;
+    padding-top:5px;
+    border-top: solid 2px;
+    border-color:#777;
+}
+.point-of-sale .order .summary .line.empty{
+    border-color:#BBB;
+    color:#999;
+}
+
+/*  ********* The OrderLineWidget  ********* */
+
+.point-of-sale .order .orderline{
+    width:100%;
+    margin:0px;
+    padding-top:3px;
+    padding-bottom:10px;
+    padding-left:15px;
+    padding-right:15px;
+    cursor: pointer;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    -webkit-transition: background 250ms ease-in-out;
+       -moz-transition: background 250ms ease-in-out;
+            transition: background 250ms ease-in-out;
+}
+
+.point-of-sale .order .orderline.selected{
+    background: rgba(140,143,183,0.2);
+    -webkit-transition: background 250ms ease-in-out;
+       -moz-transition: background 250ms ease-in-out;
+            transition: background 250ms ease-in-out;
+    cursor: default;
+}
+.point-of-sale .order .orderline .product-name{
+    padding:0;
+    display:inline-block;
+    font-weight: bold;
+    width:80%;
+    overflow:hidden;
+}
+.point-of-sale .order .orderline .price{
+    padding:0;
+    font-weight: bold;
+    float:right;
+}
+.point-of-sale .order .orderline .info-list{
+    color: #888;
+    margin-left:10px;
+}
+.point-of-sale .order .orderline .info-list em{
+    color: #777;
+    font-weight: bold;
+    font-style:normal;
+}
+
+/*  ********* The ActionBarWidget  ********* */
+
+.point-of-sale .pos-actionbar{
+    position:absolute;
+    left:    0;
+    bottom:  0px;
+    height: 105px;
+    width:  100%;
+    margin: 0;
+    background: #f5f5f5;    /*#ebebeb;*/
+    border-top: solid 1px #afafb6;
+    z-index:900;
+}
+
+.point-of-sale .pos-actionbar ul{
+    list-style:  none;
+}
+
+.point-of-sale .pos-actionbar-left-pane{
+    height: 100%;
+    width:  434px;
+    margin: 0px;
+    padding-left:3px;
+    padding-right:3px;
+    border-right: solid 1px #dfdfdf;
+    float:  left;
+}
+
+.point-of-sale .pos-actionbar-button-list{
+    height: 100%;
+    margin: 0px;
+    padding-left:3px;
+    padding-right:3px;
+    overflow:hidden;
+}
+
+.point-of-sale .pos-actionbar .button{
+    width: 90px;
+    height: 90px;
+    text-align:center;
+    margin:3px;
+    margin-top:6px;
+    float:left;
+
+    font-size:   14px;
+    font-weight: bold;
+
+    cursor: pointer;
+
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+
+    background: #e2e2e2;
+    background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
+    background:    -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background:     -ms-linear-gradient(#f0f0f0, #e2e2e2);
+    background:         linear-gradient(#f0f0f0, #e2e2e2);
+    -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+       -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+            box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+}
+.point-of-sale .pos-actionbar .button .label{
+    margin-top: 37px;
+}
+.point-of-sale .pos-actionbar .button .icon{
+    margin-top: 10px;
+}
+
+.point-of-sale .pos-actionbar .button.disabled *{
+    opacity: 0.5;
+}
+
+.point-of-sale .pos-actionbar .button.rightalign{
+    float:right;
+}
+
+/*  ********* The PopupWidgets  ********* */
+
+.point-of-sale .modal-dialog{
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height:100%;
+    background-color: rgba(0,0,0,0.5);
+    z-index:1000;
+}
+.point-of-sale .modal-dialog .popup{
+    position: absolute;
+    left:50%;
+    top:50%;
+    width:500px;
+    height:400px;
+    margin-left: -250px;
+    margin-top: -200px;
+    padding:10px;
+    padding-top:20px;
+    text-align:center;
+    font-size:20px;
+    font-weight:bold;
+    background-color: #F0EEEE;
+    border: 1px solid #E0DDDD;
+    -webkit-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+        -ms-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+    z-index:1200;
+}
+.point-of-sale .popup .footer{
+    position:absolute;
+    bottom:0;
+    left:0;
+    width:100%;
+    height:60px;
+    border-top: 1px solid #E0DDDD;
+}
+.point-of-sale .popup .button{
+    float:right;
+    width: 110px;
+    height: 40px;
+    line-height:40px;
+    text-align:center;
+    margin:3px;
+    margin-top:10px;
+    margin-right:10px;
+
+    font-size:   14px;
+    font-weight: bold;
+
+    cursor: pointer;
+
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+
+    background: #e2e2e2;
+    background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
+    background:    -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background:     -ms-linear-gradient(#f0f0f0, #e2e2e2);
+    background:         linear-gradient(#f0f0f0, #e2e2e2);
+    -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+            box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+}
+
+.point-of-sale .popup .button.big-left{
+    position:absolute;
+    top: 120px;
+    left:40px;
+    width: 180px;
+    height: 180px;
+    line-height:180px;
+}
+
+.point-of-sale .popup .button.big-right{
+    position:absolute;
+    top: 120px;
+    right:40px;
+    width: 180px;
+    height: 180px;
+    line-height:180px;
+}
+
+/*  ********* The ScrollBarWidget  ********* */
+
+.point-of-sale .scrollbar{  
+    position:absolute;
+    top:7px;
+    right:7px;
+    width:48px;
+    bottom:7px;
+    background: rgba(0,0,0,0.1);
+
+}
+.point-of-sale .scrollbar .button{
+    width:100%;
+    height: 48px;
+    line-height: 38px;
+    text-align: center;
+    font-size:48px;
+    border-radius: 4px;
+    cursor: pointer;
+    -webkit-user-select: none;
+       -moz-user-select: none;
+        -ms-user-select: none;
+            user-select: none;
+    transition: all 250ms ease-in-out;
+}
+.point-of-sale .scrollbar .button{
+    color:white;
+    background: rgba(0,0,0,0.6);
+    -webkit-box-shadow: 0px 1px 4px rgba(0,0,0,0.01);
+       -moz-box-shadow: 0px 1px 4px rgba(0,0,0,0.01);
+            box-shadow: 0px 1px 4px rgba(0,0,0,0.01);
+    text-shadow: rgba(255,255,255,0.5) 0px 0px 10px;
+    -webkit-transition: all 250ms ease-in-out;
+       -moz-transition: all 250ms ease-in-out;
+            transition: all 250ms ease-in-out;
+}
+.point-of-sale .scrollbar .button.disabled{
+    background: rgba(0,0,0,0.3);
+    color:rgba(255,255,255,0.5);
+    -webkit-transition: all 250ms ease-in-out;
+       -moz-transition: all 250ms ease-in-out;
+            transition: all 250ms ease-in-out;
+}
+.point-of-sale .scrollbar .down-button{
+    position:absolute;
+    bottom:0px;
+}
+.point-of-sale .scrollbar .up-button{
+    position:absolute;
+    top:0px;
+}
+.point-of-sale .scrollbar .scroller{
+    position:absolute;
+    top:33%;
+    bottom:50%;
+    width:100%;
+    background: rgba(0,0,0,0.1);
+    border-radius: 4px;
+}
+

From d5459171bd7cc19379fe897b10192ba3733cf884 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 3 Sep 2012 14:57:40 +0200
Subject: [PATCH 731/999] [FIX] point_of_sale: Show the Opening and Closing
 balance only if the session is closed

bzr revid: stw@openerp.com-20120903125740-xxl4x298imiyo0y9
---
 addons/point_of_sale/point_of_sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 0e906186285..a9abc545bc1 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -930,7 +930,7 @@
                                 </field>
                             </group>
 
-                            <div attrs="{'invisible': [('state', '=', 'closed')]}">
+                            <div attrs="{'invisible': [('state', '!=', 'closed')]}">
                                 <group class="oe_subtotal_footer oe_right">
                                     <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator"/>
                                     <field name="cash_register_total_entry_encoding"  attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions"/>
@@ -947,7 +947,7 @@
                             </div>
 
 
-                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', 'in', ('opening_control', 'closed'))]}">
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '!=', 'closed')]}">
                                 <field name="cash_register_balance_end_real" class="oe_subtotal_footer_separator"/>
                                 <field name="cash_register_difference"  class="oe_subtotal_footer_separator"/>
                             </group>

From 19ca7c3e4ed9201a75c9b26287ceb68f4ff3923f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 3 Sep 2012 15:04:27 +0200
Subject: [PATCH 732/999] [ADD] Add 'name' field to ir.translation search view

bzr revid: fme@openerp.com-20120903130427-f2sriqp15c7ybuhx
---
 openerp/addons/base/ir/ir.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index fd4bb2f89b4..cecec8437c6 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -1173,6 +1173,7 @@
                     <filter icon="terp-gdu-smart-failing"
                         string="Untranslated"
                         domain="['|',('value', '=', False),('value','=','')]"/>
+                    <field name="name"/>
                     <field name="lang"/>
                     <field name="src"/>
                     <field name="value"/>

From e754257c0bd82ca8f301ba3617f7cf20bcf74b0a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 3 Sep 2012 15:10:16 +0200
Subject: [PATCH 733/999] [IMP] Make the translation tree an editable list

bzr revid: fme@openerp.com-20120903131016-a0ocg43lnnm2j9eg
---
 openerp/addons/base/ir/ir.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index cecec8437c6..09ff7c036f3 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -1214,7 +1214,7 @@
             <field name="name">Translations</field>
             <field name="model">ir.translation</field>
             <field name="arch" type="xml">
-                <tree string="Translations">
+                <tree string="Translations" editable="bottom">
                     <field name="src"/>
                     <field name="value"/>
                     <field name="name"/>

From 6abc8a1d762573a598cf3bb19175af8270635c38 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Mon, 3 Sep 2012 18:55:42 +0530
Subject: [PATCH 734/999] [IMP]Search by Advanced for groups using fnct_search

bzr revid: hsa@tinyerp.com-20120903132542-xzfow8u5qbgxvbt2
---
 openerp/addons/base/res/res_users.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 3078d94fd9d..47ad27c25f0 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -52,6 +52,9 @@ class groups(osv.osv):
                 res[g.id] = g.name
         return res
     
+    def _search_group(self, cr, uid, obj, name, args, context=None):
+        return [('name',args[0][1],args[0][2])]
+    
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
         'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'),
@@ -61,7 +64,7 @@ class groups(osv.osv):
         'menu_access': fields.many2many('ir.ui.menu', 'ir_ui_menu_group_rel', 'gid', 'menu_id', 'Access Menu'),
         'comment' : fields.text('Comment', size=250, translate=True),
         'category_id': fields.many2one('ir.module.category', 'Application', select=True),
-        'full_name': fields.function(_get_full_name, type='char', string='Group Name', store=True),
+        'full_name': fields.function(_get_full_name, type='char', string='Group Name', fnct_search=_search_group),
     }
 
     _sql_constraints = [

From 06469d039f051e00c096ae31b480d4ee51bfbe85 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 3 Sep 2012 15:29:23 +0200
Subject: [PATCH 735/999] [MOV] Moved Technical Translation to debug select box

bzr revid: fme@openerp.com-20120903132923-uqjz5j7h562g3ji9
---
 addons/web/static/src/js/views.js  | 25 +++++++++++--------------
 addons/web/static/src/xml/base.xml |  1 +
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index b83ddb1cc3f..0cd729fa733 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -749,6 +749,17 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
             case 'toggle_layout_outline':
                 current_view.rendering_engine.toggle_layout_debugging();
                 break;
+            case 'translate':
+                this.do_action({
+                    name: "Technical Translation",
+                    res_model : 'ir.translation',
+                    domain : [['type', '!=', 'object'], '|', ['name', '=', this.dataset.model], ['name', 'ilike', this.dataset.model + ',']],
+                    views: [[false, 'list'], [false, 'form']],
+                    type : 'ir.actions.act_window',
+                    view_type : "list",
+                    view_mode : "list"
+                });
+                break;
             case 'fields':
                 this.dataset.call_and_eval(
                         'fields_get', [false, {}], null, 1).then(function (fields) {
@@ -882,10 +893,6 @@ instance.web.Sidebar = instance.web.Widget.extend({
             'files' : [],
             'other' : []
         };
-        if (this.session.uid === 1) {
-            var item = { label: _t("Translate"), callback: view.on_sidebar_translate, title: _t("Technical translation") };
-            this.items.other.push(item);
-        }
         this.fileupload_id = _.uniqueId('oe_fileupload');
         $(window).on(this.fileupload_id, function() {
             var args = [].slice.call(arguments).slice(1);
@@ -1219,16 +1226,6 @@ instance.web.View = instance.web.Widget.extend({
     on_sidebar_export: function() {
         new instance.web.DataExport(this, this.dataset).open();
     },
-    on_sidebar_translate: function() {
-        return this.do_action({
-            res_model : 'ir.translation',
-            domain : [['type', '!=', 'object'], '|', ['name', '=', this.dataset.model], ['name', 'ilike', this.dataset.model + ',']],
-            views: [[false, 'list'], [false, 'form']],
-            type : 'ir.actions.act_window',
-            view_type : "list",
-            view_mode : "list"
-        });
-    },
     sidebar_context: function () {
         return $.when();
     },
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 623d87bea31..b163f99fab3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -483,6 +483,7 @@
     <option value="fvg">Fields View Get</option>
     <option value="manage_filters">Manage Filters</option>
     <t t-if="view_manager.session.uid === 1">
+        <option value="translate">Technical translation</option>
         <option value="manage_views">Manage Views</option>
         <option value="edit" data-model="ir.ui.view" t-att-data-id="view.fields_view.view_id">Edit <t t-esc="_.str.capitalize(view.fields_view.type)"/>View</option>
         <option t-if="view_manager.searchview" value="edit" data-model="ir.ui.view" t-att-data-id="view_manager.searchview.view_id">Edit SearchView</option>

From 2c3b3a0bd129d724181ab4e8ef18d4c6b30646a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 3 Sep 2012 15:32:39 +0200
Subject: [PATCH 736/999] [IMP] point_of_sale: adding a description field to
 the products

bzr revid: fva@openerp.com-20120903133239-hai1o87yrpxvbaic
---
 addons/point_of_sale/static/src/js/devices.js | 2 ++
 addons/point_of_sale/static/src/js/models.js  | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index a6be16b3835..e36070414b6 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -184,6 +184,8 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
          *          price_with_tax:     (number) the price paid for this orderline, tax included
          *          price_without_tax:  (number) the price paid for this orderline, without taxes
          *          tax:                (number) the price paid in taxes on this orderline
+         *          product_description:         (string) generic description of the product
+         *          product_description_sale:    (string) sales related information of the product
          *     }
          *  - paymentlines : list of paymentlines :
          *     {
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 2dd13638300..2c175d5b2b5 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -142,7 +142,8 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
 
                     return fetch(
                         'product.product', 
-                        ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type'],
+                        ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 
+                         'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
                         [['pos_categ_id','!=', false],['sale_ok','=',true]],
                         {pricelist: self.get('shop').pricelist_id[0]} // context for price
                     );
@@ -417,6 +418,8 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 price_with_tax :    this.get_price_with_tax(),
                 price_without_tax:  this.get_price_without_tax(),
                 tax:                this.get_tax(),
+                product_description:      this.get_product().get('description'),
+                product_description_sale: this.get_product().get('description_sale'),
             };
         },
         get_price_without_tax: function(){

From c09802208d5b5c01c86d9e43159d6827a01b3edf Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 3 Sep 2012 15:45:03 +0200
Subject: [PATCH 737/999] [FIX] some issues

bzr revid: fp@tinyerp.com-20120903134503-obbbb47f7chxt461
---
 addons/membership/__openerp__.py      |  1 -
 addons/membership/membership_data.xml | 31 ---------------------------
 addons/stock/stock_view.xml           |  2 +-
 3 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 addons/membership/membership_data.xml

diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index e4b596183af..316a2f0f120 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -46,7 +46,6 @@ invoice and send propositions for membership renewal.
         'membership_view.xml',
         'report/report_membership_view.xml',
         'process/membership_process.xml',
-        'membership_data.xml'
     ],
     'demo': ['membership_demo.xml'],
     'test': ['test/test_membership.yml'],
diff --git a/addons/membership/membership_data.xml b/addons/membership/membership_data.xml
deleted file mode 100644
index 14fbb00f9a2..00000000000
--- a/addons/membership/membership_data.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data noupdate="1">
-
-    <!--
-    Price type
-    -->
-    <record model="product.price.type" id="product_price_type_memberprice" >
-        <field name="name">Member Price</field>
-        <field name="field">member_price</field>
-    </record>
-
-    <!--
-    Price list
-    -->
-    <record model="product.pricelist" id="list1m">
-        <field name="name">Member Sale Pricelist</field>
-        <field name="type">sale</field>
-    </record>
-    <record model="product.pricelist.version" id="ver1m">
-        <field name="pricelist_id" ref="list1m"/>
-        <field name="name">Member Sale Pricelist Version</field>
-    </record>
-    <record model="product.pricelist.item" id="item1m">
-        <field name="price_version_id" ref="ver1m"/>
-        <field name="base" ref="product_price_type_memberprice" />
-        <field name="name">Member Sale Pricelist Line</field>
-    </record>
-
-    </data>
-</openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a2c966fdb7f..3560b255ab5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -269,7 +269,7 @@
             </field>
         </record>
         <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" 
-            sequence="3" groups="stock.group_stock_tracking_lot,stock.group_stock_production_lot"/>
+            sequence="3" groups="stock.group_tracking_lot,stock.group_production_lot"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
             groups="product.group_stock_packaging"
             sequence="6"

From b83211505706971779eba2bd61c48d1ba8b46ca4 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 3 Sep 2012 15:45:33 +0200
Subject: [PATCH 738/999] [FIX] point_of_sale: Return the state of the session
 in the wizard

bzr revid: stw@openerp.com-20120903134533-lqyay7rv7jkusde8
---
 .../point_of_sale/wizard/pos_session_opening.py | 17 ++++++++++++-----
 .../wizard/pos_session_opening.xml              |  6 +++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py
index 4364998b6a4..d6f95cbb7fc 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.py
+++ b/addons/point_of_sale/wizard/pos_session_opening.py
@@ -6,14 +6,18 @@ import netsvc
 
 from openerp.addons.point_of_sale.point_of_sale import pos_session
 
+
 class pos_session_opening(osv.osv_memory):
     _name = 'pos.session.opening'
 
     _columns = {
         'pos_config_id' : fields.many2one('pos.config', 'Point of Sale', required=True),
         'pos_session_id' : fields.many2one('pos.session', 'PoS Session'),
-        'pos_state' : fields.selection(pos_session.POS_SESSION_STATE,
-                                       'Session State', readonly=True),
+        'pos_state' : fields.related('pos_session_id', 'state',
+                                     type='selection',
+                                     selection=pos_session.POS_SESSION_STATE,
+                                     string='Session State', readonly=True),
+        'pos_state_str' : fields.char('State', 32, readonly=True),
         'show_config' : fields.boolean('Show Config', readonly=True),
         'pos_session_name' : fields.related('pos_session_id', 'name',
                                             type='char', size=64, readonly=True),
@@ -71,22 +75,25 @@ class pos_session_opening(osv.osv_memory):
         result = {
             'pos_session_id': False,
             'pos_state': False,
+            'pos_state_str' : '',
             'pos_session_username' : False,
             'pos_session_name' : False,
         }
         if not config_id:
-            return {'value': result}
+            return {'value' : result}
         proxy = self.pool.get('pos.session')
         session_ids = proxy.search(cr, uid, [
-            ('state', '<>', 'closed'),
+            ('state', '!=', 'closed'),
             ('config_id', '=', config_id),
         ], context=context)
         if session_ids:
             session = proxy.browse(cr, uid, session_ids[0], context=context)
-            result['pos_state'] = session.state
+            result['pos_state'] = str(session.state)
+            result['pos_state_str'] = dict(pos_session.POS_SESSION_STATE).get(session.state, '')
             result['pos_session_id'] = session.id
             result['pos_session_name'] = session.name
             result['pos_session_username'] = session.user_id.name
+
         return {'value' : result}
 
     def default_get(self, cr, uid, fieldnames, context=None):
diff --git a/addons/point_of_sale/wizard/pos_session_opening.xml b/addons/point_of_sale/wizard/pos_session_opening.xml
index 9279d5fce45..6e44030e582 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.xml
+++ b/addons/point_of_sale/wizard/pos_session_opening.xml
@@ -12,7 +12,7 @@
                         <field name="pos_config_id" on_change="on_change_config(pos_config_id)"
                             widget="selection" domain="[('state','=','active')]"
                             class="oe_inline"/>
-                        <field name="pos_state" class="oe_inline" attrs="{'invisible' : [('pos_state', '=', False)]}" />
+                        <field name="pos_state" invisible="1" />
                     </group>
                     <field name="pos_session_id" invisible="1"/>
                     <button name="open_ui" type="object" string="Start Selling" 
@@ -49,8 +49,8 @@
                             Click to continue the session.
                         </p>
                         <p>
-                            The session <field name="pos_session_name" class="oe_inline" /> (<field name="pos_session_username" class="oe_inline" />) is "<b><field name="pos_state" class="oe_inline" /></b>"<br/>
-                            You can continue sales from the touchscreen interface by clicking on "<b>Settings</b>" or close the cash register session ?
+                            The session <field name="pos_session_name" class="oe_inline" /> (<field name="pos_session_username" class="oe_inline" />) is "<b><field name="pos_state_str" class="oe_inline" /></b>"<br/>
+                            You can continue sales from the touchscreen interface by clicking on "<b>Sellings</b>" or close the cash register session ?
                         </p>
                     </div>
 

From 2918133ee52b5d269c6d58e6ba5c1f0481ef7878 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 3 Sep 2012 16:00:22 +0200
Subject: [PATCH 739/999] [IMP] catch-and-return all errors in parse_preview

bzr revid: xmo@openerp.com-20120903140022-osfkgk4l6r2hj42j
---
 addons/base_import/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_import/models.py b/addons/base_import/models.py
index 51fac2af91c..1e5ad002b84 100644
--- a/addons/base_import/models.py
+++ b/addons/base_import/models.py
@@ -227,7 +227,7 @@ class ir_import(orm.TransientModel):
                 'headers': headers or False,
                 'preview': list(preview),
             }
-        except (csv.Error, TypeError, UnicodeDecodeError), e:
+        except Exception, e:
             # Due to lazy generators, UnicodeDecodeError (for
             # instance) may only be raised when serializing the
             # preview to a list in the return.

From 5f89461c60c3820c116d76ea7a7a8ea3f83c074f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 3 Sep 2012 16:21:10 +0200
Subject: [PATCH 740/999] [IMP] add validation call after each field matching
 (slooooooowwwwww)

bzr revid: xmo@openerp.com-20120903142110-0mziyxhcku22gbm8
---
 addons/base_import/static/src/js/import.js | 38 ++++++++++++++--------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 797a094b390..ca0f7e04ea7 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -44,6 +44,7 @@ openerp.base_import = function (instance) {
             {name: 'quoting', label: _lt("Quoting:"), value: '"'}
         ],
         events: {
+            'change .oe_import_grid input': 'import_dryrun',
             'change input.oe_import_file': 'file_update',
             'change input.oe_import_has_header, .oe_import_options input': 'settings_updated',
             'click a.oe_import_csv': function (e) {
@@ -147,6 +148,7 @@ openerp.base_import = function (instance) {
                             .text(item.label));
                 }
             };
+            this.import_dryrun();
         },
         generate_fields_completion: function (root) {
             // Display nice names to user, but send logical names to server
@@ -210,27 +212,35 @@ openerp.base_import = function (instance) {
         },
 
         //- import itself
-        do_import: function () {
+        call_import: function (options) {
             var self = this;
             var fields = this.$('.oe_import_fields input').map(function (index, el) {
                 // Convert user-readable field label to logical db-backed name
                 return self.field_label_to_name[el.value] || false;
             }).get();
-            this.Import.call(
-                'do', [this.id, fields, this.import_options()], {
-                    // maybe could do a dryrun after successful
-                    // preview or something (note: don't go to
-                    // this.result if dryrun=true)
-                    dryrun: false
-                })
-                .then(this.proxy('result'));
+            return this.Import.call(
+                'do', [this.id, fields, this.import_options()], options);
         },
-        result: function (errors) {
-            if (!errors.length) {
-                if (this.getParent().reload_content) {
-                    this.getParent().reload_content();
+        import_dryrun: function () {
+            this.call_import({ dryrun: true })
+                .then(this.proxy('render_import_errors'));
+        },
+        do_import: function () {
+            var self = this;
+            this.call_import({ dryrun: false }).then(function (errors) {
+                if (_.isEmpty(errors)) {
+                    if (self.getParent().reload_content) {
+                        self.getParent().reload_content();
+                    }
+                    self.close();
+                    return;
                 }
-                this.close();
+                self.render_import_errors(errors);
+            });
+        },
+        render_import_errors: function (errors) {
+            if (_.isEmpty(errors)) {
+                this.$el.removeClass('oe_import_error');
                 return;
             }
             // import failed (or maybe just warnings, if we ever get

From 38b913a3eb70668819f1eb611e828a50a150757e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 3 Sep 2012 16:22:48 +0200
Subject: [PATCH 741/999] [FIX] comment out validation dryrun import: not for
 phase 1

bzr revid: xmo@openerp.com-20120903142248-v5oti2gltew9f674
---
 addons/base_import/static/src/js/import.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index ca0f7e04ea7..2ec0caf1fc0 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -222,8 +222,8 @@ openerp.base_import = function (instance) {
                 'do', [this.id, fields, this.import_options()], options);
         },
         import_dryrun: function () {
-            this.call_import({ dryrun: true })
-                .then(this.proxy('render_import_errors'));
+//            this.call_import({ dryrun: true })
+//                .then(this.proxy('render_import_errors'));
         },
         do_import: function () {
             var self = this;

From f8212984f39f5e04991186b9fd5061edf067c186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 3 Sep 2012 16:25:27 +0200
Subject: [PATCH 742/999] [IMP] point_of_sale: moved data loading to it's own
 method for easier extension dev

bzr revid: fva@openerp.com-20120903142527-iv0d97a0tzbjyo6o
---
 addons/point_of_sale/static/src/js/models.js | 28 ++++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 2c175d5b2b5..93860697492 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -58,6 +58,21 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             
             // We fetch the backend data on the server asynchronously. this is done only when the pos user interface is launched,
             // Any change on this data made on the server is thus not reflected on the point of sale until it is relaunched. 
+            // when all the data has loaded, we compute some stuff, and declare the Pos ready to be used. 
+            $.when(this.load_server_data())
+                .then(function(){ 
+                    //self.log_loaded_data(); //Uncomment if you want to log the data to the console for easier debugging
+                    self.ready.resolve();
+                },function(){
+                    //we failed to load some backend data, or the backend was badly configured.
+                    //the error messages will be displayed in PosWidget
+                    self.ready.reject();
+                });
+        },
+
+        // loads all the needed data on the sever. returns a deferred indicating when all the data has loaded. 
+        load_server_data: function(){
+            var self = this;
 
             var loaded = fetch('res.users',['name','company_id'],[['id','=',this.session.uid]]) 
                 .pipe(function(users){
@@ -174,17 +189,8 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                     }
                     self.set({'cashRegisters' : new module.CashRegisterCollection(self.get('bank_statements'))});
                 });
-
-            // when all the data has loaded, we compute some stuff, and declare the Pos ready to be used. 
-            $.when(loaded)
-                .then(function(){ 
-                    //self.log_loaded_data(); //Uncomment if you want to log the data to the console for easier debugging
-                    self.ready.resolve();
-                },function(){
-                    //we failed to load some backend data, or the backend was badly configured.
-                    //the error messages will be displayed in PosWidget
-                    self.ready.reject();
-                });
+        
+            return loaded;
         },
 
         // logs the usefull posmodel data to the console for debug purposes

From 4498663baf2b95d28559c95e66379ea4b515c64d Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Mon, 3 Sep 2012 16:58:28 +0200
Subject: [PATCH 743/999] [FIX] ad_paths: makes sure the server addons path is
 absolute (needed when using cProfile).

bzr revid: vmt@openerp.com-20120903145828-8yflgc0lfqn6woai
---
 openerp/modules/module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index b1d4de31bce..8cb6f17324b 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -162,7 +162,7 @@ def initialize_sys_path():
         return
 
     ad_paths = map(lambda m: os.path.abspath(tools.ustr(m.strip())), tools.config['addons_path'].split(','))
-    ad_paths.append(_ad) # for get_module_path
+    ad_paths.append(os.path.abspath(_ad)) # for get_module_path
     sys.meta_path.append(AddonsImportHook())
 
 def get_module_path(module, downloaded=False, display_warning=True):

From f3742f0558f4cf2ef94bfa513008d7050e07af40 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Mon, 3 Sep 2012 16:59:29 +0200
Subject: [PATCH 744/999] [FIX] test_ir_sequence: reduce the number of call to
 next() (to reduce test time).

bzr revid: vmt@openerp.com-20120903145929-p4kp6eotkcflletk
---
 openerp-server                    | 2 +-
 openerp/tests/test_ir_sequence.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp-server b/openerp-server
index be0710cbce9..65073b22798 100755
--- a/openerp-server
+++ b/openerp-server
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
diff --git a/openerp/tests/test_ir_sequence.py b/openerp/tests/test_ir_sequence.py
index b1076e830ee..cbb1a347038 100644
--- a/openerp/tests/test_ir_sequence.py
+++ b/openerp/tests/test_ir_sequence.py
@@ -186,7 +186,7 @@ class test_ir_sequence_generate(unittest2.TestCase):
 
         cr = cursor()
         f = lambda *a: registry('ir.sequence').next_by_code(cr, ADMIN_USER_ID, 'test_sequence_type_5', {})
-        assert all(str(x) == f() for x in xrange(1,1000))
+        assert all(str(x) == f() for x in xrange(1,10))
         cr.commit()
         cr.close()
 
@@ -204,7 +204,7 @@ class test_ir_sequence_generate(unittest2.TestCase):
 
         cr = cursor()
         f = lambda *a: registry('ir.sequence').next_by_code(cr, ADMIN_USER_ID, 'test_sequence_type_6', {})
-        assert all(str(x) == f() for x in xrange(1,1000))
+        assert all(str(x) == f() for x in xrange(1,10))
         cr.commit()
         cr.close()
 

From 9c26c8e00098e99a21b2896d7ea1d8d8ea7ee2eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 3 Sep 2012 17:20:25 +0200
Subject: [PATCH 745/999] [IMP] mail: cleaning of the Chatter front-end. Wall
 and Wall-like group menu entries: now use the correct contexts to give to the
 composer. res_users: posting on the user consists in posting on the related
 partner. TODO: clean that when we have cleared our minds about what to do
 when posting in the wall. xml, css: small cleanup of dead code mail.js:
 propagated the use of 'default_' values in the various contexts (Wall,
 RecordThread, Thread, ComposeMessage); cleaned do_action overrides; general
 cleanup of the code and options propagation.

bzr revid: tde@openerp.com-20120903152025-bzchl603mzuhggn4
---
 addons/mail/mail_group.py           |   5 +-
 addons/mail/mail_message_view.xml   |   6 +-
 addons/mail/res_users.py            |   4 +
 addons/mail/static/src/css/mail.css |   6 +-
 addons/mail/static/src/js/mail.js   | 290 ++++++++++++----------------
 addons/mail/static/src/xml/mail.xml |   2 +-
 6 files changed, 134 insertions(+), 179 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 1824f59e0b9..d17be6d578e 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -131,9 +131,10 @@ class mail_group(osv.Model):
             search_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'view_message_search')
             params = {
                 'search_view_id': search_ref and search_ref[1] or False,
-                'domain': [('model','=','mail.group'),('res_id','=',mail_group_id)],
+                'domain': [('model','=','mail.group'), ('res_id','=',mail_group_id)],
+                'context': {'default_model': 'mail.group', 'default_res_id': mail_group_id},
                 'res_model': 'mail.message',
-                'thread_level': 2
+                'thread_level': 1,
             }
             cobj = self.pool.get('ir.actions.client')
             newref = cobj.copy(cr, uid, ref[1], default={'params': str(params), 'name': vals['name']}, context=context)
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index bc39a36cd3a..914937a34f3 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -90,13 +90,15 @@
         <record id="action_mail_all_feeds" model="ir.actions.client">
             <field name="name">News Feed</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid])] }&quot;"/>
+            <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid])],
+                'context': {'default_model': 'res.users', 'default_res_id': uid} }&quot;"/>
         </record>
 
         <record id="action_mail_my_feeds" model="ir.actions.client">
             <field name="name">My Feeds</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="&quot;{'domain': [('author_id.user_ids', 'in', [uid])]}&quot;"/>
+            <field name="params" eval="&quot;{'domain': [('author_id.user_ids', 'in', [uid])],
+                'context': {'default_model': 'res.users', 'default_res_id': uid} }&quot;"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index ebaff2bdce7..1bc193051a1 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -96,6 +96,10 @@ class res_users(osv.Model):
         alias_pool.unlink(cr, uid, alias_ids, context=context)
         return res
 
+    def message_post(self, cr, uid, thread_id, **kwargs):
+        partner_id = self.pool.get('res.users').browse(cr, uid, thread_id)[0].partner_id.id
+        return self.pool.get('res.partner').message_post(cr, uid, partner_id, **kwargs)
+
 class res_users_mail_group(osv.Model):
     """ Update of res.users class
         - if adding groups to an user, check mail.groups linked to this user
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index f33f1c6ed99..240627c9e6c 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -8,7 +8,7 @@
     margin: 0;
 }
 
-.openerp .oe_mail_recthread ul, .openerp .oe_mail_recthread li {
+.openerp .oe_chatter ul, .openerp .oe_chatter li {
     list-style-type: none;
     padding: 0;
     margin: 0;
@@ -78,10 +78,6 @@
     overflow: auto;
 }
 
-.openerp div.oe_mail_recthread {
-    /*overflow: auto;*/
-}
-
 .openerp div.oe_mail_recthread_main {
     float: left;
     width: 560px;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 5eda999f874..a5a64a59a8b 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -17,9 +17,15 @@ openerp.mail = function(session) {
      */
 
     session.web.FormView = session.web.FormView.extend({
-        // #FIXME TODO: CHECK WITH NEW BRANCH
+        // TDE FIXME TODO: CHECK WITH NEW BRANCH
         do_action: function(action, on_close) {
-            if (action.res_model == 'mail.compose.message' && this.fields && this.fields.message_ids && this.fields.message_ids.view.get("actual_mode") != 'create') {
+            if (action.res_model == 'mail.compose.message' &&
+                this.fields && this.fields.message_ids &&
+                this.fields.message_ids.view.get("actual_mode") != 'create') {
+                // debug
+                console.groupCollapsed('FormView do_action on mail.compose.message');
+                console.log('message_ids field:', this.fields.message_ids);
+                console.groupEnd();
                 var record_thread = this.fields.message_ids;
                 var thread = record_thread.thread;
                 thread.instantiate_composition_form('comment', true, false, 0, action.context);
@@ -40,14 +46,11 @@ openerp.mail = function(session) {
      * the various Chatter widgets.
      *
      * Some regular expressions not used anymore, kept because I want to
-     * - (^|\s)@((\w|@|\.)*): @login@log.log, supports inner '@' for
-     *   logins that are emails
+     * - (^|\s)@((\w|@|\.)*): @login@log.log
      *      1. '(void)'
      *      2. login@log.log
      * - (^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]: [ir.attachment,3|My Label],
-     *   for internal links to model ir.attachment, id=3, and with
-     *   optional label 'My Label'. Note that having a '|Label' is not
-     *   mandatory, because the regex should still be correct.
+     *   for internal links
      *      1. '(void)'
      *      2. 'ir'
      *      3. 'attachment'
@@ -62,7 +65,7 @@ openerp.mail = function(session) {
             return session_prefix + '/web/binary/image?session_id=' + session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
 
-        /** checks if tue current user is the message author */
+        /** check if the current user is the message author */
         is_author: function (widget, message_user_id) {
             return (widget.session && widget.session.uid != 0 && widget.session.uid == message_user_id);
         },
@@ -71,7 +74,6 @@ openerp.mail = function(session) {
          * - :name - shortcut to an image
          */
         do_replace_expressions: function (string) {
-            var self = this;
             var icon_list = ['al', 'pinky']
             /* special shortcut: :name, try to find an icon if in list */
             var regex_login = new RegExp(/(^|\s):((\w)*)/g);
@@ -93,8 +95,7 @@ openerp.mail = function(session) {
      * ------------------------------------------------------------
      * 
      * This widget handles the display of a form to compose a new message.
-     * This form is an OpenERP form_view, build on a mail.compose.message
-     * wizard.
+     * This form is a mail.compose.message form_view.
      */
 
     mail.ComposeMessage = session.web.Widget.extend({
@@ -102,14 +103,10 @@ openerp.mail = function(session) {
         
         /**
          * @param {Object} parent parent
-         * @param {Object} [options] 
-         * @param {Object} [options.context] context
-         * @param {String} [context.res_model] res_model of document [REQUIRED]
-         * @param {Number} [context.res_id] res_id of record [REQUIRED]
-         * @param {String} [context.composition_mode] mail.compose.message.mode
-         *      (see composition wizard)
-         * @param {Number} [context.msg_id] id of a message in case we are in
-         *      reply mode
+         * @param {Object} [options]
+         * @param {Object} [options.context] context passed to the
+         *  mail.compose.message DataSetSearch. Please refer to this model
+         *  for more details about fields and default values.
          */
         init: function (parent, options) {
             var self = this;
@@ -120,9 +117,9 @@ openerp.mail = function(session) {
             this.options.form_xml_id = options.form_xml_id || 'email_compose_message_wizard_form_chatter';
             this.options.form_view_id = options.form_view_id || false;
             // debug
-            console.groupCollapsed('New ComposeMessage: model', this.options.context.default_res_model, ', id', this.options.context.default_res_id);
-            console.log('context:', this.options.context);
-            console.groupEnd();
+            // console.groupCollapsed('New ComposeMessage: model', this.options.context.default_res_model, ', id', this.options.context.default_res_id);
+            // console.log('context:', this.options.context);
+            // console.groupEnd();
         },
 
         start: function () {
@@ -132,33 +129,22 @@ openerp.mail = function(session) {
             this.$el.find('img.oe_mail_icon').attr('src', user_avatar);
             this.$el.find('div.oe_mail_msg_content').empty();
             // create a context for the dataset and default_get of the wizard
-            var context = this._update_context({});
-            console.log(context);
+            var context = _.extend({}, this.options.context);
             this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
             // find the id of the view to display in the chatter form
-            var data_ds = new session.web.DataSetSearch(this, 'ir.model.data');
-            return data_ds.call('get_object_reference', ['mail', this.options.form_xml_id]).pipe(this.proxy('create_form_view'));
-        },
-
-        /** Update the context of the compose wizard */
-        _update_context: function (dest_context) {
-            // TDE TOCHECK: after posting, back to reply mode !
-            _.extend(dest_context, this.options.context, {
-                'mail.compose.message.mode': this.options.context.composition_mode,
-            });
-            if (this.options.context.composition_mode == 'comment') {
-                // _.extend(dest_context, {'default_res_id': this.options.res_id});
+            if (this.options.form_view_id) {
+                return this.create_form_view();
             }
-            else if (this.options.context.composition_mode == 'reply') {
-                _.extend(dest_context, {'active_id': this.options.context.msg_id});
+            else {
+                var data_ds = new session.web.DataSetSearch(this, 'ir.model.data');
+                return data_ds.call('get_object_reference', ['mail', this.options.form_xml_id]).pipe(this.proxy('create_form_view'));
             }
-            return dest_context
         },
 
         /** Create a FormView, then append it to the to widget DOM. */
-        create_form_view: function (form_view_id) {
-            this.options.form_view_id = form_view_id[1] || false;
+        create_form_view: function (new_form_view_id) {
             var self = this;
+            this.options.form_view_id = (new_form_view_id && new_form_view_id[1]) || this.options.form_view_id;
             // destroy previous form_view if any
             if (this.form_view) { this.form_view.destroy(); }
             // create the FormView
@@ -177,14 +163,15 @@ openerp.mail = function(session) {
         },
 
         /**
-         * Reinitialize the widget field values to the default values. The
-         * purpose is to avoid to destroy and re-build a form view. Default
-         * values are therefore given as for an on_change. */
-        refresh: function (options_update_values) {
-            var self = this;
-            this.options.context = _.extend(this.options.context, options_update_values || {});
+         * Reinitialize the widget field values to the default values obtained
+         * using default_get on mail.compose.message. This allows to reinitialize
+         * the widget without having to rebuild a complete form view.
+         * @param {Object} new_context: context of the refresh */
+        refresh: function (new_context) {
             if (! this.form_view) return;
-            this.ds_compose.context = this._update_context(this.ds_compose.context);
+            var self = this;
+            this.options.context = _.extend(this.options.context, new_context || {});
+            this.ds_compose.context = _.extend(this.ds_compose.context, this.options.context);
             return this.ds_compose.call('default_get', [
                 ['subject', 'body_text', 'body', 'attachment_ids', 'partner_ids', 'composition_mode',
                     'model', 'res_id', 'parent_id', 'content_subtype'],
@@ -192,13 +179,6 @@ openerp.mail = function(session) {
             ]).then( function (result) { self.form_view.on_processed_onchange({'value': result}, []); });
         },
 
-        /**
-         * Override-hack of do_action: clean the form */
-        do_action: function(action, on_close) {
-            console.log('compose_message do_action', action, on_close);
-            return this._super(action, on_close);
-        },
-
         /**
          * Bind events in the widget. Each event is slightly described
          * in the function. */
@@ -223,9 +203,6 @@ openerp.mail = function(session) {
      * - - sub message (parent_id = root message)
      * - - - sub sub message (parent id = sub message)
      * - - sub message (parent_id = root message)
-     * This widget has 2 ways of initialization, either you give records
-     * to be rendered, either it will fetch [limit] messages related to
-     * [res_model]:[res_id].
      */
 
     mail.Thread = session.web.Widget.extend({
@@ -234,71 +211,54 @@ openerp.mail = function(session) {
         /**
          * @param {Object} parent parent
          * @param {Object} [options]
-         * @param {String} [options.res_model] res_model of document [REQUIRED]
-         * @param {Number} [options.res_id] res_id of record [REQUIRED]
-         * @param {Number} [options.uid] user id [REQUIRED]
-         * @param {Bool}   [options.parent_id=false] parent_id of message
-         * @param {Number} [options.thread_level=0] number of levels in the thread
-         *      (only 0 or 1 currently)
-         * @param {Bool}   [options.is_wall=false] thread is displayed in the wall
-         * @param {Number} [options.msg_more_limit=150] number of character to
+         * @param {Object} [options.context] context of the thread. It should
+            contain at least default_model, default_res_id. Please refer to
+            the ComposeMessage widget for more information about it.
+         * @param {Number} [options.thread_level=0] number of thread levels
+         * @param {Number} [options.message_ids=null] ids for message_fetch
+         * @param {Number} [options.message_data=null] already formatted message
+            data, for subthreads getting data from their parent
+         * @param {Boolean} [options.composer] use the advanced composer, or
+            the default basic textarea if not set
+         * @param {Number} [options.truncate_limit=250] number of character to
          *      display before having a "show more" link; note that the text
          *      will not be truncated if it does not have 110% of the parameter
-         *      (ex: 110 characters needed to be truncated and be displayed as
-         *      a 100-characters message)
-         * @param {Number} [options.limit=100] maximum number of messages to fetch
-         * @param {Number} [options.offset=0] offset for fetching messages
-         * @param {Number} [options.records=null] records to show instead of fetching messages
          */
         init: function(parent, options) {
-            console.log(parent);
             this._super(parent);
             // options
             this.options = options || {};
             this.options.domain = options.domain || [];
-            this.options.context = options.context || {};
-            // check in parents, should not define multiple times
-            this.options.context.res_model = options.context.res_model || 'mail.thread';
-            this.options.context.res_id = options.context.res_id || false;
-            this.options.context.parent_id = options.context.parent_id || false;
+            this.options.context = _.extend({
+                default_model: 'mail.thread',
+                default_res_id:  0,
+                default_parent_id: false }, options.context || {});
             this.options.thread_level = options.thread_level || 0;
             this.options.composer = options.composer || false;
-            // TDE: not sure, here for testing / compatibility
-            this.options.records = options.records || null;
-            this.options.ids = options.ids || null;
+            this.options.message_ids = options.message_ids || null;
+            this.options.message_data = options.message_data || null;
             // datasets and internal vars
-            this.ds_post = new session.web.DataSetSearch(this, this.options.context.res_model);
-            this.ds_notif = new session.web.DataSetSearch(this, 'mail.notification');
-            this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
+            this.ds_thread = new session.web.DataSetSearch(this, this.options.context.default_model);
+            this.ds_notification = new session.web.DataSetSearch(this, 'mail.notification');
+            this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
             // display customization vars
-            this.display = {};
-            this.display.truncate_limit = options.truncate_limit || 250;
-            this.display.show_header_compose = options.show_header_compose || false;
-            this.display.show_reply = options.show_reply || false;
-            this.display.show_delete = options.show_delete || false;
-            this.display.show_hide = options.show_hide || false;
-            this.display.show_reply_by_email = options.show_reply_by_email || false;
-            this.display.show_more = options.show_more || false;
-            // for search view
-            this.search = {'domain': [], 'context': {}, 'groupby': {}}
-            this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
-            // debug
-            console.groupCollapsed('New Thread: model', this.options.context.res_model, 'id', this.options.context.res_id, 'parent_id', this.options.context.parent_id, 'thread level', this.options.thread_level);
-            console.log('records:', this.options.records, 'ids:', this.options.ids);
-            console.log('options:', this.options);
-            console.log('display:', this.display);
-            console.groupEnd();
+            this.display = {
+                truncate_limit: options.truncate_limit || 250,
+                show_header_compose: options.show_header_compose || false,
+                show_reply: options.show_reply || false,
+                show_delete: options.show_delete || false,
+                show_hide: options.show_hide || false,
+                show_reply_by_email: options.show_reply_by_email || false,
+                show_more: options.show_more || false,
+            }
         },
         
         start: function() {
+            // TDE TODO: check for deferred, not sure it is correct
             this._super.apply(this, arguments);
             this.bind_events();
-            // display messages: either given by parent, either fetch new ones
-            if (this.options.records) var display_done = this.message_display(this.options.records);
-            else var display_done = this.message_fetch();
-            // customize display
-            this.display_user_avatar();
-            $.when(display_done).then(this.proxy('do_customize_display'));
+            // fetch and display message, using message_ids if set
+            var display_done = $.when(this.message_fetch(true, [], {})).then(this.proxy('do_customize_display'));
             // add message composition form view
             if (this.display.show_header_compose && this.options.composer) {
                 var compose_done = this.instantiate_composition_form();
@@ -309,6 +269,7 @@ openerp.mail = function(session) {
         /** Customize the display
          * - show_header_compose: show the composition form in the header */
         do_customize_display: function() {
+            this.display_user_avatar();
             if (this.display.show_header_compose) { this.$el.find('div.oe_mail_thread_action').eq(0).show(); }
         },
 
@@ -366,7 +327,10 @@ openerp.mail = function(session) {
                 event.stopPropagation();
                 var msg_id = event.srcElement.dataset.msg_id;
                 if (! msg_id) return false;
-                self.compose_message_widget.refresh({'composition_mode': 'reply', 'msg_id': parseInt(msg_id)});
+                self.compose_message_widget.refresh({
+                    'default_composition_mode': 'reply',
+                    'default_parent_id': parseInt(msg_id),
+                    'default_content_subtype': 'html'} );
             });
         },
 
@@ -375,24 +339,26 @@ openerp.mail = function(session) {
          * Normally it should be called only when clicking on 'Post/Send'
          * in the composition form. */
         do_action: function(action, on_close) {
-            console.log('thread do_action', action, on_close, this);
             this.message_clean();
             this.message_fetch();
             if (this.compose_message_widget) {
-                this.compose_message_widget.refresh(); }
+                this.compose_message_widget.refresh({
+                    'default_composition_mode': 'comment',
+                    'default_parent_id': this.options.default_parent_id,
+                    'default_content_subtype': 'plain'} );
+            }
             return this._super(action, on_close);
         },
 
-        /** Instantiate the composition form, with parameters coming from thread parameters */
-        instantiate_composition_form: function(mode, formatting, msg_id, context) {
+        /** Instantiate the composition form, with every parameters in context
+            or in the widget context. */
+        instantiate_composition_form: function(context) {
             if (this.compose_message_widget) {
                 this.compose_message_widget.destroy();
             }
             this.compose_message_widget = new mail.ComposeMessage(this, {
-                'context': {
-                    'default_model': this.options.context.res_model, 'default_res_id': this.options.context.res_id,
-                    'composition_mode': mode || 'comment', 'msg_id': msg_id }
-                });
+                'context': _.extend(context || {}, this.options.context),
+            });
             var composition_node = this.$el.find('div.oe_mail_thread_action');
             composition_node.empty();
             var compose_done = this.compose_message_widget.appendTo(composition_node);
@@ -405,35 +371,33 @@ openerp.mail = function(session) {
         },
 
         /** Fetch messages
-         * @param {Array} additional_domain
-         * @param {Object} additional_context
+         * @param {Bool} initial_mode: initial mode: try to use message_data or
+         *  message_ids, if nothing available perform a message_read; otherwise
+         *  directly perform a message_read
+         * @param {Array} additional_domain: added to options.domain
+         * @param {Object} additional_context: added to options.context
          */
-        message_fetch: function (additional_domain, additional_context) {
+        message_fetch: function (initial_mode, additional_domain, additional_context) {
             var self = this;
-            // Update the domain and context
-            this.search['domain'] = _.union(this.options.domain, this.search_results.domain);
-            this.search['context'] = _.extend(this.options.context, this.search_results.context);
-            if (additional_domain) var fetch_domain = this.search['domain'].concat(additional_domain);
-            else var fetch_domain = this.search['domain'];
-            if (additional_context) var fetch_context = _.extend(this.search['context'], additional_context);
-            else var fetch_context = this.search['context'];
-
-            // TODO first use: use IDS, otherwise set false
-
-            var read_defer = this.ds_msg.call('message_read',
-                [false, fetch_domain, this.options.thread_level, undefined, fetch_context]
+            // domain and context: options + additional
+            fetch_domain = _.flatten([this.options.domain, additional_domain || []], true)
+            fetch_context = _.extend(this.options.context, additional_context || {})
+            // if message_ids is set: try to use it
+            if (initial_mode && this.options.message_data) {
+                return this.message_display(this.options.message_data);
+            }
+            return this.ds_message.call('message_read',
+                [(initial_mode && this.options.message_ids) || false, fetch_domain, this.options.thread_level, undefined, fetch_context]
                 ).then(this.proxy('message_display'));
-            return read_defer;
         },
 
         /* Display a list of records
-         * - */
+         * A specific case is done for 'expandable' messages that are messages
+            displayed under a 'show more' button form
+         */
         message_display: function (records) {
             var self = this;
             var _expendable = false;
-            console.groupCollapsed('message_display');
-            console.log('records', records)
-            console.groupEnd();
             _(records).each(function (record) {
                 if (record.type == 'expandable') {
                     _expendable = true;
@@ -443,14 +407,19 @@ openerp.mail = function(session) {
                 }
                 else {
                     self.display_record(record);
+                    // if (self.options.thread_level >= 0) {
                     self.thread = new mail.Thread(self, {
-                        'context': { 'res_model': record.model, 'res_id': record.res_id, 'parent_id': record.id},
+                        'context': {
+                            'default_model': record.model,
+                            'default_id': record.res_id,
+                            'default_parent_id': record.id },
+                        'message_data': record.child_ids, 'thread_level': self.options.thread_level-1,
                         'show_header_compose': false, 'show_reply': self.options.thread_level > 1,
                         'show_hide': self.display.show_hide, 'show_delete': self.display.show_delete,
-                        'uid': self.options.uid, 'records': record.child_ids, 'thread_level': (self.options.thread_level-1),
                     });
                     self.$el.find('li.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');
                     self.thread.appendTo(self.$el.find('div.oe_mail_thread_subthread:last'));
+                    // }
                 }
             });
             if (! _expendable) {
@@ -522,7 +491,7 @@ openerp.mail = function(session) {
 
         /** Action: 'shows more' to fetch new messages */
         do_message_fetch: function () {
-            return this.message_fetch(this.fetch_more_domain, this.fetch_more_context);
+            return this.message_fetch(false, this.fetch_more_domain, this.fetch_more_context);
         },
 
         // TDE: keep currently because need something similar
@@ -572,19 +541,18 @@ openerp.mail = function(session) {
 
     /** mail_thread widget: thread of comments */
     mail.RecordThread = session.web.form.AbstractField.extend({
-        // QWeb template to use when rendering the object
         template: 'mail.record_thread',
 
         init: function() {
             this._super.apply(this, arguments);
             this.options.domain = this.options.domain || [];
-            this.options.context = {'res_model': 'mail.thread', 'res_id': false, 'parent_id': false};
+            this.options.context = {'default_model': 'mail.thread', 'default_res_id': false};
             this.options.thread_level = this.options.thread_level || 0;
             this.thread_list = [];
         },
 
         start: function() {
-            // this._super.apply(this, arguments);
+            this._super.apply(this, arguments);
             // NB: all the widget should be modified to check the actual_mode property on view, not use
             // any other method to know if the view is in create mode anymore
             this.view.on("change:actual_mode", this, this._check_visibility);
@@ -608,14 +576,14 @@ openerp.mail = function(session) {
                 return;
             }
             // update context
-            this.options.context['res_id'] = this.view.datarecord.id;
-            this.options.context['res_model'] = this.view.model;
+            _.extend(this.options.context, {
+                default_res_id: this.view.datarecord.id,
+                default_model: this.view.model });
             // create and render Thread widget
             this.$el.find('div.oe_mail_recthread_main').empty();
             for (var i in this.thread_list) { this.thread_list[i].destroy(); }
-            console.log(this);
             var thread = new mail.Thread(self, {
-                'context': this.options.context, 'uid': this.session.uid,
+                'context': this.options.context,
                 'thread_level': this.options.thread_level, 'show_header_compose': true,
                 'show_delete': true, 'composer': true });
             this.thread_list.push(thread);
@@ -644,7 +612,7 @@ openerp.mail = function(session) {
          * @param {Object} [options]
          * @param {Number} [options.domain] domain on the Wall, is an array.
          * @param {Number} [options.domain] context, is an object. It should
-         *      contain res_model, res_id, parent_id, to give it to the threads.
+         *      contain default_model, default_res_id, to give it to the threads.
          */
         init: function (parent, options) {
             this._super(parent);
@@ -653,7 +621,7 @@ openerp.mail = function(session) {
             this.options.context = options.context || {};
             this.options.thread_level = options.thread_level || 1;
             this.thread_list = [];
-            this.ds_msg = new session.web.DataSet(this, 'mail.message');
+            this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
             // for search view
             this.search = {'domain': [], 'context': {}, 'groupby': {}}
             this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
@@ -662,29 +630,15 @@ openerp.mail = function(session) {
         start: function () {
             this._super.apply(this, arguments);
             var search_view_ready = this.load_search_view({}, false);
-            var thread_displayed = this.display_thread();
+            var thread_displayed = this.message_display();
             return (search_view_ready && thread_displayed);
         },
 
         destroy: function () {
-            for (var i in this.thrad_list) { this.thread_list[i].destroy(); }
+            for (var i in this.thread_list) { this.thread_list[i].destroy(); }
             this._super.apply(this, arguments);
         },
 
-        /**
-         * Override-hack of do_action: automatically reload the chatter.
-         * Normally it should be called only when clicking on 'Post/Send'
-         * in the composition form. */
-        //TDE: still useful ? TO CHECK
-        do_action: function(action, on_close) {
-            console.log('wall do_action');
-            if (this.compose_message_widget) {
-                this.compose_message_widget.refresh(); }
-            this.message_clean();
-            this.display_thread();
-            return this._super(action, on_close);
-        },
-
         /**
          * Load the mail.message search view
          * @param {Object} defaults ??
@@ -717,7 +671,7 @@ openerp.mail = function(session) {
                 self.search_results['domain'] = results.domain;
                 self.search_results['groupby'] = results.group_by;
                 self.message_clean();
-                return self.display_thread();
+                return self.message_display();
             });
         },
 
@@ -726,14 +680,12 @@ openerp.mail = function(session) {
             this.$el.find('ul.oe_mail_wall_threads').empty();
         },
 
-        /** Display comments
-         * @param {Array} records tree structure of records
-         */
-        display_thread: function () {
+        /** Display the Wall threads */
+        message_display: function () {
             var render_res = session.web.qweb.render('mail.wall_thread_container', {});
             $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(this.$el.find('ul.oe_mail_wall_threads'));
             var thread = new mail.Thread(this, {
-                'domain': this.options.domain, 'context': this.options.context, 'uid': this.session.uid,
+                'domain': this.options.domain, 'context': this.options.context,
                 'thread_level': this.options.thread_level, 'composer': true,
                 // display options
                 'show_header_compose': true,  'show_reply': this.options.thread_level > 0,
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 06a1ce48605..e31a23ae517 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -47,7 +47,7 @@
         Template used to display the communication history in documents
         form view.
         -->
-    <div t-name="mail.record_thread" class="oe_mail_recthread">
+    <div t-name="mail.record_thread">
         <!-- <h4>History and Comments</h4> -->
         <div class="oe_mail_recthread_main">
             <!-- contains the document thread -->

From c1ec19eba9c8e44f96cfbd4cf462993cc399c921 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 3 Sep 2012 17:21:49 +0200
Subject: [PATCH 746/999] [IMP] Put some translation editable list fields
 readonly

bzr revid: fme@openerp.com-20120903152149-ss9j9e7xxcgv42f6
---
 openerp/addons/base/ir/ir.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 09ff7c036f3..4fb3c82dd24 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -1215,11 +1215,11 @@
             <field name="model">ir.translation</field>
             <field name="arch" type="xml">
                 <tree string="Translations" editable="bottom">
-                    <field name="src"/>
+                    <field name="src" readonly="True"/>
                     <field name="value"/>
-                    <field name="name"/>
-                    <field name="lang"/>
-                    <field name="type"/>
+                    <field name="name" readonly="True"/>
+                    <field name="lang" readonly="True"/>
+                    <field name="type" readonly="True"/>
                 </tree>
             </field>
         </record>

From 203f4636d521386e0f1c0e17dce1e77e438749c1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 3 Sep 2012 17:53:32 +0200
Subject: [PATCH 747/999] [IMP] Renamed tranlate to translate_fields

bzr revid: fme@openerp.com-20120903155332-nw2p14u8maywy7wm
---
 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 7975906e100..b0c8b6618ae 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1998,7 +1998,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
     on_translate: function() {
         var self = this;
         var trans = new instance.web.DataSet(this, 'ir.translation', this.view.dataset.get_context());
-        return trans.call('translate', [this.view.dataset.model, this.view.datarecord.id, this.name]).then(function(action) {
+        return trans.call('translate_fields', [this.view.dataset.model, this.view.datarecord.id, this.name]).then(function(action) {
             self.do_action(action);
         });
     },

From 06e6bf71cc2effe244d5a392934a9b3abf93f35a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 3 Sep 2012 17:54:08 +0200
Subject: [PATCH 748/999] [IMP] Always update src to the last value

bzr revid: fme@openerp.com-20120903155408-9agsj0y8y6g7ydsj
---
 openerp/addons/base/ir/ir_translation.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index 05f5071a2d7..55902389ee4 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -328,7 +328,7 @@ class ir_translation(osv.osv):
         result = super(ir_translation, self).unlink(cursor, user, ids, context=context)
         return result
 
-    def translate(self, cr, uid, model, id, field=None, context=None):
+    def translate_fields(self, cr, uid, model, id, field=None, context=None):
         trans_model = self.pool.get(model)
         domain = ['&', ('res_id', '=', id), ('name', 'ilike', model + ',')]
         langs_ids = self.pool.get('res.lang').search(cr, uid, [], context=context)
@@ -353,9 +353,11 @@ class ir_translation(osv.osv):
                     sql = """INSERT INTO ir_translation (lang, src, name, type, res_id, value)
                         SELECT %s, %s, %s, 'field', %s, %s WHERE NOT EXISTS
                         (SELECT 1 FROM ir_translation WHERE lang=%s AND name=%s AND res_id=%s);
+                        UPDATE ir_translation SET src = %s WHERE lang=%s AND name=%s AND res_id=%s;
                         """
+                    src = record[f['name']]
                     name = "%s,%s" % (f['model'], f['name'])
-                    cr.execute(sql, (lg, record[f['name']], name, f['id'], record[f['name']], lg, name, f['id']))
+                    cr.execute(sql, (lg, src , name, f['id'], src, lg, name, f['id'], src, lg, name, id))
 
         action = {
             'name': 'Translate',

From da86f505acf8b6c906f80933dc733c02ffa84eec Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 3 Sep 2012 18:40:10 +0200
Subject: [PATCH 749/999] Added polish to left menu

bzr revid: mit@openerp.com-20120903164010-itzwtaf37c6bas71
---
 addons/web/static/src/css/base.css           | 33 ++++++++++++++------
 addons/web/static/src/css/base.sass          | 16 ++++++----
 addons/web_kanban/static/src/css/kanban.css  |  5 +--
 addons/web_kanban/static/src/css/kanban.sass |  3 +-
 4 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b1c6348b2ad..e875ff9fab2 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -454,6 +454,9 @@
   -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
   box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
 }
+.openerp .oe_background_grey {
+  background: #eeeeee !important;
+}
 .openerp .oe_form_dirty .oe_highlight_on_dirty {
   color: white;
   background: #dc5f59;
@@ -1207,24 +1210,31 @@
 .openerp .oe_secondary_submenu .oe_menu_counter {
   float: right;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-  margin: 0px;
+  margin: 1px;
   padding: 1px 4px;
+  border: none;
 }
 .openerp .oe_secondary_submenu .oe_menu_counter:hover {
   cursor: pointer;
-  border: 1px solid #c81010;
-  -moz-box-shadow: 0 0 2px #c81010;
-  -webkit-box-shadow: 0 0 2px #c81010;
-  box-shadow: 0 0 2px #c81010;
+  -moz-transform: scale(1.1);
+  -webkit-transform: scale(1.1);
+  -o-transform: scale(1.1);
+  -ms-transform: scale(1.1);
 }
 .openerp .oe_secondary_submenu .oe_active {
-  background: #7c7bad;
   border-top: 1px solid lightGray;
-  border-bottom: 1px solid lightGray;
+  border-bottom: 1px solid #e0e0e0;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2);
+  box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2);
+  background-color: #7372a7;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#7372a7), to(#8281b1));
+  background-image: -webkit-linear-gradient(top, #7372a7, #8281b1);
+  background-image: -moz-linear-gradient(top, #7372a7, #8281b1);
+  background-image: -ms-linear-gradient(top, #7372a7, #8281b1);
+  background-image: -o-linear-gradient(top, #7372a7, #8281b1);
+  background-image: linear-gradient(to bottom, #7372a7, #8281b1);
 }
 .openerp .oe_secondary_submenu .oe_active a {
   color: white;
@@ -1240,6 +1250,9 @@
 .openerp .oe_secondary_submenu .oe_active .oe_menu_counter {
   background: #eeeeee;
   color: #7c7bad;
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2);
 }
 .openerp .oe_secondary_submenu .oe_menu_toggler:before {
   width: 0;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 1b6a1b3d766..637a1975e32 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -390,6 +390,8 @@ $sheet-max-width: 860px
         @include vertical-gradient(#DF6B66, #BF3A33)
         //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%))
         @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2))
+    .oe_background_grey
+        background: #eee !important
 
     .oe_form_dirty
         .oe_highlight_on_dirty
@@ -945,18 +947,19 @@ $sheet-max-width: 860px
         .oe_menu_counter
             float: right
             text-shadow: 0 1px 1px rgba(0,0,0,0.2)
-            margin: 0px
+            margin: 1px 
             padding: 1px 4px
+            border: none
             &:hover
                 cursor: pointer
-                border: 1px solid #C81010
-                @include box-shadow(0 0 2px #C81010)
+                @include transform(scale(1.1))
         .oe_active
-            background: $link-color
             border-top: 1px solid lightGray
-            border-bottom: 1px solid lightGray
+            border-bottom: 1px solid #e0e0e0
             text-shadow: 0 1px 1px rgba(0,0,0,0.2)
-            @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2))
+            @include box-shadow((inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2)))
+            //background: $link-color
+            @include vertical-gradient(darken($link-color, 3%), lighten($link-color, 2%))
             a
                 color: white
             .oe_menu_label
@@ -967,6 +970,7 @@ $sheet-max-width: 860px
             .oe_menu_counter
                 background: #eee
                 color: $link-color
+                @include box-shadow(inset 0 1px 2px rgba(0, 0, 0, 0.2))
         .oe_menu_toggler:before
             width: 0
             height: 0
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 299aba737e6..1b9530b0845 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,4 +1,5 @@
 .openerp .oe_kanban_view {
+  background: white;
   height: inherit;
 }
 .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_dummy_cell {
@@ -229,7 +230,6 @@
   margin-bottom: 5px;
 }
 .openerp .oe_kanban_view .oe_kanban_box_header {
-  background: #eeeeee;
   border-bottom: 1px solid #cccccc;
 }
 .openerp .oe_kanban_view .oe_kanban_title {
@@ -248,9 +248,6 @@
 .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_show_more .oe_button {
   width: 100%;
 }
-.openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column {
-  background: #eeeeee;
-}
 .openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column .oe_kanban_record {
   float: left;
   padding: 2px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 30bfe9b364f..cd2b210a733 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -37,6 +37,7 @@
 .openerp .oe_kanban_view
     // KanbanView {{{
     //background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==)
+    background: white
     height: inherit
     &.oe_kanban_grouped .oe_kanban_dummy_cell
         background: url(/web/static/src/img/form_sheetbg.png)
@@ -219,7 +220,6 @@
         -webkit-border-radius: 4px
         margin-bottom: 5px
     .oe_kanban_box_header
-        background: #EEE
         border-bottom: 1px solid #CCC
     .oe_kanban_title
         font-size: 95%
@@ -234,7 +234,6 @@
     &.oe_kanban_grouped .oe_kanban_show_more .oe_button
         width: 100%
     &.oe_kanban_ungrouped .oe_kanban_column
-        background: #eee
         .oe_kanban_record
             float: left
             padding: 2px

From 1bcad78c9958b3dee7c63e45a09cdfa3a9ebf64b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 3 Sep 2012 19:48:29 +0200
Subject: [PATCH 750/999] [FIX] res_partner: not always have a context.

bzr revid: tde@openerp.com-20120903174829-epc4nyiyavdppsbu
---
 openerp/addons/base/res/res_partner.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index fbc9e7ee7b6..242526b3d35 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -380,6 +380,8 @@ class res_partner(osv.osv):
             If only an email address is received and that the regex cannot find
             a name, the name will have the email value.
             If 'force_email' key in context: must find the email address. """
+        if context is None:
+            context = {}
         name, email = self._parse_partner_name(name, context=context)
         if context.get('force_email') and not email:
             raise osv.except_osv(_('Warning'), _("Couldn't create contact without email address !"))

From 3eaeda7144c8ef2a33bedc272ba24702125d119c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 3 Sep 2012 19:54:10 +0200
Subject: [PATCH 751/999] [IMP] Product view

bzr revid: fp@tinyerp.com-20120903175410-d1434rw9cs3ekmo8
---
 addons/product/product_view.xml | 54 ++++++++++++-------------------
 addons/stock/product.py         |  6 ++--
 addons/stock/product_view.xml   | 57 ++++++++++-----------------------
 3 files changed, 41 insertions(+), 76 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 3e0432f135e..ab86b526e29 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -101,7 +101,7 @@
                                         <field name="price_extra" groups="product.group_product_variant"/>
                                     </group>
                                 </group>
-                                <field name="description" placeholder="describe the product's characteristics..."/>
+                                <field name="description" placeholder="describe the product's characteristics for internal use..."/>
                             </page>
                             <page string="Procurements" groups="base.group_user">
                                 <group name="procurement">
@@ -177,7 +177,7 @@
                                     </form>
                                 </field>
                                 <separator string="Notes on Quotations"/>
-                                <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
+                                <field name="description_sale" placeholder="note to be displayed on quotations..."/>
                             </page>
                         </notebook>
                     </sheet>
@@ -190,42 +190,30 @@
         </record>
 
         <!-- Product Kanban View  -->
-        <record model="ir.ui.view" id="product_kanban_view">
+
+        <record model="ir.ui.view" id="product.product_kanban_view">
             <field name="name">Product Kanban</field>
             <field name="model">product.product</field>
             <field name="arch" type="xml">
                 <kanban>
                     <field name="color"/>
                     <field name="type"/>
-                    <field name="image_medium"/>
+                    <field name="image_small"/>
                     <field name="list_price"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <t t-if="record.type.raw_value!='service' and record.qty_available.raw_value lte 0" t-set="border">oe_kanban_color_red</t>
-                            <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}">
-                                <div class="oe_kanban_box oe_kanban_color_border">
-                                    <div class="oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle oe_kanban_title">
-                                        <field name="name"/>
-                                    </div>
-                                    <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
-                                        <img t-att-src="kanban_image('product.product', 'image_medium', record.id.value)" width="48" style="float: left; padding: 0 4px 4px 0"/>
-                                        Code: <field name="code"/>
-                                        <div t-if="record.type.raw_value == 'service'">No Stock</div>
-                                        <t t-if="record.type.raw_value != 'service'">
-                                            <div>Stock: <field name="qty_available"/> on hand, <field name="virtual_available"/> available</div>
-                                            <div t-if="record.list_price.raw_value != 0">Public Price: <field name="lst_price"/></div>
-                                            <!-- TODO would deserve to be hidden at the field level -->
-                                            <div groups="base.group_user">Cost : <field name="standard_price"/></div>
-                                        </t>
-                                        <div class="oe_kanban_clear"/>
-                                    </div>
-                                    <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
-                                        <div class="oe_kanban_left">
-                                            <a string="Edit" icon="gtk-edit" type="edit"/>
-                                            <a string="Change Color" icon="color-picker" type="color" name="color"/>
-                                        </div>
-                                        <div class="oe_kanban_clear"/>
-                                    </div>
+                            <div class="oe_kanban_vignette">
+                                <a type="open"><img t-att-src="kanban_image('product.product', 'image_small', record.id.value)" class="oe_kanban_image"/></a>
+                                <div class="oe_kanban_details">
+                                    <h4>
+                                        <a type="open">
+                                             <t t-if="record.code.raw_value">[<field name="code"/>]</t> <field name="name"/>
+                                        </a>
+                                    </h4>
+                                    <div name="tags"/>
+                                    <ul>
+                                        <li>Price: <field name="lst_price"></field></li>
+                                    </ul>
                                 </div>
                             </div>
                         </t>
@@ -255,7 +243,7 @@
             <field name="name">Products</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.product</field>
-            <field name="view_mode">tree,form,kanban</field>
+            <field name="view_mode">kanban,tree,form</field>
             <field name="view_type">form</field>
             <field name="context">{"search_default_filter_to_sell":1}</field>
             <field name="view_id" ref="product_product_tree_view"/>
@@ -278,7 +266,7 @@
         <record id="open_view_product_tree1" model="ir.actions.act_window.view">
             <field name="sequence" eval="2"/>
             <field name="view_mode">tree</field>
-           <field name="view_id" ref="product_product_tree_view"/>
+            <field name="view_id" ref="product_product_tree_view"/>
             <field name="act_window_id" ref="product_normal_action_sell"/>
         </record>
 
@@ -292,8 +280,8 @@
         <record id="open_view_product_kanban1" model="ir.actions.act_window.view">
             <field name="sequence" eval="1"/>
             <field name="view_mode">kanban</field>
-           <field name="view_id" ref="product_kanban_view"/>
-            <field name="act_window_id" ref="product_normal_action"/>
+            <field name="view_id" ref="product_kanban_view"/>
+            <field name="act_window_id" ref="product_normal_action_sell"/>
         </record>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
diff --git a/addons/stock/product.py b/addons/stock/product.py
index e0e55594eca..b8e8ddc4505 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -32,7 +32,7 @@ class product_product(osv.osv):
         moves = move_pool.read_group(cr, uid, [
             ('product_id', 'in', ids),
             ('picking_id.type', '=', 'in'),
-            ('state','in',('draft','confirmed','assigned','pending'))
+            ('state','in',('confirmed','assigned','pending'))
         ], ['product_id'], ['product_id'])
         for move in moves:
             product_id = move['product_id'][0]
@@ -40,7 +40,7 @@ class product_product(osv.osv):
         moves = move_pool.read_group(cr, uid, [
             ('product_id', 'in', ids),
             ('picking_id.type', '=', 'out'),
-            ('state','in',('draft','confirmed','assigned','pending'))
+            ('state','in',('confirmed','assigned','pending'))
         ], ['product_id'], ['product_id'])
         for move in moves:
             product_id = move['product_id'][0]
@@ -373,7 +373,7 @@ class product_product(osv.osv):
                  "typed as 'internal'."),
         'virtual_available': fields.function(_product_available, multi='qty_available',
             type='float',  digits_compute=dp.get_precision('Product Unit of Measure'),
-            string='Quantity Available',
+            string='Future Quantity',
             help="Forecast quantity (computed as Quantity On Hand "
                  "- Outgoing + Incoming)\n"
                  "In a context with a single Stock Location, this includes "
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index af11c3fafbb..2e0eef44da9 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -183,50 +183,27 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="product.product_kanban_view">
-            <field name="name">Product Kanban</field>
+        <record model="ir.ui.view" id="product_kanban_stock_view">
+            <field name="name">Product Kanban Stock</field>
             <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_kanban_view"/>
             <field name="arch" type="xml">
-                <kanban>
-                    <field name="color"/>
-                    <field name="type"/>
-                    <field name="image_medium"/>
-                    <field name="list_price"/>
+                <field name="list_price" position="after">
                     <field name="reception_count"/>
                     <field name="delivery_count"/>
-                    <templates>
-                        <t t-name="kanban-box">
-                            <div class="oe_product_vignette">
-                                <div class="oe_product_img">
-                                <a type="open"><img t-att-src="kanban_image('product.product', 'image_medium', record.id.value)" class="oe_product_photo"/></a>
-                                </div>
-                                <div class="oe_product_desc">
-                                    <h4><a type="open"><field name="name"></field></a></h4>
-                                    <ul>
-                                        <li t-if="record.code.raw_value">Code: <field name="code"/></li>
-                                        <li t-if="record.type.raw_value != 'service'">Stock on hand: <field name="qty_available"/> <field name="uom_id"/></li>
-                                        <li t-if="record.type.raw_value != 'service'">Stock available: <field name="virtual_available"/> <field name="uom_id"/></li>
-                                        <li>Price: <field name="lst_price"></field></li>
-                                        <!-- TODO the 'groups' attribute doesn't work in kanban views -->
-                                        <li groups="base.group_user">Cost: <field name="standard_price"></field></li>
-                                    </ul>
-                                    <div groups="base.group_user">
-                                        <a name="%(action_receive_move)d" type="action">
-                                            <t t-if="record.reception_count.value">Receptions(<t t-esc="record.reception_count.value"/>)</t>
-                                        </a>
-                                        <a name="%(action_deliver_move)d" type="action">
-                                            <t t-if="record.delivery_count.value">Deliveries(<t t-esc="record.delivery_count.value"/>)</t>
-                                        </a>
-                                    </div>
-                                </div>
-                            </div>
-                            <script>
-                                $('.oe_product_photo').load(function() { if($(this).width() > $(this).height()) { $(this).addClass('oe_product_photo_wide') } });
-                            </script>
-                            <div></div>
-                        </t>
-                    </templates>
-                </kanban>
+                </field>
+                <xpath expr="//div[@name='tags']" position="inside">
+                    <a name="%(action_receive_move)d" type="action" t-if="record.reception_count.raw_value>0">
+                        <t t-esc="record.reception_count.value"/> Receptions
+                    </a>
+                    <a name="%(action_deliver_move)d" type="action" t-if="record.delivery_count.raw_value>0">
+                        <t t-esc="record.delivery_count.value"/> Deliveries
+                    </a>
+                </xpath>
+                <ul position="inside">
+                    <li t-if="record.type.raw_value != 'service'">On hand: <field name="qty_available"/> <field name="uom_id"/></li>
+                    <li t-if="record.type.raw_value != 'service'">Available: <field name="virtual_available"/> <field name="uom_id"/></li>
+                </ul>
             </field>
         </record>
 

From 6cab0916391df75940734a6abbf71290b7938c15 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 3 Sep 2012 19:55:17 +0200
Subject: [PATCH 752/999] [IMP] usability product kanban and search

bzr revid: fp@tinyerp.com-20120903175517-ue9rn3g0j05qge1f
---
 addons/product/product_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ab86b526e29..ae769528d3c 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -12,8 +12,6 @@
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
                    <filter string="Products" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]" help="Both stockable and consumable products"/>
                    <separator/>
-                   <filter string="To Sell" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
-                   <separator/>
                    <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
                    <filter string="Can be Sold" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter name="filter_to_purchase" string="Can be Purchased" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>

From 88ce376c321a0ccc523e3d02dc6e128b2cb58b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 3 Sep 2012 20:10:00 +0200
Subject: [PATCH 753/999] [CLEAN] mail_compose_message: removed default values
 for partner_ids, that were a bit strange.

bzr revid: tde@openerp.com-20120903181000-4al2stqzqfw4bhfc
---
 addons/mail/wizard/mail_compose_message.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index d141b3cf1e0..0c0626f44c9 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -118,7 +118,6 @@ class mail_compose_message(osv.TransientModel):
         'body_text': lambda self,cr, uid, context={}: False,
         'body': lambda self,cr, uid, context={}: '',
         'subject': lambda self,cr, uid, context={}: False,
-        'partner_ids': [],
     }
 
     def notify(self, cr, uid, newid, context=None):

From a3db9b35bd561bd00d7f5d1a90c0adb25a150be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 3 Sep 2012 20:11:11 +0200
Subject: [PATCH 754/999] [WIP] email_template: WIP about debugging the use of
 email_templates. A method to get and handle values coming from generate_emial
 has been added. TODO: use it where necessary, clean the remaining of the
 code, add some tests. Added some new tests.

bzr revid: tde@openerp.com-20120903181111-yy9y6omu4vyhdc11
---
 addons/email_template/tests/test_mail.py      | 41 +++++++--
 .../wizard/mail_compose_message.py            | 86 ++++++++++++-------
 2 files changed, 89 insertions(+), 38 deletions(-)

diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
index 5ca608e6b81..05f8f81d76d 100644
--- a/addons/email_template/tests/test_mail.py
+++ b/addons/email_template/tests/test_mail.py
@@ -71,23 +71,50 @@ class test_message_compose(common.TransactionCase):
         _subject1 = 'Pigs'
         _subject2 = 'Bird'
         _body_text1 = 'Pigs rules'
-        _body_text_html1 = 'Pigs rules<pre>Admin</pre>'
+        _body_text_html1 = 'Fans of Pigs, unite !\n<pre>Admin</pre>\n'
         _body_text2 = 'I am angry !'
         _body_text_html2 = 'I am angry !<pre>Admin</pre>'
 
-        # CASE1: create in mass_mail composition mode that should work with email_template installed
+        # CASE1: create in comment
+        compose_id = mail_compose.create(cr, uid,
+            {'subject': 'Forget me subject', 'body': 'Dummy body'},
+            {'default_composition_mode': 'comment', 'default_model': 'mail.group',
+                'default_res_id': self.group_pigs_id, 'default_use_template': True,
+                'active_ids': [self.group_pigs_id, group_bird_id] })
+        compose = mail_compose.browse(cr, uid, compose_id)
+
+        # Perform 'onchange_template_id' with 'use_template' set
+        values = mail_compose.onchange_template_id(cr, uid, [], compose.use_template, email_template_id, compose.composition_mode, compose.model, compose.res_id)
+        compose.write(values.get('value', {}), {'default_composition_mode': 'comment', 'default_model': 'mail.group'})
+        compose.refresh()
+        message_pids = [partner.id for partner in compose.partner_ids]
+        partner_ids = self.res_partner.search(cr, uid, [('email', 'in', ['b@b.b', 'c@c.c', 'd@d.d'])])
+        partners = self.res_partner.browse(cr, uid, partner_ids)
+        # Test: subject, body, partner_ids
+        self.assertEqual(compose.subject, _subject1, 'mail.compose.message subject incorrect')
+        self.assertEqual(compose.body, _body_text_html1, 'mail.compose.message body incorrect')
+        self.assertEqual(set(message_pids), set(partner_ids), 'mail.compose.message partner_ids incorrect')
+
+        # Perform 'onchange_use_template': use_template is not set anymore
+        values = mail_compose.onchange_use_template(cr, uid, [], not compose.use_template, compose.template_id, compose.composition_mode, compose.model, compose.res_id)
+        compose.write(values.get('value', {}), {'default_composition_mode': 'comment', 'default_model': 'mail.group'})
+        compose.refresh()
+        # Test: subject, body, partner_ids
+        self.assertEqual(compose.subject, False, 'mail.compose.message subject incorrect')
+        self.assertEqual(compose.body, '', 'mail.compose.message body incorrect')
+
+        # CASE12 create in mass_mail composition
         compose_id = mail_compose.create(cr, uid,
             {'subject': 'Forget me subject', 'body': 'Dummy body'},
             {'default_composition_mode': 'mass_mail', 'default_model': 'mail.group',
                 'default_res_id': -1, 'default_use_template': True,
-                'active_ids': [self.group_pigs_id, group_bird_id], 'default_template_id': email_template_id})
+                'active_ids': [self.group_pigs_id, group_bird_id] })
         compose = mail_compose.browse(cr, uid, compose_id)
-        # print compose.subject
-        
 
-        # Try the 'onchange_template_id'
-        values = mail_compose.onchange_template_id(cr, uid, [], compose.use_template, compose.template_id, compose.composition_mode, compose.model, compose.res_id)
+        # Test 'onchange_template_id' with 'use_template' set
+        values = mail_compose.onchange_template_id(cr, uid, [], compose.use_template, email_template_id, compose.composition_mode, compose.model, compose.res_id)
         print values
+        # self.assertEqual()
         # compose.write(values['value'])
         values = mail_compose.onchange_use_template(cr, uid, [], not compose.use_template, compose.template_id, compose.composition_mode, compose.model, compose.res_id)
         print values
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 71586649f37..85dfe8bc843 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -28,15 +28,17 @@ from tools.translate import _
 
 class mail_compose_message(osv.osv_memory):
     _inherit = 'mail.compose.message'
+    _compose_fields = ['body', 'body_html', 'subject', 'partner_ids', 'attachment_ids']
 
     def _get_templates(self, cr, uid, context=None):
         if context is None:
             context = {}
         model = False
         email_template_obj= self.pool.get('email.template')
+        message_id = context.get('default_parent_id', context.get('message_id', context.get('active_id')))
 
-        if context.get('default_composition_mode') == 'reply' and context.get('active_id'):
-            message_data = self.pool.get('mail.message').browse(cr, uid, int(context.get('active_id')), context)
+        if context.get('default_composition_mode') == 'reply' and message_id:
+            message_data = self.pool.get('mail.message').browse(cr, uid, message_id, context=context)
             if message_data:
                 model = message_data.model
         else:
@@ -62,32 +64,17 @@ class mail_compose_message(osv.osv_memory):
 
     def onchange_template_id(self, cr, uid, ids, use_template, template_id, composition_mode, model, res_id, context=None):
         """ - use_template not set: return default_get
-            - use_template set:
-                - mass_mailing: we cannot render, so return the template values
-                - else: return rendered values """
-        fields = ['body', 'body_html', 'subject', 'partner_ids', 'email_to', 'email_cc']
+            - use_template set in mass_mailing: we cannot render, so return the template values
+            - use_template set: return rendered values """
         if use_template and template_id and composition_mode == 'mass_mail':
-            values = self.pool.get('email.template').read(cr, uid, template_id, fields, context)
+            values = self.pool.get('email.template').read(cr, uid, template_id, self._compose_fields, context)
         elif use_template and template_id:
-            values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
-
-            values['attachment_ids'] = []
-            attachment_obj = self.pool.get('ir.attachment')
-            for attach_fname, attach_datas in values.get('attachments', []):
-                data_attach = {
-                    'name': attach_fname,
-                    'datas': attach_datas,
-                    'datas_fname': attach_fname,
-                    'description': fname,
-                    'res_model': model,
-                    'res_id': res_id,
-                }
-                values['attachment_ids'].append(attachment_obj.create(cr, uid, data_attach), context=context)
+            values = self.generate_email_for_composer(cr, uid, template_id, res_id, context=context)
         else:
-            values = self.default_get(cr, uid, fields, context=context)
+            values = self.default_get(cr, uid, self._compose_fields, context=context)
 
-        if values.get('body_html') and not values.get('body'):
-            values['body'] = values.get('body_html')
+        if values.get('body_html'):
+            values['body'] = values.pop('body_html')
         values.update(use_template=use_template, template_id=template_id)
 
         return {'value': values}
@@ -98,14 +85,17 @@ class mail_compose_message(osv.osv_memory):
         for record in self.browse(cr, uid, ids, context=context):
             onchange_res = self.onchange_use_template(cr, uid, ids, not record.use_template,
                 record.template_id, record.composition_mode, record.model, record.res_id, context=context)['value']
-            record.write(onchange_res)
+            record.write(onchange_res.get('value', {}))
         return True
 
     def onchange_use_template(self, cr, uid, ids, use_template, template_id, composition_mode, model, res_id, context=None):
         """ onchange_use_template (values: True or False).  If use_template is
             False, we do like an onchange with template_id False for values """
-        return self.onchange_template_id(cr, uid, ids, use_template,
+        values = self.onchange_template_id(cr, uid, ids, use_template,
             template_id, composition_mode, model, res_id, context=context)
+        if use_template:
+            values['content_subtype'] = 'html'
+        return values
 
     def save_as_template(self, cr, uid, ids, context=None):
         """ hit save as template button: current form value will be a new
@@ -113,8 +103,7 @@ class mail_compose_message(osv.osv_memory):
         email_template = self.pool.get('email.template')
         ir_model_pool = self.pool.get('ir.model')
         for record in self.browse(cr, uid, ids, context=context):
-            model = record.model
-            model_ids = ir_model_pool.search(cr, uid, [('model', '=', model)])
+            model_ids = ir_model_pool.search(cr, uid, [('model', '=', record.model)], context=context)
             model_id = model_ids and model_ids[0] or False
             model_name = ''
             if model_id:
@@ -135,14 +124,49 @@ class mail_compose_message(osv.osv_memory):
     # Wizard validation and send
     #------------------------------------------------------
 
+    def generate_email_for_composer(self, cr, uid, template_id, res_id, context=None):
+        """ Call email_template.generate_email(), get fields relevant for
+            mail.compose.message, transform email_cc and email_to into partner_ids """
+        fields = ['body', 'body_html', 'subject', 'email_to', 'email_cc', 'attachment_ids']
+        template_values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
+        values = {field: template_values[field] for field in fields if template_values.get(field)}
+
+        # transform email_to, email_cc into partner_ids
+        values['partner_ids'] = []
+        mails = tools.email_split(values.pop('email_to', '') + ' ' + values.pop('email_cc', ''))
+        for mail in mails:
+            partner_search_ids = self.pool.get('res.partner').search(cr, uid, [('email', 'ilike', mail)], context=context)
+            if partner_search_ids:
+                values['partner_ids'].append((4, partner_search_ids[0]))
+            else:
+                partner_id = self.pool.get('res.partner').name_create(cr, uid, mail, context=context)[0]
+                partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+                values['partner_ids'].append((4, partner_id))
+
+        # transform attachments into attachment_ids
+        values['attachment_ids'] = []
+        for attach_fname, attach_datas in template_values.get('attachments', []):
+            data_attach = {
+                'name': attach_fname,
+                'datas': attach_datas,
+                'datas_fname': attach_fname,
+                'res_model': model,
+                'res_id': res_id,
+            }
+            values['attachment_ids'].append((0, 0, data_attach))
+
+        return values
+
     def render_message(self, cr, uid, wizard, model, res_id, context=None):
         """ Generate an email from the template for given (model, res_id) pair.
             This method is meant to be inherited by email_template that will
             produce a more complete dictionary, with email_to, ...
         """
         # render the template to get the email
+        fields = ['body', 'body_html', 'subject', 'email_to', 'email_cc', 'partner_ids', 'attachment_ids']
         template_values = self.pool.get('email.template').generate_email(cr, uid, wizard.template_id, res_id, context=context)
-        # TDE TODO: handle fields to update / not to update (mail_server_id, auto_delete, ...)
+        template_values = {field: template_values[field] for field in fields if template_values.get(field)}
+
         # transform email_to, email_cc into partner_ids
         partner_ids = []
         mails = tools.email_split(template_values.pop('email_to', '') + ' ' + template_values.pop('email_cc', ''))
@@ -154,10 +178,10 @@ class mail_compose_message(osv.osv_memory):
                 partner_id = self.pool.get('res.partner').name_create(cr, uid, mail, context=context)[0]
                 partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
                 partner_ids.append((4, partner_id))
+
         # get values to return
         email_dict = super(mail_compose_message, self).render_message(cr, uid, wizard, model, res_id, context)
-        email_dict.update(template_values)
-        email_dict.update(partner_ids=partner_ids, attachments=template_values.get('attachments'))
+        email_dict.update(template_values, partner_ids=partner_ids)
         return email_dict
 
     def render_template(self, cr, uid, template, model, res_id, context=None):

From 8e975d7406fbf2a5ad5b431a8e1868e5c762184e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 4 Sep 2012 00:41:47 +0200
Subject: [PATCH 755/999] [IMP] Notes icon

bzr revid: fp@openerp.com-20120903224147-eeby02dymv5jyfv5
---
 addons/note/static/src/img/icon.png | Bin 0 -> 13042 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 addons/note/static/src/img/icon.png

diff --git a/addons/note/static/src/img/icon.png b/addons/note/static/src/img/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6ad0548a40a4db04ab4a6f24b495e7f8840c7f1
GIT binary patch
literal 13042
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

literal 0
HcmV?d00001


From 1db49a08818b361eab4c4216dad709c3d6171328 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 4 Sep 2012 10:21:15 +0530
Subject: [PATCH 756/999] [FIX] crm : Dead should be a visible stage in lead
 status bar.

bzr revid: mdi@tinyerp.com-20120904045115-f2b4ymn2eux0c35b
---
 addons/crm/crm_lead_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 04f91933f66..f734a839ff4 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -55,7 +55,7 @@
         <record model="crm.case.stage" id="stage_lead7">
             <field name="name">Dead</field>
             <field eval="1" name="case_default"/>
-            <field eval="True" name="fold"/>
+            <field eval="False" name="fold"/>
             <field name="state">cancel</field>
             <field eval="'0'" name="probability"/>
             <field eval="'16'" name="sequence"/>

From ffc772edfd262a65daad316ffd4d2dc5c60d734b Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 4 Sep 2012 04:52:49 +0000
Subject: [PATCH 757/999] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120904045249-1039twan4q8v5oip
---
 addons/base_action_rule/i18n/nb.po | 536 +++++++++++++++++++++++++++++
 addons/hr/i18n/nl.po               |  12 +-
 addons/hr_holidays/i18n/nl.po      |  10 +-
 addons/hr_payroll/i18n/nl.po       |  20 +-
 addons/import_sugarcrm/i18n/fr.po  |  36 +-
 addons/mail/i18n/nl.po             |  10 +-
 addons/pad_project/i18n/fr.po      |  15 +-
 addons/sale_crm/i18n/fr.po         |  22 +-
 addons/share/i18n/nl.po            |  11 +-
 9 files changed, 610 insertions(+), 62 deletions(-)
 create mode 100644 addons/base_action_rule/i18n/nb.po

diff --git a/addons/base_action_rule/i18n/nb.po b/addons/base_action_rule/i18n/nb.po
new file mode 100644
index 00000000000..7aae94c417f
--- /dev/null
+++ b/addons/base_action_rule/i18n/nb.po
@@ -0,0 +1,536 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-03 16:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_user:0
+msgid ""
+"Check this if you want the rule to send an email to the responsible person."
+msgstr ""
+"Sjekk dette hvis du vil at regelen skal sende en e-post til ansvarlig person."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr "Påminn partner"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr "Partner Kategori"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr "Post til overvåkere (CC)"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr "Knapp trykket"
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr "Send mail til disse e-postene"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr "Still stat til"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr "E-post fra"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr "E-post kropp"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr "Dager"
+
+#. module: base_action_rule
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr "Siste kjøring"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:328
+#, python-format
+msgid "Error!"
+msgstr "Feil!"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr "Svar til"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_cc:0
+msgid ""
+"These people will receive a copy of the future communication between partner "
+"and users by email"
+msgstr ""
+"Disse menneskene vil motta en kopi av den fremtidige kommunikasjon mellom "
+"partner og brukere av e-post"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr "Minutter"
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Regelnavn"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_partner:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the partner."
+msgstr ""
+"Sjekk dette hvis du vil at regelen skal sende en påminnelse via e-post til "
+"partneren."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr "Forholdene på Modell Partner"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr "Frist"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr "%(object_subject)s = Object subject"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr "E-post påminnelser"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Special Keywords to be Used in the Body"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_from:0
+msgid "State"
+msgstr "Stat"
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
+msgid ""
+"Use automated actions to automatically trigger actions for various screens. "
+"Example: a lead created by a specific user may be automatically set to a "
+"specific sales team, or an opportunity which still has status pending after "
+"14 days might trigger an automatic reminder email."
+msgstr ""
+"Bruke automatiserte tiltak for å automatisk utløse tiltak for ulike "
+"skjermer. Eksempel: en leder er opprettet av en bestemt bruker kan bli satt "
+"automatisk til en bestemt salgsteam, eller en mulighet som fortsatt har "
+"status påvente etter 14 dager kan utløse en automatisk påminnelse e-post."
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_email:0
+msgid "Email-id of the persons whom mail is to be sent"
+msgstr "E-post ID av personer som post skal sendes"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Action Rule"
+msgstr "Handling regel"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr "Felter å endre"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr "Opprettelsesdato"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr "Siste handlingsdato"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr "Timer"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr "%(object_ID)s = Object ID"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr "Forsinkelse Etter utløser Dato"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr "Minn med vedlegg"
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Ugyldige argumenter"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr "Satt Ansvarlig for å"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr "Ingen"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_to:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'To' field of the header"
+msgstr ""
+"Bruk en python uttrykk for å angi høyre feltet på hvilken enn vi vil bruke "
+"for Til-feltet på header."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr "% (object_bruker_telefonen) s = Ansvarlig telefon"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid ""
+"The rule uses the AND operator. The model must match all non-empty fields so "
+"that the rule executes the action described in the 'Actions' tab."
+msgstr ""
+"Regelen bruker AND-operatoren. Modellen må matche alle-ikke tomme felt, slik "
+"at regelen utfører handlingen som er beskrevet i \"Handlinger\"-fanen."
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr "forsinkelse typen"
+
+#. module: base_action_rule
+#: help:base.action.rule,regex_name:0
+msgid ""
+"Regular expression for matching name of the resource\n"
+"e.g.: 'urgent.*' will search for records having name starting with the "
+"string 'urgent'\n"
+"Note: This is case sensitive search."
+msgstr ""
+"Regulært uttrykk for matchende navnet på ressursen\n"
+"f.eks: \". haster * 'vil søke etter poster som har navn som starter med "
+"strengen\" haster \"\n"
+"Merk: Dette er små bokstaver søk."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr "Kall objektmetode"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr "E-post til."
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_watchers:0
+msgid ""
+"Check this if you want the rule to mark CC(mail to any other person defined "
+"in actions)."
+msgstr ""
+"Sjekk dette hvis du vil at regelen skal merkes CC (mail til en annen person "
+"som er definert i handlinger)."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr "%(partner)s = Navn på partner"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr "Notat"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_from:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'From' field of the header"
+msgstr ""
+"Bruk en python uttrykk for å angi høyre feltet på hvilken enn vi vil bruke "
+"for Fra-feltet på overskriften"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr "Forsinkelse etter triggerdato"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr "Betingelser"
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay After Trigger Date,specifies you can put a negative number. If you "
+"need a delay before the trigger date, like sending a reminder 15 minutes "
+"before a meeting."
+msgstr ""
+"Forsinkelse Etter utløser Dato, spesifiserer du kan sette et negativt tall. "
+"Hvis du trenger en forsinkelse før avtrekkeren dato, som å sende en "
+"påminnelse 15 minutter før et møte."
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:329
+#, python-format
+msgid "No Email ID Found for your Company address!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr "Minn Ansvarlig"
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr "Gir sekvens ordre når du viser en liste over regler."
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Måneder"
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr "Filtrer"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: base_action_rule
+#: help:base.action.rule,server_action_id:0
+msgid ""
+"Describes the action name.\n"
+"eg:on which object which action to be taken on basis of which condition"
+msgstr ""
+"Beskriver handlingens navn.\n"
+"f.eks: på hvilket objekt som tiltak som skal iverksettes på grunnlag av "
+"hvilken tilstand"
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr "ir.actions.actions"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr "% (object_beskrivelse) s = Object beskrivelse"
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Feil: E-posten er ikke godt nok formatert"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr "E-post handlinger"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr "E-post Informasjon"
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr "Handlingsregler"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr "Innholdet av post"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr "Ansvarlig"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr "% (partner_e-post) s = Partner E-post"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr "%(object_dato)s = opprettelsesdato"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr "% (object_brukerens_e-post) s = Ansvarlig e-post"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr "Mail kropp"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_user:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
+msgstr ""
+"Kryss av her hvis du vil at regelen skal sende en påminnelse til brukeren "
+"via e-post."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr "Server Tiltak som skal Utløses"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr "send mail til ansvarlig"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr "Legg til overvåkere (Cc)"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr "Forholdene på Modell Felter"
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
+#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
+msgid "Automated Actions"
+msgstr "Automatiserte handinger"
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr "Tjenerhandling"
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr "Regex på Ressursnavn"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_attach:0
+msgid ""
+"Check this if you want that all documents attached to the object be attached "
+"to the reminder email sent."
+msgstr ""
+"Kryss av her om du vil at alle dokumenter knyttet til objektet festes til "
+"påminnelse e-post sendt."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr "Vilkår for timing"
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr "Handlinger"
+
+#. module: base_action_rule
+#: help:base.action.rule,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the rule "
+"without removing it."
+msgstr ""
+"Hvis det aktive feltet er satt til False, vil det tillate deg å skjule "
+"regelen uten å fjerne den."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr "% (object_bruker) s = Ansvarlig navn"
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr "Opprettet dato"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr "Vilkår for tilstander"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr "Uttløser dato"
+
+#~ msgid "Special Keywords to Be Used in The Body"
+#~ msgstr "Spesielle nøkkelord for bruk i meldingsinnhold"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Ingen E-post ID funnet for din firmaadresse!"
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index 9a16f1fc1fb..e63c2c1f1cb 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.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-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-26 14:02+0000\n"
+"PO-Revision-Date: 2012-09-03 17:10+0000\n"
 "Last-Translator: Erwin <Unknown>\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: 2012-08-28 06:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -195,7 +195,7 @@ msgstr "Vrouw"
 #: help:hr.job,expected_employees:0
 msgid ""
 "Expected number of employees for this job position after new recruitment."
-msgstr ""
+msgstr "Verwachte aantal werknemers voor deze functie na de nieuwe werving."
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -710,12 +710,12 @@ msgstr "Ondergeschikten"
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "Number of employees currently occupying this job position."
-msgstr ""
+msgstr "Huidige aantal werknemers welke deze functie bekleden ."
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Number of new employees you expect to recruit."
-msgstr ""
+msgstr "Verwachte aantal te werven nieuwe werknemers."
 
 #~ msgid "Sunday"
 #~ msgstr "Zondag"
diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po
index ef84f17a58b..4c44ef380bb 100644
--- a/addons/hr_holidays/i18n/nl.po
+++ b/addons/hr_holidays/i18n/nl.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-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-19 13:05+0000\n"
+"PO-Revision-Date: 2012-09-03 17:12+0000\n"
 "Last-Translator: Erwin <Unknown>\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: 2012-08-28 06:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -416,6 +416,8 @@ msgid ""
 "When selected, the Allocation/Leave Requests for this type require a second "
 "validation to be approved."
 msgstr ""
+"Wanneer aangevinkt heeft deze toewijzing of aanvraag een tweede controle "
+"nodig om te worden goedgekeurd."
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -787,6 +789,8 @@ msgid ""
 "If you select this checkbox, the system allows the employees to take more "
 "leaves than the available ones for this type."
 msgstr ""
+"Indien u deze optie aanvinkt, dan staat u toe dat werknemers meer verlof "
+"aanvragen dan dat ze nog beschikbaar hebben."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
diff --git a/addons/hr_payroll/i18n/nl.po b/addons/hr_payroll/i18n/nl.po
index 8e9c0b35b6d..2ad4fc5aa0b 100644
--- a/addons/hr_payroll/i18n/nl.po
+++ b/addons/hr_payroll/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: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-22 19:09+0000\n"
+"PO-Revision-Date: 2012-09-03 17:17+0000\n"
 "Last-Translator: Erwin <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: 2012-08-28 06:33+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -357,7 +357,7 @@ msgstr "Half-jaarlijks"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Children Definition"
-msgstr ""
+msgstr "Definitie onderliggende"
 
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
@@ -465,7 +465,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Worked Days & Inputs"
-msgstr ""
+msgstr "Gewerkte dagen & ingaves"
 
 #. module: hr_payroll
 #: field:hr.payslip,details_by_salary_rule_category:0
@@ -522,7 +522,7 @@ msgstr "Bereik"
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
 msgid "Salary Structures Hierarchy"
-msgstr ""
+msgstr "Salaris structuur hiërarchie"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -769,7 +769,7 @@ msgstr "Contributie"
 #: code:addons/hr_payroll/hr_payroll.py:347
 #, python-format
 msgid "Refund Payslip"
-msgstr ""
+msgstr "Credit salarisstrook"
 
 #. module: hr_payroll
 #: field:hr.rule.input,input_id:0
@@ -852,7 +852,7 @@ msgstr "Salaris Structuur"
 #. module: hr_payroll
 #: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
-msgstr ""
+msgstr "Register regel"
 
 #. module: hr_payroll
 #: view:hr.payslip:0 view:hr.payslip.employees:0
@@ -1083,7 +1083,7 @@ msgstr "Totaal"
 #: help:hr.payslip.line,appears_on_payslip:0
 #: help:hr.salary.rule,appears_on_payslip:0
 msgid "Used for the display of rule on payslip"
-msgstr ""
+msgstr "Wordt gebruikt om de regel van de salaristrook weer te geven"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0
@@ -1093,7 +1093,7 @@ msgstr "Zoek loonafschrift regels"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Details By Salary Rule Category"
-msgstr ""
+msgstr "details per salarisregel categorie"
 
 #. module: hr_payroll
 #: help:hr.payslip.input,code:0 help:hr.payslip.worked_days,code:0
diff --git a/addons/import_sugarcrm/i18n/fr.po b/addons/import_sugarcrm/i18n/fr.po
index e9872a1f655..64673de4bc6 100644
--- a/addons/import_sugarcrm/i18n/fr.po
+++ b/addons/import_sugarcrm/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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-24 17:37+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2012-09-03 22:20+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@simplee.fr>\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: 2012-08-28 06:42+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
@@ -38,7 +38,7 @@ msgstr "(Prochainement)"
 #. module: import_sugarcrm
 #: field:import.sugarcrm,document:0
 msgid "Documents"
-msgstr ""
+msgstr "Documents"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -58,7 +58,7 @@ msgstr ""
 #. module: import_sugarcrm
 #: field:import.sugarcrm,contact:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contacts"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -79,7 +79,7 @@ msgstr "Nom de l'instance"
 #. module: import_sugarcrm
 #: field:import.sugarcrm,project_task:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Tâches du projet"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,email_from:0
@@ -134,27 +134,27 @@ msgstr ""
 #. module: import_sugarcrm
 #: field:import.sugarcrm,employee:0
 msgid "Employee"
-msgstr ""
+msgstr "Employé"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Document"
-msgstr ""
+msgstr "Document"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,document:0
 msgid "Check this box to import sugarCRM Documents into OpenERP documents"
-msgstr ""
+msgstr "Cochez cette case  pour importer les documents SugarCRM dans OpenERP"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Import Data From SugarCRM"
-msgstr ""
+msgstr "Importee les données de SugarCRM"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: import_sugarcrm
 #: view:import.message:0
@@ -166,7 +166,7 @@ msgstr ""
 #. module: import_sugarcrm
 #: field:import.sugarcrm,call:0
 msgid "Calls"
-msgstr ""
+msgstr "Appels"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -176,7 +176,7 @@ msgstr ""
 #. module: import_sugarcrm
 #: view:import.message:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Valider"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,opportunity:0
@@ -184,11 +184,13 @@ msgid ""
 "Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
 "and Opportunities"
 msgstr ""
+"Cochez cette case pour importer les Pistes et les Opportunités SugarCRM dans "
+"OpenERP."
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,email_history:0
 msgid "Email and Note"
-msgstr ""
+msgstr "Email et note"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,url:0
@@ -208,12 +210,12 @@ msgstr ""
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Import"
-msgstr ""
+msgstr "_Importer"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,user:0
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
index a5e2fee8155..0fef9761c2f 100644
--- a/addons/mail/i18n/nl.po
+++ b/addons/mail/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: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:39+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-09-03 17:14+0000\n"
+"Last-Translator: Erwin <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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -196,7 +196,7 @@ msgstr "Ontvangers"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "E-mail samenstellen wizard"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
diff --git a/addons/pad_project/i18n/fr.po b/addons/pad_project/i18n/fr.po
index ad5998d968e..9e549424e26 100644
--- a/addons/pad_project/i18n/fr.po
+++ b/addons/pad_project/i18n/fr.po
@@ -8,31 +8,32 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-22 08:03+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-09-03 22:22+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@simplee.fr>\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: 2012-08-28 06:43+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
 msgstr ""
+"Erreur ! la date de fin de la tâche doit être supérieure a celle de début"
 
 #. module: pad_project
 #: model:ir.model,name:pad_project.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tâche"
 
 #. module: pad_project
 #: view:project.task:0
 msgid "Pad"
-msgstr ""
+msgstr "Pad"
 
 #. module: pad_project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de tâches récursives."
diff --git a/addons/sale_crm/i18n/fr.po b/addons/sale_crm/i18n/fr.po
index e9463b543de..eac4ce9a5b0 100644
--- a/addons/sale_crm/i18n/fr.po
+++ b/addons/sale_crm/i18n/fr.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-11-25 14:51+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2012-09-03 22:25+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@simplee.fr>\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: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Catégorie"
 
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "La référence de commande doit être unique par société !"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:112
 #, python-format
 msgid "Converted to Sales Quotation(%s)."
-msgstr ""
+msgstr "Convertir en devis (%s)"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -62,7 +62,7 @@ msgstr "_Créer"
 #. module: sale_crm
 #: view:sale.order:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Mon (mes) équipe(s) de vente"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
@@ -75,7 +75,7 @@ msgstr ""
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "Mes opportunités"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -106,7 +106,7 @@ msgstr "Fermer l'opportunité"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "Mes revenus planifiés par étape"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
@@ -133,7 +133,7 @@ msgstr "Annuler"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr "Commande de ventes"
+msgstr "Commande client"
 
 #~ msgid "Crm opportunity quotation"
 #~ msgstr "Chiffrage de l'opportunité"
diff --git a/addons/share/i18n/nl.po b/addons/share/i18n/nl.po
index 976d28f66c5..c0d68268f2c 100644
--- a/addons/share/i18n/nl.po
+++ b/addons/share/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: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-28 12:52+0000\n"
+"PO-Revision-Date: 2012-09-03 17:14+0000\n"
 "Last-Translator: Erwin <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: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -384,6 +384,7 @@ msgid ""
 "An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
+"Een e-mail bevestiging met instructies is verzonden naar de volgende mensen:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -415,6 +416,8 @@ msgstr "Kan bewerken"
 msgid ""
 "An optional personal message, to be included in the email notification."
 msgstr ""
+"Een optionele persoonlijk bericht, welke kan worden toegevoegd in de e-mail "
+"bevestiging."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -532,6 +535,8 @@ msgid ""
 "You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
+"U dient u e-mail adres in te stellen in uw gebruikersinstellingen, voordat u "
+"de 'share' knop kunt gebruiken."
 
 #. module: share
 #: help:share.wizard,access_mode:0

From f56863c6720e89f61ed566f8a0b8842274f5e755 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 4 Sep 2012 09:35:02 +0200
Subject: [PATCH 758/999] [FIX] Reset the right python environment

bzr revid: stw@openerp.com-20120904073502-xce3wn064f8e0pru
---
 openerp-server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp-server b/openerp-server
index 65073b22798..be0710cbce9 100755
--- a/openerp-server
+++ b/openerp-server
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #

From b203377994ff51231a632f5b940c14482b9c3206 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 4 Sep 2012 09:41:45 +0200
Subject: [PATCH 759/999] [IMP] in list views: hide drag-n-drop handle and
 trash can with css classes

bzr revid: rco@openerp.com-20120904074145-5mefinpkz0pl0qyb
---
 addons/web/static/src/css/base.css    |  9 +++++++--
 addons/web/static/src/css/base.sass   |  7 +++++++
 addons/web/static/src/js/view_list.js | 12 ++++++++++++
 addons/web/static/src/xml/base.xml    |  6 +++---
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 06a37a54727..d32b0a9f42a 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -69,7 +69,6 @@
     display: none !important;
   }
 }
-
 .openerp.openerp_webclient_container {
   height: 100%;
   position: relative;
@@ -85,7 +84,7 @@
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */ */
+   */
 }
 .openerp :-moz-placeholder {
   color: #afafb6 !important;
@@ -2638,6 +2637,12 @@
   content: "ö";
   color: #404040;
 }
+.openerp .oe_list_cannot_edit .oe_list_header_handle, .openerp .oe_list_cannot_edit .oe_list_field_handle {
+  display: none !important;
+}
+.openerp .oe_list_cannot_delete .oe_list_header_delete, .openerp .oe_list_cannot_delete .oe_list_record_delete {
+  display: none !important;
+}
 .openerp .tree_header {
   background-color: #f0f0f0;
   border-bottom: 1px solid #cacaca;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c238ef6ee07..8ddf9b56b9f 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2050,6 +2050,13 @@ $sheet-max-width: 860px
             .oe_list_handle
                 @include text-to-icon("ö")
 
+    .oe_list_cannot_edit
+        .oe_list_header_handle, .oe_list_field_handle
+            display: none !important
+    .oe_list_cannot_delete
+        .oe_list_header_delete, .oe_list_record_delete
+            display: none !important
+
     // }}}
     // Tree view {{{
     .tree_header
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index e3006a31757..06d2548339c 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -250,6 +250,18 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
 
         this.$el.html(QWeb.render(this._template, this));
         this.$el.addClass(this.fields_view.arch.attrs['class']);
+
+        // add css classes that reflect the (absence of) access rights
+        if (!this._is_action_enabled('create')) {
+            this.$el.addClass('oe_list_cannot_create');
+        }
+        if (!this._is_action_enabled('edit')) {
+            this.$el.addClass('oe_list_cannot_edit');
+        }
+        if (!this._is_action_enabled('delete')) {
+            this.$el.addClass('oe_list_cannot_delete');
+        }
+
         // Head hook
         // Selecting records
         this.$el.find('.oe_list_record_selector').click(function(){
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 3bee6eebcc5..7c135ad047c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -635,7 +635,7 @@
                     <t t-if="column.tag !== 'button'"><t t-esc="column.string"/></t>
                 </th>
             </t>
-            <th t-if="options.deletable and _is_action_enabled('delete')" width="13px"/>
+            <th t-if="options.deletable" class="oe_list_header_delete" width="13px"/>
         </tr>
     </thead>
     <tfoot>
@@ -644,7 +644,7 @@
             <td t-foreach="aggregate_columns" t-as="column" class="oe_list_footer oe_number"
                 t-att-data-field="column.id" t-att-title="column.label">
             </td>
-            <td t-if="options.deletable and _is_action_enabled('delete')"/>
+            <td t-if="options.deletable"/>
         </tr>
     </tfoot>
 </table>
@@ -691,7 +691,7 @@
             t-att-data-field="column.id"
             ><t t-raw="render_cell(record, column)"/></td>
     </t>
-    <td t-if="options.deletable and view._is_action_enabled('delete')" class='oe_list_record_delete' width="13px">
+    <td t-if="options.deletable" class='oe_list_record_delete' width="13px">
         <button type="button" name="delete" class="oe_i">d</button>
     </td>
 </tr>

From 8b98de00e43b2ba0a3df676f0362a9d3d342092b Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 4 Sep 2012 09:49:21 +0200
Subject: [PATCH 760/999] [IMP] simplification in list views: merge two css
 classes

bzr revid: rco@openerp.com-20120904074921-ff9pkr64g58ku9n3
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 addons/web/static/src/xml/base.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index d32b0a9f42a..bbee2adfbc4 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2640,7 +2640,7 @@
 .openerp .oe_list_cannot_edit .oe_list_header_handle, .openerp .oe_list_cannot_edit .oe_list_field_handle {
   display: none !important;
 }
-.openerp .oe_list_cannot_delete .oe_list_header_delete, .openerp .oe_list_cannot_delete .oe_list_record_delete {
+.openerp .oe_list_cannot_delete .oe_list_record_delete {
   display: none !important;
 }
 .openerp .tree_header {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 8ddf9b56b9f..63c6f3398fa 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2054,7 +2054,7 @@ $sheet-max-width: 860px
         .oe_list_header_handle, .oe_list_field_handle
             display: none !important
     .oe_list_cannot_delete
-        .oe_list_header_delete, .oe_list_record_delete
+        .oe_list_record_delete
             display: none !important
 
     // }}}
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 7c135ad047c..a92eacc0710 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -635,7 +635,7 @@
                     <t t-if="column.tag !== 'button'"><t t-esc="column.string"/></t>
                 </th>
             </t>
-            <th t-if="options.deletable" class="oe_list_header_delete" width="13px"/>
+            <th t-if="options.deletable" class="oe_list_record_delete" width="13px"/>
         </tr>
     </thead>
     <tfoot>

From a0704feafd897d1f7e408464e09d1ea255850209 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 4 Sep 2012 10:03:02 +0200
Subject: [PATCH 761/999] [FIX] web_kanban: remove unexpected css class

bzr revid: rco@openerp.com-20120904080302-dcxytj3tkin6fdt3
---
 addons/web_kanban/static/src/xml/web_kanban.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index d3ed0fed129..b2f9e757b43 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -28,7 +28,7 @@
 <t t-name="KanbanView.group_header">
     <td class="oe_kanban_group_header">
         <t t-if="widget.view.group_by">
-            <div class="oe_kanban_header oe_semantic_html_override">
+            <div class="oe_kanban_header">
                 <t t-if="widget.view._is_quick_create_enabled()">
                     <div class="oe_kanban_add oe_e">]</div>
                 </t>

From 76772d06bf6aa8097d93a619add3734a01eaf85f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Sep 2012 10:54:47 +0200
Subject: [PATCH 762/999] [CHG] titlecase discard option in list views

as required by apr

bzr revid: xmo@openerp.com-20120904085447-wvpc9d2iv7vj20pg
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index d5596f5c8da..7e98a6b41a6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -701,7 +701,7 @@
                 type="button">Save</button>
     </t>
     <t t-jquery="a.oe_list_button_import" t-operation="after">
-        <a href="#" class="oe_bold oe_list_discard">discard</a>
+        <a href="#" class="oe_bold oe_list_discard">Discard</a>
     </t>
 </t>
 <t t-extend="ListView.row">

From c52ab94960f0346ff82e2ecf72cda67d667d9f6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Sep 2012 11:28:20 +0200
Subject: [PATCH 763/999] [REVIEW] addons: small cleanups nex to a diff read.
 Some improvements will follow, this commit is about small cleanups.

bzr revid: tde@openerp.com-20120904092820-56zgwpkqfpd7as5k
---
 addons/crm_claim/test/ui/claim_demo.yml       |  1 -
 addons/crm_partner_assign/crm_lead_view.xml   |  2 +-
 .../wizard/crm_forward_to_partner.py          |  8 +++---
 .../wizard/crm_forward_to_partner_view.xml    |  2 +-
 addons/email_template/email_template.py       |  2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   | 25 ++++++++++---------
 addons/mail/mail_group.py                     |  8 ++----
 addons/mail/mail_mail_view.xml                |  2 +-
 addons/mail/tests/test_mail.py                |  4 +--
 addons/mail/wizard/mail_compose_message.py    |  8 +++---
 .../marketing_campaign_demo.xml               |  2 +-
 addons/purchase/purchase.py                   |  2 +-
 12 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/addons/crm_claim/test/ui/claim_demo.yml b/addons/crm_claim/test/ui/claim_demo.yml
index 6b6d380f5be..044e0482e93 100644
--- a/addons/crm_claim/test/ui/claim_demo.yml
+++ b/addons/crm_claim/test/ui/claim_demo.yml
@@ -12,4 +12,3 @@
       self.message_update(cr, uid,[ref('crm_claim_4')], {'subject': 'Claim Update record','body': 'first training session completed',})
     except:
       pass
-  
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 057d5240847..cd2e3f08c9a 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -19,7 +19,7 @@
                                             attrs="{'invisible':[('partner_assigned_id','=',False)]}"
                                             name="%(crm_lead_forward_to_partner_act)d"
                                             icon="terp-mail-forward" type="action"
-                                            context="{'mail.compose.message.mode': 'forward', 'default_partner_ids': [partner_assigned_id]}"/>
+                                            context="{'default_composition_mode': 'forward', 'default_partner_ids': [partner_assigned_id]}"/>
                                     </div>
                                 </group>
                                 <group string="Geo Assignation">
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 5b0fe97b015..6ed8da7b231 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -36,12 +36,12 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         if context is None:
             context = {}
         # set as comment, perform overrided document-like action that calls get_record_data
-        old_mode = context.get('mail.compose.message.mode', 'forward')
-        context['mail.compose.message.mode'] = 'comment'
+        old_mode = context.get('default_composition_mode', 'forward')
+        context['default_composition_mode'] = 'comment'
         res = super(crm_lead_forward_to_partner, self).default_get(cr, uid, fields, context=context)
         # back to forward mode
-        context['mail.compose.message.mode'] = old_mode
-        res['composition_mode'] = context['mail.compose.message.mode']
+        context['default_composition_mode'] = old_mode
+        res['composition_mode'] = context['default_composition_mode']
         return res
 
     def _get_composition_mode_selection(self, cr, uid, context=None):
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 600bd301b3f..fe9e1476817 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -51,7 +51,7 @@
             key2="client_action_multi" name="Mass forward to partner"
             res_model="crm.lead.forward.to.partner" src_model="crm.lead"
             view_mode="form" target="new" view_type="form"
-            context="{'mail.compose.message.mode' : 'mass_mail'}"
+            context="{'default_composition_mode' : 'mass_mail'}"
             view_id="crm_lead_forward_to_partner_form"
         />
 
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 73dc5ed2754..b68005bd997 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -171,7 +171,7 @@ class email_template(osv.osv):
                  'res_model': 'mail.compose.message',
                  'src_model': src_obj,
                  'view_type': 'form',
-                 'context': "{'mail.compose.message.mode':'mass_mail', 'mail.compose.template_id' : %d}" % (template.id),
+                 'context': "{'default_composition_mode': 'mass_mail', 'default_template_id' : %d}" % (template.id),
                  'view_mode':'form,tree',
                  'view_id': res_id,
                  'target': 'new',
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 12c5dc0af6d..9f64df8808d 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -388,22 +388,23 @@
             action="action_hr_evaluation_interview_tree"/>
 
       <!-- Email Compose message Action-->
+      <!-- TDE TODO: add context values -->
       <act_window
-      id="evaluation_reminders" name="Appraisal Reminders"
-      res_model="mail.compose.message"
-      src_model="hr.evaluation.interview"
-      view_type="form" view_mode="form"
-      target="new" multi="True"
-      key2="client_action_multi"
-      context="{'mail.compose.message.mode':'mass_mail'}"/>
+        id="evaluation_reminders" name="Appraisal Reminders"
+        res_model="mail.compose.message"
+        src_model="hr.evaluation.interview"
+        view_type="form" view_mode="form"
+        target="new" multi="True"
+        key2="client_action_multi"
+        context="{'default_composition_mode': 'mass_mail'}"/>
 
       <!-- Appraisal Interviews Button on Employee Form -->
       <act_window
-      context="{'search_default_user_to_review_id': [active_id], 'default_user_to_review_id': active_id}"
-      id="act_hr_employee_2_hr__evaluation_interview"
-      name="Appraisal Interviews"
-      res_model="hr.evaluation.interview"
-      src_model="hr.employee"/>
+        context="{'search_default_user_to_review_id': [active_id], 'default_user_to_review_id': active_id}"
+        id="act_hr_employee_2_hr__evaluation_interview"
+        name="Appraisal Interviews"
+        res_model="hr.evaluation.interview"
+        src_model="hr.employee"/>
 
     </data>
 </openerp>
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index d17be6d578e..f5769e082a1 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -28,12 +28,8 @@ from osv import fields
 from tools.translate import _
 
 class mail_group(osv.Model):
-    """
-    A mail_group is a collection of users sharing messages in a discussion
-    group. Group users are users that follow the mail group, using the
-    subscription/follow mechanism of OpenSocial. A mail group has nothing
-    in common with res.users.group.
-    """
+    """ A mail_group is a collection of users sharing messages in a discussion
+        group. The group mechanics are based on the followers. """
     _description = 'Discussion group'
     _name = 'mail.group'
     _inherit = ['mail.thread']
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index f6846954ec0..72d41e33a84 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -12,7 +12,7 @@
                         <div>
                             by <field name="author_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/>
                             <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
-                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
+                                context="{'default_composition_mode':'reply', 'default_parent_id': active_id}" states='received,sent,exception,cancel'/>
                         </div>
                         <notebook colspan="4">
                             <page string="Message Details">
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index fa30c76aa1e..9c148647b9b 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -353,7 +353,7 @@ class test_mail(common.TransactionCase):
         # CASE1: comment group_pigs with body_text and subject
         compose_id = mail_compose.create(cr, uid,
             {'subject': _subject, 'body_text': _body_text, 'partner_ids': [(4, p_c_id), (4, p_d_id)]},
-            {'mail.compose.message.mode': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_pigs_id})
+            {'default_composition_mode': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_pigs_id})
         compose = mail_compose.browse(cr, uid, compose_id)
         # Test: mail.compose.message: model, res_id
         self.assertEqual(compose.model,  'mail.group', 'mail.compose.message incorrect model')
@@ -378,7 +378,7 @@ class test_mail(common.TransactionCase):
         message.write({'subject': _subject})
         compose_id = mail_compose.create(cr, uid,
             {'attachment_ids': [(0, 0, _attachments[0]), (0, 0, _attachments[1])]},
-            {'mail.compose.message.mode': 'reply', 'default_model': 'mail.thread', 'default_res_id': self.group_pigs_id, 'active_id': message.id})
+            {'default_composition_mode': 'reply', 'default_model': 'mail.thread', 'default_res_id': self.group_pigs_id, 'default_parent_id': message.id})
         compose = mail_compose.browse(cr, uid, compose_id)
 
         # Test: form view methods
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 0c0626f44c9..15f428264ff 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -35,8 +35,7 @@ class mail_compose_message(osv.TransientModel):
     """ Generic message composition wizard. You may inherit from this wizard
         at model and view levels to provide specific features.
 
-        The behavior of the wizard can be modified through the context key 
-        mail.compose.message.mode:
+        The behavior of the wizard depends on the composition_mode field:
         - 'reply': reply to a previous message. The wizard is pre-populated 
             via ``get_message_data``.
         - 'comment': new post on a record. The wizard is pre-populated via
@@ -56,10 +55,11 @@ class mail_compose_message(osv.TransientModel):
                 - default_model or active_model
                 - default_res_id or active_id
             - reply: active_id of a message the user replies to
-                - active_id: ID of a mail.message to which we are replying
+                - default_parent_id or message_id or active_id: ID of the
+                    mail.message we reply to
                 - message.res_model or default_model
                 - message.res_id or default_res_id
-            - mass_mailing mode: model and IDs of records the user mass-mails
+            - mass_mail: model and IDs of records the user mass-mails
                 - active_ids: record IDs
                 - default_model or active_model
         """
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
index 19e44eb4ace..0c2d7f32715 100644
--- a/addons/marketing_campaign/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -64,7 +64,7 @@
         </record>
 
 
-    <!-- Tranisition -->
+    <!-- Transition -->
         <record id="marketing_campaign_transition_0" model="marketing.campaign.transition">
             <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
             <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index b1a5631e59e..592bf783a64 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -732,7 +732,7 @@ class purchase_order(osv.osv):
     # --------------------------------------
 
     def needaction_domain_get(self, cr, uid, ids, context=None):
-        return [('state','=','draft')]
+        return [('state', '=', 'draft')]
 
     def create_send_note(self, cr, uid, ids, context=None):
         return self.message_post(cr, uid, ids, body=_("Request for quotation <b>created</b>."), context=context)

From fdfaa0f5cfe33c9641c5c7a39c5ab474aeaf01a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Sep 2012 11:29:38 +0200
Subject: [PATCH 764/999] [REF] project_mailgate: moved content of
 project_mailgate (basically message_new and message_update overrides, and a
 now dead message_thread_followers) into project. Removed project_mailgate
 module.

bzr revid: tde@openerp.com-20120904092938-fmesjk7cwzxa3s0h
---
 addons/project/project.py                     |  39 +++++++
 addons/project_mailgate/__init__.py           |  24 ----
 addons/project_mailgate/__openerp__.py        |  52 ---------
 addons/project_mailgate/i18n/ar.po            | 102 -----------------
 addons/project_mailgate/i18n/ca.po            | 106 -----------------
 addons/project_mailgate/i18n/cs.po            |  78 -------------
 addons/project_mailgate/i18n/da.po            |  78 -------------
 addons/project_mailgate/i18n/de.po            | 106 -----------------
 addons/project_mailgate/i18n/es.po            | 106 -----------------
 addons/project_mailgate/i18n/es_CR.po         | 107 -----------------
 addons/project_mailgate/i18n/es_MX.po         | 108 ------------------
 addons/project_mailgate/i18n/es_VE.po         | 108 ------------------
 addons/project_mailgate/i18n/fi.po            |  88 --------------
 addons/project_mailgate/i18n/fr.po            | 106 -----------------
 addons/project_mailgate/i18n/gl.po            | 105 -----------------
 addons/project_mailgate/i18n/hr.po            | 104 -----------------
 addons/project_mailgate/i18n/hu.po            |  84 --------------
 addons/project_mailgate/i18n/it.po            | 106 -----------------
 addons/project_mailgate/i18n/ja.po            |  78 -------------
 addons/project_mailgate/i18n/lv.po            |  87 --------------
 addons/project_mailgate/i18n/mn.po            |  85 --------------
 addons/project_mailgate/i18n/nl.po            | 104 -----------------
 addons/project_mailgate/i18n/nl_BE.po         | 105 -----------------
 addons/project_mailgate/i18n/pl.po            | 102 -----------------
 .../i18n/project_mailgate.pot                 |  77 -------------
 addons/project_mailgate/i18n/pt.po            |  84 --------------
 addons/project_mailgate/i18n/pt_BR.po         | 105 -----------------
 addons/project_mailgate/i18n/ro.po            | 107 -----------------
 addons/project_mailgate/i18n/sv.po            |  78 -------------
 addons/project_mailgate/i18n/tr.po            |  78 -------------
 addons/project_mailgate/i18n/zh_CN.po         | 101 ----------------
 addons/project_mailgate/project_mailgate.py   |  80 -------------
 32 files changed, 39 insertions(+), 2839 deletions(-)
 delete mode 100644 addons/project_mailgate/__init__.py
 delete mode 100644 addons/project_mailgate/__openerp__.py
 delete mode 100644 addons/project_mailgate/i18n/ar.po
 delete mode 100644 addons/project_mailgate/i18n/ca.po
 delete mode 100644 addons/project_mailgate/i18n/cs.po
 delete mode 100644 addons/project_mailgate/i18n/da.po
 delete mode 100644 addons/project_mailgate/i18n/de.po
 delete mode 100644 addons/project_mailgate/i18n/es.po
 delete mode 100644 addons/project_mailgate/i18n/es_CR.po
 delete mode 100644 addons/project_mailgate/i18n/es_MX.po
 delete mode 100644 addons/project_mailgate/i18n/es_VE.po
 delete mode 100644 addons/project_mailgate/i18n/fi.po
 delete mode 100644 addons/project_mailgate/i18n/fr.po
 delete mode 100644 addons/project_mailgate/i18n/gl.po
 delete mode 100644 addons/project_mailgate/i18n/hr.po
 delete mode 100644 addons/project_mailgate/i18n/hu.po
 delete mode 100644 addons/project_mailgate/i18n/it.po
 delete mode 100644 addons/project_mailgate/i18n/ja.po
 delete mode 100644 addons/project_mailgate/i18n/lv.po
 delete mode 100644 addons/project_mailgate/i18n/mn.po
 delete mode 100644 addons/project_mailgate/i18n/nl.po
 delete mode 100644 addons/project_mailgate/i18n/nl_BE.po
 delete mode 100644 addons/project_mailgate/i18n/pl.po
 delete mode 100644 addons/project_mailgate/i18n/project_mailgate.pot
 delete mode 100644 addons/project_mailgate/i18n/pt.po
 delete mode 100644 addons/project_mailgate/i18n/pt_BR.po
 delete mode 100644 addons/project_mailgate/i18n/ro.po
 delete mode 100644 addons/project_mailgate/i18n/sv.po
 delete mode 100644 addons/project_mailgate/i18n/tr.po
 delete mode 100644 addons/project_mailgate/i18n/zh_CN.po
 delete mode 100644 addons/project_mailgate/project_mailgate.py

diff --git a/addons/project/project.py b/addons/project/project.py
index 42fbe56036d..241e3a24dc5 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1155,6 +1155,45 @@ class task(base_stage, osv.osv):
         result += "\n"
         return result
 
+    # ---------------------------------------------------
+    # mail gateway
+    # ---------------------------------------------------
+
+    def message_new(self, cr, uid, msg, custom_values=None, context=None):
+        """ Override to updates the document according to the email. """
+        if custom_values is None: custom_values = {}
+        custom_values.update({
+            'name': subject,
+            'planned_hours': 0.0,
+            'subject': msg.get('subject'),
+        })
+        return super(project_tasks,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
+
+    def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
+        """ Override to update the task according to the email. """
+        if update_vals is None: update_vals = {}
+        act = False
+        maps = {
+            'cost':'planned_hours',
+        }
+        for line in msg['body'].split('\n'):
+            line = line.strip()
+            res = tools.misc.command_re.match(line)
+            if res:
+                match = res.group(1).lower()
+                field = maps.get(match)
+                if field:
+                    try:
+                        update_vals[field] = float(res.group(2).lower())
+                    except (ValueError, TypeError):
+                        pass
+                elif match.lower() == 'state' \
+                        and res.group(2).lower() in ['cancel','close','draft','open','pending']:
+                    act = 'do_%s' % res.group(2).lower()
+        if act:
+            getattr(self,act)(cr, uid, ids, context=context)
+        return super(project_tasks,self).message_update(cr, uid, msg, update_vals=update_vals, context=context)
+
     # ---------------------------------------------------
     # OpenChatter methods and notifications
     # ---------------------------------------------------
diff --git a/addons/project_mailgate/__init__.py b/addons/project_mailgate/__init__.py
deleted file mode 100644
index 0f82ebd1b41..00000000000
--- a/addons/project_mailgate/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 project_mailgate
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py
deleted file mode 100644
index 05eacb782cc..00000000000
--- a/addons/project_mailgate/__openerp__.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Tasks-Mail Integration',
-    'version': '1.1',
-    'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'category': 'Project Management',
-    'images': ['images/project_mailgate_task.jpeg'],
-    'depends': ['project', 'mail'],
-    'description': """
-This module can automatically create Project Tasks based on incoming emails.
-============================================================================
-
-Allows creating tasks based on new emails arriving at a given mailbox,
-similarly to what the CRM application has for Leads/Opportunities.
-
-There are two common alternatives to configure the mailbox integration:
------------------------------------------------------------------------
-    * Install the ``fetchmail`` module and configure a new mailbox, then select
-      ``Project Tasks`` as the target for incoming emails.
-    * Set it up manually on your mail server based on the 'mail gateway' script
-      provided in the ``mail`` module - and connect it to the `project.task` model.
-    """,
-    'data': [],
-    'demo': [],
-    'installable': True,
-    'auto_install': False,
-    'certificate': '001075048780413258261',
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mailgate/i18n/ar.po b/addons/project_mailgate/i18n/ar.po
deleted file mode 100644
index 42b0945e3a8..00000000000
--- a/addons/project_mailgate/i18n/ar.po
+++ /dev/null
@@ -1,102 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-12 21:12+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "معلومات المحفوظات"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "مهمة"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "خطأ ! لا يمكنك انشاء مهام رجعية."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "الرسائل"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "مسودة"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "خطأ! يجب ان يكون تاريخ انتهاء المهمة اكبر من تاريخ البداية"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "إلغاء"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "تم"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "فتح"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "معلّق"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "محفوظات"
-
-#~ msgid "Attachments"
-#~ msgstr "مرفقات"
-
-#~ msgid "Details"
-#~ msgstr "تفاصيل"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "مدخل بريد المشروع"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "هذه الوحدة هي تفاعل التي تتزامن البريد مع مهام مشروع OpenERP .\n"
-#~ "وهي تسمح بإنشاء المهام في اقرب وقت كما يصل البريد الجديد في خادم البريد الذي "
-#~ "تم ضبطه.\n"
-#~ "علاوة على ذلك, تستمر في تعقب المزيد من كل الاتصالات وحالات المهمة.\n"
-#~ "    "
diff --git a/addons/project_mailgate/i18n/ca.po b/addons/project_mailgate/i18n/ca.po
deleted file mode 100644
index 622d0a55ac1..00000000000
--- a/addons/project_mailgate/i18n/ca.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# Catalan translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-02-06 21:57+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan <ca@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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informació històrica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tasca"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Error! No podeu crear tasques recursives."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Missatges"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Esborrany"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Error ! La data final de la tasca ha de ser major que la data d'inici"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Canceŀla"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Realitzat"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Obre"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendent"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Històric"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Ruta d'enllaç del projecte"
-
-#~ msgid "Attachments"
-#~ msgstr "Adjunts"
-
-#~ msgid "Details"
-#~ msgstr "Detalls"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Aquest mòdul proporciona una interfície per sincronitzar correus amb les "
-#~ "tasques de projectes d'OpenERP.\n"
-#~ "\n"
-#~ "Permet crear tasques tan aviat com arriba un nou correu en el nostre "
-#~ "servidor de correu prèviament configurat.\n"
-#~ "A més realitza un seguiment de totes les comunicacions addicionals i estats "
-#~ "de la tasca.\n"
-#~ "    "
diff --git a/addons/project_mailgate/i18n/cs.po b/addons/project_mailgate/i18n/cs.po
deleted file mode 100644
index b65ae7910f5..00000000000
--- a/addons/project_mailgate/i18n/cs.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Czech translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-04-06 06:41+0000\n"
-"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
-"Language-Team: Czech <cs@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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informace historie"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Úkol"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Chyba ! Nemůžete vytvořit rekurzivní úkoly."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Zprávy"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Koncept"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Chyba ! Datum ukončení úkolu musí být větší než počáteční datum"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Zrušit"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Dokončené"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Otevřené"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Čekající"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historie"
diff --git a/addons/project_mailgate/i18n/da.po b/addons/project_mailgate/i18n/da.po
deleted file mode 100644
index 43aeba4c665..00000000000
--- a/addons/project_mailgate/i18n/da.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-27 06:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr ""
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr ""
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr ""
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr ""
diff --git a/addons/project_mailgate/i18n/de.po b/addons/project_mailgate/i18n/de.po
deleted file mode 100644
index a8f8bfa17c6..00000000000
--- a/addons/project_mailgate/i18n/de.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-31 10:37+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
-"Language-Team: German <de@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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Information Historie"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Aufgabe"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Nachrichten"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Entwurf"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Fehler! Aufgaben End-Datum muss größer als Aufgaben-Beginn sein"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Erledigt"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Offen"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Im Wartezustand"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historie"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Projekte Mailgateway"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Dieses Modul ermöglicht die Synchronisation von Email mit openERP "
-#~ "Projektaufgaben.\n"
-#~ "\n"
-#~ "Es ermöglicht die Erstellung einer neuen Aufgabe sobald eine neue EMail von "
-#~ "Ihrem Mailserver empfangen wird.\n"
-#~ "Ausserdem können Sie dann alle weitere Korrespondenz und Kommunikation "
-#~ "rückverfolgen sowie den Status der Aufgabe überwachen.\n"
-#~ "    "
-
-#~ msgid "Details"
-#~ msgstr "Details"
-
-#~ msgid "Attachments"
-#~ msgstr "Anhänge"
diff --git a/addons/project_mailgate/i18n/es.po b/addons/project_mailgate/i18n/es.po
deleted file mode 100644
index e5aab3c52b1..00000000000
--- a/addons/project_mailgate/i18n/es.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-28 08:35+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Información histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historial"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Ruta de enlace del proyecto"
-
-#~ msgid "Details"
-#~ msgstr "Detalles"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo proporciona una interfaz para sincronizar correos con las tareas "
-#~ "de proyectos de OpenERP.\n"
-#~ "Permite crear tareas tan pronto como llega un nuevo correo en nuestro "
-#~ "servidor de correo previamente configurado.\n"
-#~ "Además realiza un seguimiento de todas las comunicaciones adicionales y "
-#~ "estados de la tarea.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Adjuntos"
diff --git a/addons/project_mailgate/i18n/es_CR.po b/addons/project_mailgate/i18n/es_CR.po
deleted file mode 100644
index 4e420fa49fa..00000000000
--- a/addons/project_mailgate/i18n/es_CR.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-17 00:30+0000\n"
-"Last-Translator: Carlos Vásquez (CLEARCORP) "
-"<carlos.vasquez@clearcorp.co.cr>\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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-"Language: es\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Información histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historial"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Ruta de enlace del proyecto"
-
-#~ msgid "Details"
-#~ msgstr "Detalles"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo proporciona una interfaz para sincronizar correos con las tareas "
-#~ "de proyectos de OpenERP.\n"
-#~ "Permite crear tareas tan pronto como llega un nuevo correo en nuestro "
-#~ "servidor de correo previamente configurado.\n"
-#~ "Además realiza un seguimiento de todas las comunicaciones adicionales y "
-#~ "estados de la tarea.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Adjuntos"
diff --git a/addons/project_mailgate/i18n/es_MX.po b/addons/project_mailgate/i18n/es_MX.po
deleted file mode 100644
index 2736d2572ac..00000000000
--- a/addons/project_mailgate/i18n/es_MX.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-28 08:35+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.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: 2011-09-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Información histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_mailgate
-#: model:ir.module.module,description:project_mailgate.module_meta_information
-msgid ""
-"This module is an interface that synchronises mails with OpenERP Project "
-"Task.\n"
-"\n"
-"It allows creating tasks as soon as a new mail arrives in our configured "
-"mail server.\n"
-"Moreover, it keeps track of all further communications and task states.\n"
-"    "
-msgstr ""
-"Este módulo proporciona una interfaz para sincronizar correos con las tareas "
-"de proyectos de OpenERP.\n"
-"Permite crear tareas tan pronto como llega un nuevo correo en nuestro "
-"servidor de correo previamente configurado.\n"
-"Además realiza un seguimiento de todas las comunicaciones adicionales y "
-"estados de la tarea.\n"
-"    "
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "Attachments"
-msgstr "Adjuntos"
-
-#. module: project_mailgate
-#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
-msgid "Project MailGateWay"
-msgstr "Ruta de enlace del proyecto"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:123
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "Details"
-msgstr "Detalles"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:149
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:143
-#, python-format
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:129
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:135
-#, python-format
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historial"
diff --git a/addons/project_mailgate/i18n/es_VE.po b/addons/project_mailgate/i18n/es_VE.po
deleted file mode 100644
index 2736d2572ac..00000000000
--- a/addons/project_mailgate/i18n/es_VE.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-28 08:35+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.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: 2011-09-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Información histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_mailgate
-#: model:ir.module.module,description:project_mailgate.module_meta_information
-msgid ""
-"This module is an interface that synchronises mails with OpenERP Project "
-"Task.\n"
-"\n"
-"It allows creating tasks as soon as a new mail arrives in our configured "
-"mail server.\n"
-"Moreover, it keeps track of all further communications and task states.\n"
-"    "
-msgstr ""
-"Este módulo proporciona una interfaz para sincronizar correos con las tareas "
-"de proyectos de OpenERP.\n"
-"Permite crear tareas tan pronto como llega un nuevo correo en nuestro "
-"servidor de correo previamente configurado.\n"
-"Además realiza un seguimiento de todas las comunicaciones adicionales y "
-"estados de la tarea.\n"
-"    "
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "Attachments"
-msgstr "Adjuntos"
-
-#. module: project_mailgate
-#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
-msgid "Project MailGateWay"
-msgstr "Ruta de enlace del proyecto"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:123
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "Details"
-msgstr "Detalles"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:149
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:143
-#, python-format
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:129
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:135
-#, python-format
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historial"
diff --git a/addons/project_mailgate/i18n/fi.po b/addons/project_mailgate/i18n/fi.po
deleted file mode 100644
index 76677ae237a..00000000000
--- a/addons/project_mailgate/i18n/fi.po
+++ /dev/null
@@ -1,88 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-06-22 10:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Historiatiedot"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tehtävä"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Viestit"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Luonnos"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Virhe! Tehtävän lopetuspäivän tulee olla myöhäisempi kuin aloituspäivä"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Peruuta"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Valmis"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Auki"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Odottava"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historia"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Projektin sähköpostivälittäjä"
-
-#~ msgid "Attachments"
-#~ msgstr "Liitteet"
-
-#~ msgid "Details"
-#~ msgstr "Yksityiskohdat"
diff --git a/addons/project_mailgate/i18n/fr.po b/addons/project_mailgate/i18n/fr.po
deleted file mode 100644
index e763eca65a3..00000000000
--- a/addons/project_mailgate/i18n/fr.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-13 23:14+0000\n"
-"Last-Translator: lholivier <olivier.lenoir@free.fr>\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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Historique"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tâche"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erreur ! Vous ne pouvez pas créer de tâches récursives."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Messages"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Brouillon"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Erreur ! La date de fin de la tâche doit être postérieure à la date de "
-"démarrage"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Terminé"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Ouvert"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "En attente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historique"
-
-#~ msgid "Attachments"
-#~ msgstr "Pièces jointes"
-
-#~ msgid "Details"
-#~ msgstr "Détails"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Messagerie de Projet"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ce module est un interface de synchronisation des emails avec la gestion de "
-#~ "projet d'OpenERP.\n"
-#~ "\n"
-#~ "Il permet la création de tâches sur l'arrivée de nouveaux emails dans le "
-#~ "serveur de messagerie configuré.\n"
-#~ "De plus, il conserve les échanges ultérieurs et l'état des tâches.\n"
-#~ "    "
diff --git a/addons/project_mailgate/i18n/gl.po b/addons/project_mailgate/i18n/gl.po
deleted file mode 100644
index 0e7334b1116..00000000000
--- a/addons/project_mailgate/i18n/gl.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-05-10 08:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Galician <gl@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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Información histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarefa"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erro! Non pode crear tarefas recorrentes."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensaxes"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Erro! A data de remate da tarefa debe ser posterior á data de inicio da "
-"tarefa"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Anular"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Feito"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historial"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Ruta de enlace do proxecto"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo proporciona unha interface para sincronizar correos coas tarefas "
-#~ "de proxectos de OpenERP. Permite crear tarefas tan pronto como chegue un "
-#~ "novo correo no noso servidor de correo previamente configurado. Ademais "
-#~ "realiza un seguimento de tódalas comunicacións adicionais e dos estados da "
-#~ "tarefa.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Anexos"
-
-#~ msgid "Details"
-#~ msgstr "Detalles"
diff --git a/addons/project_mailgate/i18n/hr.po b/addons/project_mailgate/i18n/hr.po
deleted file mode 100644
index 15952d948a1..00000000000
--- a/addons/project_mailgate/i18n/hr.po
+++ /dev/null
@@ -1,104 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-12-12 08:56+0000\n"
-"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
-"Language-Team: Croatian <hr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informacije o povjesti"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Zadatak"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Greška! Ne možete kreirati rekurzivne zadatke."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Poruke"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Nacrt"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Odustani"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Izvršeno"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Otvoreno"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Na čekanju"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Povijest"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "MailGateWay projekta"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ovaj modul je sučelje za sinhronizaciju poruka sa OpenERP projektnim "
-#~ "zadacima.\n"
-#~ "\n"
-#~ "Omogućava kreiranje zadataka čim stigne novi e-mail na naš konfigurirani "
-#~ "mail poslužitelj.\n"
-#~ "Štoviše, čuva zapise o svim kasnijim komunikacijama i statusima zadataka.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Privici"
-
-#~ msgid "Details"
-#~ msgstr "Pojedinosti"
diff --git a/addons/project_mailgate/i18n/hu.po b/addons/project_mailgate/i18n/hu.po
deleted file mode 100644
index b1d551f476e..00000000000
--- a/addons/project_mailgate/i18n/hu.po
+++ /dev/null
@@ -1,84 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * project_mailgate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-25 13:21+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Előzmény"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Feladat"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Hiba! Nem hozhat létre rekurzív feladatokat."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Üzenetek"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Tervezet"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Mégsem"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Kész"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Nyitott"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Függőben lévő"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Előzmény"
-
-#~ msgid "Attachments"
-#~ msgstr "Mellékletek"
-
-#~ msgid "Details"
-#~ msgstr "Részletek"
diff --git a/addons/project_mailgate/i18n/it.po b/addons/project_mailgate/i18n/it.po
deleted file mode 100644
index a6d56020918..00000000000
--- a/addons/project_mailgate/i18n/it.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-04-22 09:54+0000\n"
-"Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Storico informazioni"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Attività"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Errore ! Non è possibile creare attività ricorsive."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Messaggi"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Bozza"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Errore ! La data finale della mansione deve essere  più vecchia di quella "
-"iniziale"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Annulla"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Completato"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Apri"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "In sospeso"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Storico"
-
-#~ msgid "Attachments"
-#~ msgstr "Allegati"
-
-#~ msgid "Details"
-#~ msgstr "Dettagli"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Questo modulo è una infertaccia che sincronizza mail con le attività di "
-#~ "progetto di OpenERP.\n"
-#~ "\n"
-#~ "Esso permette di creare attività non appena una nuova mail arriva nel mail "
-#~ "server configurato.\n"
-#~ "Inoltre, tiene traccia di tutte le comunicazioni e lo stato delle attività.\n"
-#~ "    "
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Ingresso Mail di Progetto"
diff --git a/addons/project_mailgate/i18n/ja.po b/addons/project_mailgate/i18n/ja.po
deleted file mode 100644
index 2370edbec6d..00000000000
--- a/addons/project_mailgate/i18n/ja.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-10 03:13+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "履歴情報"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "タスク"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "エラー。再帰的なタスクを作成することはできません。"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "メッセージ"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "ドラフト"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "エラー。タスクの終了日は開始日以降の日付に設定しなければなりません。"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "キャンセル"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "完了"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "開く"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "保留中"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "履歴"
diff --git a/addons/project_mailgate/i18n/lv.po b/addons/project_mailgate/i18n/lv.po
deleted file mode 100644
index 4bb1683a2f2..00000000000
--- a/addons/project_mailgate/i18n/lv.po
+++ /dev/null
@@ -1,87 +0,0 @@
-# Latvian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-31 10:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Latvian <lv@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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Vēstures informācija"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Uzdevums"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Ziņojumi"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Melnraksts"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Atcelt"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Pabeigts"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Atvērt"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Neizlemts"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Vēsture"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Projekta MailGateWay"
-
-#~ msgid "Attachments"
-#~ msgstr "Piesaistnes"
-
-#~ msgid "Details"
-#~ msgstr "Sīkāka informācija"
diff --git a/addons/project_mailgate/i18n/mn.po b/addons/project_mailgate/i18n/mn.po
deleted file mode 100644
index 157b726d3bd..00000000000
--- a/addons/project_mailgate/i18n/mn.po
+++ /dev/null
@@ -1,85 +0,0 @@
-# Mongolian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-21 13:53+0000\n"
-"Last-Translator: OpenERP Administrators <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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Түүх"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Ажил"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Мессежүүд"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Ноорог"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Болих"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Хийсэн"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Нээх"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Хүлээгдэж буй"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Түүх"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "MailGateWay Төсөл"
-
-#~ msgid "Details"
-#~ msgstr "Нарийвчлал"
diff --git a/addons/project_mailgate/i18n/nl.po b/addons/project_mailgate/i18n/nl.po
deleted file mode 100644
index 1fffc910a74..00000000000
--- a/addons/project_mailgate/i18n/nl.po
+++ /dev/null
@@ -1,104 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-18 20:55+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Historie informatie"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Taak"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Fout! U kunt geen recursieve taken aanmaken."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Berichten"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Concept"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Fout! Einddatum taak moet groter zijn dat begindatum taak"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Gereed"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Open"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Wachtend"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Geschiedenis"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Deze module is een interface dat mail synchroniseert met OpenERP Project "
-#~ "taak.\n"
-#~ "\n"
-#~ "Het maakt nieuwe taken aan zodra mail binnenkomt op de ingestelde "
-#~ "mailserver.\n"
-#~ "Daarbij houdt het alle verdere communicaties en taak statussen bij.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Bijlagen"
-
-#~ msgid "Details"
-#~ msgstr "Details"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Project MailGateWay"
diff --git a/addons/project_mailgate/i18n/nl_BE.po b/addons/project_mailgate/i18n/nl_BE.po
deleted file mode 100644
index 40124ec1928..00000000000
--- a/addons/project_mailgate/i18n/nl_BE.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# Dutch (Belgium) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-03-01 15:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (Belgium) <nl_BE@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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Historiekinformatie"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Taak"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "U kunt niet dezelfde taken maken."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Berichten"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Voorlopig"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Let op: de einddatum van de taak moet na de begindatum van de taak liggen"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Gereed"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Open"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Wachtend"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historiek"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Deze module is een interface waarmee mails met OpenERP-projecttaken worden "
-#~ "gesynchroniseerd.\n"
-#~ "\n"
-#~ "Hiermee worden taken gemaakt zodra een nieuwe mail binnenkomt via de "
-#~ "ingestelde mailserver.\n"
-#~ "Bovendien worden alle communicatie en taakstatussen bijgehouden.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Bijlagen"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Projectmailgateway"
-
-#~ msgid "Details"
-#~ msgstr "Details"
diff --git a/addons/project_mailgate/i18n/pl.po b/addons/project_mailgate/i18n/pl.po
deleted file mode 100644
index 448e4b44ad9..00000000000
--- a/addons/project_mailgate/i18n/pl.po
+++ /dev/null
@@ -1,102 +0,0 @@
-# Polish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-11-28 12:29+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Polish <pl@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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informacja o historii"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Zadanie"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Wiadomosći"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Projekt"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Anuluj"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Wykonano"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Otwórz"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Oczekujące"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historia"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "MailGateWay dla projektu"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ten moduł jest interfejsem do synchronizacji poczty z zadaniami w projektach "
-#~ "OpenERP.\n"
-#~ "\n"
-#~ "Pozwala tworzyć projekty po otrzymaniu wiadomości przez odpowiednio "
-#~ "skonfigurowany\n"
-#~ "server pocztowy. Co więcej, utrzymuje on w jednym miejscu dalszą komunikację "
-#~ "i stany zadań.\n"
-#~ "    "
-
-#~ msgid "Details"
-#~ msgstr "Szczegóły"
diff --git a/addons/project_mailgate/i18n/project_mailgate.pot b/addons/project_mailgate/i18n/project_mailgate.pot
deleted file mode 100644
index acb1e4e981c..00000000000
--- a/addons/project_mailgate/i18n/project_mailgate.pot
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_mailgate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-08 00:37+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr ""
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr ""
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr ""
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr ""
-
diff --git a/addons/project_mailgate/i18n/pt.po b/addons/project_mailgate/i18n/pt.po
deleted file mode 100644
index 8a907a4d013..00000000000
--- a/addons/project_mailgate/i18n/pt.po
+++ /dev/null
@@ -1,84 +0,0 @@
-# Portuguese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-12 10:12+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Portuguese <pt@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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informação do Histórico"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarefa"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erro ! Não se pode criar tarefas recursivas"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensagens"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Rascunho"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Erro !Data final da tarefa dever ser posterior à data inicial"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Concluído"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Histórico"
-
-#~ msgid "Details"
-#~ msgstr "Detalhes"
-
-#~ msgid "Attachments"
-#~ msgstr "Anexos"
diff --git a/addons/project_mailgate/i18n/pt_BR.po b/addons/project_mailgate/i18n/pt_BR.po
deleted file mode 100644
index cd084a2e1e2..00000000000
--- a/addons/project_mailgate/i18n/pt_BR.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-17 11:53+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informação Histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarefa"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erro! Você não pode criar tarefas recursivas."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensagens"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Provisório"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Erro ! A data final deve ser maior do que a data inicial"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Concluído"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Histórico"
-
-#~ msgid "Details"
-#~ msgstr "Detalhes"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo é uma interface que sincroniza emails com as Tarefas de Projetos "
-#~ "OpenERP.\n"
-#~ "\n"
-#~ "Permite a criação de tarefas tão logo um novo email chegue no nosso servidor "
-#~ "de email configurado.\n"
-#~ "Além disso, mantém o controle de todas as demais comunicações e estados das "
-#~ "tarefas.\n"
-#~ "    "
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Projeto Gateway de Email"
-
-#~ msgid "Attachments"
-#~ msgstr "Anexos"
diff --git a/addons/project_mailgate/i18n/ro.po b/addons/project_mailgate/i18n/ro.po
deleted file mode 100644
index dacd3b477f8..00000000000
--- a/addons/project_mailgate/i18n/ro.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-13 11:48+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <ro@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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Istoric Informatii"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Sarcina"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Eroare ! Nu puteti crea sarcini recursive."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mesaje"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Ciorna"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Eroare ! Data de sfarsit a sarcinii trebuie sa fie mai mare decat data de "
-"inceput"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Anulati"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Efectuat"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Deschideti"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "In asteptare"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Istoric"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "MailGAteWay Proiect"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Acest modul este o interfată care sincronizează email-urile cu Activitatea "
-#~ "de Proiect OpenERP.\n"
-#~ "\n"
-#~ "Permite crearea de sarcini de indată ce un nou email soseste in serverul de "
-#~ "mail configurat.\n"
-#~ "In plus, tine evidenta tuturor comunicatiilor viitoare si a stărilor "
-#~ "activitătilor.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Atașamente"
-
-#~ msgid "Details"
-#~ msgstr "Detalii"
diff --git a/addons/project_mailgate/i18n/sv.po b/addons/project_mailgate/i18n/sv.po
deleted file mode 100644
index 02d5c55be00..00000000000
--- a/addons/project_mailgate/i18n/sv.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Swedish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-18 23:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Historikinformation"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Aktivitet"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Fel ! Du kan inte skapa rekursiva aktiviteter"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Meddelanden"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Preliminär"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Fel ! Aktivitetens slutdatum måste komma efter startdatumet"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Avbryt"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Färdig"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Öppen"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Väntande"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historik"
diff --git a/addons/project_mailgate/i18n/tr.po b/addons/project_mailgate/i18n/tr.po
deleted file mode 100644
index 1f8a351bcbc..00000000000
--- a/addons/project_mailgate/i18n/tr.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-25 17:33+0000\n"
-"Last-Translator: Ahmet Altınışık <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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr ""
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Görev"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mesajlar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Taslak"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "İptal"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Tamamlandı"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Açık"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Bekleyen"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr ""
diff --git a/addons/project_mailgate/i18n/zh_CN.po b/addons/project_mailgate/i18n/zh_CN.po
deleted file mode 100644
index c1b8ea02d5a..00000000000
--- a/addons/project_mailgate/i18n/zh_CN.po
+++ /dev/null
@@ -1,101 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-06-28 16:25+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "日志信息"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "任务"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "错误！不能创建循环引用的任务"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "消息"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "草稿"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "错误！任务结束日期必须大于任务开始日期"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "取消"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "完成"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "未结"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "等待中"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "日志"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Project MailGateWay"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "此模块是邮件和任务的接口。\n"
-#~ "允许在特定邮件服务器收到邮件后马上创建任务。\n"
-#~ "还能跟踪进一步的沟通和任务阶段\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "附件"
-
-#~ msgid "Details"
-#~ msgstr "详细信息"
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
deleted file mode 100644
index 3096a7381e6..00000000000
--- a/addons/project_mailgate/project_mailgate.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 binascii
-from osv import fields, osv
-from tools.translate import _
-import tools
-
-class project_tasks(osv.osv):
-    _inherit = 'project.task'
-
-    def message_new(self, cr, uid, msg, custom_values=None, context=None):
-        """ Overrides mail_thread message_new that is called by the mailgateway
-            through message_process.
-            This override updates the document according to the email.
-        """
-        if custom_values is None: custom_values = {}
-        custom_values.update({
-            'name': subject,
-            'planned_hours': 0.0,
-            'subject': msg.get('subject'),
-        })
-        return super(project_tasks,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
-
-    def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
-        """ Overrides mail_thread message_update that is called by the mailgateway
-            through message_process.
-            This method updates the task according to the email.
-        """
-        if update_vals is None: update_vals = {}
-        act = False
-        maps = {
-            'cost':'planned_hours',
-        }
-        for line in msg['body'].split('\n'):
-            line = line.strip()
-            res = tools.misc.command_re.match(line)
-            if res:
-                match = res.group(1).lower()
-                field = maps.get(match)
-                if field:
-                    try:
-                        update_vals[field] = float(res.group(2).lower())
-                    except (ValueError, TypeError):
-                        pass
-                elif match.lower() == 'state' \
-                        and res.group(2).lower() in ['cancel','close','draft','open','pending']:
-                    act = 'do_%s' % res.group(2).lower()
-        if act:
-            getattr(self,act)(cr, uid, ids, context=context)
-        return super(project_tasks,self).message_update(cr, uid, msg, update_vals=update_vals, context=context)
-
-    def message_thread_followers(self, cr, uid, ids, context=None):
-        followers = super(project_tasks,self).message_thread_followers(cr, uid, ids, context=context)
-        for task in self.browse(cr, uid, followers.keys(), context=context):
-            task_followers = set(followers[task.id])
-            task_followers.add(task.user_id.email)
-            followers[task.id] = filter(None, task_followers)
-        return followers
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 5d2b0fc63b8bf029c92553b7d5b61f9f89d45f31 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 4 Sep 2012 15:02:20 +0530
Subject: [PATCH 765/999] [IMP] crm: made some little changes in domain for
 field 'stage_id'

bzr revid: cha@tinyerp.com-20120904093220-b2kunh9ccec9z3xo
---
 addons/crm/crm_lead.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 8f857c28556..aa6a7a66e5c 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -213,7 +213,7 @@ class crm_lead(base_stage, osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'date_closed': fields.datetime('Closed', readonly=True),
         'stage_id': fields.many2one('crm.case.stage', 'Stage',
-                        domain="['&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '&', ('fold', '=', False), '|', ('type', '=', type), ('type', '=', 'both')]"),
+                        domain="['&', '&', '|', ('fold', '=', False),('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"),
         'user_id': fields.many2one('res.users', 'Salesperson'),
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),

From 29b437766f12fcff6463f5b8da19147ca941ae01 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 4 Sep 2012 12:02:50 +0200
Subject: [PATCH 766/999] [FIX] amount_to_text: avoid to have a none in the
 concat

bzr revid: stw@openerp.com-20120904100250-utk61q7ik41lameo
---
 openerp/tools/amount_to_text_en.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/tools/amount_to_text_en.py b/openerp/tools/amount_to_text_en.py
index 9a1ac939e6b..97d690c70e2 100644
--- a/openerp/tools/amount_to_text_en.py
+++ b/openerp/tools/amount_to_text_en.py
@@ -88,8 +88,8 @@ def amount_to_text(number, currency):
     end_word = english_number(int(list[1]))
     cents_number = int(list[1])
     cents_name = (cents_number > 1) and 'Cents' or 'Cent'
-    final_result = start_word +' '+units_name+' and ' + end_word +' '+cents_name
-    return final_result
+
+    return ' '.join(filter(None, [start_word, units_name, (start_word or units_name) and (end_word or cents_name) and 'and', end_word, cents_name]))
 
 
 #-------------------------------------------------------------

From 9612626dacbaf3a7956a68f8bd7696966430c0ec Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 4 Sep 2012 12:19:16 +0200
Subject: [PATCH 767/999] [ADD] Kanban dummy cell click triggers 'add column'
 button bounce effect

bzr revid: fme@openerp.com-20120904101916-wzkxutkcthgyv2fe
---
 addons/web/static/src/css/base.css              | 4 +++-
 addons/web/static/src/css/base.sass             | 2 ++
 addons/web_kanban/static/src/js/kanban.js       | 9 +++++++++
 addons/web_kanban/static/src/xml/web_kanban.xml | 4 +++-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index dd168653f03..94cb4d3a007 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -69,7 +69,6 @@
     display: none !important;
   }
 }
-
 .openerp.openerp_webclient_container {
   height: 100%;
   position: relative;
@@ -238,6 +237,9 @@
 .openerp .ui-widget-content a {
   color: #7c7bad;
 }
+.openerp .oe_bounce_container {
+  display: inline-block;
+}
 .openerp.ui-dialog {
   display: none;
   padding: 6px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 537988e9c4a..ad5794ab5cf 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -251,6 +251,8 @@ $sheet-max-width: 860px
     // Jquery ui Overrides {{{
     .ui-widget-content a
         color: $link-color
+    .oe_bounce_container
+        display: inline-block
 
     // Modal box
     &.ui-dialog
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index ffec52e8b97..e00f6d9f44e 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -42,6 +42,15 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         this.limit = options.limit || 80;
         this.add_group_mutex = new $.Mutex();
     },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+        this.$el.on('click', '.oe_kanban_dummy_cell', function() {
+            if (self.$buttons) {
+                self.$buttons.find('.oe_kanban_add_column').effect('bounce', {distance: 18, times: 5}, 150);
+            }
+        });
+    },
     destroy: function() {
         this._super.apply(this, arguments);
         $('html').off('click.kanban');
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 39bca51c1f5..20b361e9445 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -20,7 +20,9 @@
             </button>
             <span class="oe_alternative" style="display: none">
                 <span class="oe_fade">or</span>
-                <a href="#" class="oe_bold oe_kanban_add_column">Add a new column</a>
+                <div class="oe_bounce_container">
+                    <a href="#" class="oe_bold oe_kanban_add_column">Add a new column</a>
+                </div>
             </span>
         </t>
     </t>

From fd40dcbeff2973c6501db4eb4e752597ef7fcbd2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Sep 2012 12:11:39 +0200
Subject: [PATCH 768/999] [FIX] add minimum height to listview rows matching
 that of edition row fields

Also fix reset of border-radius: none is not a valid value for
border-radius, change to 0.

bzr revid: xmo@openerp.com-20120904101139-xyl0dskdk6dbdfe1
---
 addons/web/static/src/css/base.css            | 20 ++++++++++---------
 addons/web/static/src/css/base.sass           | 12 ++++++-----
 .../web/static/src/js/view_list_editable.js   |  2 +-
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 94cb4d3a007..c20cdf92891 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -523,9 +523,9 @@
   padding: 0;
   margin: 0;
   background: none;
-  -moz-border-radius: none;
-  -webkit-border-radius: none;
-  border-radius: none;
+  -moz-border-radius: 0;
+  -webkit-border-radius: 0;
+  border-radius: 0;
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
@@ -538,9 +538,9 @@
   padding: 0;
   margin: 0;
   background: none;
-  -moz-border-radius: none;
-  -webkit-border-radius: none;
-  border-radius: none;
+  -moz-border-radius: 0;
+  -webkit-border-radius: 0;
+  border-radius: 0;
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
@@ -2479,10 +2479,11 @@
   height: 27px;
 }
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea {
+  -moz-border-radius: 0;
+  -webkit-border-radius: 0;
+  border-radius: 0;
   border: 1px solid #aaaaff;
-  border-radius: 0px;
-  margin: 0px;
-  -webkit-border-radius: 0px;
+  margin: 0;
 }
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea {
   height: 60px;
@@ -2582,6 +2583,7 @@
   cursor: pointer;
 }
 .openerp .oe_list_content > tbody > tr {
+  height: 27px;
   border-top: 1px solid #dddddd;
 }
 .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index ad5794ab5cf..5f72b7ae548 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -36,7 +36,7 @@ $sheet-max-width: 860px
     padding: 0
     margin: 0
     background: none
-    @include radius(none)
+    @include radius(0)
     @include box-shadow(none)
 
 @mixin vertical-gradient($startColor: #555, $endColor: #333)
@@ -1911,6 +1911,8 @@ $sheet-max-width: 860px
                     background-color: #d2d2ff
                 td.oe_readonly
                     background-color: #eee
+
+    $row-height: 27px
     .oe_list_editable
         .oe_list_content
             td.oe_list_field_cell
@@ -1925,12 +1927,11 @@ $sheet-max-width: 860px
             display: none
         .oe_form_field
             input
-                height: 27px
+                height: $row-height
             input, textarea
+                @include radius(0)
                 border: 1px solid #aaf
-                border-radius: 0px
-                margin: 0px
-                -webkit-border-radius: 0px
+                margin: 0
             textarea
                 height: 60px
             &.oe_form_field_float,&.oe_form_view_integer
@@ -2015,6 +2016,7 @@ $sheet-max-width: 860px
         > tbody
             cursor: pointer
             > tr
+                height: $row-height
                 border-top: 1px solid #ddd
                 > td.oe_list_field_cell
                     padding: 3px 6px
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 65f5620c1a9..9998eb5fce2 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -249,7 +249,7 @@ openerp.web.list_editable = function (instance) {
             var position = $cell.position();
 
             // jquery does not understand !important
-            field.$el.attr('style', 'width: '+$cell.outerWidth()+'px !important')
+            field.$el.attr('style', 'width: '+$cell.outerWidth()+'px !important');
             field.$el.css({
                 top: position.top,
                 left: position.left,

From cccbe77b77ce060cb39ed609812bfad947dff553 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 4 Sep 2012 15:52:12 +0530
Subject: [PATCH 769/999] [IMP] hr_recruitment, project, project_issue: made
 some little changes in domain for field 'stage_id'

bzr revid: cha@tinyerp.com-20120904102212-ccxp2ik0r5kp3vc3
---
 addons/hr_recruitment/hr_recruitment.py | 2 +-
 addons/project/project.py               | 2 +-
 addons/project_issue/project_issue.py   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 2a3fab58730..581f9263264 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -185,7 +185,7 @@ class hr_applicant(base_stage, osv.Model):
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage',
-                        domain="['&', ('fold', '=', False), '|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
+                        domain="['&','|',('fold', '=', False), ('department_id', '=', department_id), ('department_id', '=', False)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=AVAILABLE_STATES, string="State", readonly=True,
                 help='The state is set to \'Draft\', when a case is created.\
diff --git a/addons/project/project.py b/addons/project/project.py
index c9bcb643150..55cb8c2ff37 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -739,7 +739,7 @@ class task(base_stage, osv.osv):
         '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',
-                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', '|', ('fold', '=', False), ('project_ids', '=', project_id), ('case_default', '=', True)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=_TASK_STATE, string="State", readonly=True,
                 help='The state is set to \'Draft\', when a case is created.\
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 368ec2cb9d7..d5279e31e41 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -240,7 +240,7 @@ 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',
-                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', '|', ('fold', '=', False), ('project_ids', '=', project_id), ('case_default', '=', True)]"),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),

From af953dab4619c3cb995bae3921e1b7d90ba3dd40 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 4 Sep 2012 12:29:25 +0200
Subject: [PATCH 770/999] [IMP] disable the document_ftp in the
 run_all_with_test script

bzr revid: stw@openerp.com-20120904102925-0yaxin1doamxyrxd
---
 scripts/run_all_with_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/run_all_with_tests.sh b/scripts/run_all_with_tests.sh
index 4103b6243e2..877a5908b1a 100755
--- a/scripts/run_all_with_tests.sh
+++ b/scripts/run_all_with_tests.sh
@@ -1,7 +1,7 @@
 DATABASE=trunk
 dropdb ${DATABASE}
 REPOSITORIES=../../addons/trunk
-MODULES=`python -c "import os; print ','.join(os.listdir('${REPOSITORIES}'))"`
+MODULES=`python -c "import os; print ','.join(list(set(os.listdir('${REPOSITORIES}')) - set(['document_ftp'])))"`
 createdb ${DATABASE}
 rm openerp-server.log
 ./openerp-server \

From c675e67b1404f171ceb58cb608732e43e94f2263 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 4 Sep 2012 16:00:56 +0530
Subject: [PATCH 771/999] [IMP] hr_recruitment: made minor change in domain

bzr revid: cha@tinyerp.com-20120904103056-2lz4ukxpnlsi7c25
---
 addons/hr_recruitment/hr_recruitment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 581f9263264..05c7a9df2bd 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -185,7 +185,7 @@ class hr_applicant(base_stage, osv.Model):
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage',
-                        domain="['&','|',('fold', '=', False), ('department_id', '=', department_id), ('department_id', '=', False)]"),
+                        domain="['&', '|', ('fold', '=', False), ('department_id', '=', department_id), ('department_id', '=', False)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=AVAILABLE_STATES, string="State", readonly=True,
                 help='The state is set to \'Draft\', when a case is created.\

From 95837af09c769370fa7c7aa1bc89bbee0868d50f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Sep 2012 12:32:42 +0200
Subject: [PATCH 772/999] [IMP] ir.needaction: made the model Abstract. Fixed a
 bug when inheriting from AbstractModels: _auto (to create a database for the
 model) was not correctly set.

bzr revid: tde@openerp.com-20120904103242-o6ky20u9gvhu0t3u
---
 openerp/addons/base/ir/ir_needaction.py | 2 +-
 openerp/osv/orm.py                      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index ba3a5c4a998..db133ad9904 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -21,7 +21,7 @@
 
 from osv import osv
 
-class ir_needaction_mixin(osv.Model):
+class ir_needaction_mixin(osv.AbstractModel):
     '''Mixin class for objects using the need action feature.
 
     Need action feature can be used by models that have to be able to
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 650a9ac78c5..df12062f922 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -654,6 +654,7 @@ class BaseModel(object):
     may be set to False.
     """
     __metaclass__ = MetaModel
+    _auto = True # create database backend
     _register = False # Set to false if the model shouldn't be automatically discovered.
     _name = None
     _columns = {}
@@ -5076,6 +5077,7 @@ class Model(BaseModel):
     The system will later instantiate the class once per database (on
     which the class' module is installed).
     """
+    _auto = True
     _register = False # not visible in ORM registry, meant to be python-inherited only
     _transient = False # True in a TransientModel
 
@@ -5088,6 +5090,7 @@ class TransientModel(BaseModel):
        records they created. The super-user has unrestricted access
        to all TransientModel records.
     """
+    _auto = True
     _register = False # not visible in ORM registry, meant to be python-inherited only
     _transient = True
 

From 58a5e1c01321dff78f4ab7d7b74acd171c7e9be4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Sep 2012 13:04:22 +0200
Subject: [PATCH 773/999] [FIX] reversal of aggregate function and title when
 extracted Column objects

bzr revid: xmo@openerp.com-20120904110422-zgk7icj5lgygnvpo
---
 addons/web/static/src/js/view_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index a2dccf2ec73..a83f7891a08 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1995,7 +1995,7 @@ instance.web.list.Column = instance.web.Class.extend({
         if (!(aggregation_func in this)) {
             return {};
         }
-        var C = function (label, fn) {
+        var C = function (fn, label) {
             this['function'] = fn;
             this.label = label;
         };

From 4260913fb76e830b31ba8a99b546729af8a35d20 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 4 Sep 2012 16:41:12 +0530
Subject: [PATCH 774/999] [IMP] crm: made state field invisible in form & tree
 view

bzr revid: cha@tinyerp.com-20120904111112-zwjcdwjq9ldkkv73
---
 addons/crm/crm_lead_view.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6a715893a17..9c0fb812fcb 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -211,7 +211,7 @@
                                 <field name="type_id" widget="selection"/>
                                 <field name="channel_id" widget="selection"/>
                                 <field name="referred"/>
-                                <field name="state" groups="base.group_no_one"/>
+                                <field name="state" groups="base.group_no_one" invisible="1"/>
                             </group>
                             <group string="Mailings">
                                 <field name="opt_out" />
@@ -257,7 +257,7 @@
                     <field name="stage_id"/>
                     <field name="user_id" invisible="1"/>
                     <field name="section_id" invisible="context.get('invisible_section', True)" />
-                    <field name="state" groups="base.group_no_one"/>
+                    <field name="state" groups="base.group_no_one" invisible="1"/>
                     <field name="type_id" invisible="1"/>
                     <field name="referred" invisible="1"/>
                     <field name="channel_id" invisible="1"/>
@@ -386,7 +386,6 @@
                         <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
                         <separator orientation="vertical"/>
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                     </group>
                     <group string="Display">
@@ -515,7 +514,7 @@
                                     <field name="day_open" groups="base.group_no_one"/>
                                     <field name="day_close" groups="base.group_no_one"/>
                                     <field name="referred"/>
-                                    <field name="state" groups="base.group_no_one"/>
+                                    <field name="state" groups="base.group_no_one" invisible="1"/>
                                     <field name="type" invisible="1"/>
                                 </group>
                                 <group string="References">
@@ -562,7 +561,7 @@
                     <field name="section_id" invisible="context.get('invisible_section', True)" />
                     <field name="user_id"/>
                     <field name="priority" invisible="1"/>
-                    <field name="state" groups="base.group_no_one"/>
+                    <field name="state" groups="base.group_no_one" invisible="1"/>
                     <field name="needaction_pending" invisible="1"/>
                 </tree>
             </field>
@@ -600,7 +599,6 @@
                         <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
                         <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                         <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
                     </group>

From 41423b675022bcad1b1ac609e48ff11d79f892ef Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 4 Sep 2012 17:03:05 +0530
Subject: [PATCH 775/999] [IMP] hr_recruitment: made state field invisible in
 form & tree view & deleted from search view

bzr revid: cha@tinyerp.com-20120904113305-b3w9trvw071nt1ts
---
 .../hr_recruitment/board_hr_recruitment_statistical_view.xml   | 2 +-
 addons/hr_recruitment/hr_recruitment_view.xml                  | 3 +--
 addons/hr_recruitment/report/hr_recruitment_report_view.xml    | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
index 461ccdf0bbe..d39a5a74fc1 100644
--- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
+++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
@@ -11,7 +11,7 @@
                 <field name="job_id"/>
                 <field name="partner_name"/>
                 <field name="stage_id"/>
-                <field name="state" groups="base.group_no_one"/>
+                <field name="state" groups="base.group_no_one" invisible="1"/>
             </tree>
         </field>
     </record>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 1ded2e67db9..7eb5187ad88 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -95,7 +95,7 @@
                 <field name="availability" invisible="1"/>
                 <field name="department_id" invisible="context.get('invisible_department', True)"/>
                 <field name="user_id"/>
-                <field name="state" groups="base.group_no_one"/>
+                <field name="state" groups="base.group_no_one" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -228,7 +228,6 @@
                     <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'availability'}"/>
                     <filter string="Appreciation" icon="terp-face-plain" domain="[]" context="{'group_by':'priority'}"/>
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Source" icon="terp-face-plain" domain="[]" context="{'group_by':'source_id'}"/>
                     <filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 30a20a25eb8..1b0b8bfa7c5 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -71,7 +71,6 @@
                    <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                    <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
-                   <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                    <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
                    <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
                    <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>

From 526b38a1f812de77598a9b7580f94fc4b51a52cf Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 4 Sep 2012 17:19:02 +0530
Subject: [PATCH 776/999] [IMP] crm: removed duplicated field in search view &
 delete state field too

bzr revid: cha@tinyerp.com-20120904114902-rfxk2xleihid083b
---
 addons/crm/report/crm_lead_report_view.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 4283dd8fb3c..35ed9411215 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -105,21 +105,11 @@
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Stage" name="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
-                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
-                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'creation_year'}"/>
-                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'creation_month'}"/>
-                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'creation_day'}"/>
-                        <filter string="Exp. Closing"  icon="terp-go-month" domain="[]" context="{'group_by':'deadline_month'}"/>
                         <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
                             domain="[]" context="{'group_by':'type_id'}" />
                         <filter string="Channel" icon="terp-call-start"
                             domain="[]" context="{'group_by':'channel_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-                        <separator orientation="vertical" />
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'creation_year'}"/>
                         <filter string="Month" icon="terp-go-month"

From 1974375c921d1fab529d433b5c88a91dd0c8f1e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Sep 2012 13:54:16 +0200
Subject: [PATCH 777/999] [IMP] hr_evaluation: send remainder email now uses
 context values to set some default values when sending an email. This is a
 basic fix of missing feature due to hr_evaluation/wizard/mail_compose_message
 override. Updated classic form view of mail.compose.message. Not sure it is
 usefull to keep two form (one classic and one Chatter)... maybe there is
 something to do here.

bzr revid: tde@openerp.com-20120904115416-zuvna57r3oj37hpu
---
 addons/hr_evaluation/hr_evaluation_view.xml   | 23 ++++++++++----
 addons/mail/mail_message.py                   |  3 +-
 addons/mail/wizard/mail_compose_message.py    |  2 +-
 .../mail/wizard/mail_compose_message_view.xml | 31 ++++++++++++-------
 4 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 9f64df8808d..78997cff83b 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -267,16 +267,27 @@
             <field name="arch" type="xml">
                 <form string="Interview Appraisal" version="7.0">
                     <header>
-                        <button string="Cancel" name="survey_req_cancel" states="draft,waiting_answer" type="object" icon="gtk-cancel"/>
-                        <button name="action_print_survey" string="Print Survey" type="object" states="draft" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
-                        <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" class="oe_highlight"/>
-                        <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                        <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to"/>
+                        <button string="Cancel" name="survey_req_cancel" type="object"
+                            states="draft,waiting_answer"/>
+                        <button string="Print Survey" name="action_print_survey"  type="object"
+                            states="draft" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}"
+                            attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
+                        <button string="Send Request" name="survey_req_waiting_answer" type="object"
+                            states="draft" class="oe_highlight"/>
+                        <button string="Answer Survey" name="%(survey.action_view_survey_question_message)d" type="action"
+                            states="waiting_answer"
+                            context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}"
+                            attrs="{'readonly':[('survey_id','=',False)]}"/>
+                        <button string="Done" name="survey_req_done" type="object"
+                            states="waiting_answer"/>
                         <field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box" name="button_box">
-                            <button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action" states="waiting_answer"/>
+                            <button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" type="action"
+                                states="waiting_answer"
+                                context="{'default_body_text': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
+                                            'default_subject': 'Reminder to fill up Survey' }"/>
                         </div>
                         <group>
                             <group col="3" colspan="1">
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 8fc9fb27b86..d87e503011d 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -135,7 +135,8 @@ class mail_message(osv.Model):
     _defaults = {
         'type': 'email',
         'date': lambda *a: fields.datetime.now(),
-        'author_id': _get_default_author
+        'author_id': lambda s,cr,uid,ctx={}: self._get_default_author(cr, uid, ctx),
+        'body': '',
     }
 
     #------------------------------------------------------
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 15f428264ff..3a42336de23 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -106,7 +106,7 @@ class mail_compose_message(osv.TransientModel):
             'mail_compose_message_ir_attachments_rel',
             'wizard_id', 'attachment_id', 'Attachments'),
         'filter_id': fields.many2one('ir.filters', 'Filters'),
-        'body_text': fields.text('Plain-text editor body'),
+        'body_text': fields.text('Plain-text Contents'),
         'content_subtype': fields.char('Message content subtype', size=32, readonly=1,
             help="Type of message, usually 'html' or 'plain', used to select "\
                   "plain-text or rich-text contents accordingly"),
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 4ce5db3f4e3..70b50c154ac 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -6,34 +6,43 @@
             <field name="model">mail.compose.message</field>
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
+                    <field name="composition_mode" nolabel="1" invisible="1"/>
+                    <field name="model" nolabel="1" invisible="1"/>
+                    <field name="res_id" nolabel="1" invisible="1"/>
+                    <field name="parent_id" nolabel="1" invisible="1"/>
+                    <field name="content_subtype" nolabel="1" invisible="1"/>
                     <group>
-                        <field name="composition_mode" invisible="1"/>
-                        <field name="model" invisible="1"/>
-                        <field name="res_id" invisible="1"/>
-                        <field name="author_id"/>
-                        <field name="partner_ids"/>
-                        <field name="subject" widget="char" size="512"/>
-                        <field name="message_id"/>
+                        <field name="subject" placeholder="Subject..."/>
+                        <field name="partner_ids" widget="many2many_tags" placeholder="Add contacts to notify..."
+                                context="{'force_create':True}"
+                                on_change="onchange_partner_ids(partner_ids)"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Body">
-                            <field name="body" colspan="4" nolabel="1" height="300" width="300"/>
+                            <field name="body_text" nolabel="1"
+                                attrs="{'invisible':[('content_subtype', '=', 'html')]}"/>
+                            <field name="body" nolabel="1"
+                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
                         </page>
                         <page string="Attachments">
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
                     <footer>
-                        <button name="send_mail" string="Send" type="object" class="oe_highlight"  />
+                        <button string="Send" name="send_mail" type="object" class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
+                        <div class="oe_right">
+                            <button string="" name="toggle_content_subtype" type="object" icon="/mail/static/src/img/formatting.png" 
+                                help="Toggle advanced formatting mode"/>
+                        </div>
                     </footer>
                 </form>
             </field>
         </record>
 
         <record model="ir.ui.view" id="email_compose_message_wizard_form_chatter">
-            <field name="name">mail.compose.message.form</field>
+            <field name="name">mail.compose.message.form.chatter</field>
             <field name="model">mail.compose.message</field>
             <field name="priority">18</field>
             <field name="arch" type="xml">

From b4e20f0c14e66bb8d5b74910c938a6a90de72f6c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Sep 2012 13:56:27 +0200
Subject: [PATCH 778/999] [IMP] use list.Column's parsed (and potentially
 altered) modifiers to generate the edition form view

This way, listview 'widgets' can alter the modifiers object and influence the corresponding form widget

bzr revid: xmo@openerp.com-20120904115627-v626hcb9o0s7bcrp
---
 addons/web/static/src/js/view_list.js         |  5 +++++
 .../web/static/src/js/view_list_editable.js   | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index a83f7891a08..40bdee3a07f 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -2115,6 +2115,11 @@ instance.web.list.ProgressBar = instance.web.list.Column.extend({
     }
 });
 instance.web.list.Handle = instance.web.list.Column.extend({
+    init: function () {
+        this._super.apply(this, arguments);
+        // Handle overrides the field to not be form-editable.
+        this.modifiers.readonly = true;
+    },
     /**
      * Return styling hooks for a drag handle
      *
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 9998eb5fce2..4ea46c51e07 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -354,14 +354,17 @@ openerp.web.list_editable = function (instance) {
                 'class': 'oe_form_container',
                 version: '7.0'
             });
-            _(view.arch.children).each(function (widget) {
-                var modifiers = JSON.parse(widget.attrs.modifiers || '{}');
-                widget.attrs.nolabel = true;
-                if (modifiers['tree_invisible'] || widget.tag === 'button') {
-                    modifiers.invisible = true;
-                }
-                widget.attrs.modifiers = JSON.stringify(modifiers);
-            });
+            _(view.arch.children).chain()
+                .zip(this.columns)
+                .each(function (ar) {
+                    var widget = ar[0], column = ar[1];
+                    var modifiers = _.extend({}, column.modifiers);
+                    widget.attrs.nolabel = true;
+                    if (modifiers['tree_invisible'] || widget.tag === 'button') {
+                        modifiers.invisible = true;
+                    }
+                    widget.attrs.modifiers = JSON.stringify(modifiers);
+                });
             return view;
         },
         handle_onwrite: function (source_record) {

From b4b104e0d03dccc01e5963b0a71134f925aaa23b Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Tue, 4 Sep 2012 13:56:38 +0200
Subject: [PATCH 779/999] [FIX] Document page css.

bzr revid: vta@openerp.com-20120904115638-nccbm09g3cof803q
---
 addons/document_page/static/src/css/document_page.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/document_page/static/src/css/document_page.css b/addons/document_page/static/src/css/document_page.css
index 723ff8d9b11..77597fb4281 100644
--- a/addons/document_page/static/src/css/document_page.css
+++ b/addons/document_page/static/src/css/document_page.css
@@ -1,7 +1,3 @@
-.oe_form_readonly .oe_notebook {
-    display: none;
-}
-
 .oe_document_page ul, .oe_document_page li {
     padding: 2px 8px;
     margin: 2px 8px;

From 54ec6e88926df67bb1963d0c20c7ee9cd6599fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Sep 2012 13:57:23 +0200
Subject: [PATCH 780/999] [IMP] hr_evaluation: also updated default values when
 sending a mass_mail reminder.

bzr revid: tde@openerp.com-20120904115723-v5ifjg18l8hmbdj2
---
 addons/hr_evaluation/hr_evaluation_view.xml | 5 +++--
 addons/mail/wizard/mail_compose_message.py  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 78997cff83b..4f49b7ba516 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -399,7 +399,6 @@
             action="action_hr_evaluation_interview_tree"/>
 
       <!-- Email Compose message Action-->
-      <!-- TDE TODO: add context values -->
       <act_window
         id="evaluation_reminders" name="Appraisal Reminders"
         res_model="mail.compose.message"
@@ -407,7 +406,9 @@
         view_type="form" view_mode="form"
         target="new" multi="True"
         key2="client_action_multi"
-        context="{'default_composition_mode': 'mass_mail'}"/>
+        context="{'default_composition_mode': 'mass_mail',
+                    'default_body_text': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
+                    'default_subject': 'Reminder to fill up Survey'}"/>
 
       <!-- Appraisal Interviews Button on Employee Form -->
       <act_window
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 3a42336de23..41b10d6d4a3 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -81,7 +81,7 @@ class mail_compose_message(osv.TransientModel):
         elif composition_mode == 'comment' and model and res_id:
             vals = self.get_record_data(cr, uid, model, res_id, context=context)
         elif composition_mode == 'mass_mail' and model and active_ids:
-            vals = {'model': model, 'res_id': res_id, 'content_subtype': 'html'}
+            vals = {'model': model, 'res_id': res_id}
         else:
             vals = {'model': model, 'res_id': res_id}
         if composition_mode:

From 5506e519fe2bc6b40c4e99a8bc2a7ff54c004b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Sep 2012 14:02:40 +0200
Subject: [PATCH 781/999] [IMP] crm_forward_to_partner: on_change_partner_ids
 -> onchange_partner_ids, already defined on mail.compose.message.

bzr revid: tde@openerp.com-20120904120240-hidqb9e3ivys9vpo
---
 .../wizard/crm_forward_to_partner.py                  | 11 ++---------
 .../wizard/crm_forward_to_partner_view.xml            |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 6ed8da7b231..0cac38e0163 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -89,11 +89,6 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             lead = self.pool.get(model).browse(cr, uid, res_id, context=context)
             body = self._get_message_body(cr, uid, lead, history_mode, context=context)
             return {'value': {'body': body}}
-    
-    def on_change_partner_ids(self, cr, uid, ids, partner_ids, context=None):
-        """ TDE-TODO: Keep void; maybe we could check that partner_ids have
-            email  defined. """
-        return {}
 
     def create(self, cr, uid, values, context=None):
         """ TDE-HACK: remove 'type' from context, because when viewing an
@@ -106,9 +101,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         return new_id
 
     def action_forward(self, cr, uid, ids, context=None):
-        """
-            Forward the lead to a partner
-        """
+        """ Forward the lead to a partner """
         if context is None:
             context = {}
         res = {'type': 'ir.actions.act_window_close'}
@@ -126,7 +119,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
 
         self.send_mail(cr, uid, ids, context=context)
         # for case in lead.browse(cr, uid, lead_ids, context=context):
-            # TDE: WHAT TO DO WITH THAT ?
+            # TODO: WHAT TO DO WITH THAT ?
             # if (this.send_to == 'partner' and this.partner_id):
             #     lead.assign_partner(cr, uid, [case.id], this.partner_id.id, context=context)
 
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index fe9e1476817..0d8f27eec74 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -16,7 +16,7 @@
                             on_change="on_change_history_mode(history_mode, model, res_id)"/>
                         <field name="subject" colspan="4"/>
                         <field name="partner_ids" colspan="4" widget="many2many_tags"
-                            on_change="on_change_partner_ids(partner_ids)"/>
+                            on_change="onchange_partner_ids(partner_ids)"/>
                         <notebook colspan="4">
                             <page string="Body">
                                 <field name="body"/>

From 6838e9193b2a873b66a9d58873085b0b533fdbd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Sep 2012 14:18:02 +0200
Subject: [PATCH 782/999] [FIX] mail_message: fixed typo.

bzr revid: tde@openerp.com-20120904121802-7lbajrbon7f83vux
---
 addons/mail/mail_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index d87e503011d..d22bd4c2e3c 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -135,7 +135,7 @@ class mail_message(osv.Model):
     _defaults = {
         'type': 'email',
         'date': lambda *a: fields.datetime.now(),
-        'author_id': lambda s,cr,uid,ctx={}: self._get_default_author(cr, uid, ctx),
+        'author_id': lambda s,cr,uid,ctx={}: s._get_default_author(cr, uid, ctx),
         'body': '',
     }
 

From 1f1a0ef14b9632847b909485265417b8c6f5fc0f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Sep 2012 14:18:23 +0200
Subject: [PATCH 783/999] [IMP] cancel pending edition when hiding the list
 view, if editable

otherwise the edition disappears but part of the list view (e.g. buttons at the top) remain in the wrong state

bzr revid: xmo@openerp.com-20120904121823-kejzzquax2hdedoo
---
 addons/web/static/src/js/view_list_editable.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 4ea46c51e07..bdd266454dd 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -55,6 +55,12 @@ openerp.web.list_editable = function (instance) {
             instance.web.bus.off('resize', this, this.resize_fields);
             this._super();
         },
+        do_hide: function () {
+            if (this.editor.is_editing()) {
+                this.cancel_edition(true);
+            }
+            this._super();
+        },
         /**
          * Handles the activation of a record in editable mode (making a record
          * editable), called *after* the record has become editable.

From 674ea0583077ed4d19547017b733a4fe44ee8a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Sep 2012 14:18:38 +0200
Subject: [PATCH 784/999] [IMP] mail_thread: cleaned comments and some var name
 in the modified many2many field. Also made mail_thread an AbstractModel.

bzr revid: tde@openerp.com-20120904121838-rpaesid3stxm8gus
---
 addons/mail/mail_thread.py | 43 +++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 4e35f3fd197..6e5f594354a 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -29,7 +29,6 @@ import time
 import tools
 import xmlrpclib
 
-from email.utils import parsedate
 from email.message import Message
 from mail_message import decode
 from osv import osv, fields
@@ -42,24 +41,20 @@ def decode_header(message, header, separator=' '):
     return separator.join(map(decode,message.get_all(header, [])))
 
 class many2many_reference(fields.many2many):
-    """ many2many_reference is an override of fields.many2many. It manages
-        many2many-like table where one id is given by two fields, res_model
-        and res_id.
-    """
+    """ many2many_reference manages many2many fields where one id is found
+        by a reference-like key (a char column in addition to the foreign id).
+        The reference_column attribute on the many2many fields is used;
+        if not defined, ``res_model`` is used. """
     
     def _get_query_and_where_params(self, cr, model, ids, values, where_params):
-        """ Add in where:
-            - ``mail_followers``.res_model = 'crm.lead'
-        """
-        # reference column name: given by attribute or res_model
-        ref_col_name = self.ref_col_name if self.ref_col_name else 'res_model'
-        values.update({'ref_col_name': ref_col_name, 'ref_col_value': model._name})
-
+        """ Add in where condition like mail_followers.res_model = 'crm.lead' """
+        reference_column = self.reference_column if self.reference_column else 'res_model'
+        values.update(reference_column=reference_column, reference_value=model._name)
         query = 'SELECT %(rel)s.%(id2)s, %(rel)s.%(id1)s \
                     FROM %(rel)s, %(from_c)s \
                     WHERE %(rel)s.%(id1)s IN %%s \
                     AND %(rel)s.%(id2)s = %(tbl)s.id \
-                    AND %(rel)s.%(ref_col_name)s = \'%(ref_col_value)s\' \
+                    AND %(rel)s.%(reference_column)s = \'%(reference_value)s\' \
                     %(where_c)s  \
                     %(order_by)s \
                     %(limit)s \
@@ -68,41 +63,41 @@ class many2many_reference(fields.many2many):
         return query, where_params
 
     def set(self, cr, model, id, name, values, user=None, context=None):
-        """ Override to add the res_model field in queries. """
+        """ Override to add the reference field in queries. """
         if not values: return
         rel, id1, id2 = self._sql_names(model)
         obj = model.pool.get(self._obj)
         # reference column name: given by attribute or res_model
-        ref_col_name = self.ref_col_name if self.ref_col_name else 'res_model'
+        reference_column = self.reference_column if self.reference_column else 'res_model'
         for act in values:
             if not (isinstance(act, list) or isinstance(act, tuple)) or not act:
                 continue
             if act[0] == 0:
                 idnew = obj.create(cr, user, act[2], context=context)
-                cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+','+ref_col_name+') VALUES (%s,%s,%s)', (id, idnew, model._name))
+                cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+','+reference_column+') VALUES (%s,%s,%s)', (id, idnew, model._name))
             elif act[0] == 3:
-                cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND '+ref_col_name+'=%s', (id, act[1], model._name))
+                cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND '+reference_column+'=%s', (id, act[1], model._name))
             elif act[0] == 4:
                 # following queries are in the same transaction - so should be relatively safe
-                cr.execute('SELECT 1 FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND '+ref_col_name+'=%s', (id, act[1], model._name))
+                cr.execute('SELECT 1 FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND '+reference_column+'=%s', (id, act[1], model._name))
                 if not cr.fetchone():
-                    cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+','+ref_col_name+') VALUES (%s,%s,%s)', (id, act[1], model._name))
+                    cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+','+reference_column+') VALUES (%s,%s,%s)', (id, act[1], model._name))
             elif act[0] == 5:
-                cr.execute('delete from '+rel+' where '+id1+' = %s AND '+ref_col_name+'=%s', (id, model._name))
+                cr.execute('delete from '+rel+' where '+id1+' = %s AND '+reference_column+'=%s', (id, model._name))
             elif act[0] == 6:
                 d1, d2,tables = obj.pool.get('ir.rule').domain_get(cr, user, obj._name, context=context)
                 if d1:
                     d1 = ' and ' + ' and '.join(d1)
                 else:
                     d1 = ''
-                cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND '+ref_col_name+'=%s AND '+id2+' IN (SELECT '+rel+'.'+id2+' FROM '+rel+', '+','.join(tables)+' WHERE '+rel+'.'+id1+'=%s AND '+rel+'.'+id2+' = '+obj._table+'.id '+ d1 +')', [id, model._name, id]+d2)
+                cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND '+reference_column+'=%s AND '+id2+' IN (SELECT '+rel+'.'+id2+' FROM '+rel+', '+','.join(tables)+' WHERE '+rel+'.'+id1+'=%s AND '+rel+'.'+id2+' = '+obj._table+'.id '+ d1 +')', [id, model._name, id]+d2)
                 for act_nbr in act[2]:
-                    cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+','+ref_col_name+') VALUES (%s,%s,%s)', (id, act_nbr, model._name))
+                    cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+','+reference_column+') VALUES (%s,%s,%s)', (id, act_nbr, model._name))
             # cases 1, 2: performs write and unlink -> default implementation is ok
             else:
                 return super(many2many_reference, self).set(cr, model, id, name, values, user, context)
 
-class mail_thread(osv.Model):
+class mail_thread(osv.AbstractModel):
     ''' mail_thread model is meant to be inherited by any model that needs to
         act as a discussion topic on which messages can be attached. Public
         methods are prefixed with ``message_`` in order to avoid name
@@ -161,7 +156,7 @@ class mail_thread(osv.Model):
             type='boolean', string='Is a Follower', multi='_get_message_data'),
         'message_follower_ids': many2many_reference('res.partner',
             'mail_followers', 'res_id', 'partner_id',
-            ref_col_name='res_model', string='Followers'),
+            reference_column='res_model', string='Followers'),
         'message_comment_ids': fields.one2many('mail.message', 'res_id',
             domain=lambda self: [('model','=',self._name),('type','in',('comment','email'))],
             string='Related Messages', 

From a613b710e92c09ed0da76fef145ef91a7a041d3d Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Tue, 4 Sep 2012 14:41:17 +0200
Subject: [PATCH 785/999] [FIX] Fixed padding in popups.

bzr revid: vta@openerp.com-20120904124117-3ilh4ryfu4r0wpqx
---
 addons/web/static/src/css/base.css  |  95 ++++++-------
 addons/web/static/src/css/base.sass | 204 ++++++++++++++--------------
 2 files changed, 151 insertions(+), 148 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index dd168653f03..f28e3c6aa0d 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -69,7 +69,6 @@
     display: none !important;
   }
 }
-
 .openerp.openerp_webclient_container {
   height: 100%;
   position: relative;
@@ -1933,6 +1932,35 @@
   margin: -16px -16px 0 -16px;
   padding: 8px;
 }
+.openerp .oe_form_sheetbg {
+  padding: 8px 0;
+}
+.openerp .oe_form_sheet_width {
+  min-width: 650px;
+  max-width: 860px;
+  margin: 0 auto;
+}
+.openerp .oe_form_sheet {
+  background: white;
+  min-height: 330px;
+  padding: 16px;
+}
+.openerp .oe_application .oe_form_sheetbg {
+  background: url(/web/static/src/img/form_sheetbg.png);
+  border-bottom: 1px solid #dddddd;
+}
+.openerp .oe_application .oe_form_sheet {
+  border: 1px solid #afafb6;
+  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+}
+.openerp .oe_application .oe_form_sheet .ui-tabs {
+  margin: 0 -16px;
+}
+.openerp .oe_application .oe_form_sheet .oe_notebook_page {
+  padding: 0 16px;
+}
 .openerp .oe_form header {
   position: relative;
   border-bottom: 1px solid #cacaca;
@@ -1972,11 +2000,11 @@
 .openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div {
   padding: 1px 0;
 }
-.openerp ul.oe_form_steps, .openerp ul.oe_form_steps_clickable {
+.openerp .oe_form ul.oe_form_steps, .openerp .oe_form ul.oe_form_steps_clickable {
   display: inline-block;
   padding-right: 18px;
 }
-.openerp ul.oe_form_steps li, .openerp ul.oe_form_steps_clickable li {
+.openerp .oe_form ul.oe_form_steps li, .openerp .oe_form ul.oe_form_steps_clickable li {
   display: inline-block;
   margin-right: -20px;
   background-color: #fcfcfc;
@@ -1987,20 +2015,20 @@
   background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
   background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
 }
-.openerp ul.oe_form_steps li:first-child .label, .openerp ul.oe_form_steps_clickable li:first-child .label {
+.openerp .oe_form ul.oe_form_steps li:first-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:first-child .label {
   border-left: 1px solid #cacaca;
   padding-left: 14px;
 }
-.openerp ul.oe_form_steps li:last-child, .openerp ul.oe_form_steps_clickable li:last-child {
+.openerp .oe_form ul.oe_form_steps li:last-child, .openerp .oe_form ul.oe_form_steps_clickable li:last-child {
   border-right: 1px solid #cacaca;
 }
-.openerp ul.oe_form_steps li:last-child .label, .openerp ul.oe_form_steps_clickable li:last-child .label {
+.openerp .oe_form ul.oe_form_steps li:last-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .label {
   padding-right: 14px;
 }
-.openerp ul.oe_form_steps li:last-child .arrow, .openerp ul.oe_form_steps_clickable li:last-child .arrow {
+.openerp .oe_form ul.oe_form_steps li:last-child .arrow, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .arrow {
   display: none;
 }
-.openerp ul.oe_form_steps li .label, .openerp ul.oe_form_steps_clickable li .label {
+.openerp .oe_form ul.oe_form_steps li .label, .openerp .oe_form ul.oe_form_steps_clickable li .label {
   color: #4c4c4c;
   text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede;
   padding: 7px;
@@ -2009,14 +2037,14 @@
   margin: 0;
   position: relative;
 }
-.openerp ul.oe_form_steps li .arrow, .openerp ul.oe_form_steps_clickable li .arrow {
+.openerp .oe_form ul.oe_form_steps li .arrow, .openerp .oe_form ul.oe_form_steps_clickable li .arrow {
   width: 17px;
   display: inline-block;
   vertical-align: top;
   overflow: hidden;
   margin-left: -5px;
 }
-.openerp ul.oe_form_steps li .arrow span, .openerp ul.oe_form_steps_clickable li .arrow span {
+.openerp .oe_form ul.oe_form_steps li .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li .arrow span {
   position: relative;
   width: 24px;
   height: 24px;
@@ -2036,7 +2064,7 @@
   -o-transform: rotate(45deg);
   -ms-transform: rotate(45deg);
 }
-.openerp ul.oe_form_steps li.oe_active, .openerp ul.oe_form_steps_clickable li.oe_active {
+.openerp .oe_form ul.oe_form_steps li.oe_active, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active {
   background-color: #729fcf;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4));
   background-image: -webkit-linear-gradient(top, #729fcf, #3465a4);
@@ -2045,20 +2073,20 @@
   background-image: -o-linear-gradient(top, #729fcf, #3465a4);
   background-image: linear-gradient(to bottom, #729fcf, #3465a4);
 }
-.openerp ul.oe_form_steps li.oe_active .arrow span, .openerp ul.oe_form_steps_clickable li.oe_active .arrow span {
+.openerp .oe_form ul.oe_form_steps li.oe_active .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .arrow span {
   background-color: #3465a4;
   background: -moz-linear-gradient(135deg, #3465a4, #729fcf);
   background: -o-linear-gradient(135deg, #729fcf, #3465a4);
   background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4));
 }
-.openerp ul.oe_form_steps li.oe_active .label, .openerp ul.oe_form_steps_clickable li.oe_active .label {
+.openerp .oe_form ul.oe_form_steps li.oe_active .label, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .label {
   color: white;
   text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4;
 }
-.openerp ul.oe_form_steps_clickable li {
+.openerp .oe_form ul.oe_form_steps_clickable li {
   cursor: pointer;
 }
-.openerp ul.oe_form_steps_clickable li:hover {
+.openerp .oe_form ul.oe_form_steps_clickable li:hover {
   background-color: #e8e8e8;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca));
   background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca);
@@ -2067,10 +2095,10 @@
   background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
   background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
 }
-.openerp ul.oe_form_steps_clickable li:hover .label {
+.openerp .oe_form ul.oe_form_steps_clickable li:hover .label {
   text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede;
 }
-.openerp ul.oe_form_steps_clickable li:hover .arrow span {
+.openerp .oe_form ul.oe_form_steps_clickable li:hover .arrow span {
   background-color: #e8e8e8;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca));
   background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca);
@@ -2079,10 +2107,10 @@
   background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
   background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
 }
-.openerp ul.oe_form_steps_clickable li .label {
+.openerp .oe_form ul.oe_form_steps_clickable li .label {
   color: #7c7bad;
 }
-.openerp ul.oe_form_steps_clickable li.oe_active:hover {
+.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover {
   background-color: #4c85c2;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d));
   background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d);
@@ -2091,10 +2119,10 @@
   background-image: -o-linear-gradient(top, #4c85c2, #284d7d);
   background-image: linear-gradient(to bottom, #4c85c2, #284d7d);
 }
-.openerp ul.oe_form_steps_clickable li.oe_active:hover .label {
+.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .label {
   text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4;
 }
-.openerp ul.oe_form_steps_clickable li.oe_active:hover .arrow span {
+.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .arrow span {
   background-color: #284d7d;
   background: -moz-linear-gradient(135deg, #284d7d, #4c85c2);
   background: -o-linear-gradient(135deg, #4c85c2, #284d7d);
@@ -2126,31 +2154,6 @@
 .openerp .oe_form .oe_subtotal_footer label.oe_form_label_help {
   font-weight: normal;
 }
-.openerp .oe_application .oe_form_sheetbg {
-  background: url(/web/static/src/img/form_sheetbg.png);
-  padding: 8px 0;
-  border-bottom: 1px solid #dddddd;
-}
-.openerp .oe_application .oe_form_sheet_width {
-  min-width: 650px;
-  max-width: 860px;
-  margin: 0 auto;
-}
-.openerp .oe_application .oe_form_sheet {
-  background: white;
-  min-height: 330px;
-  padding: 16px;
-  border: 1px solid #afafb6;
-  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
-  -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
-}
-.openerp .oe_application .oe_form_sheet .ui-tabs {
-  margin: 0 -16px;
-}
-.openerp .oe_application .oe_form_sheet .oe_notebook_page {
-  padding: 0 16px;
-}
 .openerp .oe_form .oe_form_button {
   margin: 2px;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 537988e9c4a..4f231331ff7 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1498,11 +1498,34 @@ $sheet-max-width: 860px
             display: none !important
         .oe_form .oe_form_field_date
             width: auto
+    // Sheet and padding 
     .oe_form_nosheet
         margin: 16px
         > header
             margin: -16px -16px 0 -16px
             padding: 8px
+    .oe_form_sheetbg
+        padding: 8px 0
+    .oe_form_sheet_width
+        min-width: 650px
+        max-width: $sheet-max-width
+        margin: 0 auto
+    .oe_form_sheet
+        background: white
+        min-height: 330px
+        padding: 16px
+    // Sheet inline mode
+    .oe_application
+        .oe_form_sheetbg
+            background: url(/web/static/src/img/form_sheetbg.png)
+            border-bottom: 1px solid #ddd
+        .oe_form_sheet
+            border: 1px solid $tag-border
+            @include box-shadow(0 0 10px rgba(0,0,0,0.3))
+            .ui-tabs
+                margin: 0 -16px
+            .oe_notebook_page
+                padding: 0 16px
     // }}}
     // FormView.custom tags and classes {{{
     .oe_form
@@ -1532,115 +1555,92 @@ $sheet-max-width: 860px
                 padding: 2px 0
             .oe_form_group_cell div div
                 padding: 1px 0
-                
-
-    ul.oe_form_steps, ul.oe_form_steps_clickable
-        display: inline-block
-        padding-right: 18px
-        li 
+        ul.oe_form_steps, ul.oe_form_steps_clickable
             display: inline-block
-            margin-right: -20px
-            @include vertical-gradient(#fcfcfc, #dedede)
-            &:first-child .label
-                border-left: 1px solid #cacaca
-                padding-left: 14px
-            &:last-child
-                border-right: 1px solid #cacaca
-                .label
-                    padding-right: 14px
-                .arrow
-                    display: none
-            .label 
-                color: #4c4c4c
-                text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede
-                padding: 7px
+            padding-right: 18px
+            li 
                 display: inline-block
-                padding-left: 24px
-                margin: 0
-                position: relative
-            .arrow
-                width: 17px
-                display: inline-block
-                vertical-align: top
-                overflow: hidden
-                margin-left: -5px
-                span 
-                    position: relative
-                    width: 24px
-                    height: 24px
+                margin-right: -20px
+                @include vertical-gradient(#fcfcfc, #dedede)
+                &:first-child .label
+                    border-left: 1px solid #cacaca
+                    padding-left: 14px
+                &:last-child
+                    border-right: 1px solid #cacaca
+                    .label
+                        padding-right: 14px
+                    .arrow
+                        display: none
+                .label 
+                    color: #4c4c4c
+                    text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede
+                    padding: 7px
                     display: inline-block
-                    margin-left: -12px
-                    margin-top: 3px
-                    box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2)
-                    @include skew-gradient(#fcfcfc, #dedede)
-                    @include radius(3px)
-                    @include transform(rotate(45deg))
-        li.oe_active
-            @include vertical-gradient(#729fcf, #3465a4)
-            .arrow span 
-                @include skew-gradient(#729fcf, #3465a4)
-            .label
-                color: white
-                text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4
-
-    ul.oe_form_steps_clickable
-        li
-            cursor: pointer
-            &:hover 
-                @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
-                .label
-                    text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede
+                    padding-left: 24px
+                    margin: 0
+                    position: relative
+                .arrow
+                    width: 17px
+                    display: inline-block
+                    vertical-align: top
+                    overflow: hidden
+                    margin-left: -5px
+                    span 
+                        position: relative
+                        width: 24px
+                        height: 24px
+                        display: inline-block
+                        margin-left: -12px
+                        margin-top: 3px
+                        box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2)
+                        @include skew-gradient(#fcfcfc, #dedede)
+                        @include radius(3px)
+                        @include transform(rotate(45deg))
+            li.oe_active
+                @include vertical-gradient(#729fcf, #3465a4)
                 .arrow span 
+                    @include skew-gradient(#729fcf, #3465a4)
+                .label
+                    color: white
+                    text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4
+        ul.oe_form_steps_clickable
+            li
+                cursor: pointer
+                &:hover 
                     @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
-            .label
-                color: $link-color
-        li.oe_active
-            &:hover 
-                @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
+                    .label
+                        text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede
+                    .arrow span 
+                        @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
                 .label
-                    text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4
-                .arrow span 
-                    @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
+                    color: $link-color
+            li.oe_active
+                &:hover 
+                    @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
+                    .label
+                        text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4
+                    .arrow span 
+                        @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
+        .oe_subtotal_footer
+            width: 1% !important
+            td.oe_form_group_cell
+                text-align: right
+                padding: 0 !important
+            td.oe_form_group_cell_label
+                border-right: none
+            .oe_subtotal_footer_separator
+                width: 108px
+                border-top: 1px solid #cacaca
+                font-weight: bold
+                font-size: 18px
+            label:after
+                content: ":"
+            label.oe_subtotal_footer_separator
+                font-weight: bold !important
+                padding: 2px 11px 2px 0px !important
+            label.oe_form_label_help
+                font-weight: normal
 
-    .oe_form .oe_subtotal_footer
-        width: 1% !important
-        td.oe_form_group_cell
-            text-align: right
-            padding: 0 !important
-        td.oe_form_group_cell_label
-            border-right: none
-        .oe_subtotal_footer_separator
-            width: 108px
-            border-top: 1px solid #cacaca
-            font-weight: bold
-            font-size: 18px
-        label:after
-            content: ":"
-        label.oe_subtotal_footer_separator
-            font-weight: bold !important
-            padding: 2px 11px 2px 0px !important
-        label.oe_form_label_help
-            font-weight: normal
-    // no sheet in popups
-    .oe_application
-        .oe_form_sheetbg
-            background: url(/web/static/src/img/form_sheetbg.png)
-            padding: 8px 0
-            border-bottom: 1px solid #ddd
-        .oe_form_sheet_width
-            min-width: 650px
-            max-width: $sheet-max-width
-            margin: 0 auto
-        .oe_form_sheet
-            background: white
-            min-height: 330px
-            padding: 16px
-            border: 1px solid $tag-border
-            @include box-shadow(0 0 10px rgba(0,0,0,0.3))
-            .ui-tabs
-                margin: 0 -16px
-            .oe_notebook_page
-                padding: 0 16px
     // }}}
     // FormView.group {{{
     .oe_form

From abdbc220d37ff68312db1b9c43c1ed801b1ad9ec Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Sep 2012 14:49:21 +0200
Subject: [PATCH 786/999] [REM] incomplete and unused bounce CSS animation

bzr revid: xmo@openerp.com-20120904124921-yur5k231wp8gn7vy
---
 addons/web/static/src/css/base.css  | 49 ++---------------------------
 addons/web/static/src/css/base.sass | 46 +++++++++------------------
 2 files changed, 18 insertions(+), 77 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 25df1334d21..de30642dfd6 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -20,50 +20,6 @@
   font-style: normal;
 }
 
-@-moz-keyframes bounce {
-  0% {
-    -moz-transform: scale(0);
-    opacity: 0;
-  }
-
-  50% {
-    -moz-transform: scale(1.3);
-    opacity: 0.4;
-  }
-
-  75% {
-    -moz-transform: scale(0.9);
-    opacity: 0.7;
-  }
-
-  100% {
-    -moz-transform: scale(1);
-    opacity: 1;
-  }
-}
-
-@-webkit-keyframes bounce {
-  0% {
-    -webkit-transform: scale(0);
-    opacity: 0;
-  }
-
-  50% {
-    -webkit-transform: scale(1.3);
-    opacity: 0.4;
-  }
-
-  75% {
-    -webkit-transform: scale(0.9);
-    opacity: 0.7;
-  }
-
-  100% {
-    -webkit-transform: scale(1);
-    opacity: 1;
-  }
-}
-
 @media print {
   .oe_topbar, .oe_leftbar, .oe_loading {
     display: none !important;
@@ -2062,10 +2018,11 @@
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
-  -moz-transform: rotate(45deg);
   -webkit-transform: rotate(45deg);
-  -o-transform: rotate(45deg);
+  -moz-transform: rotate(45deg);
   -ms-transform: rotate(45deg);
+  -o-transform: rotate(45deg);
+  transform: rotate(45deg);
 }
 .openerp .oe_form ul.oe_form_steps li.oe_active, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active {
   background-color: #729fcf;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 3c61702a60c..82c8e1a57ab 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -95,10 +95,23 @@ $sheet-max-width: 860px
     background: -webkit-gradient(linear, left top, right bottom, from($startColor), to($endColor))
 
 @mixin transform($transform)
-    -moz-transform: $transform
     -webkit-transform: $transform
-    -o-transform: $transform
+    -moz-transform: $transform
     -ms-transform: $transform
+    -o-transform: $transform
+    transform: $transform
+
+@mixin keyframes($name)
+    @-webkit-keyframes #{$name}
+        @content
+    @-moz-keyframes #{$name}
+        @content
+    @-ms-keyframes #{$name}
+        @content
+    @-o-keyframes #{$name}
+        @content
+    @keyframes #{$name}
+        @content
 
 // Transforms the (readable) text of an inline element into an mmlicons icon,
 // allows for actual readable text in-code (and in readers?) with iconic looks
@@ -112,35 +125,6 @@ $sheet-max-width: 860px
         color: $color
 
 // }}}
-// CSS animation bounces {{{
-@-moz-keyframes bounce
-    0%
-        -moz-transform: scale(0)
-        opacity: 0
-    50%
-        -moz-transform: scale(1.3)
-        opacity: 0.4
-    75%
-        -moz-transform: scale(0.9)
-        opacity: 0.7
-    100%
-        -moz-transform: scale(1)
-        opacity: 1
-
-@-webkit-keyframes bounce
-    0%
-        -webkit-transform: scale(0)
-        opacity: 0
-    50%
-        -webkit-transform: scale(1.3)
-        opacity: 0.4
-    75%
-        -webkit-transform: scale(0.9)
-        opacity: 0.7
-    100%
-        -webkit-transform: scale(1)
-        opacity: 1
-// }}}
 
 @media print
     .oe_topbar, .oe_leftbar, .oe_loading

From 4dc1a363f06ec02ba39ffcff54ccf63318596e60 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 4 Sep 2012 18:22:33 +0530
Subject: [PATCH 787/999] [IMP] project: made state field invisible in form &
 tree view & deleted from search view

bzr revid: cha@tinyerp.com-20120904125233-lq4wh9epkteom0z3
---
 addons/project/board_project_view.xml         | 2 +-
 addons/project/project_view.xml               | 7 +++----
 addons/project/report/project_report_view.xml | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 2023ba5a0b9..122536d3690 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -16,7 +16,7 @@
                     <field name="effective_hours" widget="float_time"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
+                    <field name="state" invisible="1" groups="base.group_no_one"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7da9b31da18..5a805e153e3 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -484,7 +484,7 @@
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="stage_id"/>
-                                    <field name="state" groups="base.group_no_one"/>
+                                    <field name="state" groups="base.group_no_one" invisible="1"/>
                                     <field name="effective_hours" widget="float_time"/>
                                     <field name="progress" widget="progressbar"/>
                                     <field name="remaining_hours" widget="float_time"/>
@@ -500,7 +500,7 @@
                                 <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
                                     groups="project.group_time_work_estimation_tasks"
                                     on_change="onchange_planned(planned_hours, effective_hours)"/>
-                                <field name="state" groups="base.group_no_one"/>
+                                <field name="state" groups="base.group_no_one" invisible="1"/>
                             </group>
                         </page>
                     </notebook>
@@ -609,7 +609,7 @@
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
+                    <field name="state" invisible="1" groups="base.group_no_one"/>
                     <field name="date_start" invisible="1" groups="base.group_no_one"/>
                     <field name="date_end" invisible="1" groups="base.group_no_one"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
@@ -676,7 +676,6 @@
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
                         <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" groups="base.group_no_one"/>
                         <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 5d6132b1b8f..1d60479f65c 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -79,7 +79,6 @@
                         <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
                         <filter string="Contact" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>

From 09fc23c99ef172dc3e8c8ceeaee40709c5091477 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 4 Sep 2012 15:05:09 +0200
Subject: [PATCH 788/999] changed red button style

bzr revid: mit@openerp.com-20120904130509-94atd9x6rf3lb0sq
---
 addons/web/static/src/css/base.css  | 88 +++++++++++++----------------
 addons/web/static/src/css/base.sass | 33 ++++++-----
 2 files changed, 56 insertions(+), 65 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index e875ff9fab2..52e74b7c17e 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -419,40 +419,35 @@
   background: #dc5f59;
 }
 .openerp button.oe_highlight {
-  background-color: #dc5f59;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630));
-  background-image: -webkit-linear-gradient(top, #dc5f59, #b33630);
-  background-image: -moz-linear-gradient(top, #dc5f59, #b33630);
-  background-image: -ms-linear-gradient(top, #dc5f59, #b33630);
-  background-image: -o-linear-gradient(top, #dc5f59, #b33630);
-  background-image: linear-gradient(to bottom, #dc5f59, #b33630);
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-}
-.openerp button.oe_highlight:active {
-  background-color: #b33630;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#b33630), to(#dc5f59));
-  background-image: -webkit-linear-gradient(top, #b33630, #dc5f59);
-  background-image: -moz-linear-gradient(top, #b33630, #dc5f59);
-  background-image: -ms-linear-gradient(top, #b33630, #dc5f59);
-  background-image: -o-linear-gradient(top, #b33630, #dc5f59);
-  background-image: linear-gradient(to bottom, #b33630, #dc5f59);
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  box-shadow: none;
+  border: 1px solid #795151;
+  background-color: #df3f3f;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#df3f3f), to(#a21a1a));
+  background-image: -webkit-linear-gradient(top, #df3f3f, #a21a1a);
+  background-image: -moz-linear-gradient(top, #df3f3f, #a21a1a);
+  background-image: -ms-linear-gradient(top, #df3f3f, #a21a1a);
+  background-image: -o-linear-gradient(top, #df3f3f, #a21a1a);
+  background-image: linear-gradient(to bottom, #df3f3f, #a21a1a);
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
 }
 .openerp button.oe_highlight:hover {
-  background-color: #df6b66;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33));
-  background-image: -webkit-linear-gradient(top, #df6b66, #bf3a33);
-  background-image: -moz-linear-gradient(top, #df6b66, #bf3a33);
-  background-image: -ms-linear-gradient(top, #df6b66, #bf3a33);
-  background-image: -o-linear-gradient(top, #df6b66, #bf3a33);
-  background-image: linear-gradient(to bottom, #df6b66, #bf3a33);
-  -moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
+  background-color: #e46565;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#e46565), to(#b81e1e));
+  background-image: -webkit-linear-gradient(top, #e46565, #b81e1e);
+  background-image: -moz-linear-gradient(top, #e46565, #b81e1e);
+  background-image: -ms-linear-gradient(top, #e46565, #b81e1e);
+  background-image: -o-linear-gradient(top, #e46565, #b81e1e);
+  background-image: linear-gradient(to bottom, #e46565, #b81e1e);
+}
+.openerp button.oe_highlight:active {
+  background-color: #ab1b1b;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#ab1b1b), to(#e04848));
+  background-image: -webkit-linear-gradient(top, #ab1b1b, #e04848);
+  background-image: -moz-linear-gradient(top, #ab1b1b, #e04848);
+  background-image: -ms-linear-gradient(top, #ab1b1b, #e04848);
+  background-image: -o-linear-gradient(top, #ab1b1b, #e04848);
+  background-image: linear-gradient(to bottom, #ab1b1b, #e04848);
 }
 .openerp .oe_background_grey {
   background: #eeeeee !important;
@@ -1223,18 +1218,12 @@
 }
 .openerp .oe_secondary_submenu .oe_active {
   border-top: 1px solid lightGray;
-  border-bottom: 1px solid #e0e0e0;
+  border-bottom: 1px solid #dedede;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2);
-  box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2);
-  background-color: #7372a7;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#7372a7), to(#8281b1));
-  background-image: -webkit-linear-gradient(top, #7372a7, #8281b1);
-  background-image: -moz-linear-gradient(top, #7372a7, #8281b1);
-  background-image: -ms-linear-gradient(top, #7372a7, #8281b1);
-  background-image: -o-linear-gradient(top, #7372a7, #8281b1);
-  background-image: linear-gradient(to bottom, #7372a7, #8281b1);
+  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
+  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
+  background: #7c7bad;
 }
 .openerp .oe_secondary_submenu .oe_active a {
   color: white;
@@ -1948,6 +1937,7 @@
 .openerp .oe_form header {
   position: relative;
   border-bottom: 1px solid #cacaca;
+  padding-left: 2px;
   background-color: #fcfcfc;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
   background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede);
@@ -1960,6 +1950,9 @@
   display: inline-block;
   float: right;
 }
+.openerp .oe_form header .oe_form_button {
+  margin: 3px 2px;
+}
 .openerp .oe_form div.oe_chatter {
   min-width: 650px;
   max-width: 860px;
@@ -1979,7 +1972,7 @@
   min-width: 150px;
 }
 .openerp .oe_form div.oe_form_configuration .oe_form_group_cell_label {
-  padding: 2px 0;
+  padding: 1px 0;
 }
 .openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div {
   padding: 1px 0;
@@ -2168,7 +2161,7 @@
 }
 .openerp .oe_form td.oe_form_group_cell_label {
   border-right: 1px solid #dddddd;
-  padding: 4px 0px 4px 0px;
+  padding: 2px 0px;
 }
 .openerp .oe_form td.oe_form_group_cell_label label {
   line-height: 18px;
@@ -2176,7 +2169,7 @@
   min-width: 140px;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
-  padding-left: 6px;
+  padding: 2px 0 2px 8px;
 }
 .openerp .oe_form .oe_form_group {
   width: 100%;
@@ -2188,7 +2181,7 @@
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
   font-weight: bold;
   white-space: nowrap;
-  padding-right: 6px;
+  padding-right: 8px;
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
@@ -2264,7 +2257,6 @@
   width: 100%;
   display: inline-block;
   padding: 2px 2px 2px 0px;
-  line-height: 1em;
 }
 .openerp .oe_form .oe_form_field input {
   margin: 0px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 637a1975e32..975a8103847 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -381,15 +381,13 @@ $sheet-max-width: 860px
         color: white
         background: #DC5F59
     button.oe_highlight
-        @include vertical-gradient(#dc5f59, #b33630)
-        @include box-shadow(none)
-    button.oe_highlight:active
-        @include vertical-gradient(#b33630, #dc5f59)
-        @include box-shadow(none)
+        border: 1px solid #795151
+        @include vertical-gradient(#df3f3f, #a21a1a)
+        @include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset))
     button.oe_highlight:hover
-        @include vertical-gradient(#DF6B66, #BF3A33)
-        //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%))
-        @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2))
+        @include vertical-gradient(lighten(#e04f4f, 5%), lighten(#a21a1a, 5%))
+    button.oe_highlight:active
+        @include vertical-gradient(lighten(#a21a1a, 2%), lighten(#df3f3f, 2%))
     .oe_background_grey
         background: #eee !important
 
@@ -955,11 +953,10 @@ $sheet-max-width: 860px
                 @include transform(scale(1.1))
         .oe_active
             border-top: 1px solid lightGray
-            border-bottom: 1px solid #e0e0e0
+            border-bottom: 1px solid #dedede
             text-shadow: 0 1px 1px rgba(0,0,0,0.2)
-            @include box-shadow((inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2)))
-            //background: $link-color
-            @include vertical-gradient(darken($link-color, 3%), lighten($link-color, 2%))
+            @include box-shadow((inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2)))
+            background: $link-color
             a
                 color: white
             .oe_menu_label
@@ -1513,10 +1510,13 @@ $sheet-max-width: 860px
         header
             position: relative
             border-bottom: 1px solid #cacaca
+            padding-left: 2px
             @include vertical-gradient(#fcfcfc, #dedede)
             ul
                 display: inline-block
                 float: right
+            .oe_form_button
+                margin: 3px 2px
         div.oe_chatter
             min-width: 650px
             max-width: $sheet-max-width
@@ -1533,7 +1533,7 @@ $sheet-max-width: 860px
             label
                 min-width: 150px
             .oe_form_group_cell_label
-                padding: 2px 0
+                padding: 1px 0
             .oe_form_group_cell div div
                 padding: 1px 0
                 
@@ -1652,13 +1652,13 @@ $sheet-max-width: 860px
             margin: 2px
         td.oe_form_group_cell_label
             border-right: 1px solid #ddd
-            padding: 4px 0px 4px 0px
+            padding: 2px 0px
             label
                 line-height: 18px
                 display: block
                 min-width: 140px
         td.oe_form_group_cell + .oe_form_group_cell
-            padding-left: 6px
+            padding: 2px 0 2px 8px
         .oe_form_group
             width: 100%
             margin: 9px 0 9px 0
@@ -1670,7 +1670,7 @@ $sheet-max-width: 860px
         .oe_form_label_help[for], .oe_form_label[for]
             font-weight: bold
             white-space: nowrap
-            padding-right: 6px
+            padding-right: 8px
             span
                 font-size: 80%
                 color: darkGreen
@@ -1733,7 +1733,6 @@ $sheet-max-width: 860px
             width: 100%
             display: inline-block
             padding: 2px 2px 2px 0px
-            line-height: 1em
             input
                 margin: 0px
         input[type="text"], input[type="password"], input[type="file"], select

From ea0f6bfd50199d4947ad773fff567da7541d152e Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 4 Sep 2012 18:56:23 +0530
Subject: [PATCH 789/999] [IMP] project_issue: made state field invisible in
 form & tree view & deleted from search view

bzr revid: cha@tinyerp.com-20120904132623-58h3r440ji5ahtp9
---
 addons/project_issue/board_project_issue_view.xml         | 2 +-
 addons/project_issue/project_issue_view.xml               | 5 ++---
 addons/project_issue/report/project_issue_report_view.xml | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 3b4fa57fc58..9a8a3c3aaec 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -16,7 +16,7 @@
                     <field name="version_id" widget="selection"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
-                    <field name="state" groups="base.group_no_one"/>
+                    <field name="state" groups="base.group_no_one" invisible="1"/>
                     <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 75bf50b23a4..f87ff9cf78d 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -151,7 +151,7 @@
                                 <field name="id"/>
                                 <field name="active"/>
                             </group>
-                            <group colspan="4" col="4">
+                            <group colspan="4" col="4" invisible="1">
                                 <separator string="Status" colspan="4"/>
                                 <field name="state" groups="base.group_no_one" string="Status"/>
                             </group>
@@ -182,7 +182,7 @@
                     <field name="user_id"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
-                    <field name="state" groups="base.group_no_one"/>
+                    <field name="state" groups="base.group_no_one" invisible="1"/>
                     <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
@@ -212,7 +212,6 @@
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
                         <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}"/>
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
                     </group>
                 </search>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 625e6e64374..f90f349ea3b 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -67,7 +67,6 @@
                         <filter string="Version"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'version_id'}"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>

From d6ddb23a4ede1f4405b735f501f599d0c0c33021 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Sep 2012 15:28:03 +0200
Subject: [PATCH 790/999] [REM] email.template: remove all text versions of
 demo/data templates

bzr revid: odo@openerp.com-20120904132803-9cgj4g10xtm121ko
---
 addons/account/edi/invoice_action_data.xml    | 58 ---------------
 .../auth_reset_password.xml                   | 13 ++--
 addons/event/email_template.xml               | 30 +++-----
 .../marketing_campaign_demo.xml               | 18 ++---
 .../marketing_campaign_demo.xml               | 74 ++++++++++---------
 .../edi/purchase_order_action_data.xml        | 45 -----------
 addons/sale/edi/sale_order_action_data.xml    | 61 ---------------
 7 files changed, 66 insertions(+), 233 deletions(-)

diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index 9aa1a4b720f..53fa03a6902 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -123,64 +123,6 @@
     </div>
 </div>
             ]]></field>
-            <field name="body"><![CDATA[
-Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
-
-A new invoice is available for ${object.partner_id.name}:
-       | Invoice number: *${object.number}*
-       | Invoice total: *${object.amount_total} ${object.currency_id.name}*
-       | Invoice date: ${object.date_invoice}
-       % if object.origin:
-       | Order reference: ${object.origin}
-       % endif
-       | Your contact: ${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-
-You can view the invoice document, download it and pay online using the following link:
-    ${ctx.get('edi_web_url_view') or 'n/a'}
-
-% if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'):
-<% 
-comp_name = quote(object.company_id.name)
-inv_number = quote(object.number)
-paypal_account = quote(object.company_id.paypal_account)
-inv_amount = quote(str(object.amount_total))
-cur_name = quote(object.currency_id.name)
-paypal_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s"\
-             "&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Invoice_PayNow_%s" % \
-             (paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)
-%>
-It is also possible to directly pay with Paypal:
-    ${paypal_url}
-% endif
-
-If you have any question, do not hesitate to contact us.
-
-
-Thank you for choosing ${object.company_id.name}!
-
-
---
-${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-${object.company_id.name}
-% if object.company_id.street:
-${object.company_id.street or ''}
-% endif
-% if object.company_id.street2:
-${object.company_id.street2}
-% endif
-% if object.company_id.city or object.company_id.zip:
-${object.company_id.zip or ''} ${object.company_id.city or ''}
-% endif
-% if object.company_id.country_id:
-${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
-% endif
-% if object.company_id.phone:
-Phone: ${object.company_id.phone}
-% endif
-% if object.company_id.website:
-${object.company_id.website or ''}
-% endif
-            ]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/auth_reset_password/auth_reset_password.xml b/addons/auth_reset_password/auth_reset_password.xml
index d2256a8911a..b7d7e0baef6 100644
--- a/addons/auth_reset_password/auth_reset_password.xml
+++ b/addons/auth_reset_password/auth_reset_password.xml
@@ -9,16 +9,13 @@
             <field name="email_from"><![CDATA[${object.company_id.name} <${object.company_id.email}>]]></field>
             <field name="email_to" eval="False"><!--(set by reset_password module)--></field>
             <field name="subject">Password reset</field>
-            <field name="body"><![CDATA[
-A password reset was requested the OpenERP account linked to this email on ${object._auth_reset_password_host()}
+            <field name="body_html"><![CDATA[
+<p>A password reset was requested the OpenERP account linked to this email on ${object._auth_reset_password_host()}</p>
 
-You may change your password following this link:
+<p>You may change your password following this <a href="${object._auth_reset_password_link()}">link</a>,
+or by copy-pasting the following URL in your browser: ${object._auth_reset_password_link()}</p>
 
-${object._auth_reset_password_link()}
-
-If you don't have asked for password reset, you can safely ignore this email.
-
-]]></field>
+<p>Note: If you did not ask for a password reset, you can safely ignore this email.</p>]]></field>
         </record>
 
         <!-- TODO get own css -->
diff --git a/addons/event/email_template.xml b/addons/event/email_template.xml
index 49738185547..95ffbf46d8d 100644
--- a/addons/event/email_template.xml
+++ b/addons/event/email_template.xml
@@ -7,15 +7,12 @@
         <field name="email_from" >${object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com'}</field>
         <field name="email_to" >${object.email}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>
-        <field name="body">
-        hello ${object.name},
-
-        The event ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin} to ${object.event_id.date_end}. For any further information please contact our event department.
-
-        we thank you for your participation
-
-        best regards
-        </field>
+        <field name="body_html"><![CDATA[
+        <p>Hello ${object.name},</p>
+        <p>The event ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin} to ${object.event_id.date_end}.
+        For any further information please contact our event department.</p>
+        <p>Thank you for your participation!</p>
+        <p>Best regards</p>]]></field>
         </record>
 
     </data>
@@ -27,15 +24,12 @@
         <field name="email_from" >${object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com'}</field>
         <field name="email_to" >${object.email}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>
-        <field name="body">
-        hello ${object.name},
-
-        We confirm you that your registration to the event ${object.event_id.name} has been recorded. You will automatically receive an email providing you more practical information (such as the schedule, the plan...) as soon as the event will be confirmed to be held.
-
-        we thank you for your participation
-
-        best regards
-        </field>
+        <field name="body_html"><![CDATA[
+        <p>Hello ${object.name},</p>
+        <p>We confirm that your registration to the event ${object.event_id.name} has been recorded.
+        You will automatically receive an email providing you more practical information (such as the schedule, the agenda...) as soon as the event is confirmed.</p>
+        <p>Thank you for your participation!</p>
+        <p>Best regards</p>]]></field>
         </record>
 
         <!-- Default Values -->
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
index 0c2d7f32715..92443fe987d 100644
--- a/addons/marketing_campaign/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -3,29 +3,29 @@
     <data>
         <!-- Email tempalte -->
         <record id="email_template_1" model="email.template">
-            <field name="name">Template for New Partner</field>
+            <field name="name">welcome new partner</field>
             <field name="email_from">info@openerp.com</field>
-            <field name="subject">Welcome in OpenERP Partner Channel!</field>
+            <field name="subject">Welcome to the OpenERP Partner Channel!</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body">Hello, We are very happy to send Welcome message.</field>
+            <field name="body_html">Hello, you will receive your welcome pack via email shortly.</field>
         </record>
         <record id="email_template_2" model="email.template">
-            <field name="name">Template for Silver Partner</field>
+            <field name="name">congrats silver partner</field>
             <field name="email_from">info@openerp.com</field>
-            <field name="subject">Congratulation! You become now our Silver Partner.</field>
+            <field name="subject">Congratulations! You are now a Silver Partner!</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body">Hello, We are happy to announce that you now become our Silver Partner.</field>
+            <field name="body_html">Hi, we are delighted to welcome you among our Silver Partners as of today!</field>
         </record>
 
         <record id="email_template_3" model="email.template">
-            <field name="name">Template for Gold Partner</field>
+            <field name="name">congrats gold partner</field>
             <field name="email_from">info@openerp.com</field>
-            <field name="subject">Congratulation! You become our Gold Partner.</field>
+            <field name="subject">Congratulations! You are now one of our Gold Partners!</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body">Hello, We are happy to announce that you become our Gold Partner.</field>
+            <field name="body_html">Hi, we are delighted to let you know that you have entered the select circle of our Gold Partners</field>
         </record>
 
 
diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index 6545dd93cb2..141981a21d6 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -40,7 +40,10 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for the genuine interest you have shown in OpenERP.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP OnDemand Free Trial 2010</field>
         </record>
         <record id="email_template_2" model="email.template">
@@ -50,11 +53,11 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello,We have very good offer that might suit you.
-            We propose you to subscribe to the OpenERP Discovery Day on May 2010.
-            If any further information required kindly revert back.
-            We really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            We suggest you subscribe to the OpenERP Discovery Day on May 2010.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP Discovery Day on May 2010</field>
         </record>
 
@@ -65,10 +68,10 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
-             If any further information required kindly revert back.
-             I really appreciate your co-operation on this.
-             Regards,OpenERP Team,</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for showing interest and for subscribing to the OpenERP Discovery Day.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP Discovery Day</field>
         </record>
 
@@ -79,10 +82,10 @@
            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
              <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello,Thanks for showing intrest and buying the OpenERP book.
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for showing interest and buying the OpenERP book.</p>
             If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP book</field>
         </record>
 
@@ -92,12 +95,12 @@
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello, We have very good offer that might suit you.
-            For our gold partners,We are arranging free technical training on june,2010.
-            If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For technical training to Gold partners</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            For our gold partners,We are arranging free technical training on june,2010.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">technical training to gold partners</field>
         </record>
 
           <record id="email_template_6" model="email.template">
@@ -107,12 +110,12 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello, We have very good offer that might suit you.
-            For our silver partners,We are  paid technical training on june,2010.
-            If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For training to Silver partners</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            For our silver partners,We are  paid technical training on june,2010.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">training to silver partners</field>
         </record>
 
         <record id="email_template_7" model="email.template">
@@ -122,12 +125,12 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello, We have very good offer that might suit you.
-            For our silver partners,We are  offering Gold partnership.
-            If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For gold partnership to silver partners</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            For our silver partners, we are  offering Gold partnership.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">gold partnership to silver partners</field>
         </record>
 
         <record id="email_template_8" model="email.template">
@@ -137,9 +140,12 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For subscribing to technical training</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for showing interest and for subscribing to technical training.</p>
+            If any further information required kindly revert back.I really appreciate your co-operation on this.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">subscribing to technical training</field>
         </record>
         <!-- Report -->
 
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index 95e6adda3d9..daad4467929 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -108,51 +108,6 @@
     </div>
 </div>
             ]]></field>
-            <field name="body"><![CDATA[
-Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
-
-Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}:
-       | Order number: *${object.name}*
-       | Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
-       | Order date: ${object.date_order}
-       % if object.origin:
-       | Order reference: ${object.origin}
-       % endif
-       % if object.partner_ref:
-       | Your reference: ${object.partner_ref}<br />
-       % endif
-       | Your contact: ${object.validator.name} ${object.validator.email and '<%s>'%(object.validator.email) or ''}
-
-You can view the ${object.state in ('draft', 'sent') and 'request for quotation' or 'order confirmation'} and download it using the following link:
-    ${ctx.get('edi_web_url_view') or 'n/a'}
-
-If you have any question, do not hesitate to contact us.
-
-Thank you!
-
-
---
-${object.validator.name} ${object.validator.email and '<%s>'%(object.validator.email) or ''}
-${object.company_id.name}
-% if object.company_id.street:
-${object.company_id.street or ''}
-% endif
-% if object.company_id.street2:
-${object.company_id.street2}
-% endif
-% if object.company_id.city or object.company_id.zip:
-${object.company_id.zip or ''} ${object.company_id.city or ''}
-% endif
-% if object.company_id.country_id:
-${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
-% endif
-% if object.company_id.phone:
-Phone: ${object.company_id.phone}
-% endif
-% if object.company_id.website:
-${object.company_id.website or ''}
-% endif
-            ]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index 478f0b17a8c..49ebe6053e6 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -126,67 +126,6 @@
     </div>
 </div>
             ]]></field>
-            <field name="body"><![CDATA[
-Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
-
-Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}:
-       | Order number: *${object.name}*
-       | Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
-       | Order date: ${object.date_order}
-       % if object.origin:
-       | Order reference: ${object.origin}
-       % endif
-       % if object.client_order_ref:
-       | Your reference: ${object.client_order_ref}<br />
-       % endif
-       | Your contact: ${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-
-You can view the ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'}, download it and even pay online using the following link:
-    ${ctx.get('edi_web_url_view') or 'n/a'}
-
-% if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account and object.state not in ('draft', 'sent'):
-<%
-comp_name = quote(object.company_id.name)
-order_name = quote(object.name)
-paypal_account = quote(object.company_id.paypal_account)
-order_amount = quote(str(object.amount_total))
-cur_name = quote(object.pricelist_id.currency_id.name)
-paypal_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amount=%s" \
-             "&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow_%s" % \
-             (paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_name)
-%>
-It is also possible to directly pay with Paypal:
-    ${paypal_url}
-% endif
-
-If you have any question, do not hesitate to contact us.
-
-
-Thank you for choosing ${object.company_id.name}!
-
-
---
-${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-${object.company_id.name}
-% if object.company_id.street:
-${object.company_id.street or ''}
-% endif
-% if object.company_id.street2:
-${object.company_id.street2}
-% endif
-% if object.company_id.city or object.company_id.zip:
-${object.company_id.zip or ''} ${object.company_id.city or ''}
-% endif
-% if object.company_id.country_id:
-${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
-% endif
-% if object.company_id.phone:
-Phone: ${object.company_id.phone}
-% endif
-% if object.company_id.website:
-${object.company_id.website or ''}
-% endif
-            ]]></field>
         </record>
     </data>
 </openerp>

From c0d92e38b15c6c7dbc662a307fd1e3e259e9469a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 4 Sep 2012 15:31:37 +0200
Subject: [PATCH 791/999] [FIX] Use call_button in order to have the action
 cleaned by the controller

bzr revid: fme@openerp.com-20120904133137-0e0gyu69p89yx3sr
---
 addons/web/static/src/js/view_form.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index b0c8b6618ae..a53807a9d79 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1997,9 +1997,9 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
     },
     on_translate: function() {
         var self = this;
-        var trans = new instance.web.DataSet(this, 'ir.translation', this.view.dataset.get_context());
-        return trans.call('translate_fields', [this.view.dataset.model, this.view.datarecord.id, this.name]).then(function(action) {
-            self.do_action(action);
+        var trans = new instance.web.DataSet(this, 'ir.translation');
+        return trans.call_button('translate_fields', [this.view.dataset.model, this.view.datarecord.id, this.name, this.view.dataset.get_context()]).then(function(r) {
+            self.do_action(r.result);
         });
     },
 });

From 6e5a9053e50f1b74ad53c9a644fe307ecc5c8348 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 4 Sep 2012 15:32:16 +0200
Subject: [PATCH 792/999] [FIX] Fixed remarks of merge proposal

bzr revid: fme@openerp.com-20120904133216-7v82tmcqi1n21c3f
---
 openerp/addons/base/ir/ir_translation.py | 27 ++++++++++++------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index 55902389ee4..3650f28d3f5 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -330,18 +330,18 @@ class ir_translation(osv.osv):
 
     def translate_fields(self, cr, uid, model, id, field=None, context=None):
         trans_model = self.pool.get(model)
-        domain = ['&', ('res_id', '=', id), ('name', 'ilike', model + ',')]
-        langs_ids = self.pool.get('res.lang').search(cr, uid, [], context=context)
-        langs = [lg.get('code') for lg in self.pool.get('res.lang').read(cr, uid, langs_ids, ['code'], context=context)]
-        main_lang = langs.pop(0)
+        domain = ['&', ('res_id', '=', id), ('name', '=like', model + ',%')]
+        langs_ids = self.pool.get('res.lang').search(cr, uid, [('code', '!=', 'en_US')], context=context)
+        langs = [lg.code for lg in self.pool.get('res.lang').browse(cr, uid, langs_ids, context=context)]
+        main_lang = 'en_US'
         translatable_fields = []
         for f, info in trans_model._all_columns.items():
             if info.column.translate:
                 if info.parent_model:
-                    domain_id = trans_model.read(cr, uid, [id], [info.parent_column], context=context)[0][info.parent_column][0]
-                    translatable_fields.append({ 'name': f, 'id': domain_id, 'model': info.parent_model })
+                    parent_id = trans_model.read(cr, uid, [id], [info.parent_column], context=context)[0][info.parent_column][0]
+                    translatable_fields.append({ 'name': f, 'id': parent_id, 'model': info.parent_model })
                     domain.insert(0, '|')
-                    domain.extend(['&', ('res_id', '=', domain_id), ('name', '=', "%s,%s" % (info.parent_model, f))])
+                    domain.extend(['&', ('res_id', '=', parent_id), ('name', '=', "%s,%s" % (info.parent_model, f))])
                 else:
                     translatable_fields.append({ 'name': f, 'id': id, 'model': model })
         if len(langs):
@@ -351,22 +351,21 @@ class ir_translation(osv.osv):
                 for f in translatable_fields:
                     # Check if record exists, else create it (at once)
                     sql = """INSERT INTO ir_translation (lang, src, name, type, res_id, value)
-                        SELECT %s, %s, %s, 'field', %s, %s WHERE NOT EXISTS
-                        (SELECT 1 FROM ir_translation WHERE lang=%s AND name=%s AND res_id=%s);
-                        UPDATE ir_translation SET src = %s WHERE lang=%s AND name=%s AND res_id=%s;
+                        SELECT %s, %s, %s, 'model', %s, %s WHERE NOT EXISTS
+                        (SELECT 1 FROM ir_translation WHERE lang=%s AND name=%s AND res_id=%s AND type='model');
+                        UPDATE ir_translation SET src = %s WHERE lang=%s AND name=%s AND res_id=%s AND type='model';
                         """
-                    src = record[f['name']]
+                    src = record[f['name']] or None
                     name = "%s,%s" % (f['model'], f['name'])
                     cr.execute(sql, (lg, src , name, f['id'], src, lg, name, f['id'], src, lg, name, id))
 
         action = {
             'name': 'Translate',
-            'view_type': 'list',
-            'view_mode': 'list',
             'res_model': 'ir.translation',
             'type': 'ir.actions.act_window',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
             'domain': domain,
-            'views': [(False, 'list'), (False, 'form')],
         }
         if field:
             info = trans_model._all_columns[field]

From fd2a4139694e2548a6bccb154a6a6c5be6d19b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Sep 2012 15:36:48 +0200
Subject: [PATCH 793/999] [FIX] [CLEAN] mail_thread: misc cleanup (comments,
 vars, typo). Fixed subscriber API. It now handles a read_back key in context
 to return the new value of the field. The purpose is to use it in
 mail_followers widget, that behaves asynchronously compared to the form_view,
 and that need updated values after subscribing a user. Updated mail_followers
 widget, cleaned its code. Updated mail_group with wrappers on
 message_subscriber_users, because it was setting user_ids as context.

bzr revid: tde@openerp.com-20120904133648-plsziijac64lw4de
---
 addons/mail/mail_group.py                   | 17 ++++--
 addons/mail/mail_group_view.xml             |  5 +-
 addons/mail/mail_message.py                 |  2 +-
 addons/mail/mail_thread.py                  | 64 +++++++++------------
 addons/mail/static/src/js/mail_followers.js | 22 +++----
 addons/mail/tests/test_mail.py              |  4 +-
 addons/mail/wizard/mail_compose_message.py  |  2 +-
 7 files changed, 55 insertions(+), 61 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index f5769e082a1..fdfeafd4afe 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -44,10 +44,6 @@ class mail_group(osv.Model):
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
 
-    def _get_default_image(self, cr, uid, context=None):
-        image_path = openerp.modules.get_module_resource('mail', 'static/src/img', 'groupdefault.png')
-        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
-
     _columns = {
         'description': fields.text('Description'),
         'menu_id': fields.many2one('ir.ui.menu', string='Related Menu', required=True, ondelete="cascade"),
@@ -89,6 +85,10 @@ class mail_group(osv.Model):
         ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
         return ref and ref[1] or False
 
+    def _get_default_image(self, cr, uid, context=None):
+        image_path = openerp.modules.get_module_resource('mail', 'static/src/img', 'groupdefault.png')
+        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
+
     def _get_menu_parent(self, cr, uid, context=None):
         ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'mail_group_root')
         return ref and ref[1] or False
@@ -156,3 +156,12 @@ class mail_group(osv.Model):
             self._subscribe_users(cr, uid, ids, vals.get('group_ids'), context=context)
         return result
 
+    def action_follow(self, cr, uid, ids, context=None):
+        """ Wrapper because message_subscribe_users take a user_ids=None
+            that receive the context without the wrapper. """
+        return self.message_subscribe_users(cr, uid, ids, context=context)
+
+    def action_unfollow(self, cr, uid, ids, context=None):
+        """ Wrapper because message_unsubscribe_users take a user_ids=None
+            that receive the context without the wrapper. """
+        return self.message_unsubscribe_users(cr, uid, ids, context=context)
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index acd9f320757..51a7a926dc9 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -33,8 +33,8 @@
                                     <h4><a type="open"><field name="name"/></a></h4>
                                     <ul>
                                         <li><t t-raw="record.message_summary.raw_value"/></li>
-                                        <li t-if="! record.message_is_follower.raw_value"><a name="message_subscribe_users" string="Join" type="object" class="oe_group_join">Not following</a></li>
-                                        <li t-if="record.message_is_follower.raw_value"><a name="message_unsubscribe_users" string="Leave" type="object" class="oe_group_leave">Following</a></li>
+                                        <li t-if="! record.message_is_follower.raw_value"><a name="action_follow" string="Join" type="object" class="oe_group_join">Not following</a></li>
+                                        <li t-if="record.message_is_follower.raw_value"><a name="action_unfollow" string="Leave" type="object" class="oe_group_leave">Following</a></li>
                                     </ul>
                                 </div>
                             </div>
@@ -81,7 +81,6 @@
                         </group>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_is_follower" invisible="1"/>
                         <field name="message_ids" widget="mail_thread"
                                 options='{"thread_level": 1}'/>
                         <field name="message_follower_ids" widget="mail_followers"/>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index d22bd4c2e3c..bca46a3c91c 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -135,7 +135,7 @@ class mail_message(osv.Model):
     _defaults = {
         'type': 'email',
         'date': lambda *a: fields.datetime.now(),
-        'author_id': lambda s,cr,uid,ctx={}: s._get_default_author(cr, uid, ctx),
+        'author_id': lambda self,cr,uid,ctx: self._get_default_author(cr, uid, ctx),
         'body': '',
     }
 
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 6e5f594354a..eda7adb995c 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -158,17 +158,16 @@ class mail_thread(osv.AbstractModel):
             'mail_followers', 'res_id', 'partner_id',
             reference_column='res_model', string='Followers'),
         'message_comment_ids': fields.one2many('mail.message', 'res_id',
-            domain=lambda self: [('model','=',self._name),('type','in',('comment','email'))],
-            string='Related Messages', 
-            help="All messages related to the current document."),
+            domain=lambda self: [('model', '=', self._name), ('type', 'in', ('comment', 'email'))],
+            string='Comments and emails', 
+            help="Comments and emails"),
         'message_ids': fields.one2many('mail.message', 'res_id',
             domain=lambda self: [('model','=',self._name)],
-            string='Related Messages', 
-            help="All messages related to the current document."),
+            string='Messages', 
+            help="Messages and communication history"),
         'message_unread': fields.function(_get_message_data, fnct_search=_search_unread, 
-            string='Has Unread Messages', type='boolean',
-            help="When checked, new messages require your attention.",
-            multi="_get_message_data"),
+            type='boolean', string='Unread Messages', multi="_get_message_data",
+            help="If checked new messages require your attention."),
         'message_summary': fields.function(_get_message_data, method=True,
             type='text', string='Summary', multi="_get_message_data",
             help="Holds the Chatter summary (number of messages, ...). "\
@@ -181,7 +180,7 @@ class mail_thread(osv.AbstractModel):
     #------------------------------------------------------
 
     def create(self, cr, uid, vals, context=None):
-        """ Override of create to subscribe the current user. """
+        """ Override to subscribe the current user. """
         thread_id = super(mail_thread, self).create(cr, uid, vals, context=context)
         self.message_subscribe_users(cr, uid, [thread_id], [uid], context=context)
         return thread_id
@@ -215,11 +214,8 @@ class mail_thread(osv.AbstractModel):
     def _message_find_partners(self, cr, uid, message, header_fields=['From'], context=None):
         """ Find partners related to some header fields of the message. """
         s = ', '.join([decode(message.get(h)) for h in header_fields if message.get(h)])
-        mails = tools.email_split(s)
-        result = []
-        for email in mails:
-            result += self.pool.get('res.partner').search(cr, uid, [('email', 'ilike', email)], context=context)
-        return result
+        return [partner_id for email in tools.email_split(s)
+                for partner_id in self.pool.get('res.partner').search(cr, uid, [('email', 'ilike', email)], context=context)]
 
     def _message_find_user_id(self, cr, uid, message, context=None):
         from_local_part = tools.email_split(decode(message.get('From')))[0]
@@ -551,16 +547,16 @@ class mail_thread(osv.AbstractModel):
     #------------------------------------------------------
 
     def log(self, cr, uid, id, message, secondary=False, context=None):
-        _logger.warning("log() is deprecated. As this module inherit from \
-                        mail.thread, the message will be managed by this \
-                        module instead of by the res.log mechanism. Please \
-                        use the mail.thread OpenChatter API instead of the \
-                        now deprecated res.log.")
+        _logger.warning("log() is deprecated. As this module inherit from "\
+                        "mail.thread, the message will be managed by this "\
+                        "module instead of by the res.log mechanism. Please "\
+                        "use mail_thread.message_post() instead of the "\
+                        "now deprecated res.log.")
         self.message_post(cr, uid, [id], message, context=context)
 
     def message_post(self, cr, uid, thread_id, body='', subject=False,
-            msg_type='notification', parent_id=False, attachments=None, context=None, **kwargs):
-        """ Post a new message in an existing message thread, returning the new
+            type='notification', parent_id=False, attachments=None, context=None, **kwargs):
+        """ Post a new message in an existing thread, returning the new
             mail.message ID. Extra keyword arguments will be used as default
             column values for the new mail.message record.
 
@@ -568,7 +564,7 @@ class mail_thread(osv.AbstractModel):
             :param str body: body of the message, usually raw HTML that will
                 be sanitized
             :param str subject: optional subject
-            :param str msg_type: mail_message.type
+            :param str type: mail_message.type
             :param int parent_id: optional ID of parent message in this thread
             :param tuple(str,str) attachments: list of attachment tuples in the form
                 ``(name,content)``, where content is NOT base64 encoded
@@ -601,7 +597,7 @@ class mail_thread(osv.AbstractModel):
             'res_id': thread_id or False,
             'body': body,
             'subject': subject,
-            'type': msg_type,
+            'type': type,
             'parent_id': parent_id,
             'attachment_ids': attachment_ids,
         })
@@ -615,40 +611,37 @@ class mail_thread(osv.AbstractModel):
     def message_subscribe_users(self, cr, uid, ids, user_ids=None, context=None):
         """ Wrapper on message_subscribe, using users. If user_ids is not
             provided, subscribe uid instead. """
-        # isinstance: because using message_subscribe_users called in a view set the context as user_ids
-        if not user_ids or isinstance(user_ids, dict): user_ids = [uid]
+        if not user_ids: user_ids = [uid]
         partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
         return self.message_subscribe(cr, uid, ids, partner_ids, context=context)
 
     def message_subscribe(self, cr, uid, ids, partner_ids, context=None):
         """ Add partners to the records followers.
-
             :param partner_ids: a list of partner_ids to subscribe
-            :param return: new value of followers, for Chatter
+            :param return: new value of followers if read_back key in context
         """
         self.write(cr, uid, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
-        # TDE: temp, must check followers widget
+        if context and context.get('read_back'):
+            return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
         return []
-        # return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
+        
 
     def message_unsubscribe_users(self, cr, uid, ids, user_ids=None, context=None):
         """ Wrapper on message_subscribe, using users. If user_ids is not
             provided, unsubscribe uid instead. """
-        # isinstance: because using message_subscribe_users called in a view set the context as user_ids
-        if not user_ids or isinstance(user_ids, dict): user_ids = [uid]
+        if not user_ids: user_ids = [uid]
         partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
         return self.message_unsubscribe(cr, uid, ids, partner_ids, context=context)
 
     def message_unsubscribe(self, cr, uid, ids, partner_ids, context=None):
         """ Remove partners from the records followers.
-
             :param partner_ids: a list of partner_ids to unsubscribe
-            :param return: new value of followers, for Chatter
+            :param return: new value of followers if read_back key in context
         """
         self.write(cr, uid, ids, {'message_follower_ids': [(3, pid) for pid in partner_ids]}, context=context)
-        # TDE: temp, must check followers widget
+        if context and context.get('read_back'):
+            return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
         return []
-        # return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
 
     #------------------------------------------------------
     # Thread state
@@ -679,4 +672,3 @@ class mail_thread(osv.AbstractModel):
                 partner_id = %s
         ''', (ids, self._name, partner_id))
         return True
-
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 6125aac12dc..e5d216ed3d2 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -9,7 +9,7 @@ openerp_mail_followers = function(session, mail) {
      * mail_followers Widget
      * ------------------------------------------------------------
      *
-     * This widget handles the display of a list of records as a vetical
+     * This widget handles the display of a list of records as a vertical
      * list, with an image on the left. The widget itself is a floatting
      * right-sided box.
      * This widget is mainly used to display the followers of records
@@ -65,25 +65,17 @@ openerp_mail_followers = function(session, mail) {
                 this.$el.find('div.oe_mail_recthread_aside').hide();
                 return;
             }
-            if (this.getParent().fields.message_is_follower === undefined) {
-                // TDE: TMP, need to change all form views
-                this.message_is_follower = false;
-            }
-            else {
-                this.message_is_follower = this.getParent().fields.message_is_follower.get_value();
-            }
             return this.fetch_followers(value_);
         },
 
         fetch_followers: function (value_) {
-            return this.ds_follow.call('read', [value_ || this.get_value(), ['name']]).then(this.proxy('display_followers'));
+            return this.ds_follow.call('read', [value_ || this.get_value(), ['name', 'user_ids']]).then(this.proxy('display_followers'));
         },
 
-        /**
-         * Display the followers.
-         * TODO: replace the is_follower check by fields read */
+        /** Display the followers, evaluate is_follower directly */
         display_followers: function (records) {
             var self = this;
+            this.message_is_follower = _.indexOf(_.flatten(_.pluck(records, 'user_ids')), this.session.uid) != -1;
             var node_user_list = this.$el.find('ul.oe_mail_followers_display').empty();
             this.$el.find('div.oe_mail_recthread_followers h4').html(this.options.title + ' (' + records.length + ')');
             _(records).each(function (record) {
@@ -99,11 +91,13 @@ openerp_mail_followers = function(session, mail) {
         },
 
         do_follow: function () {
-            return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id]]).pipe(this.proxy('set_value'));
+            var context = new session.web.CompoundContext(this.build_context(), {'read_back': true});
+            return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], undefined, context]).pipe(this.proxy('set_value'));
         },
 
         do_unfollow: function () {
-            return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id]]).pipe(this.proxy('set_value'));
+            var context = new session.web.CompoundContext(this.build_context(), {'read_back': true});
+            return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], undefined, context]).pipe(this.proxy('set_value'));
         },
     });
 };
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 9c148647b9b..f8fd02bfb7e 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -250,7 +250,7 @@ class test_mail(common.TransactionCase):
         _attachments = [('First', 'My first attachment'), ('Second', 'My second attachment')]
 
         # CASE1: post comment, body and subject specified
-        msg_id = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body1, subject=_subject, msg_type='comment')
+        msg_id = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body1, subject=_subject, type='comment')
         message = self.mail_message.browse(cr, uid, msg_id)
         mail_ids = self.mail_mail.search(cr, uid, [], limit=1)
         mail = self.mail_mail.browse(cr, uid, mail_ids[0])
@@ -280,7 +280,7 @@ class test_mail(common.TransactionCase):
 
         # CASE2: post an email with attachments, parent_id, partner_ids
         # TESTS: automatic subject, signature in body_html, attachments propagation
-        msg_id2 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body2, msg_type='email',
+        msg_id2 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body2, type='email',
             partner_ids=[(6, 0, [p_d_id])], parent_id=msg_id, attachments=_attachments)
         message = self.mail_message.browse(cr, uid, msg_id2)
         mail_ids = self.mail_mail.search(cr, uid, [], limit=1)
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 41b10d6d4a3..3c93440642d 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -269,7 +269,7 @@ class mail_compose_message(osv.TransientModel):
                     post_values['attachments'] += new_attachments
                     post_values.update(email_dict)
                 # post the message
-                active_model_pool.message_post(cr, uid, [res_id], msg_type='comment', context=context, **post_values)
+                active_model_pool.message_post(cr, uid, [res_id], type='comment', context=context, **post_values)
 
         return {'type': 'ir.actions.act_window_close'}
 

From c0fbdc25566af3ee35fac1509748a9bb9715a682 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Tue, 4 Sep 2012 15:50:45 +0200
Subject: [PATCH 794/999] [IMP] kanban tooltip on quickcreate

bzr revid: vta@openerp.com-20120904135045-husx3of9jnjhzpqp
---
 addons/web_kanban/static/src/js/kanban.js       | 5 +++--
 addons/web_kanban/static/src/xml/web_kanban.xml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index e00f6d9f44e..e18b7c33d96 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -517,7 +517,6 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
             self.quick.focus();
         });
         // Add bounce effect on image '+' of kanban header when click on empty space of kanban grouped column.
-        var add_btn = this.$el.find('.oe_kanban_add');
         this.$records.find('.oe_kanban_show_more').click(this.do_show_more);
         if (this.state.folded) {
             this.do_toggle_fold();
@@ -526,10 +525,12 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         this.$records.data('widget', this);
         this.$has_been_started.resolve();
         this.compute_cards_auto_height();
+        var add_btn = this.$el.find('.oe_kanban_add');
+        add_btn.tipsy({delayIn: 500, delayOut: 1000});
         this.$records.click(function (ev) {
             if (ev.target == ev.currentTarget) {
                 if (!self.state.folded) {
-                    add_btn.effect('bounce', {distance: 18, times: 5}, 150);
+                    add_btn.effect('bounce', {distance: 18, times: 5}, 150);                    
                 }
             }
         });
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 20b361e9445..17d45d90505 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -32,7 +32,7 @@
         <t t-if="widget.view.group_by">
             <div class="oe_kanban_header">
                 <t t-if="widget.view._is_quick_create_enabled()">
-                    <div class="oe_kanban_add oe_e">]</div>
+                    <div class="oe_kanban_add oe_e" original-title="Quick create">]</div>
                 </t>
                     <div class="oe_dropdown_toggle oe_dropdown_kanban">
                         <span class="oe_e">í</span>

From e386d895ad1aab43d88b4241e24b8659314cfe3b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 4 Sep 2012 15:57:28 +0200
Subject: [PATCH 795/999] [FIX] Do not ilike on name for the translation search
 view

bzr revid: fme@openerp.com-20120904135728-6i5nrwemsluexlx0
---
 openerp/addons/base/ir/ir.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 4fb3c82dd24..bd98bb34c12 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -1173,7 +1173,7 @@
                     <filter icon="terp-gdu-smart-failing"
                         string="Untranslated"
                         domain="['|',('value', '=', False),('value','=','')]"/>
-                    <field name="name"/>
+                    <field name="name" operator="="/>
                     <field name="lang"/>
                     <field name="src"/>
                     <field name="value"/>

From 440b8aabbd9ca0e1928d39207c6ed957fec613c8 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 4 Sep 2012 15:59:05 +0200
Subject: [PATCH 796/999] [IMP] web_kanban: remove inappropriate method
 _is_action_enabled

bzr revid: rco@openerp.com-20120904135905-4f7lu2qk0p5qk8cs
---
 addons/web_kanban/static/src/js/kanban.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 6efd8593deb..143ff7d685b 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -633,9 +633,6 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
                 self.view.dataset.ids.push(id);
                 self.do_add_records(records, true);
             });
-    },
-    _is_action_enabled: function(action) {
-        return (_.has(this.fields_view.arch.attrs, action)) ? JSON.parse(this.fields_view.arch.attrs[action]) : true;
     }    
 });
 
@@ -910,9 +907,6 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
     },
     kanban_compute_domain: function(domain) {
         return instance.web.form.compute_domain(domain, this.values);
-    },
-    _is_action_enabled: function(action) {
-        return (_.has(this.fields_view.arch.attrs, action)) ? JSON.parse(this.fields_view.arch.attrs[action]) : true;
     }
 });
 

From 14e87c09f3ecf5cefd9b6d6bcfc6b5efa35e7729 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 4 Sep 2012 16:11:55 +0200
Subject: [PATCH 797/999] [IMP] rename method _is_action_enabled to
 is_action_enabled

bzr revid: rco@openerp.com-20120904141155-288vwhonbt07dfcs
---
 addons/web/static/src/js/view_form.js              | 10 +++++-----
 addons/web/static/src/js/view_list.js              | 10 +++++-----
 addons/web/static/src/js/view_list_editable.js     |  2 +-
 addons/web/static/src/js/views.js                  |  2 +-
 addons/web/static/src/xml/base.xml                 |  6 +++---
 addons/web_diagram/static/src/xml/base_diagram.xml |  2 +-
 addons/web_gantt/static/src/js/gantt.js            |  2 +-
 addons/web_kanban/static/src/js/kanban.js          |  4 ++--
 addons/web_kanban/static/src/xml/web_kanban.xml    |  2 +-
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index cca3d410a50..669126820e8 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -148,12 +148,12 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             if (this.fields_view.toolbar) {
                 this.sidebar.add_toolbar(this.fields_view.toolbar);
             }
-            if (self._is_action_enabled('delete')) {
+            if (self.is_action_enabled('delete')) {
                 this.sidebar.add_items('other', [
                     { label: _t('Delete'), callback: self.on_button_delete }
                 ]);
             }
-            if (self._is_action_enabled('create')) {
+            if (self.is_action_enabled('create')) {
                 this.sidebar.add_items('other', [
                     { label: _t('Duplicate'), callback: self.on_button_duplicate }
                 ]);
@@ -3485,7 +3485,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
                 return self.o2m.dataset.read_ids.apply(self.o2m.dataset, arguments);
             },
             form_view_options: {'not_interactible_on_create':true},
-            readonly: !this._is_action_enabled('edit') || self.o2m.get("effective_readonly")
+            readonly: !this.is_action_enabled('edit') || self.o2m.get("effective_readonly")
         });
     },
     do_button_action: function (name, id, callback) {
@@ -3573,7 +3573,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
 });
 instance.web.form.One2ManyList = instance.web.ListView.List.extend({
     pad_table_to: function (count) {
-        this._super(this.view._is_action_enabled('create') ? (count > 0 ? count - 1 : 0) : this.records.length);
+        this._super(this.view.is_action_enabled('create') ? (count > 0 ? count - 1 : 0) : this.records.length);
 
         // magical invocation of wtf does that do
         if (this.view.o2m.get('effective_readonly')) {
@@ -3586,7 +3586,7 @@ instance.web.form.One2ManyList = instance.web.ListView.List.extend({
         }).length;
         if (this.options.selectable) { columns++; }
         if (this.options.deletable) { columns++; }
-        if (this.view._is_action_enabled('create')) {
+        if (this.view.is_action_enabled('create')) {
             var $cell = $('<td>', {
                 colspan: columns,
                 'class': 'oe_form_field_one2many_list_row_add'
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 06d2548339c..da806f415cf 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -252,13 +252,13 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         this.$el.addClass(this.fields_view.arch.attrs['class']);
 
         // add css classes that reflect the (absence of) access rights
-        if (!this._is_action_enabled('create')) {
+        if (!this.is_action_enabled('create')) {
             this.$el.addClass('oe_list_cannot_create');
         }
-        if (!this._is_action_enabled('edit')) {
+        if (!this.is_action_enabled('edit')) {
             this.$el.addClass('oe_list_cannot_edit');
         }
-        if (!this._is_action_enabled('delete')) {
+        if (!this.is_action_enabled('delete')) {
             this.$el.addClass('oe_list_cannot_delete');
         }
 
@@ -363,7 +363,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         if (!this.sidebar && this.options.$sidebar) {
             this.sidebar = new instance.web.Sidebar(this);
             this.sidebar.appendTo(this.options.$sidebar);
-            if (self._is_action_enabled('create')) {
+            if (self.is_action_enabled('create')) {
                 this.sidebar.add_items('other', [
                     { label: _t("Import"), callback: this.on_sidebar_import }
                 ]);
@@ -371,7 +371,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
             this.sidebar.add_items('other', [
                 { label: _t("Export"), callback: this.on_sidebar_export }
             ]);
-            if (self._is_action_enabled('delete')) {
+            if (self.is_action_enabled('delete')) {
                 this.sidebar.add_items('other', [
                     { label: _t('Delete'), callback: this.do_delete_selected }
                 ]);
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 2615d8c66dd..5a1eac23a90 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -750,7 +750,7 @@ openerp.web.list_editable = function (instance) {
 
     instance.web.ListView.List.include(/** @lends instance.web.ListView.List# */{
         row_clicked: function (event) {
-            if (!this.view.editable() || ! this.view._is_action_enabled('edit')) {
+            if (!this.view.editable() || ! this.view.is_action_enabled('edit')) {
                 return this._super.apply(this, arguments);
             }
             var record_id = $(event.currentTarget).data('id');
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 183b63a218e..43d935b91e8 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1363,7 +1363,7 @@ instance.web.View = instance.web.Widget.extend({
      * An action is disabled by setting the corresponding attribute in the view's main element,
      * like: <form string="" create="false" edit="false" delete="false">
      */
-    _is_action_enabled: function(action) {
+    is_action_enabled: function(action) {
         return (_.has(this.fields_view.arch.attrs, action)) ? JSON.parse(this.fields_view.arch.attrs[action]) : true;
     }
 });
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a92eacc0710..789fbcb4baa 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -649,7 +649,7 @@
     </tfoot>
 </table>
 <div t-name="ListView.buttons" class="oe_list_buttons">
-    <t t-if="!widget.no_leaf and widget.options.action_buttons !== false and widget.options.addable and widget._is_action_enabled('create')">
+    <t t-if="!widget.no_leaf and widget.options.action_buttons !== false and widget.options.addable and widget.is_action_enabled('create')">
         <button type="button" class="oe_button oe_list_add oe_highlight">
             <t t-esc="widget.options.addable"/>
         </button>
@@ -725,12 +725,12 @@
 <div t-name="FormView.buttons" class="oe_form_buttons">
     <t t-if="widget.options.action_buttons !== false">
         <span class="oe_form_buttons_view">
-            <t t-if="widget._is_action_enabled('edit')">
+            <t t-if="widget.is_action_enabled('edit')">
                 <div style="display: inline-block;"> <!-- required for the bounce effect on button -->
                     <button type="button" class="oe_button oe_form_button_edit" accesskey="E">Edit</button>
                 </div>
             </t>
-            <t t-if="widget._is_action_enabled('create')">
+            <t t-if="widget.is_action_enabled('create')">
                 <button type="button" class="oe_button oe_form_button_create" accesskey="C">Create</button>
             </t>
         </span>
diff --git a/addons/web_diagram/static/src/xml/base_diagram.xml b/addons/web_diagram/static/src/xml/base_diagram.xml
index 619ebb241f4..eec8e4f9139 100644
--- a/addons/web_diagram/static/src/xml/base_diagram.xml
+++ b/addons/web_diagram/static/src/xml/base_diagram.xml
@@ -2,7 +2,7 @@
 <t t-name="DiagramView">
     <div class="oe_diagram_header" t-att-id="element_id + '_header'">
         <h3 class="oe_diagram_title"/>
-        <t t-if="widget._is_action_enabled('create')">
+        <t t-if="widget.is_action_enabled('create')">
             <div class="oe_diagram_buttons">
                 <button type="button" id="new_node" class="oe_button oe_diagram_button_new">New Node</button>
             </div>
diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
index 44adbc41b10..8d782c5fd51 100644
--- a/addons/web_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -183,7 +183,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({
                 self.on_task_display(task_info.internal_task);
             }
         });
-        if (this._is_action_enabled('create')) {        
+        if (this.is_action_enabled('create')) {        
             // insertion of create button
             var td = $($("table td", self.$el)[0]);
             var rendered = QWeb.render("GanttView-create-button");
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 143ff7d685b..cbe88ec847b 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -71,7 +71,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
             return JSON.parse(this.fields_view.arch.attrs.quick_create);
         return !! this.group_by;
     },
-    _is_action_enabled: function(action) {
+    is_action_enabled: function(action) {
         if (action === 'create' && !this.options.creatable)
             return false;
         return this._super(action);
@@ -735,7 +735,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
             var $action = $(this),
                 type = $action.data('type') || 'button',
                 method = 'do_action_' + (type === 'action' ? 'object' : type);
-            if ((type === 'edit' || type === 'delete') && ! self.view._is_action_enabled(type)) {
+            if ((type === 'edit' || type === 'delete') && ! self.view.is_action_enabled(type)) {
                 self.view.open_record(self.id);
             } else if (_.str.startsWith(type, 'switch_')) {
                 self.view.do_switch_view(type.substr(7));
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index b2f9e757b43..278b9cc02b6 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -14,7 +14,7 @@
 </t>
 <div t-name="KanbanView.buttons" class="oe_kanban_buttons">
     <t t-if="widget.options.action_buttons !== false">
-        <t t-if="widget._is_action_enabled('create')">
+        <t t-if="widget.is_action_enabled('create')">
             <button type="button" class="oe_kanban_button_new oe_highlight">
                 <t t-esc="widget.options.create_text || _t('Create')"/>
             </button>

From 570f76fa9aa46919f7ee95e973caee6d99cdfa7c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 4 Sep 2012 16:12:04 +0200
Subject: [PATCH 798/999] [IMP] rename method _is_action_enabled to
 is_action_enabled

bzr revid: rco@openerp.com-20120904141204-oqykdxnwb9yf3itc
---
 addons/crm/crm_lead_view.xml                  | 4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml | 4 ++--
 addons/project/project_view.xml               | 8 ++++----
 addons/project_issue/project_issue_view.xml   | 4 ++--
 addons/survey/survey_view.xml                 | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 17cc7e9498d..2eb6981319a 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -311,8 +311,8 @@
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
-                                        <t t-if="widget.view._is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
-                                        <t t-if="widget.view._is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
                                         <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
                                         <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index de6b3c6d286..08bade296cf 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -282,8 +282,8 @@
                             <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                 <span class="oe_e">i</span>
                                 <ul class="oe_dropdown_menu">
-                                    <t t-if="widget.view._is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
-                                    <t t-if="widget.view._is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
+                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                    <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                     <li><a name="action_makeMeeting" type="object">Schedule Interview</a></li>
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c915622392b..9d14b1a8f0f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -236,8 +236,8 @@
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
-                                        <t t-if="widget.view._is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
-                                        <t t-if="widget.view._is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
                                 </div>
@@ -539,8 +539,8 @@
                             <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                 <span class="oe_e">í</span>
                                 <ul class="oe_dropdown_menu">
-                                    <t t-if="widget.view._is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
-                                    <t t-if="widget.view._is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
+                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                    <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                     <li>
                                       <ul class="oe_kanban_project_times">
                                         <li><a name="set_remaining_time_1" type="object" class="oe_kanban_button">1</a></li>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 4dda165689d..2ef3e291201 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -257,8 +257,8 @@
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
-                                        <t t-if="widget.view._is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
-                                        <t t-if="widget.view._is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
                                 </div>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 0b0ab177820..8b49b89df65 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -302,8 +302,8 @@
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
-                                        <t t-if="widget.view._is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
-                                        <t t-if="widget.view._is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
                                 </div>

From bf20cd701840bd8e08ca05207566c4ddcbad6ced Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 4 Sep 2012 16:30:24 +0200
Subject: [PATCH 799/999] [IMP] view_form: improve code formatting

bzr revid: rco@openerp.com-20120904143024-g6fmxpkcjmg95zcu
---
 addons/web/static/src/js/view_form.js | 71 +++++++++++++++------------
 1 file changed, 39 insertions(+), 32 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 669126820e8..3ea3e853894 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3573,7 +3573,11 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
 });
 instance.web.form.One2ManyList = instance.web.ListView.List.extend({
     pad_table_to: function (count) {
-        this._super(this.view.is_action_enabled('create') ? (count > 0 ? count - 1 : 0) : this.records.length);
+        if (!this.view.is_action_enabled('create')) {
+            this._super(count);
+        } else {
+            this._super(count > 0 ? count - 1 : 0);
+        }
 
         // magical invocation of wtf does that do
         if (this.view.o2m.get('effective_readonly')) {
@@ -3586,38 +3590,41 @@ instance.web.form.One2ManyList = instance.web.ListView.List.extend({
         }).length;
         if (this.options.selectable) { columns++; }
         if (this.options.deletable) { columns++; }
-        if (this.view.is_action_enabled('create')) {
-            var $cell = $('<td>', {
-                colspan: columns,
-                'class': 'oe_form_field_one2many_list_row_add'
-            }).append(
-                $('<a>', {href: '#'}).text(_t("Add a row"))
-                    .mousedown(function () {
-                        // FIXME: needs to be an official API somehow
-                        if (self.view.editor.is_editing()) {
-                            self.view.__ignore_blur = true;
-                        }
-                    })
-                    .click(function (e) {
-                        e.preventDefault();
-                        e.stopPropagation();
-                        // FIXME: there should also be an API for that one
-                        if (self.view.editor.form.__blur_timeout) {
-                            clearTimeout(self.view.editor.form.__blur_timeout);
-                            self.view.editor.form.__blur_timeout = false;
-                        }
-                        self.view.ensure_saved().then(function () {
-                            self.view.do_add_record();
-                        });
-                    }));
 
-            var $padding = this.$current.find('tr:not([data-id]):first');
-            var $newrow = $('<tr>').append($cell);
-            if ($padding.length) {
-                $padding.before($newrow);
-            } else {
-                this.$current.append($newrow)
-            }
+        if (!this.view.is_action_enabled('create')) {
+            return;
+        }
+
+        var $cell = $('<td>', {
+            colspan: columns,
+            'class': 'oe_form_field_one2many_list_row_add'
+        }).append(
+            $('<a>', {href: '#'}).text(_t("Add a row"))
+                .mousedown(function () {
+                    // FIXME: needs to be an official API somehow
+                    if (self.view.editor.is_editing()) {
+                        self.view.__ignore_blur = true;
+                    }
+                })
+                .click(function (e) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    // FIXME: there should also be an API for that one
+                    if (self.view.editor.form.__blur_timeout) {
+                        clearTimeout(self.view.editor.form.__blur_timeout);
+                        self.view.editor.form.__blur_timeout = false;
+                    }
+                    self.view.ensure_saved().then(function () {
+                        self.view.do_add_record();
+                    });
+                }));
+
+        var $padding = this.$current.find('tr:not([data-id]):first');
+        var $newrow = $('<tr>').append($cell);
+        if ($padding.length) {
+            $padding.before($newrow);
+        } else {
+            this.$current.append($newrow)
         }
     }
 });

From 7ce2e6ff63e744cc6509ba7360bd75efdeec1457 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 4 Sep 2012 16:34:36 +0200
Subject: [PATCH 800/999] fix status glitch on firefox

bzr revid: mit@openerp.com-20120904143436-3b11jkrxxxmmtn4s
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 52e74b7c17e..1a1a07d0fb5 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1951,7 +1951,7 @@
   float: right;
 }
 .openerp .oe_form header .oe_form_button {
-  margin: 3px 2px;
+  margin: 3px 2px 1px;
 }
 .openerp .oe_form div.oe_chatter {
   min-width: 650px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 975a8103847..308f32e7daa 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1516,7 +1516,7 @@ $sheet-max-width: 860px
                 display: inline-block
                 float: right
             .oe_form_button
-                margin: 3px 2px
+                margin: 3px 2px 1px
         div.oe_chatter
             min-width: 650px
             max-width: $sheet-max-width

From bacbb8e2f444ad7bf520ab3caf72351a1af28cc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Sep 2012 16:50:11 +0200
Subject: [PATCH 801/999] [REVIEW] base_stage: removed now dead
 message_thread_followers method. mail_thread: set message_capable_models
 back, because it is used in the plugin addon, adn therefore in various
 plugin_XXX addons. Maybe a refactoring of those plugins could be done, but it
 is beyond the scope of this refactoring.

bzr revid: tde@openerp.com-20120904145011-tlwgcu32uv8cwe6g
---
 addons/base_status/base_stage.py | 11 -----------
 addons/mail/mail_thread.py       | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 26afe548217..4cbb039490e 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -360,17 +360,6 @@ class base_stage(object):
     def format_mail(self, obj, body):
         return self.pool.get('base.action.rule').format_mail(obj, body)
 
-    def message_thread_followers(self, cr, uid, ids, context=None):
-        res = {}
-        for case in self.browse(cr, uid, ids, context=context):
-            l=[]
-            if case.email_cc:
-                l.append(case.email_cc)
-            if case.user_id and case.user_id.email:
-                l.append(case.user_id.email)
-            res[case.id] = l
-        return res
-
     # ******************************
     # Notifications
     # ******************************
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index eda7adb995c..5bd81e3ccff 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -211,6 +211,15 @@ class mail_thread(osv.AbstractModel):
     # Mail gateway
     #------------------------------------------------------
 
+    def message_capable_models(self, cr, uid, context=None):
+        """ Used by the plugin addon, based for plugin_outlook and others. """
+        ret_dict = {}
+        for model_name in self.pool.obj_list():
+            model = self.pool.get(model_name)
+            if 'mail.thread' in getattr(model, '_inherit', []):
+                ret_dict[model_name] = model._description
+        return ret_dict
+
     def _message_find_partners(self, cr, uid, message, header_fields=['From'], context=None):
         """ Find partners related to some header fields of the message. """
         s = ', '.join([decode(message.get(h)) for h in header_fields if message.get(h)])
@@ -378,9 +387,7 @@ class mail_thread(osv.AbstractModel):
            for a given thread model, if the message did not belong to
            an existing thread.
            The default behavior is to create a new record of the corresponding
-           model (based on some very basic info extracted from the message),
-           then attach the message to the newly created record
-           (by calling ``message_append_dict``).
+           model (based on some very basic info extracted from the message).
            Additional behavior may be implemented by overriding this method.
 
            :param dict msg_dict: a map containing the email details and
@@ -413,9 +420,8 @@ class mail_thread(osv.AbstractModel):
 
     def message_update(self, cr, uid, ids, msg_dict, update_vals=None, context=None):
         """Called by ``message_process`` when a new message is received
-           for an existing thread. The default behavior is to create a
-           new mail.message in the given thread (by calling
-           ``message_append_dict``)
+           for an existing thread. The default behavior is to update the record
+           with update_vals taken from the incoming email.
            Additional behavior may be implemented by overriding this
            method.
            :param dict msg_dict: a map containing the email details and

From d6dc264ea28dff087c75c67ff36e2b82aa1a2b70 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 4 Sep 2012 16:50:17 +0200
Subject: [PATCH 802/999] [IMP] web, web_diagram: improve code formatting

bzr revid: rco@openerp.com-20120904145017-qw6n8clak9byw1w3
---
 addons/web/static/src/js/view_list.js              | 12 +++---------
 addons/web/static/src/js/views.js                  |  3 ++-
 addons/web/static/src/xml/base.xml                 | 14 ++++++--------
 addons/web_diagram/static/src/xml/base_diagram.xml | 10 ++++------
 4 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index da806f415cf..0c1e6805f9a 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -252,15 +252,9 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         this.$el.addClass(this.fields_view.arch.attrs['class']);
 
         // add css classes that reflect the (absence of) access rights
-        if (!this.is_action_enabled('create')) {
-            this.$el.addClass('oe_list_cannot_create');
-        }
-        if (!this.is_action_enabled('edit')) {
-            this.$el.addClass('oe_list_cannot_edit');
-        }
-        if (!this.is_action_enabled('delete')) {
-            this.$el.addClass('oe_list_cannot_delete');
-        }
+        this.$el.toggleClass('oe_list_cannot_create', !this.is_action_enabled('create'))
+                .toggleClass('oe_list_cannot_edit', !this.is_action_enabled('edit'))
+                .toggleClass('oe_list_cannot_delete', !this.is_action_enabled('delete'));
 
         // Head hook
         // Selecting records
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 43d935b91e8..83c1ecaa679 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1364,7 +1364,8 @@ instance.web.View = instance.web.Widget.extend({
      * like: <form string="" create="false" edit="false" delete="false">
      */
     is_action_enabled: function(action) {
-        return (_.has(this.fields_view.arch.attrs, action)) ? JSON.parse(this.fields_view.arch.attrs[action]) : true;
+        var attrs = this.fields_view.arch.attrs;
+        return (action in attrs) ? JSON.parse(attrs[action]) : true;
     }
 });
 
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 789fbcb4baa..2e2935a7bc6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -725,14 +725,12 @@
 <div t-name="FormView.buttons" class="oe_form_buttons">
     <t t-if="widget.options.action_buttons !== false">
         <span class="oe_form_buttons_view">
-            <t t-if="widget.is_action_enabled('edit')">
-                <div style="display: inline-block;"> <!-- required for the bounce effect on button -->
-                    <button type="button" class="oe_button oe_form_button_edit" accesskey="E">Edit</button>
-                </div>
-            </t>
-            <t t-if="widget.is_action_enabled('create')">
-                <button type="button" class="oe_button oe_form_button_create" accesskey="C">Create</button>
-            </t>
+            <!-- required for the bounce effect on button -->
+            <div t-if="widget.is_action_enabled('edit')" style="display: inline-block;">
+                <button type="button" class="oe_button oe_form_button_edit" accesskey="E">Edit</button>
+            </div>
+            <button t-if="widget.is_action_enabled('create')"
+                type="button" class="oe_button oe_form_button_create" accesskey="C">Create</button>
         </span>
         <span class="oe_form_buttons_edit">
             <button type="button" class="oe_button oe_form_button_save oe_highlight" accesskey="S">Save</button>
diff --git a/addons/web_diagram/static/src/xml/base_diagram.xml b/addons/web_diagram/static/src/xml/base_diagram.xml
index eec8e4f9139..388092b3d23 100644
--- a/addons/web_diagram/static/src/xml/base_diagram.xml
+++ b/addons/web_diagram/static/src/xml/base_diagram.xml
@@ -1,12 +1,10 @@
 <template>
 <t t-name="DiagramView">
-    <div class="oe_diagram_header" t-att-id="element_id + '_header'">
+    <div class="oe_diagram_header" t-att-id="widget.element_id + '_header'">
         <h3 class="oe_diagram_title"/>
-        <t t-if="widget.is_action_enabled('create')">
-            <div class="oe_diagram_buttons">
-                <button type="button" id="new_node" class="oe_button oe_diagram_button_new">New Node</button>
-            </div>
-        </t>
+        <div t-if="widget.is_action_enabled('create')" class="oe_diagram_buttons">
+            <button type="button" id="new_node" class="oe_button oe_diagram_button_new">New Node</button>
+        </div>
         <div class="oe_diagram_pager">
             <t t-call="ViewPager">
                 <span class="oe_pager_index">0</span> / <span class="oe_pager_count">0</span>

From 13e10079b1afb91d9c0c21b235cc78f68d4bac5f Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 4 Sep 2012 17:18:24 +0200
Subject: [PATCH 803/999] [IMP] web: improve code formatting, more

bzr revid: rco@openerp.com-20120904151824-0z51u2cavjtzqpzd
---
 addons/web/static/src/js/view_form.js | 16 ++++------------
 addons/web/static/src/js/view_list.js | 18 +++++-------------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3ea3e853894..ba096ec2f78 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -148,19 +148,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             if (this.fields_view.toolbar) {
                 this.sidebar.add_toolbar(this.fields_view.toolbar);
             }
-            if (self.is_action_enabled('delete')) {
-                this.sidebar.add_items('other', [
-                    { label: _t('Delete'), callback: self.on_button_delete }
-                ]);
-            }
-            if (self.is_action_enabled('create')) {
-                this.sidebar.add_items('other', [
-                    { label: _t('Duplicate'), callback: self.on_button_duplicate }
-                ]);
-            }
-            this.sidebar.add_items('other', [
+            this.sidebar.add_items('other', _.compact([
+                self.is_action_enabled('delete') && { label: _t('Delete'), callback: self.on_button_delete },
+                self.is_action_enabled('create') && { label: _t('Duplicate'), callback: self.on_button_duplicate },
                 { label: _t('Set Default'), callback: function (item) { self.open_defaults_dialog(); } }
-            ]);
+            ]));
         }
 
         this.has_been_loaded.resolve();
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 0c1e6805f9a..fd5d26076d8 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -357,19 +357,11 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         if (!this.sidebar && this.options.$sidebar) {
             this.sidebar = new instance.web.Sidebar(this);
             this.sidebar.appendTo(this.options.$sidebar);
-            if (self.is_action_enabled('create')) {
-                this.sidebar.add_items('other', [
-                    { label: _t("Import"), callback: this.on_sidebar_import }
-                ]);
-            }
-            this.sidebar.add_items('other', [
-                { label: _t("Export"), callback: this.on_sidebar_export }
-            ]);
-            if (self.is_action_enabled('delete')) {
-                this.sidebar.add_items('other', [
-                    { label: _t('Delete'), callback: this.do_delete_selected }
-                ]);
-            }
+            this.sidebar.add_items('other', _.compact([
+                self.is_action_enabled('create') && { label: _t("Import"), callback: this.on_sidebar_import },
+                { label: _t("Export"), callback: this.on_sidebar_export },
+                self.is_action_enabled('delete') && { label: _t('Delete'), callback: this.do_delete_selected }
+            ]));
             this.sidebar.add_toolbar(this.fields_view.toolbar);
             this.sidebar.$el.hide();
         }

From 43eb05242f0026f7b8742136dcfd2801f0125187 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Sep 2012 17:20:02 +0200
Subject: [PATCH 804/999] [IMP] res.partner: add find_or_create util method for
 on-the-fly partner creation + update/improve tests

Changed parsing test to be higher level and test name_create as well

bzr revid: odo@openerp.com-20120904152002-8rra325huf5p3xek
---
 openerp/addons/base/res/res_partner.py | 15 +++++++++++++++
 openerp/addons/base/tests/test_base.py | 25 +++++++++++++++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 39ff6775cb3..1609fa2a16f 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -409,6 +409,21 @@ class res_partner(osv.osv):
                 return self.name_get(cr, uid, ids, context)
         return super(res_partner,self).name_search(cr, uid, name, args, operator=operator, context=context, limit=limit)
 
+    def find_or_create(self, cr, uid, email, context=None):
+        """ Find a partner with the given ``email`` or use :py:method:`~.name_create`
+            to create one
+            
+            :param str email: email-like string, which should contain at least one email,
+                e.g. ``"Raoul Grosbedon <r.g@grosbedon.fr>"``"""
+        assert email, 'an email is required for find_or_create to work'
+        emails = tools.email_split(email)
+        if emails:
+            email = emails[0]
+        ids = self.search(cr, uid, [('email','ilike',email)], context=context)
+        if not ids:
+            return self.name_create(cr, uid, email, context=context)[0]
+        return ids[0]
+
     def _email_send(self, cr, uid, ids, email_from, subject, body, on_error=None):
         partners = self.browse(cr, uid, ids)
         for partner in partners:
diff --git a/openerp/addons/base/tests/test_base.py b/openerp/addons/base/tests/test_base.py
index 1ff200a8b68..285af8fbf6e 100644
--- a/openerp/addons/base/tests/test_base.py
+++ b/openerp/addons/base/tests/test_base.py
@@ -8,18 +8,35 @@ class test_base(common.TransactionCase):
         super(test_base,self).setUp()
         self.res_partner = self.registry('res.partner')
 
-    def test_00_res_partner_name_parse(self):
-        parse = self.res_partner._parse_partner_name
         # samples use effective TLDs from the Mozilla public suffix
         # list at http://publicsuffix.org
-        test_samples = [
+        self.samples = [
             ('"Raoul Grosbedon" <raoul@chirurgiens-dentistes.fr> ', 'Raoul Grosbedon', 'raoul@chirurgiens-dentistes.fr'),
             ('ryu+giga-Sushi@aizubange.fukushima.jp', '', 'ryu+giga-Sushi@aizubange.fukushima.jp'),
             ('Raoul chirurgiens-dentistes.fr', 'Raoul chirurgiens-dentistes.fr', ''),
             (" Raoul O'hara  <!@historicalsociety.museum>", "Raoul O'hara", '!@historicalsociety.museum')
         ]
-        for text, name, mail in test_samples:
+
+    def test_00_res_partner_name_create(self):
+        cr, uid = self.cr, self.uid
+        parse = self.res_partner._parse_partner_name
+        for text, name, mail in self.samples:
             self.assertEqual((name,mail), parse(text), 'Partner name parsing failed')
+            partner_id, dummy = self.res_partner.name_create(cr, uid, text)
+            partner = self.res_partner.browse(cr, uid, partner_id)
+            self.assertEqual(name or mail, partner.name, 'Partner name incorrect')
+            self.assertEqual(mail or False, partner.email, 'Partner email incorrect')
+
+    def test_10_res_partner_find_or_create(self):
+        cr,uid = self.cr, self.uid
+        email = self.samples[0][0]
+        partner_id, dummy = self.res_partner.name_create(cr, uid, email)
+        found_id = self.res_partner.find_or_create(cr, uid, email)
+        self.assertEqual(partner_id, found_id, 'find_or_create failed')
+        new_id = self.res_partner.find_or_create(cr, uid, self.samples[1][0])
+        self.assertTrue(new_id > partner_id, 'find_or_create failed - should have created new one')
+        new_id2 = self.res_partner.find_or_create(cr, uid, self.samples[2][0])
+        self.assertTrue(new_id2 > new_id, 'find_or_create failed - should have created new one again')
 
 
 if __name__ == '__main__':

From ef1dba893463383aa5659971150710a270256e23 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 4 Sep 2012 17:20:12 +0200
Subject: [PATCH 805/999] [FIX] remove trailing spaces in code

bzr revid: rco@openerp.com-20120904152012-dvrpzmx94jlpos2k
---
 addons/web_kanban/static/src/js/kanban.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index cbe88ec847b..3fa675c5edd 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -633,7 +633,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
                 self.view.dataset.ids.push(id);
                 self.do_add_records(records, true);
             });
-    }    
+    }
 });
 
 instance.web_kanban.KanbanRecord = instance.web.Widget.extend({

From 9e8de4f5ed35ee1665526b3c2bc81fea6d3fe788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Sep 2012 17:34:34 +0200
Subject: [PATCH 806/999] [IMP] crm_lead: removed _send_mail_to_salesman, never
 called; base_action_rule: cleaned email_send with new message_post; cleaned
 do_action about partner_ids search; crm_action_rule: removed email_send that
 was a duplicate of the base_action_rule one; updated do_action about
 partner_ids search.

bzr revid: tde@openerp.com-20120904153434-vqnrfgwz4rq1ox5m
---
 addons/base_action_rule/base_action_rule.py | 72 ++++++---------------
 addons/crm/crm_action_rule.py               | 31 ++-------
 addons/crm/crm_lead.py                      | 18 ------
 3 files changed, 25 insertions(+), 96 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 8c115baed23..9f658b9294c 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -301,35 +301,10 @@ the rule to mark CC(mail to any other person defined in actions)."),
         }
         return self.format_body(body % data)
 
-    def email_send(self, cr, uid, obj, emails, body, emailfrom=None, context=None):
-        """ send email
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param email: pass the emails
-            @param emailfrom: Pass name the email From else False
-            @param context: A standard dictionary for contextual values """
-
-        if not emailfrom:
-            emailfrom = tools.config.get('email_from', False)
-
-        if context is None:
-            context = {}
-
-        mail_message = self.pool.get('mail.message')
+    def email_send(self, cr, uid, obj, partner_ids, body, context=None):
         body = self.format_mail(obj, body)
-        if not emailfrom:
-            if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.email:
-                emailfrom = obj.user_id.email
-
-        name = '[%d] %s' % (obj.id, tools.ustr(obj.name))
-        emailfrom = tools.ustr(emailfrom)
-        reply_to = emailfrom
-        if not emailfrom:
-            raise osv.except_osv(_('Error!'),
-                    _("No email ID found for your company address."))
-        return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model='base.action.rule', reply_to=reply_to, res_id=obj.id)
-
+        subject = '[%d] %s' % (obj.id, tools.ustr(obj.name))
+        return obj.message_post(cr, uid, obj.id, subject=name, body=body, partner_ids=partner_ids, context=context)
 
     def do_check(self, cr, uid, action, obj, context=None):
         """ check Action
@@ -416,32 +391,23 @@ the rule to mark CC(mail to any other person defined in actions)."),
         if action.act_method:
             getattr(model_obj, 'act_method')(cr, uid, [obj.id], action, context)
 
-        emails = []
-        if hasattr(obj, 'user_id') and action.act_mail_to_user:
-            if obj.user_id:
-                emails.append(obj.user_id.email)
-
-        if action.act_mail_to_watchers:
-            emails += (action.act_email_cc or '').split(',')
-        if action.act_mail_to_email:
-            emails += (action.act_mail_to_email or '').split(',')
-
-        locals_for_emails = {
-            'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
-            'obj' : obj,
-        }
-
+        # Email: find partner_ids
+        res_partner_obj = self.pool.get('res.partner')
+        partner_ids = []
+        if action.act_mail_to_user and obj._columns.get('user_id') and obj.user_id:
+            partner_ids.append(obj.user_id.partner_id.id)
+        if action.act_mail_to_watchers and action.act_email_cc:
+            partner_ids += [res_partner_obj.find_or_create(cr, uid, mail, context=context)
+                for mail in action.act_email_cc.split(',') if mail]
+        if action.act_mail_to_email and action.act_mail_to_email:
+            partner_ids += [res_partner_obj.find_or_create(cr, uid, mail, context=context)
+                for mail in action.act_mail_to_email.split(',') if mail]
         if action.act_email_to:
-            emails.append(safe_eval(action.act_email_to, {}, locals_for_emails))
-
-        emails = filter(None, emails)
-        if len(emails) and action.act_mail_body:
-            emails = list(set(emails))
-            email_from = safe_eval(action.act_email_from, {}, locals_for_emails)
-            emails = tools.email_split(','.join(filter(None, emails)))
-            email_froms = tools.email_split(email_from)
-            if email_froms:
-                self.email_send(cr, uid, obj, emails, action.act_mail_body, emailfrom=email_froms[0])
+            emails = safe_eval(action.act_email_to, {}, locals_for_emails)
+            partner_ids += [res_partner_obj.find_or_create(cr, uid, mail, context=context)
+                for mail in emails if mail]
+        if partner_ids:
+            self.email_send(cr, uid, obj, partner_ids, action.act_mail_body, context=context)
         return True
 
     def _action(self, cr, uid, ids, objects, scrit=None, context=None):
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 36700b5b6c2..ca6e02d99b5 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -45,23 +45,6 @@ class base_action_rule(osv.osv):
                                               help="Check this if you want the rule to send an email to the partner."),
     }
 
-    def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context=None):
-        mail_message = self.pool.get('mail.message')
-        body = self.format_mail(obj, body)
-        if not emailfrom:
-            if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.email:
-                emailfrom = obj.user_id.email
-
-        name = '[%d] %s' % (obj.id, tools.ustr(obj.name))
-        emailfrom = tools.ustr(emailfrom)
-        if hasattr(obj, 'section_id') and obj.section_id and obj.section_id.alias_id:
-            reply_to = obj.section_id.alias_id.name_get()[0][1]
-        else:
-            reply_to = emailfrom
-        if not emailfrom:
-            raise osv.except_osv(_('Error!'), _("There is no email for your company address."))
-        return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model=obj._name, reply_to=reply_to, res_id=obj.id)
-
     def do_check(self, cr, uid, action, obj, context=None):
         ok = super(base_action_rule, self).do_check(cr, uid, action, obj, context=context)
 
@@ -110,17 +93,15 @@ class base_action_rule(osv.osv):
 
         model_obj.write(cr, uid, [obj.id], write, context)
         super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context)
-        emails = []
 
-        if hasattr(obj, 'email_from') and action.act_mail_to_partner:
-            emails.append(obj.email_from)
-        emails = filter(None, emails)
-        if len(emails) and action.act_mail_body:
-            emails = list(set(emails))
-            self.email_send(cr, uid, obj, emails, action.act_mail_body)
+        # Post a message if act_mail_to_partner and act_mail_body
+        if not action.act_mail_body or not action.act_mail_to_partner:
+            return True
+        if obj._columns.get('email_from') and obj.email_from:
+            partner_ids = [self.pool.get('res.partner').find_or_create(cr, uid, obj.email_from, context=context)]
+            self.email_send(cr, uid, obj, partner_ids, action.act_mail_body, context=context)
         return True
 
-
     def state_get(self, cr, uid, context=None):
         """Gets available states for crm"""
         res = super(base_action_rule, self).state_get(cr, uid, context=context)
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 8117ed22c6f..881c0ace3cc 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -668,24 +668,6 @@ class crm_lead(base_stage, osv.osv):
             partner_ids[lead.id] = partner_id
         return partner_ids
 
-    def _send_mail_to_salesman(self, cr, uid, lead, context=None):
-        """
-        Send mail to salesman with updated Lead details.
-        @ lead: browse record of 'crm.lead' object.
-        """
-        #TOFIX: mail template should be used here instead of fix subject, body text.
-        message = self.pool.get('mail.message')
-        email_to = lead.user_id and lead.user_id.email
-        if not email_to:
-            return False
-
-        email_from = lead.section_id and lead.section_id.user_id and lead.section_id.user_id.email or email_to
-        partner = lead.partner_id and lead.partner_id.name or lead.partner_name
-        subject = "lead %s converted into opportunity" % lead.name
-        body = "Info \n Id : %s \n Subject: %s \n Partner: %s \n Description : %s " % (lead.id, lead.name, lead.partner_id.name, lead.description)
-        return message.schedule_with_attach(cr, uid, email_from, [email_to], subject, body)
-
-
     def allocate_salesman(self, cr, uid, ids, user_ids, team_id=False, context=None):
         index = 0
         for lead_id in ids:

From 39bd8f7595d83761847a5aa7dd7d2f73726cb56a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Sep 2012 17:49:16 +0200
Subject: [PATCH 807/999] [FIX] base_status: fix deprecated
 mail_message.schedule_with_attach -> message_port

bzr revid: odo@openerp.com-20120904154916-6y3chb54u0ypheog
---
 addons/base_status/base_stage.py | 74 +++++++++++---------------------
 1 file changed, 25 insertions(+), 49 deletions(-)

diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 4cbb039490e..529e70fdb49 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -297,55 +297,31 @@ class base_stage(object):
                 destination=False)
 
     def remind_user(self, cr, uid, ids, context=None, attach=False, destination=True):
-        mail_message = self.pool.get('mail.message')
-        for case in self.browse(cr, uid, ids, context=context):
-            if not destination and not case.email_from:
-                return False
-            if not case.user_id.email:
-                return False
-            if destination and case.section_id.user_id:
-                case_email = case.section_id.user_id.email
-            else:
-                case_email = case.user_id.email
-
-            src = case_email
-            dest = case.user_id.email or ""
-            body = case.description or ""
-            for message in case.message_ids:
-                if message.email_from and message.body:
-                    body = message.body
-                    break
-
-            if not destination:
-                src, dest = dest, case.email_from
-                if body and case.user_id.signature:
-                    if body:
-                        body += '\n\n%s' % (case.user_id.signature)
-                    else:
-                        body = '\n\n%s' % (case.user_id.signature)
-
-            body = self.format_body(body)
-
-            attach_to_send = {}
-
-            if attach:
-                attach_ids = self.pool.get('ir.attachment').search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', case.id)])
-                attach_to_send = self.pool.get('ir.attachment').read(cr, uid, attach_ids, ['datas_fname', 'datas'])
-                attach_to_send = dict(map(lambda x: (x['datas_fname'], base64.decodestring(x['datas'])), attach_to_send))
-
-            # Send an email
-            subject = "Reminder: [%s] %s" % (str(case.id), case.name, )
-            mail_message.schedule_with_attach(cr, uid,
-                src,
-                [dest],
-                subject,
-                body,
-                model=self._name,
-                reply_to=case.section_id.reply_to,
-                res_id=case.id,
-                attachments=attach_to_send,
-                context=context
-            )
+        if 'message_post' in self:
+            for case in self.browse(cr, uid, ids, context=context):
+                if destination:
+                    recipient_id = case.user_id.partner_id.id
+                else:
+                    if not case.email_from:
+                        return False
+                    recipient_id = self.pool.get('res.partner').find_or_create(cr, uid, case.email_from, context=context)
+                
+                body = case.description or ""
+                for message in case.message_ids:
+                    if message.type == 'email' and message.body:
+                        body = message.body
+                        break
+                body = self.format_body(body)
+                attach_to_send = {}
+                if attach:
+                    attach_ids = self.pool.get('ir.attachment').search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', case.id)])
+                    attach_to_send = self.pool.get('ir.attachment').read(cr, uid, attach_ids, ['datas_fname', 'datas'])
+                    attach_to_send = dict(map(lambda x: (x['datas_fname'], x['datas'].decode('base64')), attach_to_send))
+ 
+                subject = "Reminder: [%s] %s" % (case.id, case.name)
+                self.message_post(cr, uid, case.id, body=body,
+                    subject=subject, attachments=attach_to_send, 
+                    partner_ids=[recipient_id], context=context)
         return True
 
     def _check(self, cr, uid, ids=False, context=None):

From c0ac0611d1192d5a047a9119419fd6e4ef465808 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Sep 2012 17:50:23 +0200
Subject: [PATCH 808/999] [IMP] misc bits - lint

bzr revid: odo@openerp.com-20120904155023-hchxi9jqemvqulpy
---
 addons/mail/mail_thread.py            | 2 +-
 addons/project_issue/project_issue.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 5bd81e3ccff..76787a8ac02 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -599,7 +599,7 @@ class mail_thread(osv.AbstractModel):
 
         values = kwargs
         values.update( {
-            'model': thread_id and context.get('thread_model', self._name) or False,
+            'model': context.get('thread_model', self._name) if thread_id else False,
             'res_id': thread_id or False,
             'body': body,
             'subject': subject,
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 9cc97ec470b..22384a12a10 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -363,7 +363,6 @@ class project_issue(base_stage, osv.osv):
         return super(project_issue, self).write(cr, uid, ids, vals, context)
 
     def onchange_task_id(self, cr, uid, ids, task_id, context=None):
-        result = {}
         if not task_id:
             return {'value':{}}
         task = self.pool.get('project.task').browse(cr, uid, task_id, context=context)

From 20c4bcf9fc978ee4a9ba81d7e1e471f4ccb4e6e1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Sep 2012 17:53:52 +0200
Subject: [PATCH 809/999] [REVERT] {crm,base}_action_rule: revert previous
 attempt to fix deprecated schedule_with_attach

bzr revid: odo@openerp.com-20120904155352-shna0b9042wfs0gt
---
 addons/base_action_rule/base_action_rule.py | 72 +++++++++++++++------
 addons/crm/crm_action_rule.py               | 31 +++++++--
 2 files changed, 78 insertions(+), 25 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 9f658b9294c..8c115baed23 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -301,10 +301,35 @@ the rule to mark CC(mail to any other person defined in actions)."),
         }
         return self.format_body(body % data)
 
-    def email_send(self, cr, uid, obj, partner_ids, body, context=None):
+    def email_send(self, cr, uid, obj, emails, body, emailfrom=None, context=None):
+        """ send email
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param email: pass the emails
+            @param emailfrom: Pass name the email From else False
+            @param context: A standard dictionary for contextual values """
+
+        if not emailfrom:
+            emailfrom = tools.config.get('email_from', False)
+
+        if context is None:
+            context = {}
+
+        mail_message = self.pool.get('mail.message')
         body = self.format_mail(obj, body)
-        subject = '[%d] %s' % (obj.id, tools.ustr(obj.name))
-        return obj.message_post(cr, uid, obj.id, subject=name, body=body, partner_ids=partner_ids, context=context)
+        if not emailfrom:
+            if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.email:
+                emailfrom = obj.user_id.email
+
+        name = '[%d] %s' % (obj.id, tools.ustr(obj.name))
+        emailfrom = tools.ustr(emailfrom)
+        reply_to = emailfrom
+        if not emailfrom:
+            raise osv.except_osv(_('Error!'),
+                    _("No email ID found for your company address."))
+        return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model='base.action.rule', reply_to=reply_to, res_id=obj.id)
+
 
     def do_check(self, cr, uid, action, obj, context=None):
         """ check Action
@@ -391,23 +416,32 @@ the rule to mark CC(mail to any other person defined in actions)."),
         if action.act_method:
             getattr(model_obj, 'act_method')(cr, uid, [obj.id], action, context)
 
-        # Email: find partner_ids
-        res_partner_obj = self.pool.get('res.partner')
-        partner_ids = []
-        if action.act_mail_to_user and obj._columns.get('user_id') and obj.user_id:
-            partner_ids.append(obj.user_id.partner_id.id)
-        if action.act_mail_to_watchers and action.act_email_cc:
-            partner_ids += [res_partner_obj.find_or_create(cr, uid, mail, context=context)
-                for mail in action.act_email_cc.split(',') if mail]
-        if action.act_mail_to_email and action.act_mail_to_email:
-            partner_ids += [res_partner_obj.find_or_create(cr, uid, mail, context=context)
-                for mail in action.act_mail_to_email.split(',') if mail]
+        emails = []
+        if hasattr(obj, 'user_id') and action.act_mail_to_user:
+            if obj.user_id:
+                emails.append(obj.user_id.email)
+
+        if action.act_mail_to_watchers:
+            emails += (action.act_email_cc or '').split(',')
+        if action.act_mail_to_email:
+            emails += (action.act_mail_to_email or '').split(',')
+
+        locals_for_emails = {
+            'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
+            'obj' : obj,
+        }
+
         if action.act_email_to:
-            emails = safe_eval(action.act_email_to, {}, locals_for_emails)
-            partner_ids += [res_partner_obj.find_or_create(cr, uid, mail, context=context)
-                for mail in emails if mail]
-        if partner_ids:
-            self.email_send(cr, uid, obj, partner_ids, action.act_mail_body, context=context)
+            emails.append(safe_eval(action.act_email_to, {}, locals_for_emails))
+
+        emails = filter(None, emails)
+        if len(emails) and action.act_mail_body:
+            emails = list(set(emails))
+            email_from = safe_eval(action.act_email_from, {}, locals_for_emails)
+            emails = tools.email_split(','.join(filter(None, emails)))
+            email_froms = tools.email_split(email_from)
+            if email_froms:
+                self.email_send(cr, uid, obj, emails, action.act_mail_body, emailfrom=email_froms[0])
         return True
 
     def _action(self, cr, uid, ids, objects, scrit=None, context=None):
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index ca6e02d99b5..36700b5b6c2 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -45,6 +45,23 @@ class base_action_rule(osv.osv):
                                               help="Check this if you want the rule to send an email to the partner."),
     }
 
+    def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context=None):
+        mail_message = self.pool.get('mail.message')
+        body = self.format_mail(obj, body)
+        if not emailfrom:
+            if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.email:
+                emailfrom = obj.user_id.email
+
+        name = '[%d] %s' % (obj.id, tools.ustr(obj.name))
+        emailfrom = tools.ustr(emailfrom)
+        if hasattr(obj, 'section_id') and obj.section_id and obj.section_id.alias_id:
+            reply_to = obj.section_id.alias_id.name_get()[0][1]
+        else:
+            reply_to = emailfrom
+        if not emailfrom:
+            raise osv.except_osv(_('Error!'), _("There is no email for your company address."))
+        return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model=obj._name, reply_to=reply_to, res_id=obj.id)
+
     def do_check(self, cr, uid, action, obj, context=None):
         ok = super(base_action_rule, self).do_check(cr, uid, action, obj, context=context)
 
@@ -93,15 +110,17 @@ class base_action_rule(osv.osv):
 
         model_obj.write(cr, uid, [obj.id], write, context)
         super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context)
+        emails = []
 
-        # Post a message if act_mail_to_partner and act_mail_body
-        if not action.act_mail_body or not action.act_mail_to_partner:
-            return True
-        if obj._columns.get('email_from') and obj.email_from:
-            partner_ids = [self.pool.get('res.partner').find_or_create(cr, uid, obj.email_from, context=context)]
-            self.email_send(cr, uid, obj, partner_ids, action.act_mail_body, context=context)
+        if hasattr(obj, 'email_from') and action.act_mail_to_partner:
+            emails.append(obj.email_from)
+        emails = filter(None, emails)
+        if len(emails) and action.act_mail_body:
+            emails = list(set(emails))
+            self.email_send(cr, uid, obj, emails, action.act_mail_body)
         return True
 
+
     def state_get(self, cr, uid, context=None):
         """Gets available states for crm"""
         res = super(base_action_rule, self).state_get(cr, uid, context=context)

From f5bc9db80c941df4b07630e7aa746f9c98388cb7 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Sep 2012 18:05:12 +0200
Subject: [PATCH 810/999] [FIX] {crm,base}_action_rule: new attempt to fix
 deprecated schedule_with_attach

bzr revid: odo@openerp.com-20120904160512-vg7np7tg83jlmyzp
---
 addons/base_action_rule/base_action_rule.py | 35 +++++++++------------
 addons/crm/crm_action_rule.py               | 18 +++--------
 2 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 8c115baed23..237788d689a 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -302,33 +302,26 @@ the rule to mark CC(mail to any other person defined in actions)."),
         return self.format_body(body % data)
 
     def email_send(self, cr, uid, obj, emails, body, emailfrom=None, context=None):
-        """ send email
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param email: pass the emails
-            @param emailfrom: Pass name the email From else False
-            @param context: A standard dictionary for contextual values """
-
         if not emailfrom:
-            emailfrom = tools.config.get('email_from', False)
-
-        if context is None:
-            context = {}
-
-        mail_message = self.pool.get('mail.message')
+            emailfrom = tools.config.get('email_from')
         body = self.format_mail(obj, body)
-        if not emailfrom:
-            if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.email:
-                emailfrom = obj.user_id.email
-
-        name = '[%d] %s' % (obj.id, tools.ustr(obj.name))
+        if not emailfrom and hasattr(obj, 'user_id') and obj.user_id and obj.user_id.email:
+            emailfrom = obj.user_id.email
         emailfrom = tools.ustr(emailfrom)
         reply_to = emailfrom
         if not emailfrom:
             raise osv.except_osv(_('Error!'),
-                    _("No email ID found for your company address."))
-        return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model='base.action.rule', reply_to=reply_to, res_id=obj.id)
+                                 _("Missing default email address or missing email on responsible user"))
+        return self.pool.get('mail.mail').create(cr, uid,
+                {   'email_from': emailfrom,
+                    'email_to': emails.join(','),
+                    'reply_to': reply_to,
+                    'state': 'outgoing',
+                    'subject': '[%d] %s' % (obj.id, tools.ustr(obj.name)),
+                    'body_html': '<pre>%s</pre>' % body,
+                    'res_id': obj.id,
+                    'model': obj._table
+                }, context=context)
 
 
     def do_check(self, cr, uid, action, obj, context=None):
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 36700b5b6c2..8b1ba655afc 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -46,21 +46,11 @@ class base_action_rule(osv.osv):
     }
 
     def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context=None):
-        mail_message = self.pool.get('mail.message')
-        body = self.format_mail(obj, body)
-        if not emailfrom:
-            if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.email:
-                emailfrom = obj.user_id.email
-
-        name = '[%d] %s' % (obj.id, tools.ustr(obj.name))
-        emailfrom = tools.ustr(emailfrom)
-        if hasattr(obj, 'section_id') and obj.section_id and obj.section_id.alias_id:
+        mail_id = super(base_action_rule, self).email_send(cr, uid, obj, emails, body, emailfrom=emailfrom, context=context)
+        if mail_id and hasattr(obj, 'section_id') and obj.section_id and obj.section_id.alias_id:
             reply_to = obj.section_id.alias_id.name_get()[0][1]
-        else:
-            reply_to = emailfrom
-        if not emailfrom:
-            raise osv.except_osv(_('Error!'), _("There is no email for your company address."))
-        return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model=obj._name, reply_to=reply_to, res_id=obj.id)
+            self.pool.get('mail.mail').write(cr, uid, [mail_id], {'reply_to': reply_to}, context=context)
+        return mail_id
 
     def do_check(self, cr, uid, action, obj, context=None):
         ok = super(base_action_rule, self).do_check(cr, uid, action, obj, context=context)

From 5d2172192a944e481951ceaec12c0401e9127b09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Sep 2012 18:13:46 +0200
Subject: [PATCH 811/999] [FIX] portal: schedule_with_attach is now a mail.mail
 creation immediately send.

bzr revid: tde@openerp.com-20120904161346-f3g3a3v2i3pi6jwk
---
 addons/portal/wizard/portal_wizard.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index 0260ce338fc..85f6566eba6 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -171,7 +171,7 @@ class wizard(osv.osv_memory):
                 'url': wiz.portal_id.url or _("(missing url)"),
                 'db': cr.dbname,
             }
-            mail_message_obj = self.pool.get('mail.message')
+            mail_mail_obj = self.pool.get('mail.mail')
             dest_uids = user_obj.search(cr, ROOT_UID, login_cond)
             dest_users = user_obj.browse(cr, ROOT_UID, dest_uids)
             for dest_user in dest_users:
@@ -184,10 +184,12 @@ class wizard(osv.osv_memory):
                 email_to = dest_user.email
                 subject = _(WELCOME_EMAIL_SUBJECT) % data
                 body = _(WELCOME_EMAIL_BODY) % data
-                res = mail_message_obj.schedule_with_attach(cr, uid, email_from , [email_to], subject, body, context=context)
-                if not res:
-                    _logger.warning(
-                        'Failed to send email from %s to %s', email_from, email_to)
+                mail_id = mail_mail_obj.create(cr, uid, {
+                            'email_from': email_from ,
+                            'email_to': email_to,
+                            'subject': subject,
+                            'state': 'outgoing',
+                            'body_html': '<pre>%s</pre>' % body}, context=context)
         
         return {'type': 'ir.actions.act_window_close'}
 

From 6bea3b189b549b6f9dd24ab57a9889d7a8ea4e2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Sep 2012 18:14:53 +0200
Subject: [PATCH 812/999] [FIX] share: fixed call to schedule_with_attach, as
 send_invite_email is now commented. This module will be cleaned in the next
 few days, and all invite mechanism is likely to disappear.
 scedule_with_attach is therefore commented and not really fixed.

bzr revid: tde@openerp.com-20120904161453-vq8zartows3eggtp
---
 addons/share/wizard/share_wizard.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index a0489c9c017..c6b628c395f 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -775,8 +775,8 @@ class share_wizard(osv.TransientModel):
             if res_id <= 0:
                 raise osv.except_osv(_('Record id not found'), _('The share engine has not been able to fetch a record_id for your invitation.'))
             self.pool.get(model.model).message_subscribe(cr, uid, [res_id], new_ids + existing_ids, context=context)
-            self.send_invite_email(cr, uid, wizard_data, context=context)
-            self.send_invite_note(cr, uid, model.model, res_id, wizard_data, context=context)
+            # self.send_invite_email(cr, uid, wizard_data, context=context)
+            # self.send_invite_note(cr, uid, model.model, res_id, wizard_data, context=context)
         
         # CLOSE
         #  A. Not invite: as before
@@ -820,9 +820,10 @@ class share_wizard(osv.TransientModel):
             elif tmp_idx == len(wizard_data.result_line_ids)-2:
                 body += ' and'
         body += '.'
-        return self.pool.get(model_name).message_post(cr, uid, [res_id], _('System Notification'), body, context=context)
+        return self.pool.get(model_name).message_post(cr, uid, [res_id], body=body, context=context)
     
     def send_invite_email(self, cr, uid, wizard_data, context=None):
+        # TDE Note: not updated because will disappear
         message_obj = self.pool.get('mail.message')
         notification_obj = self.pool.get('mail.notification')
         user = self.pool.get('res.users').browse(cr, UID_ROOT, uid)

From acd610f039ac75fd94b6cca9bf29bee93f92c2c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Sep 2012 18:19:56 +0200
Subject: [PATCH 813/999] [FIX] share: fixed second call to
 schedule_with_attach, in send_emails. It has been replaced by a
 mail_mail.create() and mail_mail.send().

bzr revid: tde@openerp.com-20120904161956-tw1xvl2vghndhif7
---
 addons/share/wizard/share_wizard.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index c6b628c395f..375c33b1e8c 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -856,13 +856,13 @@ class share_wizard(osv.TransientModel):
     
     def send_emails(self, cr, uid, wizard_data, context=None):
         _logger.info('Sending share notifications by email...')
-        mail_message = self.pool.get('mail.message')
+        mail_mail = self.pool.get('mail.mail')
         user = self.pool.get('res.users').browse(cr, UID_ROOT, uid)
         if not user.email:
             raise osv.except_osv(_('Email required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
         
         # TODO: also send an HTML version of this mail
-        msg_ids = []
+        mail_ids = []
         for result_line in wizard_data.result_line_ids:
             email_to = result_line.user_id.email
             if not email_to:
@@ -885,10 +885,14 @@ class share_wizard(osv.TransientModel):
             body += "--\n"
             body += _("OpenERP is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n"
                       "It is open source and can be found on http://www.openerp.com.")
-            msg_ids.append(mail_message.schedule_with_attach(cr, uid, user.email, [email_to], subject, body, model='share.wizard', context=context))
+            mail_ids.append(mail_mail.create(cr, uid, {
+                    'email_from': user.email,
+                    'email_to': email_to,
+                    'subject': subject,
+                    'body_html': '<pre>%s</pre>' % body}, context=context))
         # force direct delivery, as users expect instant notification
-        mail_message.send(cr, uid, msg_ids, context=context)
-        _logger.info('%d share notification(s) sent.', len(msg_ids))
+        mail_mail.send(cr, uid, mail_ids, context=context)
+        _logger.info('%d share notification(s) sent.', len(mail_ids))
 
     def onchange_embed_options(self, cr, uid, ids, opt_title, opt_search, context=None):
         wizard = self.browse(cr, uid, ids[0], context)

From 62cb85433bb4b5ac44fff1cc79b1ba1b475af2b3 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Sep 2012 18:21:35 +0200
Subject: [PATCH 814/999] [FIX] base_calendar: attempt to fix deprecated
 schedule_with_attach

bzr revid: odo@openerp.com-20120904162135-9a328743y387kuv9
---
 addons/base_calendar/base_calendar.py | 31 +++++++++++----------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index d560eaacd66..3f6b83bad62 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -471,18 +471,10 @@ property or property parameter."),
     def _send_mail(self, cr, uid, ids, mail_to, email_from=tools.config.get('email_from', False), context=None):
         """
         Send mail for event invitation to event attendees.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of attendee’s IDs.
         @param email_from: Email address for user sending the mail
-        @param context: A standard dictionary for contextual values
         @return: True
         """
-        if context is None:
-            context = {}
-
         company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
-        mail_message = self.pool.get('mail.message')
         for att in self.browse(cr, uid, ids, context=context):
             sign = att.sent_by_uid and att.sent_by_uid.signature or ''
             sign = '<br>'.join(sign and sign.split('\n') or [])
@@ -508,17 +500,18 @@ property or property parameter."),
                 }
                 body = html_invitation % body_vals
                 if mail_to and email_from:
-                    attach = self.get_ics_file(cr, uid, res_obj, context=context)
-                    mail_message.schedule_with_attach(cr, uid,
-                        email_from,
-                        mail_to,
-                        sub,
-                        body,
-                        attachments=attach and {'invitation.ics': attach} or None,
-                        content_subtype='html',
-                        reply_to=email_from,
-                        context=context
-                    )
+                    ics_file = self.get_ics_file(cr, uid, res_obj, context=context)
+                    vals = {'email_from': email_from,
+                            'email_to': mail_to,
+                            'state': 'outgoing',
+                            'subject': sub,
+                            'body_html': body,
+                            'auto_delete': True}
+                    if ics_file:
+                        vals['attachment_ids'] = [(0,0,{'name': 'invitation.ics',
+                                                        'datas_fname': 'invitation.ics',
+                                                        'datas': str(ics_file).encode('base64')})]
+                    self.pool.get('mail.mail').create(cr, uid, vals, context=context)
             return True
 
     def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):

From c85552b472f210a9016eced3289daa525c456ef2 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Sep 2012 18:21:40 +0200
Subject: [PATCH 815/999] [FIX] typo

bzr revid: odo@openerp.com-20120904162140-g03z16djdvbiqiiz
---
 addons/base_action_rule/base_action_rule.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 237788d689a..7e9bbacab13 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -320,7 +320,8 @@ the rule to mark CC(mail to any other person defined in actions)."),
                     'subject': '[%d] %s' % (obj.id, tools.ustr(obj.name)),
                     'body_html': '<pre>%s</pre>' % body,
                     'res_id': obj.id,
-                    'model': obj._table
+                    'model': obj._table_name,
+                    'auto_delete': True
                 }, context=context)
 
 

From 81497cdc2f65591f12175922b13bae7eb1b82999 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Sep 2012 18:36:44 +0200
Subject: [PATCH 816/999] [FIX] base_calendar: attempt to fix deprecated
 schedule_with_attach (part2)

bzr revid: odo@openerp.com-20120904163644-b0o4guocm0b7ymob
---
 addons/base_calendar/base_calendar.py | 50 +++++++--------------------
 1 file changed, 12 insertions(+), 38 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 3f6b83bad62..a6d5f6859af 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -805,7 +805,6 @@ class calendar_alarm(osv.osv):
         """
         if context is None:
             context = {}
-        mail_message = self.pool.get('mail.message')
         current_datetime = datetime.now()
         alarm_ids = self.search(cr, uid, [('state', '!=', 'done')], context=context)
 
@@ -842,36 +841,10 @@ class calendar_alarm(osv.osv):
             else:
                 re_dates = [alarm.trigger_date]
 
-            for r_date in re_dates:
-                ref = alarm.model_id.model + ',' + str(alarm.res_id)
-
-                # search for alreay sent requests
-                #if request_obj.search(cr, uid, [('trigger_date', '=', r_date), ('ref_doc1', '=', ref)], context=context):
-                    #continue
-
-                # Deactivated because of the removing of res.request
-                # TODO: when cleaning calendar module, re-add this in a new mechanism
-                #if alarm.action == 'display':
-                    #value = {
-                       #'name': alarm.name,
-                       #'act_from': alarm.user_id.id,
-                       #'act_to': alarm.user_id.id,
-                       #'body': alarm.description,
-                       #'trigger_date': r_date,
-                       #'ref_doc1': ref
-                    #}
-                    #request_id = request_obj.create(cr, uid, value)
-                    #request_ids = [request_id]
-                    #for attendee in res_obj.attendee_ids:
-                        #if attendee.user_id:
-                            #value['act_to'] = attendee.user_id.id
-                            #request_id = request_obj.create(cr, uid, value)
-                            #request_ids.append(request_id)
-                    #request_obj.request_send(cr, uid, request_ids)
-
+            if re_dates:
                 if alarm.action == 'email':
-                    sub = '[Openobject Reminder] %s' % (alarm.name)
-                    body = """
+                    sub = '[OpenERP Reminder] %s' % (alarm.name)
+                    body = """<pre>
 Event: %s
 Event Date: %s
 Description: %s
@@ -881,20 +854,21 @@ From:
 
 ----
 %s
-
+</pre>
 """  % (alarm.name, alarm.trigger_date, alarm.description, \
                         alarm.user_id.name, alarm.user_id.signature)
                     mail_to = [alarm.user_id.email]
                     for att in alarm.attendee_ids:
                         mail_to.append(att.user_id.email)
                     if mail_to:
-                        mail_message.schedule_with_attach(cr, uid,
-                            tools.config.get('email_from', False),
-                            mail_to,
-                            sub,
-                            body,
-                            context=context
-                        )
+                        vals = {
+                            'state': 'outgoing',
+                            'subject': sub,
+                            'body_html': body,
+                            'email_to': mail_to,
+                            'email_from': tools.config.get('email_from', mail_to),
+                        }
+                        self.pool.get('mail.mail').create(cr, uid, vals, context=context)
             if next_trigger_date:
                 update_vals.update({'trigger_date': next_trigger_date})
             else:

From 5126f6ff6e4ddba8fb8a99e3be03529523c7ab31 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 4 Sep 2012 18:37:25 +0200
Subject: [PATCH 817/999] wip

bzr revid: nicolas.vanhoren@openerp.com-20120904163725-ptsij09rve8j3txs
---
 addons/auth_openid/static/src/xml/auth_openid.xml     | 2 +-
 addons/board/static/src/xml/board.xml                 | 2 +-
 addons/crm/crm_lead_view.xml                          | 4 ++--
 addons/edi/static/src/xml/edi.xml                     | 2 +-
 addons/edi/static/src/xml/edi_account.xml             | 2 +-
 addons/edi/static/src/xml/edi_sale_purchase.xml       | 2 +-
 addons/hr/hr_view.xml                                 | 2 +-
 addons/hr_recruitment/hr_recruitment_view.xml         | 4 ++--
 addons/mail/mail_group_view.xml                       | 2 +-
 addons/mail/static/src/xml/mail.xml                   | 6 +++---
 addons/mail/static/src/xml/mail_followers.xml         | 2 +-
 addons/note/note_view.xml                             | 2 +-
 addons/plugin_outlook/plugin_outlook.xml              | 2 +-
 addons/plugin_thunderbird/plugin_thunderbird.xml      | 2 +-
 addons/point_of_sale/static/src/xml/pos.xml           | 2 +-
 addons/portal_crm/wizard/contact_view.xml             | 4 ++--
 addons/portal_hr_employees/hr_employee_view.xml       | 2 +-
 addons/product/product_view.xml                       | 2 +-
 addons/project/project_view.xml                       | 6 +++---
 addons/project_issue/project_issue_view.xml           | 4 ++--
 addons/stock/product_view.xml                         | 2 +-
 addons/survey/survey_view.xml                         | 2 +-
 addons/web_linkedin/web_linkedin_view.xml             | 2 +-
 addons/web_shortcuts/static/src/xml/web_shortcuts.xml | 2 +-
 24 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/addons/auth_openid/static/src/xml/auth_openid.xml b/addons/auth_openid/static/src/xml/auth_openid.xml
index aa61d161657..8c297320759 100644
--- a/addons/auth_openid/static/src/xml/auth_openid.xml
+++ b/addons/auth_openid/static/src/xml/auth_openid.xml
@@ -4,7 +4,7 @@
 
     <t t-extend="Login">
         <t t-jquery=".oe_login .oe_login_logo" t-operation="after">
-            <ul class="openid_providers">
+            <ul class="openid_providers oe_semantic_html_override_ul">
                 <li><a href="#login,password" title="Password" data-url="" id="btn_password">Password</a></li>
                 <li><a href="#google" title="Google" data-url="https://www.google.com/accounts/o8/id">Google</a></li>
                 <li><a href="#googleapps" title="Google Apps" data-url="https://www.google.com/accounts/o8/site-xrds?hd={id}">Google</a></li>
diff --git a/addons/board/static/src/xml/board.xml b/addons/board/static/src/xml/board.xml
index b2363cafd53..3cd7090f1e0 100644
--- a/addons/board/static/src/xml/board.xml
+++ b/addons/board/static/src/xml/board.xml
@@ -36,7 +36,7 @@
     </div>
 </t>
 <t t-name="DashBoard.layouts">
-    <div class="oe_dashboard_layout_selector">
+    <div class="oe_dashboard_layout_selector oe_semantic_html_override">
         <p>
             <strong>Choose dashboard layout</strong>
         </p>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6a715893a17..0575b17b36e 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -299,7 +299,7 @@
                     <field name="needaction_pending"/>
                     <templates>
                         <t t-name="lead_details">
-                            <ul class="oe_kanban_tooltip">
+                            <ul class="oe_kanban_tooltip oe_semantic_html_override_ul">
                                 <li t-if="record.phone.raw_value"><b>Phone:</b> <field name="phone"/></li>
                                 <li><b>Probability:</b> <field name="probability"/>%%</li>
                                 <li><b>Creation date:</b> <field name="create_date"/></li>
@@ -308,7 +308,7 @@
                         </t>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
-                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban oe_semantic_html_override">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
                                         <li><a type="edit" >Edit...</a></li>
diff --git a/addons/edi/static/src/xml/edi.xml b/addons/edi/static/src/xml/edi.xml
index 88e09824b9b..111cb6d9d26 100644
--- a/addons/edi/static/src/xml/edi.xml
+++ b/addons/edi/static/src/xml/edi.xml
@@ -6,7 +6,7 @@
     <t t-call="WebClient"/>
 </t>
 <t t-name="EdiView">
-    <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" id="oe_app" class="oe-application oe_forms">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" id="oe_app" class="oe-application oe_forms oe_semantic_html_override">
     <tr>
         <td colspan="2" valign="top" id="oe_header" class="header">
             <div> <a href="/" class="company_logo_link">
diff --git a/addons/edi/static/src/xml/edi_account.xml b/addons/edi/static/src/xml/edi_account.xml
index 3ce1daebf93..4dea048a02c 100644
--- a/addons/edi/static/src/xml/edi_account.xml
+++ b/addons/edi/static/src/xml/edi_account.xml
@@ -151,7 +151,7 @@
                      reference <strong><t t-esc="doc.internal_number"/></strong> on the transfer:
                      <br/><br/>
                 </p>
-                <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
+                <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested oe_semantic_html_override_ul">
                 <t t-foreach="doc.company_address.bank_ids" t-as="bank_info">
                     <li><t t-esc="bank_info[1]"/></li>
                 </t>
diff --git a/addons/edi/static/src/xml/edi_sale_purchase.xml b/addons/edi/static/src/xml/edi_sale_purchase.xml
index 8d6bab67761..b2763c363b9 100644
--- a/addons/edi/static/src/xml/edi_sale_purchase.xml
+++ b/addons/edi/static/src/xml/edi_sale_purchase.xml
@@ -151,7 +151,7 @@
                      reference <strong><t t-esc="doc.name"/></strong> on the transfer:
                      <br/><br/>
                 </p>
-                <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
+                <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested oe_semantic_html_override_ul">
                 <t t-foreach="doc.company_address.bank_ids" t-as="bank_info">
                     <li><t t-esc="bank_info[1]"/></li>
                 </t>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index e8ed1d61157..d126c455d0b 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -128,7 +128,7 @@
                 <field name="last_login"/>
                 <templates>
                     <t t-name="kanban-box">
-                        <div class="oe_employee_vignette">
+                        <div class="oe_employee_vignette oe_semantic_html_override">
                             <div class="oe_employee_image">
                                 <a type="open"><img t-att-src="kanban_image('hr.employee', 'image_medium', record.id.value)" class="oe_employee_picture"/></a>
                             </div>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index d1866f124af..e4fbc0902f4 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -271,14 +271,14 @@
                 <field name="categ_ids"/>
                 <templates>
                     <t t-name="kanban-tooltip">
-                        <ul class="oe_kanban_tooltip">
+                        <ul class="oe_kanban_tooltip oe_semantic_html_override_ul">
                             <li t-if="record.type_id.raw_value"><b>Degree:</b> <field name="type_id"/></li>
                             <li t-if="record.partner_id.raw_value"><b>Contact:</b> <field name="partner_id"/></li>
                             <li t-if="record.department_id.raw_value"><b>Departement:</b> <field name="department_id"/></li>
                         </ul>
                     </t>
                     <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
                             <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                 <span class="oe_e">i</span>
                                 <ul class="oe_dropdown_menu">
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index d83b32d7afb..2b5e9b340af 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -23,7 +23,7 @@
                             </div>
                         </t>
                         <t t-name="kanban-box">
-                            <div t-attf-class="{record.message_is_follower.raw_value} oe_group_vignette">
+                            <div t-attf-class="{record.message_is_follower.raw_value} oe_group_vignette oe_semantic_html_override">
                                 <div class="oe_group_image">
                                     <a type="open"><img t-att-src="kanban_image('mail.group', 'image_medium', record.id.value)" class="oe_group_photo" tooltip="kanban-description"/></a>
                                 </div>
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f67c4e8676f..b44cb2e8ae7 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -99,7 +99,7 @@
         container, holding the composition form. Then come the various
         messages. Then comes the 'more' button.
         -->
-    <ul t-name="mail.thread" class="oe_mail oe_mail_thread">
+    <ul t-name="mail.thread" class="oe_mail oe_mail_thread oe_semantic_html_override">
         <div class="oe_mail_thread_action">
             <!-- contains the composition box (form + image) -->
             <t t-call="mail.compose_message"/>
@@ -114,12 +114,12 @@
 
     <!-- default layout -->
     <li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
-        <div t-attf-class="oe_mail_msg_#{record.type}">
+        <div t-attf-class="oe_mail_msg_#{record.type} oe_semantic_html_override">
             <img class="oe_mail_icon oe_mail_frame oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
                 <!-- dropdown menu with message options and actions -->
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">
-                    <ul class="oe_dropdown_menu">
+                    <ul class="oe_dropdown_menuoe_semantic_html_override_ul">
                         <t t-if="display['show_delete']">
                                 <li t-if="record.is_author"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                         </t>
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 53c899b9569..829242150ef 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -5,7 +5,7 @@
         followers main template
         Template used to display the followers and the actions in a record.
         -->
-    <div t-name="mail.followers" class="oe_mail_recthread_aside">
+    <div t-name="mail.followers" class="oe_mail_recthread_aside oe_semantic_html_override">
         <div class="oe_mail_recthread_actions">
             <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
             <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index a7c17a29869..04b5553e692 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -57,7 +57,7 @@
           <field name="follower_ids"/>
           <templates>
             <t t-name="kanban-box">
-              <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+              <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
                 <!-- dropdown menu -->
                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                   <span class="oe_e">í</span>
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index e99fbf72b6d..99751af1469 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -19,7 +19,7 @@
                         <separator string="Installation and Configuration Steps"/>
                         <p>Click on the link above to download the installer for either 32 or 64 bits, and execute it.</p>
                         <p>System requirements:</p>
-                        <ul>
+                        <ul class="oe_semantic_html_override_ul">
                             <li>1. MS Outlook 2005 or above.</li>
                             <li>2. MS .Net Framework 3.5 or above.</li>
                         </ul>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 5ea5fc38219..b41e552d327 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -20,7 +20,7 @@
                         </group>
                         <separator string="Installation and Configuration Steps"/>
                         <p>Thunderbird plugin installation:</p>
-                        <ul>
+                        <ul class="oe_semantic_html_override_ul">
                             <li>1. Save the Thunderbird plug-in.</li>
                             <li>2. From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li>
                             <li>3. Select the plug-in (the file named openerp_plugin.xpi).</li>
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index bbe278758d5..ab5f99a149e 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -4,7 +4,7 @@
 <templates id="template" xml:space="preserve">
 
     <t t-name="PosWidget">
-        <div class="point-of-sale">
+        <div class="point-of-sale oe_semantic_html_override">
             <div id="topheader">
                 <div id="branding">
                     <img src="/point_of_sale/static/src/img/logo.png" />
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 1776632d7ab..c70319b9957 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -40,14 +40,14 @@
                                             <templates>
                                                 <t t-name="kanban-box">
                                                     <h4><field name="name"/></h4>
-                                                    <ul class="oe_portal_crm_address">
+                                                    <ul class="oe_portal_crm_address oe_semantic_html_override_ul">
                                                         <li t-if="record.street"><field name="street"/></li>
                                                         <li t-if="record.street2"><field name="street2"/></li>
                                                         <li t-if="record.zip"><field name="zip"/></li>
                                                         <li t-if="record.city"><field name="city"/></li>
                                                         <li t-if="record.country_id"><field name="country_id"/></li>
                                                     </ul>
-                                                    <ul class="oe_portal_crm_contact_info">
+                                                    <ul class="oe_portal_crm_contact_info oe_semantic_html_override_ul">
                                                         <li t-if="record.phone"><field name="phone"/></li>
                                                         <li t-if="record.email.raw_value">
                                                             <a title="Mail" t-att-href="'mailto:'+record.email.value">
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index dc1b1bae56c..5bc3915658f 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -32,7 +32,7 @@
 
                             <templates>
                                 <t t-name="kanban-box">
-                                    <div class="oe_employee_vignette">
+                                    <div class="oe_employee_vignette oe_semantic_html_override">
                                         <div class="oe_employee_image">
                                             <img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/>
                                         </div>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ae769528d3c..d75fec3861b 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -200,7 +200,7 @@
                     <field name="list_price"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div class="oe_kanban_vignette">
+                            <div class="oe_kanban_vignette oe_semantic_html_override">
                                 <a type="open"><img t-att-src="kanban_image('product.product', 'image_small', record.id.value)" class="oe_kanban_image"/></a>
                                 <div class="oe_kanban_details">
                                     <h4>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 56d1b27561c..c30efb6a866 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -232,8 +232,8 @@
                     <field name="alias_domain"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click">
-                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click oe_semantic_html_override">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban oe_semantic_html_override">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
                                         <li><a type="edit">Edit...</a></li>
@@ -535,7 +535,7 @@
                     <field name="categ_ids"/>
                     <templates>
                     <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
                             <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                 <span class="oe_e">í</span>
                                 <ul class="oe_dropdown_menu">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 75bf50b23a4..80c19907ef3 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -247,13 +247,13 @@
                     <field name="date_deadline"/>
                     <templates>
                         <t t-name="kanban-tooltip">
-                           <ul class="oe_kanban_tooltip">
+                           <ul class="oe_kanban_tooltip oe_semantic_html_override_ul">
                               <li><b>Project:</b> <field name="project_id"/></li>
                               <li><b>Category:</b> <field name="categ_ids"/></li>
                            </ul>
                         </t>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 2e0eef44da9..66d61ea3054 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -200,7 +200,7 @@
                         <t t-esc="record.delivery_count.value"/> Deliveries
                     </a>
                 </xpath>
-                <ul position="inside">
+                <ul position="inside" class="oe_semantic_html_override_ul">
                     <li t-if="record.type.raw_value != 'service'">On hand: <field name="qty_available"/> <field name="uom_id"/></li>
                     <li t-if="record.type.raw_value != 'service'">Available: <field name="virtual_available"/> <field name="uom_id"/></li>
                 </ul>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index b8c6f97e45b..1571089e81e 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -298,7 +298,7 @@
                     <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_semantic_html_override">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
diff --git a/addons/web_linkedin/web_linkedin_view.xml b/addons/web_linkedin/web_linkedin_view.xml
index 8b4fa617bf3..5fb9a916f16 100644
--- a/addons/web_linkedin/web_linkedin_view.xml
+++ b/addons/web_linkedin/web_linkedin_view.xml
@@ -18,7 +18,7 @@
             <field name="model">sale.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <div name="linkedin" position="inside">
+                <div name="linkedin" position="inside" class="oe_semantic_html_override">
                     <form string="Configure Linkedin" version="7.0" class="oe_form_configuration">
                         <p>
                             To use the LinkedIn module with this database, an API Key is required. Please follow this procedure:
diff --git a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
index 0b9701f9f1a..63055d9b47a 100644
--- a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
+++ b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
@@ -3,7 +3,7 @@
 -->
 <templates id="template" xml:space="preserve">
 <t t-name="Systray.Shortcuts">
-    <div class="oe_systray_shortcuts oe_topbar_item oe_dropdown_toggle">
+    <div class="oe_systray_shortcuts oe_topbar_item oe_dropdown_toggle oe_semantic_html_override">
         <span class="oe_e oe_star_off">7</span>
         <ul class="oe_systray_shortcuts_items oe_dropdown_menu"/>
     </div>

From 904f66730c118abbb67da2002e39363223fd55f8 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 4 Sep 2012 18:40:07 +0200
Subject: [PATCH 818/999] fix

bzr revid: nicolas.vanhoren@openerp.com-20120904164007-u45aey3w6zssht0w
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b44cb2e8ae7..afb1323c62f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -119,7 +119,7 @@
             <div class="oe_mail_msg_content">
                 <!-- dropdown menu with message options and actions -->
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">
-                    <ul class="oe_dropdown_menuoe_semantic_html_override_ul">
+                    <ul class="oe_dropdown_menu">
                         <t t-if="display['show_delete']">
                                 <li t-if="record.is_author"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                         </t>

From 76031179e40e93ee20853ab4e0623611bfba0a28 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 4 Sep 2012 18:41:53 +0200
Subject: [PATCH 819/999] fix

bzr revid: nicolas.vanhoren@openerp.com-20120904164153-iu7grb5rvv2f6gxv
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c30efb6a866..67c9b2f16a3 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -233,7 +233,7 @@
                     <templates>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click oe_semantic_html_override">
-                                <div class="oe_dropdown_toggle oe_dropdown_kanban oe_semantic_html_override">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
                                         <li><a type="edit">Edit...</a></li>

From 006ed33ff344784dd84c3458b6cef41f6db4ea7a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 4 Sep 2012 18:42:41 +0200
Subject: [PATCH 820/999] wip

bzr revid: nicolas.vanhoren@openerp.com-20120904164241-lrvvsj5i7axni5ng
---
 addons/web/static/src/css/Makefile            |  2 +-
 addons/web/static/src/css/base.css            | 97 +++++++++++++++++--
 addons/web/static/src/css/base.sass           | 34 +++++--
 addons/web/static/src/xml/base.xml            |  2 +-
 addons/web_graph/static/src/xml/web_graph.xml |  2 +-
 .../web_kanban/static/src/xml/web_kanban.xml  |  2 +-
 6 files changed, 121 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile
index eca044497ef..d6b4f4b2fc8 100644
--- a/addons/web/static/src/css/Makefile
+++ b/addons/web/static/src/css/Makefile
@@ -1,3 +1,3 @@
 base.css: base.sass
-	sass -t expanded base.sass base.css
+	sass --trace -t expanded base.sass base.css
 
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index de30642dfd6..09432786ca0 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -97,13 +97,6 @@
   background-image: -o-linear-gradient(top, #eeeeee, #dedede);
   background-image: linear-gradient(to bottom, #eeeeee, #dedede);
 }
-.openerp ul, .openerp li, .openerp ol {
-  margin: 0;
-  padding: 0;
-}
-.openerp li {
-  list-style-type: none;
-}
 .openerp input, .openerp textarea, .openerp select {
   padding: 2px 4px;
   border: 1px solid #cccccc;
@@ -118,6 +111,24 @@
 .openerp h4 {
   margin: 4px 0;
 }
+.openerp .oe_semantic_html_override_ul {
+  margin: 0;
+  padding: 0;
+}
+.openerp .oe_semantic_html_override_ul li {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
+.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol {
+  margin: 0;
+  padding: 0;
+}
+.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
 .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
   display: inline-block;
   border: 1px solid #ababab;
@@ -589,6 +600,22 @@
   padding: 0 16px;
   list-style: none;
   zoom: 1;
+  margin: 0;
+  padding: 0;
+}
+.openerp .oe_notebook li {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
+.openerp .oe_notebook ul, .openerp .oe_notebook ol {
+  margin: 0;
+  padding: 0;
+}
+.openerp .oe_notebook ul li, .openerp .oe_notebook ol li {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
 }
 .openerp .oe_notebook.ui-corner-all {
   -moz-border-radius: 0;
@@ -893,6 +920,15 @@
   -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
   box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
 }
+.openerp .oe_login .oe_login_pane ul, .openerp .oe_login .oe_login_pane ol {
+  margin: 0;
+  padding: 0;
+}
+.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
 .openerp .oe_login .oe_login_pane h2 {
   margin-top: 0;
   font-size: 18px;
@@ -972,6 +1008,15 @@
   background-image: -o-linear-gradient(top, #646060, #262626);
   background-image: linear-gradient(to bottom, #646060, #262626);
 }
+.openerp .oe_topbar ul, .openerp .oe_topbar ol {
+  margin: 0;
+  padding: 0;
+}
+.openerp .oe_topbar ul li, .openerp .oe_topbar ol li {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
 .openerp .oe_topbar .oe_topbar_item {
   display: block;
   padding: 5px 10px 7px;
@@ -1044,6 +1089,15 @@
   text-shadow: 0 1px 1px white;
   padding-bottom: 16px;
 }
+.openerp .oe_leftbar ul, .openerp .oe_leftbar ol {
+  margin: 0;
+  padding: 0;
+}
+.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
 .openerp a.oe_logo {
   width: 220px;
   display: block;
@@ -1246,6 +1300,15 @@
   width: 100%;
   table-layout: fixed;
 }
+.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header ol {
+  margin: 0;
+  padding: 0;
+}
+.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
 .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row {
   clear: both;
   text-shadow: 0 1px 1px white;
@@ -1946,7 +2009,7 @@
   max-width: 650px;
   margin: 0 0 10px 0;
 }
-.openerp .oe_form div.oe_form_configuration p {
+.openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol {
   color: #aaaaaa;
   max-width: 650px;
 }
@@ -2376,6 +2439,24 @@
 .openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option {
   margin-top: 10px;
 }
+.openerp .oe_form_field_status {
+  margin: 0;
+  padding: 0;
+}
+.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol {
+  margin: 0;
+  padding: 0;
+}
+.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
+.openerp .oe_form_field_status li {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
 .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
   display: none;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 82c8e1a57ab..40766085008 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -124,6 +124,18 @@ $sheet-max-width: 860px
         content: $icon-name
         color: $color
 
+@mixin ul-html-override()
+    margin: 0
+    padding: 0
+    li
+        margin: 0
+        padding: 0
+        list-style-type: none
+
+@mixin semantic-html-override()
+    ul, ol
+        @include ul-html-override()
+
 // }}}
 
 @media print
@@ -178,11 +190,6 @@ $sheet-max-width: 860px
         @include vertical-gradient(#f0f0fa, #eeeef6)
     .zebra tbody tr:hover td
         @include vertical-gradient(#eee, #dedede)
-    ul, li, ol
-        margin: 0
-        padding: 0
-    li
-        list-style-type: none
     input, textarea, select
         padding: 2px 4px
         border: 1px solid #ccc
@@ -192,6 +199,10 @@ $sheet-max-width: 860px
         vertical-align: middle
     h4
         margin: 4px 0
+    .oe_semantic_html_override
+        @include semantic-html-override
+    .oe_semantic_html_override_ul
+        @include ul-html-override
     // }}}
     // Button style {{{
     a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
@@ -497,6 +508,8 @@ $sheet-max-width: 860px
         padding: 0 16px
         list-style: none
         zoom: 1
+        @include ul-html-override
+        @include semantic-html-override
     .oe_notebook.ui-corner-all
         @include radius(0)
     .oe_notebook:before, .oe_notebook:after
@@ -716,6 +729,7 @@ $sheet-max-width: 860px
             text-align: left
             @include radius(8px)
             @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9))
+            @include semantic-html-override
             h2
                 margin-top: 0
                 font-size: 18px
@@ -781,6 +795,7 @@ $sheet-max-width: 860px
         height: 31px
         border-top: solid 1px #d3d3d3
         @include vertical-gradient(#646060, #262626)
+        @include semantic-html-override
         .oe_topbar_item
             display: block
             padding: 5px 10px 7px
@@ -831,6 +846,7 @@ $sheet-max-width: 860px
         border-right: 1px solid $tag-border
         text-shadow: 0 1px 1px white
         padding-bottom: 16px
+        @include semantic-html-override
     a.oe_logo
         width: 220px
         display: block
@@ -995,6 +1011,7 @@ $sheet-max-width: 860px
         table.oe_view_manager_header
             width: 100%
             table-layout: fixed
+            @include semantic-html-override
             .oe_header_row
                 //min-height: 26px
                 //line-height: 26px
@@ -1532,7 +1549,7 @@ $sheet-max-width: 860px
             max-width: 650px
             margin: 0 0 10px 0
         div.oe_form_configuration
-            p
+            p, ul, ol
                 color: #aaa
                 max-width: 650px
             label
@@ -1848,6 +1865,11 @@ $sheet-max-width: 860px
         li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option
             margin-top: 10px
     // }}}
+    // FormView.fieldstatus {{{
+    .oe_form_field_status
+        @include semantic-html-override
+        @include ul-html-override
+    // }}}
     // FormView.one2many {{{
     .oe_form .oe_form_field_one2many > .oe_view_manager
         .oe_list_pager_single_page
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index bdfd494fdda..28f98a7b4cd 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1064,7 +1064,7 @@
     </span>
 </t>
 <t t-name="FieldStatus">
-    <ul t-att-class="widget.options.clickable ? 'oe_form_steps_clickable' : 'oe_form_steps'" t-att-style="widget.node.attrs.style"/>
+    <ul t-att-class="'oe_form_field_status ' + (widget.options.clickable ? 'oe_form_steps_clickable' : 'oe_form_steps')" t-att-style="widget.node.attrs.style"/>
 </t>
 <t t-name="FieldStatus.content">
     <t t-foreach="widget.selection" t-as="i">
diff --git a/addons/web_graph/static/src/xml/web_graph.xml b/addons/web_graph/static/src/xml/web_graph.xml
index 80b2fc16f81..e2e316b22d9 100644
--- a/addons/web_graph/static/src/xml/web_graph.xml
+++ b/addons/web_graph/static/src/xml/web_graph.xml
@@ -1,5 +1,5 @@
 <template>
-    <div t-name="GraphView" id="element-chart" class="editor-render" style="position:relative; width: 300px;">
+    <div t-name="GraphView" id="element-chart" class="oe_semantic_html_override editor-render" style="position:relative; width: 300px;">
         <a href="#" class="oe_e dropdown-menu-icon" data-toggle="dropdown" title="Graph Options">&amp;iacute;</a>
         <div class="graph_header_legend">
         </div>
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 17d45d90505..cb856ea4e28 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -30,7 +30,7 @@
 <t t-name="KanbanView.group_header">
     <td class="oe_kanban_group_header">
         <t t-if="widget.view.group_by">
-            <div class="oe_kanban_header">
+            <div class="oe_kanban_header oe_semantic_html_override">
                 <t t-if="widget.view._is_quick_create_enabled()">
                     <div class="oe_kanban_add oe_e" original-title="Quick create">]</div>
                 </t>

From d5661c50965ff648fba74b48de47215159406ff3 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Sep 2012 18:55:53 +0200
Subject: [PATCH 821/999] [FIX] survey: attempt to fix deprecated
 schedule_with_attach

bzr revid: odo@openerp.com-20120904165553-nxhbgmkpyk7imp4q
---
 .../survey/wizard/survey_send_invitation.py   | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index da439959ec5..5677a985e09 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -116,7 +116,6 @@ class survey_send_invitation(osv.osv_memory):
         existing = ""
         created = ""
         error = ""
-        user_exists = False
         new_user = []
         attachments = {}
         current_sur = survey_ref.browse(cr, uid, context.get('active_id'), context=context)
@@ -150,8 +149,14 @@ class survey_send_invitation(osv.osv_memory):
                 mail = record['mail']%{'login':partner.email, 'passwd':user.password, \
                                             'name' : partner.name}
                 if record['send_mail_existing']:
-                    mail_message.schedule_with_attach(cr, uid, record['mail_from'], [partner.email] , \
-                                     record['mail_subject_existing'] , mail, context=context)
+                    vals = {
+                        'state': 'outgoing',
+                        'subject': record['mail_subject_existing'],
+                        'body_html': '<pre>%s</pre>' % mail,
+                        'email_to': partner.email,
+                        'email_from': record['mail_from'],
+                    }
+                    self.pool.get('mail.mail').create(cr, uid, vals, context=context)
                     existing+= "- %s (Login: %s,  Password: %s)\n" % (user.name, partner.email, \
                                                                       user.password)
                 continue
@@ -160,8 +165,19 @@ class survey_send_invitation(osv.osv_memory):
             out+= partner.email + ',' + passwd + '\n'
             mail= record['mail'] % {'login' : partner.email, 'passwd' : passwd, 'name' : partner.name}
             if record['send_mail']:
-                ans = mail_message.schedule_with_attach(cr, uid, record['mail_from'], [partner.email], \
-                                       record['mail_subject'], mail, attachments=attachments, context=context)
+                vals = {
+                        'state': 'outgoing',
+                        'subject': record['mail_subject'],
+                        'body_html': '<pre>%s</pre>' % mail,
+                        'email_to': partner.email,
+                        'email_from': record['mail_from'],
+                }
+                if attachments:
+                    vals['attachment_ids'] = [(0,0,{'name': a_name,
+                                                    'datas_fname': a_name,
+                                                    'datas': str(a_content).encode('base64')})
+                                                    for a_name, a_content in attachments]
+                ans = self.pool.get('mail.mail').create(cr, uid, vals, context=context)
                 if ans:
                     res_data = {'name': partner.name or _('Unknown'),
                                 'login': partner.email,

From 7761a0f603e90fa833d6f6c2abdd806d98fd9cc6 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 4 Sep 2012 19:02:47 +0200
Subject: [PATCH 822/999] styling tweaks to red buttons

bzr revid: mit@openerp.com-20120904170247-fcqvjiy8n46zyf38
---
 addons/web/static/src/css/base.css  | 28 ++++++++++++++--------------
 addons/web/static/src/css/base.sass |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 1a1a07d0fb5..846c62f64b4 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -432,22 +432,22 @@
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
 }
 .openerp button.oe_highlight:hover {
-  background-color: #e46565;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#e46565), to(#b81e1e));
-  background-image: -webkit-linear-gradient(top, #e46565, #b81e1e);
-  background-image: -moz-linear-gradient(top, #e46565, #b81e1e);
-  background-image: -ms-linear-gradient(top, #e46565, #b81e1e);
-  background-image: -o-linear-gradient(top, #e46565, #b81e1e);
-  background-image: linear-gradient(to bottom, #e46565, #b81e1e);
+  background-color: #e25858;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#e25858), to(#ab1b1b));
+  background-image: -webkit-linear-gradient(top, #e25858, #ab1b1b);
+  background-image: -moz-linear-gradient(top, #e25858, #ab1b1b);
+  background-image: -ms-linear-gradient(top, #e25858, #ab1b1b);
+  background-image: -o-linear-gradient(top, #e25858, #ab1b1b);
+  background-image: linear-gradient(to bottom, #e25858, #ab1b1b);
 }
 .openerp button.oe_highlight:active {
-  background-color: #ab1b1b;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#ab1b1b), to(#e04848));
-  background-image: -webkit-linear-gradient(top, #ab1b1b, #e04848);
-  background-image: -moz-linear-gradient(top, #ab1b1b, #e04848);
-  background-image: -ms-linear-gradient(top, #ab1b1b, #e04848);
-  background-image: -o-linear-gradient(top, #ab1b1b, #e04848);
-  background-image: linear-gradient(to bottom, #ab1b1b, #e04848);
+  background-color: #c52020;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#c52020), to(#d22323));
+  background-image: -webkit-linear-gradient(top, #c52020, #d22323);
+  background-image: -moz-linear-gradient(top, #c52020, #d22323);
+  background-image: -ms-linear-gradient(top, #c52020, #d22323);
+  background-image: -o-linear-gradient(top, #c52020, #d22323);
+  background-image: linear-gradient(to bottom, #c52020, #d22323);
 }
 .openerp .oe_background_grey {
   background: #eeeeee !important;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 308f32e7daa..1991052180c 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -385,9 +385,9 @@ $sheet-max-width: 860px
         @include vertical-gradient(#df3f3f, #a21a1a)
         @include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset))
     button.oe_highlight:hover
-        @include vertical-gradient(lighten(#e04f4f, 5%), lighten(#a21a1a, 5%))
+        @include vertical-gradient(lighten(#e04f4f, 2%), lighten(#a21a1a, 2%))
     button.oe_highlight:active
-        @include vertical-gradient(lighten(#a21a1a, 2%), lighten(#df3f3f, 2%))
+        @include vertical-gradient(lighten(#a21a1a, 8%), darken(#df3f3f, 8%))
     .oe_background_grey
         background: #eee !important
 

From 622bb963125379c09aaed636c7696b30a5246542 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Sep 2012 19:03:30 +0200
Subject: [PATCH 823/999] [FIX] survey: attempt to fix deprecated
 schedule_with_attach (part2)

bzr revid: odo@openerp.com-20120904170330-nd6rv6jaiofb2hw3
---
 addons/survey/wizard/survey_answer.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 66098b45fa8..e2216ea8389 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -420,7 +420,17 @@ class survey_question_wiz(osv.osv_memory):
                         if user_email and resp_email:
                             user_name = user_obj.browse(cr, uid, uid, context=context).name
                             mail = "Hello " + survey_data.responsible_id.name + ",\n\n " + str(user_name) + " has given the Response Of " + survey_data.title + " Survey.\nThe Response has been attached herewith.\n\n Thanks."
-                            mail_message.schedule_with_attach(cr, uid, user_email, [resp_email], "Survey Answer Of " + str(user_name) , mail, attachments=attachments, context=context)
+                            vals = {'state': 'outgoing',
+                                    'subject': "Survey Answer Of " + user_name,
+                                    'body_html': '<pre>%s</pre>' % mail,
+                                    'email_to': [resp_email],
+                                    'email_from': user_email}
+                            if attachments:
+                                vals['attachment_ids'] = [(0,0,{'name': a_name,
+                                                                'datas_fname': a_name,
+                                                                'datas': str(a_content).encode('base64')})
+                                                                for a_name, a_content in attachments]
+                            self.pool.get('mail.mail').create(cr, uid, vals, context=context)
 
                     xml_form = etree.Element('form', {'string': _('Complete Survey Answer')})
                     etree.SubElement(xml_form, 'separator', {'string': 'Complete Survey', 'colspan': "4"})

From b9fd1cae1448af71bb3c93a1b5412e1b2c39ff5c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Sep 2012 19:08:49 +0200
Subject: [PATCH 824/999] [FIX] hr_evaluation: attempt to fix deprecated
 schedule_with_attach

bzr revid: odo@openerp.com-20120904170849-w4xdfuykz6ycor8v
---
 addons/hr_evaluation/hr_evaluation.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index def21f2b169..3508dc36d49 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -228,9 +228,13 @@ class hr_evaluation(osv.osv):
                         body = phase.mail_body % {'employee_name': child.name, 'user_signature': child.user_id.signature,
                             'eval_name': phase.survey_id.title, 'date': time.strftime('%Y-%m-%d'), 'time': time }
                         sub = phase.email_subject
-                        dest = [child.work_email]
-                        if dest:
-                           mail_message.schedule_with_attach(cr, uid, evaluation.employee_id.work_email, dest, sub, body, context=context)
+                        if child.work_email:
+                            vals = {'state': 'outgoing',
+                                    'subject': sub,
+                                    'body_html': '<pre>%s</pre>' % body,
+                                    'email_to': child.work_email,
+                                    'email_from': evaluation.employee_id.work_email}
+                            self.pool.get('mail.mail').create(cr, uid, vals, context=context)
 
         self.write(cr, uid, ids, {'state':'wait'}, context=context)
         return True

From 5e1da73b29e076c0bfe9c2740df56a68c6cd987d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Sep 2012 19:16:29 +0200
Subject: [PATCH 825/999] [FIX] account_followup: attempt to fix deprecated
 schedule_with_attach

bzr revid: odo@openerp.com-20120904171629-kdo7erx35cfsty2y
---
 .../account_followup/wizard/account_followup_print.py  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index d151d2171a4..2b573fe0275 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -213,8 +213,6 @@ class account_followup_print_all(osv.osv_memory):
         mod_obj = self.pool.get('ir.model.data')
         move_obj = self.pool.get('account.move.line')
         user_obj = self.pool.get('res.users')
-        line_obj = self.pool.get('account_followup.stat')
-        mail_message = self.pool.get('mail.message')
 
         if context is None:
             context = {}
@@ -241,7 +239,6 @@ class account_followup_print_all(osv.osv_memory):
                     if (not dest) and partner.type=='default':
                         if partner.email:
                             dest = [partner.email]
-                src = tools.config.options['email_from']
                 if not data.partner_lang:
                     body = data.email_body
                 else:
@@ -281,7 +278,12 @@ class account_followup_print_all(osv.osv_memory):
                 msg = ''
                 if dest:
                     try:
-                        mail_message.schedule_with_attach(cr, uid, src, dest, sub, body, context=context)
+                        vals = {'state': 'outgoing',
+                                'subject': sub,
+                                'body_html': '<pre>%s</pre>' % body,
+                                'email_to': dest,
+                                'email_from': data_user.email or tools.config.options['email_from']}
+                        self.pool.get('mail.mail').create(cr, uid, vals, context=context)
                         msg_sent += partner.name + '\n'
                     except Exception, e:
                         raise osv.except_osv('Error !', e )

From be78c0a018fa32982488c6ad74e1da71215d28e9 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 4 Sep 2012 19:24:36 +0200
Subject: [PATCH 826/999] fix notes css no longer applies to generic kanban

bzr revid: mit@openerp.com-20120904172436-cp6zjyizk8ir0wan
---
 addons/note/static/src/css/note.css | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
index 616f8fa71ed..7e79438b46a 100644
--- a/addons/note/static/src/css/note.css
+++ b/addons/note/static/src/css/note.css
@@ -65,9 +65,8 @@
     -moz-transform:rotate(-1deg);
 }
 
-.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card:hover,
-.openerp  .oe_kanban_column .oe_fold_column .oe_kanban_card:focus
-{
+.openerp .oe_notes .oe_kanban_column .oe_fold_column .oe_kanban_card:hover,
+.openerp .oe_notes .oe_kanban_column .oe_fold_column .oe_kanban_card:focus {
     box-shadow:10px 10px 7px rgba(0,0,0,.7);
     -moz-box-shadow:10px 10px 7px rgba(0,0,0,.7);
     -webkit-box-shadow: 10px 10px 7px rgba(0,0,0,.7);

From 84d1bd435134bd74633627814f9803b30756ceb6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 4 Sep 2012 23:57:42 +0200
Subject: [PATCH 827/999] [iMP] task form

bzr revid: fp@openerp.com-20120904215742-gdw8dcuc73qgb2id
---
 addons/project/project_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 56d1b27561c..c540e3c31df 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -445,12 +445,10 @@
                         </group>
                         <group>
                             <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                            <field name="categ_ids" widget="many2many_tags"/>
                             <field name="progress" widget="progressbar"
                                 groups="project.group_time_work_estimation_tasks"/>
                         </group>
-                        <group>
-                            <field name="categ_ids" widget="many2many_tags"/>
-                        </group>
                     </group>
                     <notebook>
                         <page string="Description">

From 7335de455d9daafce759353f352692b01296868c Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 5 Sep 2012 04:46:27 +0000
Subject: [PATCH 828/999] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120905044627-f278574oe3tqa0ja
---
 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/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_CL.po    |  4 +-
 openerp/addons/base/i18n/es_CR.po    |  4 +-
 openerp/addons/base/i18n/es_EC.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/gl.po       |  4 +-
 openerp/addons/base/i18n/gu.po       |  4 +-
 openerp/addons/base/i18n/he.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       | 70 ++++++++++++++++++++++++++--
 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 +-
 63 files changed, 191 insertions(+), 127 deletions(-)

diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po
index a1ac5d7b6b0..7edfde74afc 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: 2012-08-28 05:47+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:37+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index 2e2512f5066..cb52e2f5de9 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: 2012-08-28 05:47+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:38+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index 3cba52b55cf..3e1e29f7661 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: 2012-08-28 05:47+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:38+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 6de1f50edb6..e127ce1abbb 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: 2012-08-28 05:48+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:38+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index 06f33f26195..3d2625e4733 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: 2012-08-28 05:48+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:39+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index 452d8e8bb7b..9a3b2255563 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: 2012-08-28 05:48+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:38+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index 284f45479f8..6fc2fb91702 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: 2012-08-28 05:48+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:39+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index b4ae65d2e0c..6069a8e44ca 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: 2012-08-28 05:48+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:39+0000\n"
+"X-Generator: Launchpad (build 15901)\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 13feac0f4aa..62dc22344a7 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: 2012-08-28 05:48+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:39+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index b096d2e6ff2..301be6a019e 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: 2012-08-28 05:49+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:40+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index eda2e5cbbf9..610613af10c 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: 2012-08-28 05:49+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:40+0000\n"
+"X-Generator: Launchpad (build 15901)\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 a8ba188c7e9..ee7bd182672 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: 2012-08-28 05:53+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:45+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 2e0dabd4d72..3f0a4646113 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: 2012-08-28 05:52+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po
index 9592a170bf4..cd7ff89c0ef 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: 2012-08-28 05:53+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:45+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index d89e62f0213..f215912bd37 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: 2012-08-28 05:54+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:45+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index 0aef8f393c6..87c2b8aa483 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: 2012-08-28 05:54+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:45+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 "Language: \n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index 5c399edb8c0..0ba92adb8ff 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: 2012-08-28 05:54+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index 9062f990858..aac50f06100 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: 2012-08-28 05:49+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:39+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index 6960c42c604..792b21b6765 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: 2012-08-28 05:48+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:38+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index cb2640e275c..066fe2500d8 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: 2012-08-28 05:51+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:42+0000\n"
+"X-Generator: Launchpad (build 15901)\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 7421652096b..6d1b941729e 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: 2012-08-28 05:54+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index 23c260fa777..62d3fff7aa8 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: 2012-08-28 05:49+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:39+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 4e9b8b65314..02830069df2 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: 2012-08-28 05:49+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:40+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index a5aedfcbabd..a1f6dec55ea 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: 2012-08-28 05:49+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:40+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po
index 98078661372..7a54b30f5c7 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: 2012-08-28 05:49+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:40+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index e93ad5bc99c..63b5e98ee3e 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: 2012-08-28 05:50+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:40+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index 77ffdcfad88..a001f4b9cbe 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: 2012-08-28 05:52+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 "Language: hr\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index 6306c0c08d8..3a4de493607 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/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: 2012-08-28 05:50+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:41+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index ee8e052c65b..aa1d7e92777 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:48+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:38+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index eb8fc32dae6..20884ecd62d 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: 2012-08-28 05:50+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:41+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index abc6822f8cf..b7d55808fb0 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: 2012-08-28 05:50+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:41+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index 3a94ae3dad4..b73f9844de2 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/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: 2012-08-28 05:50+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:41+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index da0df0161b6..f67e49e8630 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: 2012-08-28 05:50+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:41+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po
index 5e103c4ddcd..3a13c7a3c19 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: 2012-08-28 05:49+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:40+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index c0ccdbb7941..331db58c6fa 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: 2012-08-28 05:50+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:41+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index b0e7ef59bb6..dff6a43c5e1 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: 2012-08-28 05:50+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:41+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index 0c8fd797b12..71314ff39ec 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: 2012-08-28 05:51+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:42+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index b358f73598c..cfc772f32f0 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: 2012-08-28 05:51+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:42+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 230c9287251..a487c340251 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: 2012-08-28 05:51+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:42+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index fb8fbd3124d..273d4002096 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: 2012-08-28 05:51+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:42+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 2349bd550f7..5a6b76b7e6a 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: 2012-08-28 05:51+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:42+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index 0b628b49d58..dbd37e376ac 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: 2012-08-28 05:48+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:39+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -921,7 +921,7 @@ msgid ""
 "The module adds google contact in partner address and add google calendar "
 "events details in Meeting"
 msgstr ""
-"Deze module voegt Google contact[ersonen in relatie adressen en voegt Google "
+"Deze module voegt Google contactersonen in relatie adressen en voegt Google "
 "agenda items details in OpenERP agenda."
 
 #. module: base
@@ -942,6 +942,15 @@ msgid ""
 "delete on objects and can check logs.\n"
 "    "
 msgstr ""
+"\n"
+"Met deze module heeft de administrator de mogelijkheid om iedere gebruikers "
+"handeling op alle objecten in het systeem te volgen.\n"
+"============================================================================="
+"=======================\n"
+"\n"
+"De administrator kan regels voor lezen, schrijven en verwijderen definiëren "
+"en logs hiervan bekijken\n"
+"    "
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
@@ -2482,6 +2491,18 @@ msgid ""
 "and categorize your interventions with a channel and a priority level.\n"
 "    "
 msgstr ""
+"\n"
+"Helpdesk management.\n"
+"===================\n"
+"\n"
+"Net als administratie en verwerking van claims is de Helpdesk en "
+"ondersteuning tool, een goed instrument\n"
+"om uw acties vast te leggen. Dit menu is meer aangepast aan de mondelinge "
+"communicatie,\n"
+"die niet noodzakelijkerwijs verband houden met een claim. Selecteer een "
+"klant, voeg notities toe\n"
+"en deel uw acties in.\n"
+"    "
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
@@ -2542,6 +2563,11 @@ msgid ""
 "\n"
 "Configure servers and trigger synchronization with its database objects.\n"
 msgstr ""
+"\n"
+"Synchronisatie van objecten.\n"
+"=======================\n"
+"Configureer servers and trigger database synchronisatie van de database "
+"objecten.\n"
 
 #. module: base
 #: model:res.country,name:base.mg
@@ -7548,6 +7574,14 @@ msgid ""
 "that exceeds minimum amount set by configuration wizard.\n"
 "    "
 msgstr ""
+"\n"
+"Dubbele controle voor inkopen, welke een minimum bedrag overstijgen.\n"
+"==========================================================\n"
+"\n"
+"Deze module past de inkoop workflow aan, zodat inkopen, welke een \n"
+"minimum bedrag overstijgen moeten worden gecontroleerd. Dit kan worden\n"
+"ingesteld in de configuratie wizard.\n"
+"    "
 
 #. module: base
 #: field:res.currency,rounding:0
@@ -10556,6 +10590,11 @@ msgid ""
 "\n"
 "Adds a Claim link to the delivery order.\n"
 msgstr ""
+"\n"
+"Maak een claim van een uitgaande levering.\n"
+"===================================\n"
+"\n"
+"Voegt claim link toe aan een uitgaande order.\n"
 
 #. module: base
 #: view:ir.model:0
@@ -11772,6 +11811,13 @@ msgid ""
 "the invoicing wizard if the delivery is to be invoiced.\n"
 "    "
 msgstr ""
+"\n"
+"Factuur wizard bij levering.\n"
+"======================\n"
+"\n"
+"Deze module start de factuur wizard, direct na het verzamelen van een\n"
+"inkomende of uitgaande levering en deze levering moet worden gefactureerd.\n"
+"    "
 
 #. module: base
 #: code:addons/orm.py:1388
@@ -13330,6 +13376,13 @@ msgid ""
 "marketing_campaign.\n"
 "    "
 msgstr ""
+"\n"
+"Demo data voor de module marketing_campaign.\n"
+"========================================\n"
+"\n"
+"maakt demo data aan, zoals leads, campagnes en segmenten voor de module "
+"marketing_campaign.\n"
+"    "
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -13962,6 +14015,17 @@ msgid ""
 "\n"
 "Used, for example, in food industries."
 msgstr ""
+"\n"
+"Traceer verschillende datums van producten and productie partijen.\n"
+"=======================================================\n"
+"\n"
+"de volgende datums kunnen worden getraceerd:\n"
+"    - THT datum\n"
+"    - Te gebruiken voor datum\n"
+"    - verwijder datum\n"
+"    - waarschuwing datum\n"
+"\n"
+"Wordt bijvoorbeeld gebruikt in de voedingsmiddelen industrie."
 
 #. module: base
 #: field:ir.exports.line,export_id:0
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index 4572bc243e8..bf6b8deabaf 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: 2012-08-28 05:54+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:45+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index 2798e4fa698..77e41253840 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: 2012-08-28 05:51+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:42+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index 81d9978b4b1..5029fad58ed 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: 2012-08-28 05:51+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index 79a1fed3fc1..3a7516a9dc2 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: 2012-08-28 05:53+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:45+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index 33e70d7897d..2f82536f1ab 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: 2012-08-28 05:52+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index 4bc5c7cfaba..365f8db415a 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: 2012-08-28 05:52+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index e04f30d17b4..d6f64ab0e58 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: 2012-08-28 05:52+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index b09a605f061..7fb3aa56052 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: 2012-08-28 05:52+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index 1458397d8aa..d7e31006f9a 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: 2012-08-28 05:47+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:38+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index 438f2ddf7fd..b409d0c1fa1 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: 2012-08-28 05:52+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 2698eaf9fe2..28f5c4fcf97 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: 2012-08-28 05:54+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index c42f59727c7..70905626277 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: 2012-08-28 05:52+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:44+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 1ba6b797df1..95cbf8b8e7e 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: 2012-08-28 05:53+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:44+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index 83667f9608c..a01448bde57 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: 2012-08-28 05:53+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:44+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index fdf6e873862..c3827b43537 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: 2012-08-28 05:53+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:44+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index 1f42e2d7096..fb53900b256 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: 2012-08-28 05:53+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:44+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index 00005a0b91a..5942b9e11a0 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: 2012-08-28 05:53+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:44+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index af94cce7bab..fbf09c542a4 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: 2012-08-28 05:53+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:44+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 13f80ce52be..c80e08c3c03 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: 2012-08-28 05:54+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index d6e460642d7..f29b2edd59e 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: 2012-08-28 05:53+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:44+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index 4e60fac3c98..9886f689f96 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: 2012-08-28 05:54+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:45+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. module: base
 #: model:res.country,name:base.sh

From 27d22d828c40168e8a177ef1964beac868e8d79f Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 5 Sep 2012 04:56:33 +0000
Subject: [PATCH 829/999] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120905044643-3lowmyxc3xu7eyq6
bzr revid: launchpad_translations_on_behalf_of_openerp-20120905045633-zku7mh6ly8z82ec4
---
 addons/base_module_record/i18n/nb.po   | 271 +++++++++++++++++++++++++
 addons/base_report_designer/i18n/nb.po | 204 +++++++++++++++++++
 addons/crm_caldav/i18n/nb.po           |  33 +++
 addons/crm_todo/i18n/nb.po             |  95 +++++++++
 addons/web/i18n/ar.po                  |  52 ++---
 addons/web/i18n/bg.po                  |  52 ++---
 addons/web/i18n/bn.po                  |  52 ++---
 addons/web/i18n/bs.po                  |  52 ++---
 addons/web/i18n/ca.po                  |  52 ++---
 addons/web/i18n/cs.po                  |  52 ++---
 addons/web/i18n/da.po                  |  52 ++---
 addons/web/i18n/de.po                  |  58 +++---
 addons/web/i18n/en_AU.po               |  52 ++---
 addons/web/i18n/en_GB.po               |  52 ++---
 addons/web/i18n/es.po                  |  52 ++---
 addons/web/i18n/es_CL.po               |  52 ++---
 addons/web/i18n/es_CR.po               |  52 ++---
 addons/web/i18n/es_EC.po               |  52 ++---
 addons/web/i18n/et.po                  |  52 ++---
 addons/web/i18n/eu.po                  |  52 ++---
 addons/web/i18n/fi.po                  |  52 ++---
 addons/web/i18n/fr.po                  |  52 ++---
 addons/web/i18n/fr_CA.po               |  52 ++---
 addons/web/i18n/gl.po                  |  52 ++---
 addons/web/i18n/gu.po                  |  52 ++---
 addons/web/i18n/hi.po                  |  52 ++---
 addons/web/i18n/hr.po                  |  52 ++---
 addons/web/i18n/hu.po                  |  52 ++---
 addons/web/i18n/id.po                  |  52 ++---
 addons/web/i18n/it.po                  |  52 ++---
 addons/web/i18n/ja.po                  |  52 ++---
 addons/web/i18n/ka.po                  |  52 ++---
 addons/web/i18n/mk.po                  |  52 ++---
 addons/web/i18n/mn.po                  |  52 ++---
 addons/web/i18n/nb.po                  |  52 ++---
 addons/web/i18n/nl.po                  |  52 ++---
 addons/web/i18n/nl_BE.po               |  52 ++---
 addons/web/i18n/pl.po                  |  52 ++---
 addons/web/i18n/pt.po                  |  52 ++---
 addons/web/i18n/pt_BR.po               |  52 ++---
 addons/web/i18n/ro.po                  |  52 ++---
 addons/web/i18n/ru.po                  |  52 ++---
 addons/web/i18n/sk.po                  |  52 ++---
 addons/web/i18n/sl.po                  |  52 ++---
 addons/web/i18n/sq.po                  |  52 ++---
 addons/web/i18n/sr@latin.po            |  52 ++---
 addons/web/i18n/sv.po                  |  52 ++---
 addons/web/i18n/tr.po                  |  52 ++---
 addons/web/i18n/uk.po                  |  52 ++---
 addons/web/i18n/zh_CN.po               |  52 ++---
 addons/web/i18n/zh_TW.po               |  52 ++---
 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         |  48 ++---
 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_EC.po      |   4 +-
 addons/web_calendar/i18n/et.po         |   4 +-
 addons/web_calendar/i18n/eu.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/hr.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/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/tr.po         |   4 +-
 addons/web_calendar/i18n/uk.po         |   4 +-
 addons/web_calendar/i18n/zh_CN.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_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_EC.po       |   4 +-
 addons/web_diagram/i18n/et.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/hr.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/mn.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/tr.po          |   4 +-
 addons/web_diagram/i18n/zh_CN.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_EC.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/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/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/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_EC.po         |   4 +-
 addons/web_graph/i18n/fi.po            |   4 +-
 addons/web_graph/i18n/fr.po            |   4 +-
 addons/web_graph/i18n/gl.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/mk.po            |   4 +-
 addons/web_graph/i18n/mn.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/tr.po            |   4 +-
 addons/web_graph/i18n/zh_CN.po         |   4 +-
 addons/web_hello/i18n/ar.po            |  20 ++
 addons/web_hello/i18n/es_CR.po         |   4 +-
 addons/web_hello/i18n/fr.po            |   4 +-
 addons/web_hello/i18n/pt_BR.po         |   4 +-
 addons/web_kanban/i18n/ar.po           |   6 +-
 addons/web_kanban/i18n/bg.po           |   6 +-
 addons/web_kanban/i18n/bn.po           |   6 +-
 addons/web_kanban/i18n/bs.po           |   6 +-
 addons/web_kanban/i18n/ca.po           |   6 +-
 addons/web_kanban/i18n/cs.po           |   6 +-
 addons/web_kanban/i18n/da.po           |   6 +-
 addons/web_kanban/i18n/de.po           |   6 +-
 addons/web_kanban/i18n/en_GB.po        |   6 +-
 addons/web_kanban/i18n/es.po           |   6 +-
 addons/web_kanban/i18n/es_CL.po        |   6 +-
 addons/web_kanban/i18n/es_CR.po        |   6 +-
 addons/web_kanban/i18n/es_EC.po        |   6 +-
 addons/web_kanban/i18n/fi.po           |   6 +-
 addons/web_kanban/i18n/fr.po           |   6 +-
 addons/web_kanban/i18n/gl.po           |   6 +-
 addons/web_kanban/i18n/hr.po           |   6 +-
 addons/web_kanban/i18n/hu.po           |   6 +-
 addons/web_kanban/i18n/it.po           |   6 +-
 addons/web_kanban/i18n/ja.po           |   6 +-
 addons/web_kanban/i18n/ka.po           |   6 +-
 addons/web_kanban/i18n/mn.po           |   6 +-
 addons/web_kanban/i18n/nl.po           |   6 +-
 addons/web_kanban/i18n/nl_BE.po        |   6 +-
 addons/web_kanban/i18n/pl.po           |   6 +-
 addons/web_kanban/i18n/pt.po           |   6 +-
 addons/web_kanban/i18n/pt_BR.po        |   6 +-
 addons/web_kanban/i18n/ro.po           |   6 +-
 addons/web_kanban/i18n/ru.po           |   6 +-
 addons/web_kanban/i18n/sr@latin.po     |   6 +-
 addons/web_kanban/i18n/sv.po           |   6 +-
 addons/web_kanban/i18n/tr.po           |   6 +-
 addons/web_kanban/i18n/zh_CN.po        |   6 +-
 addons/web_mobile/i18n/ar.po           |   4 +-
 addons/web_mobile/i18n/bg.po           |   4 +-
 addons/web_mobile/i18n/bn.po           |   4 +-
 addons/web_mobile/i18n/ca.po           |   4 +-
 addons/web_mobile/i18n/cs.po           |   4 +-
 addons/web_mobile/i18n/da.po           |   4 +-
 addons/web_mobile/i18n/de.po           |   4 +-
 addons/web_mobile/i18n/en_GB.po        |   4 +-
 addons/web_mobile/i18n/es.po           |   4 +-
 addons/web_mobile/i18n/es_CL.po        |   4 +-
 addons/web_mobile/i18n/es_CR.po        |   4 +-
 addons/web_mobile/i18n/es_EC.po        |   4 +-
 addons/web_mobile/i18n/et.po           |   4 +-
 addons/web_mobile/i18n/fi.po           |   4 +-
 addons/web_mobile/i18n/fr.po           |   4 +-
 addons/web_mobile/i18n/gl.po           |   4 +-
 addons/web_mobile/i18n/hr.po           |   4 +-
 addons/web_mobile/i18n/it.po           |   4 +-
 addons/web_mobile/i18n/ja.po           |   4 +-
 addons/web_mobile/i18n/ka.po           |   4 +-
 addons/web_mobile/i18n/mk.po           |   4 +-
 addons/web_mobile/i18n/mn.po           |   4 +-
 addons/web_mobile/i18n/nb.po           |   4 +-
 addons/web_mobile/i18n/nl.po           |   4 +-
 addons/web_mobile/i18n/nl_BE.po        |   4 +-
 addons/web_mobile/i18n/pl.po           |   4 +-
 addons/web_mobile/i18n/pt.po           |   4 +-
 addons/web_mobile/i18n/pt_BR.po        |   4 +-
 addons/web_mobile/i18n/ro.po           |   4 +-
 addons/web_mobile/i18n/ru.po           |   4 +-
 addons/web_mobile/i18n/sk.po           |   4 +-
 addons/web_mobile/i18n/sl.po           |   4 +-
 addons/web_mobile/i18n/sq.po           |   4 +-
 addons/web_mobile/i18n/sr@latin.po     |   4 +-
 addons/web_mobile/i18n/sv.po           |   4 +-
 addons/web_mobile/i18n/tr.po           |   4 +-
 addons/web_mobile/i18n/uk.po           |   4 +-
 addons/web_mobile/i18n/zh_CN.po        |   4 +-
 addons/web_process/i18n/ar.po          |   4 +-
 addons/web_process/i18n/bg.po          |   4 +-
 addons/web_process/i18n/bn.po          |   4 +-
 addons/web_process/i18n/bs.po          |   4 +-
 addons/web_process/i18n/ca.po          |   4 +-
 addons/web_process/i18n/cs.po          |   4 +-
 addons/web_process/i18n/da.po          |   4 +-
 addons/web_process/i18n/de.po          |   4 +-
 addons/web_process/i18n/en_GB.po       |   4 +-
 addons/web_process/i18n/es.po          |   4 +-
 addons/web_process/i18n/es_CL.po       |   4 +-
 addons/web_process/i18n/es_CR.po       |   4 +-
 addons/web_process/i18n/es_EC.po       |   4 +-
 addons/web_process/i18n/fi.po          |   4 +-
 addons/web_process/i18n/fr.po          |   4 +-
 addons/web_process/i18n/gl.po          |   4 +-
 addons/web_process/i18n/hr.po          |   4 +-
 addons/web_process/i18n/hu.po          |   4 +-
 addons/web_process/i18n/it.po          |   4 +-
 addons/web_process/i18n/ja.po          |   4 +-
 addons/web_process/i18n/ka.po          |   4 +-
 addons/web_process/i18n/mk.po          |   4 +-
 addons/web_process/i18n/mn.po          |   4 +-
 addons/web_process/i18n/nb.po          |   4 +-
 addons/web_process/i18n/nl.po          |   4 +-
 addons/web_process/i18n/nl_BE.po       |   4 +-
 addons/web_process/i18n/pl.po          |   4 +-
 addons/web_process/i18n/pt.po          |   4 +-
 addons/web_process/i18n/pt_BR.po       |   4 +-
 addons/web_process/i18n/ro.po          |   4 +-
 addons/web_process/i18n/ru.po          |   4 +-
 addons/web_process/i18n/sl.po          |   4 +-
 addons/web_process/i18n/sr@latin.po    |   4 +-
 addons/web_process/i18n/sv.po          |   4 +-
 addons/web_process/i18n/tr.po          |   4 +-
 addons/web_process/i18n/zh_CN.po       |   4 +-
 addons/web_rpc/i18n/es_CR.po           |   4 +-
 addons/web_tests/i18n/es_CR.po         |   4 +-
 318 files changed, 2436 insertions(+), 1811 deletions(-)
 create mode 100644 addons/base_module_record/i18n/nb.po
 create mode 100644 addons/base_report_designer/i18n/nb.po
 create mode 100644 addons/crm_caldav/i18n/nb.po
 create mode 100644 addons/crm_todo/i18n/nb.po
 create mode 100644 addons/web_hello/i18n/ar.po

diff --git a/addons/base_module_record/i18n/nb.po b/addons/base_module_record/i18n/nb.po
new file mode 100644
index 00000000000..8465596f21b
--- /dev/null
+++ b/addons/base_module_record/i18n/nb.po
@@ -0,0 +1,271 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-04 13:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,category:0
+msgid "Category"
+msgstr "Kategori"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid "Information"
+msgstr "Informasjon"
+
+#. module: base_module_record
+#: model:ir.model,name:base_module_record.model_ir_module_record
+msgid "ir.module.record"
+msgstr "ir.modul.opptak"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,info,end:0
+#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
+msgid "End"
+msgstr "Slutt"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,init:0
+#: wizard_view:base_module_record.module_record_objects,init:0
+msgid "Choose objects to record"
+msgstr "Velg objekter til opptak"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,author:0
+msgid "Author"
+msgstr "Forfatter"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
+msgid "Directory Name"
+msgstr "Navn på katalog"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
+#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Records only"
+msgstr "Bare opptak"
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_objects,info,data_kind:0
+msgid "Demo Data"
+msgstr "Demo data"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
+msgid "Filename"
+msgstr "Filnavn"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,version:0
+msgid "Version"
+msgstr "Versjon"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,info:0
+#: wizard_view:base_module_record.module_record_data,init:0
+#: wizard_view:base_module_record.module_record_data,save_yaml:0
+#: wizard_view:base_module_record.module_record_objects,init:0
+msgid "Objects Recording"
+msgstr "objekter Innspilling"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid ""
+"If you think your module could interest other people, we'd like you to "
+"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
+"it through the website or using features of the 'base_module_publish' module."
+msgstr ""
+"Hvis du tror din modul kan interessere andre mennesker, vil vi gjerne at du "
+"publisere den på http://www.openerp.com, i 'Moduler-delen. Du kan gjøre det "
+"gjennom nettstedet eller bruke funksjonene i «base_module_publish»-modulen."
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,check_date:0
+#: wizard_field:base_module_record.module_record_objects,init,check_date:0
+msgid "Record from Date"
+msgstr "Dato fra opptak"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,end:0
+#: wizard_view:base_module_record.module_record_objects,end:0
+#: wizard_view:base_module_record.module_record_objects,info:0
+#: wizard_view:base_module_record.module_record_objects,save:0
+#: wizard_view:base_module_record.module_record_objects,save_yaml:0
+msgid "Module Recording"
+msgstr "Modul innspilling"
+
+#. module: base_module_record
+#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
+#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
+msgid "Export Customizations As a Module"
+msgstr "Eksporter Tilpasninger som en modul"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid "Thanks in advance for your contribution."
+msgstr "Takk på forhånd for ditt bidrag."
+
+#. module: base_module_record
+#: help:base_module_record.module_record_data,init,objects:0
+#: help:base_module_record.module_record_objects,init,objects:0
+msgid "List of objects to be recorded"
+msgstr "Liste over objekter som skal spilles inn"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,description:0
+msgid "Full Description"
+msgstr "Full beskrivelse"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,name:0
+msgid "Module Name"
+msgstr "Modulnavn"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,objects:0
+#: wizard_field:base_module_record.module_record_objects,init,objects:0
+msgid "Objects"
+msgstr "Objekter"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,save,module_file:0
+#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
+msgid "Module .zip File"
+msgstr "Modul .zip fil"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid "Module successfully created!"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save_yaml:0
+msgid "YAML file successfully created !"
+msgstr "YAML fil opprettet!"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,info:0
+#: wizard_view:base_module_record.module_record_data,save_yaml:0
+msgid "Result, paste this to your module's xml"
+msgstr "Resultatet, lim denne til modulen xml"
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_data,init,filter_cond:0
+#: selection:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Created"
+msgstr "Opprettet"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,end:0
+#: wizard_view:base_module_record.module_record_objects,end:0
+msgid "Thanks For using Module Recorder"
+msgstr "Takk for at du brukte Modul opptaker."
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,website:0
+msgid "Documentation URL"
+msgstr "Dokumentasjon URL"
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_data,init,filter_cond:0
+#: selection:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Modified"
+msgstr "Modifisert"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,init,record:0
+#: wizard_button:base_module_record.module_record_objects,init,record:0
+msgid "Record"
+msgstr "Opptak"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_objects,info,save:0
+msgid "Continue"
+msgstr "Fortsett"
+
+#. module: base_module_record
+#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
+#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
+msgid "Export Customizations As Data File"
+msgstr "Eksport Tilpasninger Som datafil"
+
+#. module: base_module_record
+#: code:addons/base_module_record/wizard/base_module_save.py:129
+#, python-format
+msgid "Error"
+msgstr "Feil"
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_objects,info,data_kind:0
+msgid "Normal Data"
+msgstr "Normal data"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,end,end:0
+#: wizard_button:base_module_record.module_record_objects,end,end:0
+msgid "OK"
+msgstr "Ok"
+
+#. module: base_module_record
+#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
+msgid "Module Creation"
+msgstr "modul Skapelsen"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
+msgid "Type of Data"
+msgstr "Type data"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,info:0
+msgid "Module Information"
+msgstr "Modul informasjon"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
+#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
+msgid "YAML"
+msgstr "YAML"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,info,res_text:0
+#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
+msgid "Result"
+msgstr "Resultat"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,init,end:0
+#: wizard_button:base_module_record.module_record_objects,info,end:0
+#: wizard_button:base_module_record.module_record_objects,init,end:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_objects,save,end:0
+#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
+msgid "Close"
+msgstr "Lukke"
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_data,init,filter_cond:0
+#: selection:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Created & Modified"
+msgstr "Laget & Modifisert"
+
+#~ msgid "Module successfully created !"
+#~ msgstr "Modulen opprettet!"
diff --git a/addons/base_report_designer/i18n/nb.po b/addons/base_report_designer/i18n/nb.po
new file mode 100644
index 00000000000..9bf2b572a5f
--- /dev/null
+++ b/addons/base_report_designer/i18n/nb.po
@@ -0,0 +1,204 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-04 13:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_sxw
+msgid "base.report.sxw"
+msgstr "basen.rapport.sxw"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "OpenERP Report Designer Configuration"
+msgstr "OpenERP Rapport Designer Konfigurasjon"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid ""
+"This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
+"Writer."
+msgstr ""
+"Denne plug-in tillater deg å lage / endre OpenERP rapporter i OpenOffice "
+"Writer."
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Laste opp den endrede rapporten"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "The .SXW report"
+msgstr ".SXW rapport"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_designer_installer
+msgid "base_report_designer.installer"
+msgstr "basen.rapport.designer.installatør"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "_Close"
+msgstr "_Lukk"
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "The RML Report"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Configure"
+msgstr "Konfigurer"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "title"
+msgstr "tittel"
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,report_id:0
+#: field:base.report.sxw,report_id:0
+msgid "Report"
+msgstr "Rapport"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_rml_save
+msgid "base.report.rml.save"
+msgstr "Basen.rapport.rml.lagre"
+
+#. module: base_report_designer
+#: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
+msgid "Report Designer"
+msgstr "Rapportdesigner"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,name:0
+msgid "File name"
+msgstr "Filnavn"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.sxw:0
+msgid "Get a report"
+msgstr "Få en rapport"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
+msgid "OpenERP Report Designer"
+msgstr "OpenERP Rapport designer"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Continue"
+msgstr "Fortsett"
+
+#. module: base_report_designer
+#: field:base.report.rml.save,file_rml:0
+msgid "Save As"
+msgstr "Lagre som"
+
+#. module: base_report_designer
+#: help:base_report_designer.installer,plugin_file:0
+msgid ""
+"OpenObject Report Designer plug-in file. Save as this file and install this "
+"plug-in in OpenOffice."
+msgstr ""
+"OpenObject Report Designer plug-in-filen. Lagre som denne filen og "
+"installere denne plugin-modulen i OpenOffice."
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "Save RML FIle"
+msgstr "Lagre RML fil"
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,file_sxw:0
+#: field:base.report.file.sxw,file_sxw_upload:0
+msgid "Your .SXW file"
+msgstr "Din .SXW fil"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Installasjon og Konfigurasjon trinn"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,description:0
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+"Dette er malen for den forespurte rapporten.\n"
+"Lagre det som en. Sxw fil og åpne den med OpenOffice.\n"
+"Ikke glem å installere OpenERP SA OpenOffice-pakken til å endre det.\n"
+"Når den er modifisert, laste opp det i OpenERP bruke denne veiviseren."
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "Bilde"
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
+msgid "Base Report sxw"
+msgstr "Basen rapport sxw"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_file_sxw
+msgid "base.report.file.sxw"
+msgstr "basen.rapport.fil.sxw"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,plugin_file:0
+msgid "OpenObject Report Designer Plug-in"
+msgstr "OpenObject Rapport Designer Plug-in"
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
+msgid "OpenERP Report Designer Installation"
+msgstr "OpenERP Rapport Designer Installasjon"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.rml.save:0
+#: view:base.report.sxw:0
+#: view:base_report_designer.installer:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.handlinger.rapport.xml"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Select your report"
+msgstr "Velg din rapport"
+
+#~ msgid "The RML report"
+#~ msgstr "RML rapport"
diff --git a/addons/crm_caldav/i18n/nb.po b/addons/crm_caldav/i18n/nb.po
new file mode 100644
index 00000000000..c5a1c3cfe37
--- /dev/null
+++ b/addons/crm_caldav/i18n/nb.po
@@ -0,0 +1,33 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-04 14:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
+
+#. module: crm_caldav
+#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
+msgid "Caldav Browse"
+msgstr "CalDAV Bla"
+
+#. module: crm_caldav
+#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
+msgid "Synchronize This Calendar"
+msgstr "Synkroniser denne kalenderen"
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "Møte"
diff --git a/addons/crm_todo/i18n/nb.po b/addons/crm_todo/i18n/nb.po
new file mode 100644
index 00000000000..44a49165e40
--- /dev/null
+++ b/addons/crm_todo/i18n/nb.po
@@ -0,0 +1,95 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-04 14:07+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr "Oppgave"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr "Timeboks"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr "For å avbryte oppgaven"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Feil! Oppgave sluttdato må være større enn oppgave startdato"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr "Neste"
+
+#. module: crm_todo
+#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
+#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
+msgid "My Tasks"
+msgstr "Mine oppgaver"
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr "Utført"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Feil! Du kan ikke lage en rekursive oppgaver."
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "Ekstra informasjon"
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr "Lede / mulighet"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr "For å bytte til ferdig tilstand"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr "Tidligere"
diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po
index 3ba35d1dc59..d237236136c 100644
--- a/addons/web/i18n/ar.po
+++ b/addons/web/i18n/ar.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "تم"
@@ -98,7 +98,7 @@ msgstr "تغيير كلمة المرور"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "تصدير البيانات"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "إغلاق"
@@ -228,17 +228,17 @@ msgid "Import Data"
 msgstr "استيراد البيانات"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "إستيراد ملف"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "معرف خارجي"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
@@ -247,7 +247,7 @@ msgstr ""
 "مرة:"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr "*لم يتم اختيار الحقول المطلوبة :"
 
@@ -559,65 +559,65 @@ msgid "Save default"
 msgstr "حفظ كإفتراضي"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "عامل غير معروف %s في نطاق %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "حقل غير معروف %s في نطاق %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "عامل غير مدعوم %s في نطاق %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "تأكيد"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>    مزيداً من البحث...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   إنشاء \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   إنشاء و تحرير...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "بحث: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "إنشاء: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "فتح: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -625,7 +625,7 @@ msgid "Add"
 msgstr "اضافة"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "إضافة: "
 
@@ -1250,7 +1250,7 @@ msgid "Set Image"
 msgstr "عيِّن صورة"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/bg.po b/addons/web/i18n/bg.po
index 0c949bcbd8e..f8d6336165b 100644
--- a/addons/web/i18n/bg.po
+++ b/addons/web/i18n/bg.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "ОК"
@@ -98,7 +98,7 @@ msgstr "Смяна на парола"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Експорт на данни"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Затваряне"
@@ -228,17 +228,17 @@ msgid "Import Data"
 msgstr "Импортиране на данни"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Импорт на файл"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Външен ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
@@ -247,7 +247,7 @@ msgstr ""
 "избрани повече от един път:"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr "*Задължителните полета не са избрани :"
 
@@ -561,65 +561,65 @@ msgid "Save default"
 msgstr "Запази по подразбиране"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Непознат оператор %s в домейн %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Непознато поле %s в домейн %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Неподдържан оператор %s в домейн %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Потвърждаване"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Търси още...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Създаване \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Създаване и редакция...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Търсене: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Създаване: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Отвори: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -627,7 +627,7 @@ msgid "Add"
 msgstr "Добавяне"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Добавяне: "
 
@@ -1252,7 +1252,7 @@ msgid "Set Image"
 msgstr "Задай изображение"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/bn.po b/addons/web/i18n/bn.po
index 5302f0c2475..1112da416c8 100644
--- a/addons/web/i18n/bn.po
+++ b/addons/web/i18n/bn.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "বেশ"
@@ -98,7 +98,7 @@ msgstr "অনুমোদন শব্দ পরিবর্তন করুন
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "বহীরায়িত তথ্য"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "বন্ধ করুন"
@@ -229,24 +229,24 @@ msgid "Import Data"
 msgstr "তথ্য আনায়ন করুন"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "ফাইল আনায়ন করুন"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "বহিরাগত আই-ডি"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -559,65 +559,65 @@ msgid "Save default"
 msgstr "অবিকল্পিতভাবে সংরক্ষন করুন"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "এলাকার মধ্যে %s অজানা পরিচালক %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "এলাকার মধ্যে %s অজানা ক্ষেত্র %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "এলাকার মধ্যে %s অসমর্থিত পরিচালক %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "নিশ্চিত করুন"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   আরো খুঁজুন...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   তৈরি করুন \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   নির্মাণ ও সম্পাদনা করুন...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "অনুসন্ধান: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "তৈরি করুন: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "খুলুন: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -625,7 +625,7 @@ msgid "Add"
 msgstr "যোগ করুন"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "যোগ করুন: "
 
@@ -1249,7 +1249,7 @@ msgid "Set Image"
 msgstr "ছবি বসান"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/bs.po b/addons/web/i18n/bs.po
index 98f7b651e81..5f63ccd21e0 100644
--- a/addons/web/i18n/bs.po
+++ b/addons/web/i18n/bs.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Uredu"
@@ -98,7 +98,7 @@ msgstr "Promijeni šifru"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr ""
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Zatvori"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Uvezi podatke"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Externi ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr "Snimi zadano"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Nepoznat operator %s na domeni %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Portvrdi"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Traži Više...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Kreiraj\"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Kreiraj i Uredi...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Otvori: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr ""
 
@@ -1247,7 +1247,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/ca.po b/addons/web/i18n/ca.po
index 0d6025bf82c..36000bec82c 100644
--- a/addons/web/i18n/ca.po
+++ b/addons/web/i18n/ca.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr ""
@@ -98,7 +98,7 @@ msgstr ""
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr ""
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr ""
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr ""
 
@@ -1247,7 +1247,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/cs.po b/addons/web/i18n/cs.po
index 1ba20c822b9..5c07120c4c3 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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 "X-Poedit-Language: Czech\n"
 
 #. openerp-web
@@ -23,7 +23,7 @@ msgstr ""
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -99,7 +99,7 @@ msgstr "Změnit heslo"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -194,11 +194,11 @@ msgstr "Exportovat data"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Zavřít"
@@ -229,24 +229,24 @@ msgid "Import Data"
 msgstr "Importovat data"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Importovat soubor"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Vnější ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -558,65 +558,65 @@ msgid "Save default"
 msgstr "Uložit výchozí"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Neznámý operátor %s v doméně %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Neplatné pole %s v doméně %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Nepodporovaný operátor %s v doméně %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Potvrdit"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>  Hledat další...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Vytvořit \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Vytvořit nebo upravit...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Hledat: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Vytvořit: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Otevřít: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -624,7 +624,7 @@ msgid "Add"
 msgstr "Přidat"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Přidat "
 
@@ -1250,7 +1250,7 @@ msgid "Set Image"
 msgstr "Nastavit obrázek"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/da.po b/addons/web/i18n/da.po
index 71f548415c2..12667911ba6 100644
--- a/addons/web/i18n/da.po
+++ b/addons/web/i18n/da.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Skift adgangskode"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Eksporter Data"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Luk"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Importer data"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Importér fil"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Eksternt ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -559,65 +559,65 @@ msgid "Save default"
 msgstr "Gem som standard"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Bekræft"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Søg efter mere....</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Create \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Opret og rediger...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Søg: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -625,7 +625,7 @@ msgid "Add"
 msgstr "Tilføj"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr ""
 
@@ -1249,7 +1249,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/de.po b/addons/web/i18n/de.po
index a5eb33b65f8..70fd3f3a3a0 100644
--- a/addons/web/i18n/de.po
+++ b/addons/web/i18n/de.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Passwort ändern"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Daten exportieren"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Schließen"
@@ -229,32 +229,34 @@ msgid "Import Data"
 msgstr "Daten importieren"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Datei importieren"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Externe ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
+"Zielfelder dürfen nur einmal ausgewählt sein, derzeit sind welche mehrmach "
+"ausgewählt:"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
-msgstr ""
+msgstr "* Pflichtfelder sind nicht ausgewählt"
 
 #. openerp-web
 #: addons/web/static/src/js/formats.js:139
 #, python-format
 msgid "(%d records)"
-msgstr ""
+msgstr "(%d Datensätze)"
 
 #. openerp-web
 #: addons/web/static/src/js/formats.js:325
@@ -559,65 +561,65 @@ msgid "Save default"
 msgstr "Standardwert speichern"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Unbekannter Operator %s in Domain %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Unbekanntes Feld %s in Domain %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Nicht unterstützer Operator %s in Domain %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Bestätigen"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Suche mehr...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Anlegen \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Anlegen und Bearbeiten...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Suche: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Erstelle: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Öffne: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -625,7 +627,7 @@ msgid "Add"
 msgstr "Hinzufügen"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Hinzufügen: "
 
@@ -1251,7 +1253,7 @@ msgid "Set Image"
 msgstr "Bild festlegen"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/en_AU.po b/addons/web/i18n/en_AU.po
index c6212e2ad88..39286ff6654 100644
--- a/addons/web/i18n/en_AU.po
+++ b/addons/web/i18n/en_AU.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "OK"
@@ -98,7 +98,7 @@ msgstr "Change password"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Export Data"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Close"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Import Data"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Import File"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "External ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -559,65 +559,65 @@ msgid "Save default"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Unknown operator %s in domain %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Unknown field %s in domain %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Unsupported operator %s in domain %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Confirm"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Continue Search ...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Create \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Create and Edit...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Search: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Create: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Open: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -625,7 +625,7 @@ msgid "Add"
 msgstr "Add"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Add: "
 
@@ -1251,7 +1251,7 @@ msgid "Set Image"
 msgstr "Load Image"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/en_GB.po b/addons/web/i18n/en_GB.po
index 3e4a554b400..8747f1d7673 100644
--- a/addons/web/i18n/en_GB.po
+++ b/addons/web/i18n/en_GB.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Change password"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Export Data"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Close"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Import Data"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Import File"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "External ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -558,65 +558,65 @@ msgid "Save default"
 msgstr "Save default"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Unknown operator %s in domain %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Unknown field %s in domain %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Unsupported operator %s in domain %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Confirm"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Search More...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Create \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Create and Edit...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Search: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Create: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Open: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -624,7 +624,7 @@ msgid "Add"
 msgstr "Add"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Add: "
 
@@ -1250,7 +1250,7 @@ msgid "Set Image"
 msgstr "Set Image"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po
index 16e92bb71b0..2da9ed2d493 100644
--- a/addons/web/i18n/es.po
+++ b/addons/web/i18n/es.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Cambiar contraseña"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Exportar información"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Cerrar"
@@ -229,24 +229,24 @@ msgid "Import Data"
 msgstr "Importar información"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Importar Fichero"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "ID externo"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -560,65 +560,65 @@ msgid "Save default"
 msgstr "Guardar por defecto"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Operador desconocido %s en el dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Campo desconocido %s en el dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Operador no soportado %s en el dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Buscar más...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Crear \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Crear y Editar...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Buscar: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Crear: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Abrir: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -626,7 +626,7 @@ msgid "Add"
 msgstr "Añadir"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Añadir: "
 
@@ -1252,7 +1252,7 @@ msgid "Set Image"
 msgstr "Establecer Imagen"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/es_CL.po b/addons/web/i18n/es_CL.po
index a66db88bbe2..00a9689d06f 100644
--- a/addons/web/i18n/es_CL.po
+++ b/addons/web/i18n/es_CL.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Cambiar la Contraseña"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Exportar datos"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Cerrar"
@@ -229,24 +229,24 @@ msgid "Import Data"
 msgstr "Importar datos"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Importar archivo"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "ID externo"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -560,65 +560,65 @@ msgid "Save default"
 msgstr "Guardar por defecto"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Operador desconocido %s en el dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Campo desconocido %s en el dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Operador no soportado %s en el dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Confimar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Buscar más...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Crear \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Crear y Editar...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Buscar: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Crear: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Abrir "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -626,7 +626,7 @@ msgid "Add"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Agregar: "
 
@@ -1250,7 +1250,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/es_CR.po b/addons/web/i18n/es_CR.po
index 7c01a2104c4..986040accbb 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 "Language: es\n"
 
 #. openerp-web
@@ -23,7 +23,7 @@ msgstr ""
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -99,7 +99,7 @@ msgstr "Cambiar contraseña"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -194,11 +194,11 @@ msgstr "Exportar información"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Cerrar"
@@ -230,24 +230,24 @@ msgid "Import Data"
 msgstr "Importar información"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Importar Fichero"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "ID externo"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -561,65 +561,65 @@ msgid "Save default"
 msgstr "Guardar por defecto"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Operador desconocido %s en dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Archivo desconocido %s en dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Operador no compatible %s en domino %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Buscar más...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Crear \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Crear y Editar...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Buscar: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Crear: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Abrir "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -627,7 +627,7 @@ msgid "Add"
 msgstr "Añadir"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Agregar: "
 
@@ -1253,7 +1253,7 @@ msgid "Set Image"
 msgstr "Establecer Imagen"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/es_EC.po b/addons/web/i18n/es_EC.po
index 5683e05fd95..26850332763 100644
--- a/addons/web/i18n/es_EC.po
+++ b/addons/web/i18n/es_EC.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Cambiar Contraseña"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Exportar Datos"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Cerrar"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Importar Datos"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Importar Archivo"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "ID externo"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -559,65 +559,65 @@ msgid "Save default"
 msgstr "Guardar por defecto"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Operador desconocido %s en el dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Campo desconocido %s en el dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Operador no soportado %s en el dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Buscar Más...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Crear \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Crear y Editar...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Buscar: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Crear: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Abrir: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -625,7 +625,7 @@ msgid "Add"
 msgstr "Agregar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Agregar: "
 
@@ -1251,7 +1251,7 @@ msgid "Set Image"
 msgstr "Establecer Imagen"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/et.po b/addons/web/i18n/et.po
index d8cac4ed68f..0d467739688 100644
--- a/addons/web/i18n/et.po
+++ b/addons/web/i18n/et.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr ""
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr ""
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr ""
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr "Lisa"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr ""
 
@@ -1247,7 +1247,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/eu.po b/addons/web/i18n/eu.po
index 901df5e6f3a..c86bd2ea1c8 100644
--- a/addons/web/i18n/eu.po
+++ b/addons/web/i18n/eu.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ados"
@@ -98,7 +98,7 @@ msgstr "Pasahitza aldatu"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Datuak Esportatu"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Irten"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr ""
 
@@ -1247,7 +1247,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po
index e95a6471d81..52e37bd2d4c 100644
--- a/addons/web/i18n/fi.po
+++ b/addons/web/i18n/fi.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Vaihda salasana"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Vie tiedot"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Sulje"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Tuo tiedot"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Tuo tiedosto"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Ulkoinen ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr "Tallenna oletusarvo"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Tuntematon operaattori %s toimialueella %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Tuntematon kenttä  %s toimialueella %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Ei tuettu operaattori  %s toimialueella %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Hyväksy"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   hae lisää...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Luo \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Luo ja muokkaa...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Etsi: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Luo: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Avaa: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr "LIsää"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Lisää: "
 
@@ -1249,7 +1249,7 @@ msgid "Set Image"
 msgstr "Aseta kuva"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po
index a7e6e4140d7..50815ffe6ab 100644
--- a/addons/web/i18n/fr.po
+++ b/addons/web/i18n/fr.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Changer de mot de passe"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Export de données"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Fermer"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Import de données"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Importer un fichier"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Identifiant externe"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -559,65 +559,65 @@ msgid "Save default"
 msgstr "Enregistrer comme valeur par défaut"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Opérateur inconnu %s dans le domaine %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Champ %s inconnu dans le domaine %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Opérateur %s non supporté dans le domaine %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Confirmer"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Plus de résultats...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Créer \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Créer et modifier...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Rechercher : "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Créer : "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Ouvrir : "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -625,7 +625,7 @@ msgid "Add"
 msgstr "Ajouter"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Ajouter "
 
@@ -1251,7 +1251,7 @@ msgid "Set Image"
 msgstr "Utiliser comme image"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/fr_CA.po b/addons/web/i18n/fr_CA.po
index 594a27bce2d..ae752394b51 100644
--- a/addons/web/i18n/fr_CA.po
+++ b/addons/web/i18n/fr_CA.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr ""
@@ -98,7 +98,7 @@ msgstr ""
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr ""
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr ""
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr ""
 
@@ -1247,7 +1247,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/gl.po b/addons/web/i18n/gl.po
index 19483531a48..2ccfe758450 100644
--- a/addons/web/i18n/gl.po
+++ b/addons/web/i18n/gl.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Cambiar o contrasinal"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Exportación de datos"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Pechar"
@@ -229,24 +229,24 @@ msgid "Import Data"
 msgstr "Importar datos"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Importar Arquivo"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "ID externo"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -559,65 +559,65 @@ msgid "Save default"
 msgstr "Gardar como predeterminado"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Operador desconocido %s en dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Campo desconocido %s en dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Operador non soportado %s en dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Buscar máis...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Crear \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Crear e Editar...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Procurar: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Crear: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Abrir: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -625,7 +625,7 @@ msgid "Add"
 msgstr "Engadir"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Engadir: "
 
@@ -1251,7 +1251,7 @@ msgid "Set Image"
 msgstr "Estabelecer imaxe"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/gu.po b/addons/web/i18n/gu.po
index b334ecb0bb0..22ac401a774 100644
--- a/addons/web/i18n/gu.po
+++ b/addons/web/i18n/gu.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "બરાબર"
@@ -98,7 +98,7 @@ msgstr "પાસવર્ડ બદલો"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr ""
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "બંધ કરો"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "માહિતી આયાત કરો"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "ફાઈલ આયાત કરો"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "ખાતરી"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "શોધો: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr "ઉમેરવું"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "ઉમેરવું: "
 
@@ -1247,7 +1247,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/hi.po b/addons/web/i18n/hi.po
index d80dd1c4fc7..87203a95e28 100644
--- a/addons/web/i18n/hi.po
+++ b/addons/web/i18n/hi.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "ठीक है"
@@ -98,7 +98,7 @@ msgstr "पासवर्ड बदलें"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "निर्यात आंकड़ा"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "बंद"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "डाटा आयात करें"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "फ़ाइल आयात करें"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "बाहरी आईडी"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -558,65 +558,65 @@ msgid "Save default"
 msgstr "डिफ़ॉल्ट रूप में सहेजें"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "पुष्टि करें"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "खोजें: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "बनाएँ: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "खोलने के लिए "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -624,7 +624,7 @@ msgid "Add"
 msgstr "जोड़ना"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "जोड़ना: "
 
@@ -1248,7 +1248,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/hr.po b/addons/web/i18n/hr.po
index b95e832c834..60d684992e4 100644
--- a/addons/web/i18n/hr.po
+++ b/addons/web/i18n/hr.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "U redu"
@@ -98,7 +98,7 @@ msgstr "Promijeni zaporku"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Izvoz podataka"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Zatvori"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Uvoz podataka"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Uvoz datoteke"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Vanjski ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -558,65 +558,65 @@ msgid "Save default"
 msgstr "Snimi zadano"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Nepoznat operator %s u domeni %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Nepoznato polje %s unutar domene %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Operator %s nije podržan unutar domene %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Potvrdi"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Traži dalje...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Kreiraj \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Kreiraj i uredi...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Traži: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Kreiraj: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Otvori: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -624,7 +624,7 @@ msgid "Add"
 msgstr "Dodaj"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Dodaj: "
 
@@ -1250,7 +1250,7 @@ msgid "Set Image"
 msgstr "Postavi sliku"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po
index b6af9f9bd9e..c6b3c3e78c6 100644
--- a/addons/web/i18n/hu.po
+++ b/addons/web/i18n/hu.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "OK"
@@ -98,7 +98,7 @@ msgstr "Jelszó megváltoztatása"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Adatok exportálása"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Bezárás"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Adatok importálása"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Fájl importálása"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr "*Szükséges mezők nincsennek kiválasztva:"
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr "Alapértelmezés mentése"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Még több keresése...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Létrehozás \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Létrehozás és Szerkesztés...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Keresés: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Létrehozás: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr "Hozzáadás"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr ""
 
@@ -1247,7 +1247,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/id.po b/addons/web/i18n/id.po
index f374b325afa..1d79472e5d9 100644
--- a/addons/web/i18n/id.po
+++ b/addons/web/i18n/id.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Ubah kata sandi"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Ekspor Data"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Selesai"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr ""
 
@@ -1247,7 +1247,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po
index 1cfd2637a61..fc5e946f0dd 100644
--- a/addons/web/i18n/it.po
+++ b/addons/web/i18n/it.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Cambia password"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Esporta Dati"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Chiudi"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Importa Dati"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Importa File"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "ID Esterno"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -559,65 +559,65 @@ msgid "Save default"
 msgstr "Salva Default"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Operatore %s sconosciuto nel dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Campo %s sconosciuto nel dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Operatore %s non supportato nel dominio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Conferma"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Cerca ancora...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Crea \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Crea e modifica...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Cerca: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Crea: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Apri: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -625,7 +625,7 @@ msgid "Add"
 msgstr "Aggiungi"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Aggiungi: "
 
@@ -1251,7 +1251,7 @@ msgid "Set Image"
 msgstr "Imposta Immagine"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index 772832fb034..6c553ddeeb4 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/i18n/ja.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "OK"
@@ -98,7 +98,7 @@ msgstr "パスワードの変更"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "データのエクスポート"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "閉じる"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "データをインポート"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "ファイルをインポート"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "外部ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr "宛先項目の選択は1回のみです。幾つかの項目は複数回選択されます："
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr "* 必須項目が選択されていません："
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr "デフォルトに保存"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "ドメイン  %s に無効な演算  %s があります"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "ドメイン  %s に無効な項目  %s があります"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "ドメイン  %s に無効な演算  %s があります"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "確認"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   さらに検索…</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   作成 \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   作成＆編集…</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "検索: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "作成: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "開く: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr "追加"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "追加: "
 
@@ -1247,7 +1247,7 @@ msgid "Set Image"
 msgstr "画像をセット"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/ka.po b/addons/web/i18n/ka.po
index 1a8ee713848..9a3bf76a186 100644
--- a/addons/web/i18n/ka.po
+++ b/addons/web/i18n/ka.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "ოკ"
@@ -98,7 +98,7 @@ msgstr "პაროლის შეცვლა"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "მონაცემების ექსპორტი"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "დახურვა"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "მონაცემების იმპორტი"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "ფაილის იმპორტი"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "გარე ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -560,65 +560,65 @@ msgid "Save default"
 msgstr "ნაგულისხმებად შენახვა"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "გაურკვეველი ოპერატორი %s დომენში %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "გაურკვეველი ველი %s დომენში %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "უცხო ოპერატორი %s დომენში %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "დამოწმება"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>    ვეძებოთ მეტი...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   შევქმნათ \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   შევქმნათ და შევცვალოთ...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "ძიება: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "შექმნა: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "ღია: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -626,7 +626,7 @@ msgid "Add"
 msgstr "დამატება"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "დამატება: "
 
@@ -1252,7 +1252,7 @@ msgid "Set Image"
 msgstr "განსაზღვრე სურათი"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po
index cd2aa466809..d22b2721a71 100644
--- a/addons/web/i18n/mk.po
+++ b/addons/web/i18n/mk.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Во Ред"
@@ -98,7 +98,7 @@ msgstr "Промени лозинка"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Експортирај ги податоците"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Затвори"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Импортирај податоци"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Импортирај датотека"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "ID Externo"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr "*Campos Obrigatórios não selecionados :"
 
@@ -558,65 +558,65 @@ msgid "Save default"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Потврди"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Најди Повеќе...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Креирај \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Креирај и Измени...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Барај: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Креирај: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Отвори: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -624,7 +624,7 @@ msgid "Add"
 msgstr "Додади"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Додади: "
 
@@ -1248,7 +1248,7 @@ msgid "Set Image"
 msgstr "Постави слика"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/mn.po b/addons/web/i18n/mn.po
index a171aed6be2..010b331b3e6 100644
--- a/addons/web/i18n/mn.po
+++ b/addons/web/i18n/mn.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Нууц үг солих"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Өгөгдөл Экспортлох"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Хаах"
@@ -228,17 +228,17 @@ msgid "Import Data"
 msgstr "Өгөгдөл импортлох"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Файл импортлох"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Гадаад ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
@@ -247,7 +247,7 @@ msgstr ""
 "олон удаа сонгосон байна:"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr "*Заавал бөглөх талбарууд бөглөгдөөгүй байна :"
 
@@ -559,65 +559,65 @@ msgid "Save default"
 msgstr "Үндсэн болгож хадгалах"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "%s гэсэн буруу %s дөмэйнд байна"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "%s гэсэн мэдэгдэхгүй талбарын нэр %s дөмэйнд байна"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "%s гэсэн зөвшөөрөгдөөгүй оператор %s дөмэйнд байна"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Батлах"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Нарийвчилж Хайх...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Үүсгэх \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Үүсгэх ба Засварлах...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Хайх: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Үүсгэх: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Нээх "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -625,7 +625,7 @@ msgid "Add"
 msgstr "Нэмэх"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Нэмэх: "
 
@@ -1250,7 +1250,7 @@ msgid "Set Image"
 msgstr "Зураг сонгох"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/nb.po b/addons/web/i18n/nb.po
index e0107459add..6c38bf0de21 100644
--- a/addons/web/i18n/nb.po
+++ b/addons/web/i18n/nb.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Endre passord"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Eksporter data"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Lukk"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Importer data"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Importer fil"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -558,65 +558,65 @@ msgid "Save default"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Bekreft"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Opprett\"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Søk: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Opprett: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Åpne: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -624,7 +624,7 @@ msgid "Add"
 msgstr "Legg til"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Legg til: "
 
@@ -1248,7 +1248,7 @@ msgid "Set Image"
 msgstr "Bruk bilde"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index eec0a770d12..df2938cc5f4 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Wachtwoord wijzigen"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Gegevens exporteren"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Sluiten"
@@ -228,17 +228,17 @@ msgid "Import Data"
 msgstr "Gegevens importeren"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Bestand importeren"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Externe ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
@@ -247,7 +247,7 @@ msgstr ""
 "velden zijn meer dan één keer geselecteerd:"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr "*Verplichte velden zijn niet geselecteerd:"
 
@@ -559,65 +559,65 @@ msgid "Save default"
 msgstr "Opslaan als standaard"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Onbekend operator% s in domein% s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Onbekend veld %s in domein %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Niet ondersteunde operator %s in domein %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Bevestig"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Zoek verder...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Maak \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Maak en wijzig...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Zoeken: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Maken: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Open: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -625,7 +625,7 @@ msgid "Add"
 msgstr "Toevoegen"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Toevoegen: "
 
@@ -1251,7 +1251,7 @@ msgid "Set Image"
 msgstr "Afbeelding instellen"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/nl_BE.po b/addons/web/i18n/nl_BE.po
index ccfe3ccedbe..ec7225e7edb 100644
--- a/addons/web/i18n/nl_BE.po
+++ b/addons/web/i18n/nl_BE.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "OK"
@@ -98,7 +98,7 @@ msgstr "Wachtwoord wijzigen"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Gegevens exporteren"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Sluiten"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Gegevens importeren"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Bestand importeren"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Externe id"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -559,65 +559,65 @@ msgid "Save default"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Uitgebreid zoeken...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Creër \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Creër en bewerk...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -625,7 +625,7 @@ msgid "Add"
 msgstr "Toevoegen"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr ""
 
@@ -1249,7 +1249,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/pl.po b/addons/web/i18n/pl.po
index b637c93321e..37435488dbf 100644
--- a/addons/web/i18n/pl.po
+++ b/addons/web/i18n/pl.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr ""
@@ -98,7 +98,7 @@ msgstr "Zmień hasło"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Eksport danych"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Zamknij"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Importuj dane"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Import z pliku"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Identyfikator zewnętrzny"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr "Zapisz jako domyślne"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Nieznany operator %s w domenie %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Nieznane pole %s w domenie %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Nieobsługiwany operator %s w domenie %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Potwierdź"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Szukaj dalej...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Utwórz \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Utwórz i edytuj...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Szukaj: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Utwórz: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Otwarte: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr "Dodaj"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Dodaj: "
 
@@ -1247,7 +1247,7 @@ msgid "Set Image"
 msgstr "Ustaw obrazek"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/pt.po b/addons/web/i18n/pt.po
index c0333fcd8ac..201e9666379 100644
--- a/addons/web/i18n/pt.po
+++ b/addons/web/i18n/pt.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "OK"
@@ -98,7 +98,7 @@ msgstr "Alterar palavra-chave"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Exportar Dados"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Fechar"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Importar Dados"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Importar Ficheiro"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "ID Externo"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -559,65 +559,65 @@ msgid "Save default"
 msgstr "Salvar Padrão"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Operador desconhecido %s no domínio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Campo desconhecido %s no domínio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Operador não suportado %s no domínio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Procurar Mais...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Criar \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Criar e Editar...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Pesquisar: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Criar: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Abrir: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -625,7 +625,7 @@ msgid "Add"
 msgstr "Acrescentar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Adicionar: "
 
@@ -1251,7 +1251,7 @@ msgid "Set Image"
 msgstr "Definir Imagem"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po
index 1c096ca1c99..716450df49d 100644
--- a/addons/web/i18n/pt_BR.po
+++ b/addons/web/i18n/pt_BR.po
@@ -15,15 +15,15 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -99,7 +99,7 @@ msgstr "Alterar Senha"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -194,11 +194,11 @@ msgstr "Exportar Dados"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Fechar"
@@ -229,17 +229,17 @@ msgid "Import Data"
 msgstr "Importar Dados"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Importar Arquivo"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "ID Externo"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
@@ -248,7 +248,7 @@ msgstr ""
 "selecionados mais de uma vez:"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr "*Campos Obrigatórios não selecionados :"
 
@@ -560,65 +560,65 @@ msgid "Save default"
 msgstr "Salvar padrão"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Operador desconhecido %s no domínio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Campo desconhecido %s no domínio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Operador não suportado %s no domínio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Procurar Mais...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Criar \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Criar e Editar...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Pesquisar: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Criar: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Aberto: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -626,7 +626,7 @@ msgid "Add"
 msgstr "Adicionar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Adicionar: "
 
@@ -1252,7 +1252,7 @@ msgid "Set Image"
 msgstr "Definir Imagem"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po
index 9b4542c91e2..0285d511a95 100644
--- a/addons/web/i18n/ro.po
+++ b/addons/web/i18n/ro.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Schimbati parola"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Exportati Datele"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Inchideti"
@@ -228,17 +228,17 @@ msgid "Import Data"
 msgstr "Importa Date"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Importa Fisier"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "ID Extern"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
@@ -247,7 +247,7 @@ msgstr ""
 "selectate de mai multe ori:"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr "*Campurile obligatorii nu sunt selectate :"
 
@@ -562,65 +562,65 @@ msgid "Save default"
 msgstr "Salveaza implicit"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Operator necunoscut %s in domeniul %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Camp necunoscut %s in domeniul %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Operator nesustinut %s in domeniul %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Confirmati"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Cauta mai multe...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Creeaza \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Creeaza si Editeaza...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Cauta: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Creati: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Deschideti: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -628,7 +628,7 @@ msgid "Add"
 msgstr "Adaugati"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Adaugati: "
 
@@ -1254,7 +1254,7 @@ msgid "Set Image"
 msgstr "Setati Imaginea"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/ru.po b/addons/web/i18n/ru.po
index 1f7b96ab0e2..44f3628970d 100644
--- a/addons/web/i18n/ru.po
+++ b/addons/web/i18n/ru.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ок"
@@ -98,7 +98,7 @@ msgstr "Изменить пароль"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Экспорт данных"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Закрыть"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Импорт данных"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Импортировать файл"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Внешний идентификатор"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -558,65 +558,65 @@ msgid "Save default"
 msgstr "Сохранить как По Умолчанию"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Неизвестный оператор %s в домене %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Неизвестное поле %s в домене %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Неподдерживаемый оператор %s в домене %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Подтвердить"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Найти еще...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Создать \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Создать и Изменить...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Найти: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Создать: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Открыть: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -624,7 +624,7 @@ msgid "Add"
 msgstr "Добавить"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Добавить: "
 
@@ -1250,7 +1250,7 @@ msgid "Set Image"
 msgstr "Назначить изображение"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/sk.po b/addons/web/i18n/sk.po
index 3f3a14c89fb..cee3204f93e 100644
--- a/addons/web/i18n/sk.po
+++ b/addons/web/i18n/sk.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr ""
@@ -98,7 +98,7 @@ msgstr ""
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr ""
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr ""
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr ""
 
@@ -1247,7 +1247,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/sl.po b/addons/web/i18n/sl.po
index a90e26131ba..1e017510061 100644
--- a/addons/web/i18n/sl.po
+++ b/addons/web/i18n/sl.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "V redu"
@@ -98,7 +98,7 @@ msgstr "Spremeni geslo"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Izvozi podatke"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Zapri"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Uvoz podatkov"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Uvoz datoteke"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Zunanji ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -559,65 +559,65 @@ msgid "Save default"
 msgstr "Shrani privzeto"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Potrdi"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Iskanje več...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Ustvari \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Ustvari in uredi...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Iskanje: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Ustvari: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Odpri: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -625,7 +625,7 @@ msgid "Add"
 msgstr "Dodaj"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Dodaj: "
 
@@ -1249,7 +1249,7 @@ msgid "Set Image"
 msgstr "Nastavi sliko"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/sq.po b/addons/web/i18n/sq.po
index f7a00d31e3f..acf9e89b55d 100644
--- a/addons/web/i18n/sq.po
+++ b/addons/web/i18n/sq.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: 2012-08-28 07:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr ""
@@ -98,7 +98,7 @@ msgstr ""
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr ""
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr ""
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr ""
 
@@ -1247,7 +1247,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/sr@latin.po b/addons/web/i18n/sr@latin.po
index 5656116c127..b46d56f58b7 100644
--- a/addons/web/i18n/sr@latin.po
+++ b/addons/web/i18n/sr@latin.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "U redu"
@@ -98,7 +98,7 @@ msgstr "Izmena lozinke"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Izvezi podatke"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Zatvori"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "Uvezi podatke"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Uvezi Datoteku"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Externi ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -558,65 +558,65 @@ msgid "Save default"
 msgstr "Sačuvaj podrazumevano"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Nepoznat operator %s na domenu %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Nepoznato polje %s na domenu %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Nepodržan operator %s na domenu %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Potvrdi"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Traži Dalje...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Create \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Kreiraj i Uredi...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Pretraga: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Kreiraj: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Otvori: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -624,7 +624,7 @@ msgid "Add"
 msgstr "Dodaj"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Dodaj: "
 
@@ -1250,7 +1250,7 @@ msgid "Set Image"
 msgstr "Podesi sliku"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/sv.po b/addons/web/i18n/sv.po
index f3231e32bc8..e7b7e1c9734 100644
--- a/addons/web/i18n/sv.po
+++ b/addons/web/i18n/sv.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +98,7 @@ msgstr "Ändra lösenord"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Exportera data"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Stäng"
@@ -228,17 +228,17 @@ msgid "Import Data"
 msgstr "Importera data"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Importera fil"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Externt ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
@@ -247,7 +247,7 @@ msgstr ""
 "gång:"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr "* Obligatoriska fälj ej valda :"
 
@@ -559,65 +559,65 @@ msgid "Save default"
 msgstr "Spara standardvärden"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Okänd operator %s i domän %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Okänt fält %s i domän %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Felaktig operator %s i domän %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Bekräfta"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Sök mer...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Skapa \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Skapa och ändra...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Sök: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Skapa: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Öppna: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -625,7 +625,7 @@ msgid "Add"
 msgstr "Lägg till"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Lägg till: "
 
@@ -1251,7 +1251,7 @@ msgid "Set Image"
 msgstr "Välj bild"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/tr.po b/addons/web/i18n/tr.po
index 87199089e33..da03519d393 100644
--- a/addons/web/i18n/tr.po
+++ b/addons/web/i18n/tr.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Tamam"
@@ -98,7 +98,7 @@ msgstr "Parolayı değiştir"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "Veri Dışaaktar"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Kapat"
@@ -228,17 +228,17 @@ msgid "Import Data"
 msgstr "Veri İçeakktar"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "Dosyayı İçeakktar"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "Dış ID"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
@@ -247,7 +247,7 @@ msgstr ""
 "seçilebilir:"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr "*Gerekli Alanlar seçilmedi:"
 
@@ -560,65 +560,65 @@ msgid "Save default"
 msgstr "Varsayılanı Kaydet"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Etki alanı %s te bilinmeyen %s operatörü"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Bilinmeyen alan %s alan adında %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Desteklenmeyen operatör %s alan adında %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "Onayla"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Daha Fazla...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Oluştur \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Oluştur ve Düzenle...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Ara: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "Oluştur: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "Aç: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -626,7 +626,7 @@ msgid "Add"
 msgstr "Ekle"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "Ekle: "
 
@@ -1253,7 +1253,7 @@ msgid "Set Image"
 msgstr "Görüntü Ayarla"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/uk.po b/addons/web/i18n/uk.po
index dd0aa2b2f4c..5aaf5375900 100644
--- a/addons/web/i18n/uk.po
+++ b/addons/web/i18n/uk.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr ""
@@ -98,7 +98,7 @@ msgstr ""
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr ""
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr ""
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr ""
 
@@ -1247,7 +1247,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po
index a117e3e4119..a19dad87680 100644
--- a/addons/web/i18n/zh_CN.po
+++ b/addons/web/i18n/zh_CN.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "确定"
@@ -98,7 +98,7 @@ msgstr "更改密码"
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr "导出数据"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "关闭"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr "导入数据"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr "导入文件"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr "外部标识"
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr "保存默认值"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "发现未知操作符 %s ，过滤条件 %s 有误"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "发现未知字段 %s ，过滤条件 %s 有误"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "有不支持的操作符 %s ，过滤条件 %s 有误"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr "确认"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   搜索更多...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   创建“<strong>%s</strong>”</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   创建并编辑...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "搜索： "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr "创建： "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr "打开： "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr "添加"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr "添加： "
 
@@ -1247,7 +1247,7 @@ msgid "Set Image"
 msgstr "设置图片"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web/i18n/zh_TW.po b/addons/web/i18n/zh_TW.po
index fe15b8da8f3..50600d342ae 100644
--- a/addons/web/i18n/zh_TW.po
+++ b/addons/web/i18n/zh_TW.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
 #: addons/web/static/src/js/chrome.js:202
 #: addons/web/static/src/js/chrome.js:380
 #: addons/web/static/src/js/view_form.js:457
-#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/js/view_form.js:1295
 #: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr ""
@@ -98,7 +98,7 @@ msgstr ""
 #: addons/web/static/src/js/view_editor.js:95
 #: addons/web/static/src/js/view_editor.js:836
 #: addons/web/static/src/js/view_editor.js:962
-#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/js/view_form.js:1290
 #: addons/web/static/src/xml/base.xml:743
 #: addons/web/static/src/xml/base.xml:1502
 #: addons/web/static/src/xml/base.xml:1512
@@ -193,11 +193,11 @@ msgstr ""
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:19
-#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/data_import.js:71
 #: addons/web/static/src/js/view_editor.js:49
 #: addons/web/static/src/js/view_editor.js:398
 #: addons/web/static/src/js/view_form.js:734
-#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/view_form.js:3325
 #: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "關閉"
@@ -228,24 +228,24 @@ msgid "Import Data"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:71
+#: addons/web/static/src/js/data_import.js:72
 msgid "Import File"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:106
+#: addons/web/static/src/js/data_import.js:108
 msgid "External ID"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:346
+#: addons/web/static/src/js/data_import.js:349
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/data_import.js:383
+#: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
 msgstr ""
 
@@ -557,65 +557,65 @@ msgid "Save default"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:867
+#: addons/web/static/src/js/view_form.js:870
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:875
+#: addons/web/static/src/js/view_form.js:878
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:913
+#: addons/web/static/src/js/view_form.js:916
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1284
+#: addons/web/static/src/js/view_form.js:1287
 msgid "Confirm"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2193
+#: addons/web/static/src/js/view_form.js:2220
 msgid "<em>   Search More...</em>"
 msgstr "<em>   搜尋更多...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2211
+#: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   建立「<strong>%s</strong>」</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2217
+#: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   建立並編輯...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2250
-#: addons/web/static/src/js/view_form.js:2738
+#: addons/web/static/src/js/view_form.js:2277
+#: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2040
-#: addons/web/static/src/js/view_form.js:2766
-#: addons/web/static/src/js/view_form.js:2991
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2793
+#: addons/web/static/src/js/view_form.js:3018
 msgid "Open: "
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/js/view_form.js:2938
 #: addons/web/static/src/xml/base.xml:755
 #: addons/web/static/src/xml/base.xml:777
 #: addons/web/static/src/xml/base.xml:1652
@@ -623,7 +623,7 @@ msgid "Add"
 msgstr "添加"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2971
+#: addons/web/static/src/js/view_form.js:2998
 msgid "Add: "
 msgstr ""
 
@@ -1247,7 +1247,7 @@ msgid "Set Image"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/js/view_form.js:1623
 #: addons/web/static/src/xml/base.xml:1170
 #: addons/web/static/src/xml/base.xml:1220
 #: addons/web/static/src/xml/base.xml:1222
diff --git a/addons/web_calendar/i18n/ar.po b/addons/web_calendar/i18n/ar.po
index f56e63a89c3..8e96343291e 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/bg.po b/addons/web_calendar/i18n/bg.po
index f18c3c006f0..189a912e5d3 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/bn.po b/addons/web_calendar/i18n/bn.po
index 1f44b1abca8..0392489d9e3 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/bs.po b/addons/web_calendar/i18n/bs.po
index fb8d9868939..08bbdbd85ad 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/ca.po b/addons/web_calendar/i18n/ca.po
index c324615c80e..ac5bfa209f7 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/cs.po b/addons/web_calendar/i18n/cs.po
index 8dbaac78404..a1295f230c1 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 "X-Poedit-Language: Czech\n"
 
 #. openerp-web
diff --git a/addons/web_calendar/i18n/da.po b/addons/web_calendar/i18n/da.po
index c6e16c1c836..ca14176dace 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/de.po b/addons/web_calendar/i18n/de.po
index 84d538b7f72..537871c5e69 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
@@ -25,114 +25,114 @@ msgstr "Kalender"
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:70
 msgid "Filter"
-msgstr ""
+msgstr "Filter"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:144
 msgid "Today"
-msgstr ""
+msgstr "Heute"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:145
 msgid "Day"
-msgstr ""
+msgstr "Tag"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:146
 msgid "Week"
-msgstr ""
+msgstr "Woche"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:147
 msgid "Month"
-msgstr ""
+msgstr "Monat"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:148
 msgid "New event"
-msgstr ""
+msgstr "Neues Ereignis"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:149
 msgid "Save"
-msgstr ""
+msgstr "Speichern"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:150
 msgid "Cancel"
-msgstr ""
+msgstr "Abbrechen"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:151
 msgid "Details"
-msgstr ""
+msgstr "Details"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:152
 msgid "Edit"
-msgstr ""
+msgstr "Bearbeiten"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:153
 msgid "Delete"
-msgstr ""
+msgstr "Löschen"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:155
 msgid "Event will be deleted permanently, are you sure?"
-msgstr ""
+msgstr "Termin wird endgültig gelöscht, sind Sie sicher?"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:156
 #: addons/web_calendar/static/src/js/calendar.js:169
 msgid "Description"
-msgstr ""
+msgstr "Beschreibung"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:157
 msgid "Time period"
-msgstr ""
+msgstr "Zeitspanne"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:158
 msgid "Full day"
-msgstr ""
+msgstr "Ganztägig"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:161
 msgid "Do you want to edit the whole set of repeated events?"
-msgstr ""
+msgstr "Möchten Sie den wiederkehrenden Termin als Ganzes bearbeiten?"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:162
 msgid "Repeat event"
-msgstr ""
+msgstr "Wiederkehrender Termin"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:163
 msgid "Disabled"
-msgstr ""
+msgstr "Deaktiviert"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:164
 msgid "Enabled"
-msgstr ""
+msgstr "Aktiviert"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:167
 #: addons/web_calendar/static/src/js/calendar.js:175
 msgid "Agenda"
-msgstr ""
+msgstr "Agenda"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:168
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:172
 msgid "Year"
-msgstr ""
+msgstr "Jahr"
 
 #. openerp-web
 #: addons/web_calendar/static/src/xml/web_calendar.xml:5
diff --git a/addons/web_calendar/i18n/en_AU.po b/addons/web_calendar/i18n/en_AU.po
index 8402bd48fe7..77d15ac29fd 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/en_GB.po b/addons/web_calendar/i18n/en_GB.po
index 457139f53c2..415199e6c5a 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/es.po b/addons/web_calendar/i18n/es.po
index 6287740a43b..55512c37e30 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/es_CL.po b/addons/web_calendar/i18n/es_CL.po
index 2ed43f574c0..40502d523f4 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/es_CR.po b/addons/web_calendar/i18n/es_CR.po
index baf058c57e7..b972f564b22 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 "Language: es\n"
 
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_EC.po b/addons/web_calendar/i18n/es_EC.po
index 4af3f9a2229..aa24da34e50 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/et.po b/addons/web_calendar/i18n/et.po
index fc8fe2c4f82..b1f459db6ce 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/eu.po b/addons/web_calendar/i18n/eu.po
index 9a40efaafad..a8c79a92c47 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/fi.po b/addons/web_calendar/i18n/fi.po
index 389c14fe39d..a7ab5e349e8 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/fr.po b/addons/web_calendar/i18n/fr.po
index e70cc3586dd..eb256b6c2e4 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/fr_CA.po b/addons/web_calendar/i18n/fr_CA.po
index 664f7548e0b..64e0bd08f0a 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/gl.po b/addons/web_calendar/i18n/gl.po
index 989ef771e00..0bc08b90ac9 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/hr.po b/addons/web_calendar/i18n/hr.po
index ee9cf0f1f6f..a93da3cb3a5 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/id.po b/addons/web_calendar/i18n/id.po
index 825875dcc72..335db226c88 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/it.po b/addons/web_calendar/i18n/it.po
index dacf0833788..5ab60f4f02e 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po
index 530114b73c8..20433096dfe 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/ka.po b/addons/web_calendar/i18n/ka.po
index f20ad7e28d1..1228c009c3a 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/mk.po b/addons/web_calendar/i18n/mk.po
index 5ac301eacbb..f58463ff47f 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/mn.po b/addons/web_calendar/i18n/mn.po
index 37c52160f41..237ff78a652 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/nb.po b/addons/web_calendar/i18n/nb.po
index 47039c57804..69c46f78587 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/nl.po b/addons/web_calendar/i18n/nl.po
index be9030bbffd..a786ac1e7b6 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/nl_BE.po b/addons/web_calendar/i18n/nl_BE.po
index b41105adb5a..637245c7749 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/pl.po b/addons/web_calendar/i18n/pl.po
index 09b4d5ff082..89c92ce8270 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/pt.po b/addons/web_calendar/i18n/pt.po
index 93872d85362..2c41b6486a3 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/pt_BR.po b/addons/web_calendar/i18n/pt_BR.po
index 15012793fd2..27fca019d28 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/ro.po b/addons/web_calendar/i18n/ro.po
index 477e5ea6dba..e016d08c6a4 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/ru.po b/addons/web_calendar/i18n/ru.po
index a285c18a8a0..9424b21635b 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/sk.po b/addons/web_calendar/i18n/sk.po
index 13235b7f1f6..0989307736e 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/sl.po b/addons/web_calendar/i18n/sl.po
index bb9a766699a..81ceb1f7896 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/sq.po b/addons/web_calendar/i18n/sq.po
index d5052c21a98..e4e83fea417 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/sr@latin.po b/addons/web_calendar/i18n/sr@latin.po
index 30df81c6547..bda4b4476fc 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/sv.po b/addons/web_calendar/i18n/sv.po
index ff31e17a3ae..13d56a158bf 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/tr.po b/addons/web_calendar/i18n/tr.po
index df64a8e2a20..a0e868e49ec 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/uk.po b/addons/web_calendar/i18n/uk.po
index 04c7810aab4..ee1418d8dc4 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/zh_CN.po b/addons/web_calendar/i18n/zh_CN.po
index 93c6e7fb8a9..00868228e45 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_diagram/i18n/ar.po b/addons/web_diagram/i18n/ar.po
index 6cefaa2a1e6..a24af2ce877 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/bg.po b/addons/web_diagram/i18n/bg.po
index 4d9b09a32fd..cb3855ab887 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/bn.po b/addons/web_diagram/i18n/bn.po
index c7c3098261a..b5866821ccd 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/bs.po b/addons/web_diagram/i18n/bs.po
index 78bc9bcfed6..dfecdc3a5bb 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/ca.po b/addons/web_diagram/i18n/ca.po
index 7bdff1f56ab..052864c8eb1 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/cs.po b/addons/web_diagram/i18n/cs.po
index 8aa648c29d6..2fb8ff74bd7 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 "X-Poedit-Language: Czech\n"
 
 #. openerp-web
diff --git a/addons/web_diagram/i18n/da.po b/addons/web_diagram/i18n/da.po
index d43db3441ef..c43207010b8 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/de.po b/addons/web_diagram/i18n/de.po
index 2a712220960..5d52c0970a6 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/en_GB.po b/addons/web_diagram/i18n/en_GB.po
index d77a4241a18..6fd8d39c639 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/es.po b/addons/web_diagram/i18n/es.po
index bbf3b6fe1a1..abf0a9e0499 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/es_CL.po b/addons/web_diagram/i18n/es_CL.po
index 0ee04a2e1b3..042cba251c3 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/es_CR.po b/addons/web_diagram/i18n/es_CR.po
index bc5a06f617b..a9ec1b50a6f 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 "Language: es\n"
 
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_EC.po b/addons/web_diagram/i18n/es_EC.po
index 02a71d4d443..a15270aa62a 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/et.po b/addons/web_diagram/i18n/et.po
index 2dbaff93c81..46c9d943166 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/fi.po b/addons/web_diagram/i18n/fi.po
index 5c7bf61c4f8..ef77db801f0 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/fr.po b/addons/web_diagram/i18n/fr.po
index 25c1d712ea8..013bdb11e20 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/gl.po b/addons/web_diagram/i18n/gl.po
index 387a3a9e176..8f1b05a2770 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/hr.po b/addons/web_diagram/i18n/hr.po
index 19c8beadb52..9b2d07f0331 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/id.po b/addons/web_diagram/i18n/id.po
index 38e3f04dd2a..c6ef3634088 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/it.po b/addons/web_diagram/i18n/it.po
index 03452a70419..74953f31ded 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index 0efa97a6739..f608596d604 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/ka.po b/addons/web_diagram/i18n/ka.po
index 8244511d7f7..6785d848287 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/mn.po b/addons/web_diagram/i18n/mn.po
index d16d11b84c5..9a38a6563c5 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/nl.po b/addons/web_diagram/i18n/nl.po
index c45161d6288..52780ad859c 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/nl_BE.po b/addons/web_diagram/i18n/nl_BE.po
index 05b7b85f9bf..196765caae1 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/pl.po b/addons/web_diagram/i18n/pl.po
index bd13e5de525..d4a85f225d4 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/pt.po b/addons/web_diagram/i18n/pt.po
index 3f7fc4e682e..27eb70063d2 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/pt_BR.po b/addons/web_diagram/i18n/pt_BR.po
index 47686c4d90e..a3ffb189d90 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/ro.po b/addons/web_diagram/i18n/ro.po
index 230a60799c8..3b2acd221a7 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/ru.po b/addons/web_diagram/i18n/ru.po
index c89a3df01b6..a7b7d62772e 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/sl.po b/addons/web_diagram/i18n/sl.po
index e66bfe21025..354c299e319 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/sq.po b/addons/web_diagram/i18n/sq.po
index 85f3c8ea3a5..e92c0b7e919 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/sr@latin.po b/addons/web_diagram/i18n/sr@latin.po
index 06b504ef6b1..d96c8029d4e 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/sv.po b/addons/web_diagram/i18n/sv.po
index fcfea765727..b627f0377d2 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/tr.po b/addons/web_diagram/i18n/tr.po
index a7d5e594b0c..d78a7576d27 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/zh_CN.po b/addons/web_diagram/i18n/zh_CN.po
index c716c0dca5a..03532a5c303 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_gantt/i18n/ar.po b/addons/web_gantt/i18n/ar.po
index 1424a611755..f17be73d2a5 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/bg.po b/addons/web_gantt/i18n/bg.po
index 03fd70a4022..3b9987e7b69 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/bn.po b/addons/web_gantt/i18n/bn.po
index 5fbfd0d559d..bbc08ae9424 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/bs.po b/addons/web_gantt/i18n/bs.po
index 8c12629417c..ea07e8ecd8e 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/ca.po b/addons/web_gantt/i18n/ca.po
index c0f595fa923..e55e4bc8137 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/cs.po b/addons/web_gantt/i18n/cs.po
index e99da0cc8a9..1a03d24c933 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 "X-Poedit-Language: Czech\n"
 
 #. openerp-web
diff --git a/addons/web_gantt/i18n/da.po b/addons/web_gantt/i18n/da.po
index f21409b8c06..68daab26815 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/de.po b/addons/web_gantt/i18n/de.po
index 12b5919db12..7a2c4dd4234 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/en_AU.po b/addons/web_gantt/i18n/en_AU.po
index eaf33501cee..edc46829394 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/en_GB.po b/addons/web_gantt/i18n/en_GB.po
index 6806f550137..4b13ab0f71d 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/es.po b/addons/web_gantt/i18n/es.po
index 8a93a2f06cb..cdc0c21b4b4 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/es_CL.po b/addons/web_gantt/i18n/es_CL.po
index b690ab31964..7eb75921fe4 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/es_CR.po b/addons/web_gantt/i18n/es_CR.po
index 690c28f19d3..c451931b817 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/es_EC.po b/addons/web_gantt/i18n/es_EC.po
index fc8d6585ff3..5a9c55af512 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/fi.po b/addons/web_gantt/i18n/fi.po
index 52ba352cd3d..fa4e4b8ae19 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/fr.po b/addons/web_gantt/i18n/fr.po
index af575c4ceb5..2213c0d9dab 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/gl.po b/addons/web_gantt/i18n/gl.po
index 18eff9bbe87..e458370623d 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/hr.po b/addons/web_gantt/i18n/hr.po
index efcdb158786..47371d24dca 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/hu.po b/addons/web_gantt/i18n/hu.po
index ba638e6f53f..a161d6476b8 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/it.po b/addons/web_gantt/i18n/it.po
index 596d2c10b23..152f656e2cd 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po
index fdae6e9856f..298233f3807 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/ka.po b/addons/web_gantt/i18n/ka.po
index 0d8d78bbcd9..0eb5a812599 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/mk.po b/addons/web_gantt/i18n/mk.po
index 0c2e2a7b10a..2aa7b263f53 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/mn.po b/addons/web_gantt/i18n/mn.po
index 0816e5c3801..1bf1a0b1423 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/nb.po b/addons/web_gantt/i18n/nb.po
index b0b11fe866d..0f0b284f298 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/nl.po b/addons/web_gantt/i18n/nl.po
index 5009a0cd4da..47ef4ae2c95 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/nl_BE.po b/addons/web_gantt/i18n/nl_BE.po
index 4900b1ad510..1b849ca0e8b 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/pl.po b/addons/web_gantt/i18n/pl.po
index 67903e79479..077e7ceb837 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/pt.po b/addons/web_gantt/i18n/pt.po
index 5b81c8dffde..ead46220439 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/pt_BR.po b/addons/web_gantt/i18n/pt_BR.po
index d454b7f761d..3aee30d76f6 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/ro.po b/addons/web_gantt/i18n/ro.po
index 2064fe9d085..bbcc2db221c 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/ru.po b/addons/web_gantt/i18n/ru.po
index 0fab8d95ab9..48ffe83f18d 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/sl.po b/addons/web_gantt/i18n/sl.po
index 68dc4eecb99..13fa2423a6f 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/sq.po b/addons/web_gantt/i18n/sq.po
index 14e0802e404..d11717cb09d 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/sr@latin.po b/addons/web_gantt/i18n/sr@latin.po
index da3ffe07e69..c8dd0d55142 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/sv.po b/addons/web_gantt/i18n/sv.po
index 561c9ea9263..470716930ef 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/tr.po b/addons/web_gantt/i18n/tr.po
index a88b14b1619..2df757ef9a3 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/zh_CN.po b/addons/web_gantt/i18n/zh_CN.po
index 58c7b37ed9c..a9909c280dd 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_graph/i18n/ar.po b/addons/web_graph/i18n/ar.po
index a604c1c5181..fa49c551a95 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/bg.po b/addons/web_graph/i18n/bg.po
index f2c65aef06c..e7a62f88810 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/bn.po b/addons/web_graph/i18n/bn.po
index 3446708f8c7..ac223d19c83 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/bs.po b/addons/web_graph/i18n/bs.po
index fe69ca74cda..7d6f892b50c 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/ca.po b/addons/web_graph/i18n/ca.po
index 7c12d4e4a5b..25e25f9dc7d 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/cs.po b/addons/web_graph/i18n/cs.po
index f859e927649..a2eea53ecb8 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/da.po b/addons/web_graph/i18n/da.po
index 4b7554491ba..cd5bcbe341f 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/de.po b/addons/web_graph/i18n/de.po
index ad047080026..0a4314edaac 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/en_AU.po b/addons/web_graph/i18n/en_AU.po
index c8bf729f812..f1b11a8dc2b 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/en_GB.po b/addons/web_graph/i18n/en_GB.po
index cf620b69f30..b70a4d79dfa 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/es.po b/addons/web_graph/i18n/es.po
index 830a3578103..305b689b3f3 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/es_CL.po b/addons/web_graph/i18n/es_CL.po
index 578a92e24b1..135e16d81f0 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/es_CR.po b/addons/web_graph/i18n/es_CR.po
index 419d34825a0..e50f8a8926a 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/es_EC.po b/addons/web_graph/i18n/es_EC.po
index c6e16670cbc..0a639edd0c8 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/fi.po b/addons/web_graph/i18n/fi.po
index e5feb98e938..4143c641102 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/fr.po b/addons/web_graph/i18n/fr.po
index 1e1da78fe94..0290bf4a5e9 100644
--- a/addons/web_graph/i18n/fr.po
+++ b/addons/web_graph/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/gl.po b/addons/web_graph/i18n/gl.po
index b0da79d0b3a..f576893740a 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/hr.po b/addons/web_graph/i18n/hr.po
index 26f93bddfcb..aba112eb4ed 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/hu.po b/addons/web_graph/i18n/hu.po
index 3e5ffe677cc..13d3736d5f0 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/it.po b/addons/web_graph/i18n/it.po
index c79df04df01..eb63c006ee6 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
index e4be5e7f545..e46a98b59e6 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/ka.po b/addons/web_graph/i18n/ka.po
index 4320bcd0b79..bb9b9fbe139 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/mk.po b/addons/web_graph/i18n/mk.po
index e99960e7d65..29d754eadbf 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/mn.po b/addons/web_graph/i18n/mn.po
index e0a1bc889f0..de3878c5528 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/nl.po b/addons/web_graph/i18n/nl.po
index 6bbc4004161..4b730a5202e 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/nl_BE.po b/addons/web_graph/i18n/nl_BE.po
index 4d404eba722..eb2dde90234 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/pl.po b/addons/web_graph/i18n/pl.po
index 238559ed66f..dc43fc00878 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/pt.po b/addons/web_graph/i18n/pt.po
index 36f23acfa05..724544dc74f 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/pt_BR.po b/addons/web_graph/i18n/pt_BR.po
index 8d56215ecdb..4d28c907521 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/ro.po b/addons/web_graph/i18n/ro.po
index 56295e0eddb..525038e8945 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/ru.po b/addons/web_graph/i18n/ru.po
index 351025ae719..a7289c36cfb 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/sl.po b/addons/web_graph/i18n/sl.po
index ccc87d073e2..29946ce6e97 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/sq.po b/addons/web_graph/i18n/sq.po
index eb4dd6f9714..dd58abcf698 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/sr@latin.po b/addons/web_graph/i18n/sr@latin.po
index 203ea75fc0c..0d010dd9c42 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/sv.po b/addons/web_graph/i18n/sv.po
index dd2c8c1a83d..82374d35137 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/tr.po b/addons/web_graph/i18n/tr.po
index ec9a1140f17..ff29d333189 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/zh_CN.po b/addons/web_graph/i18n/zh_CN.po
index cbe82598c17..d891e7cc126 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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_hello/i18n/ar.po b/addons/web_hello/i18n/ar.po
new file mode 100644
index 00000000000..0950b48223f
--- /dev/null
+++ b/addons/web_hello/i18n/ar.po
@@ -0,0 +1,20 @@
+# Arabic translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-09-04 09:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
+
+
diff --git a/addons/web_hello/i18n/es_CR.po b/addons/web_hello/i18n/es_CR.po
index 6eab78acf41..18dd064ffa7 100644
--- a/addons/web_hello/i18n/es_CR.po
+++ b/addons/web_hello/i18n/es_CR.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 
diff --git a/addons/web_hello/i18n/fr.po b/addons/web_hello/i18n/fr.po
index 869d0ee429c..3621654d4f7 100644
--- a/addons/web_hello/i18n/fr.po
+++ b/addons/web_hello/i18n/fr.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 
diff --git a/addons/web_hello/i18n/pt_BR.po b/addons/web_hello/i18n/pt_BR.po
index 67290686615..82101dcb365 100644
--- a/addons/web_hello/i18n/pt_BR.po
+++ b/addons/web_hello/i18n/pt_BR.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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 
diff --git a/addons/web_kanban/i18n/ar.po b/addons/web_kanban/i18n/ar.po
index c9ae855e476..328eb31798a 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "غير محدد"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "هل أنت متأكد من حذف هذ السجل"
 
diff --git a/addons/web_kanban/i18n/bg.po b/addons/web_kanban/i18n/bg.po
index 7dcf4fa77a7..a8f0dce35a1 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Неопределен"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Сигурни ли сте, че искате да изтриете този запис?"
 
diff --git a/addons/web_kanban/i18n/bn.po b/addons/web_kanban/i18n/bn.po
index 37287eab6f8..3cafa7fc5b9 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "অনির্ণীত"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "আপনি কি নিশ্চিত যে আপনি এই তথ্য মুছে ফেলতে চান?"
 
diff --git a/addons/web_kanban/i18n/bs.po b/addons/web_kanban/i18n/bs.po
index d0a21ac4c2a..7b1917c4fd6 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Nedefinisano"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Jeste li sigurni da želite izbrisati zapis?"
 
diff --git a/addons/web_kanban/i18n/ca.po b/addons/web_kanban/i18n/ca.po
index 007e778a085..85a20edef73 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr ""
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr ""
 
diff --git a/addons/web_kanban/i18n/cs.po b/addons/web_kanban/i18n/cs.po
index bd337268145..89773210e67 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 "X-Poedit-Language: Czech\n"
 
 #. openerp-web
@@ -29,7 +29,7 @@ msgid "Undefined"
 msgstr "Neurčeno"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Opravdu jste si jisti, že chcete smazat tento záznam ?"
 
diff --git a/addons/web_kanban/i18n/da.po b/addons/web_kanban/i18n/da.po
index ee6bd4a1ac6..8d8c51d01df 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Ikke defineret"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Er du sikker på at du vil slette denne post?"
 
diff --git a/addons/web_kanban/i18n/de.po b/addons/web_kanban/i18n/de.po
index 4fedf032dc0..d952a64c1d9 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Nicht definiert"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Wollen Sie diesen Datensatz wirklich löschen?"
 
diff --git a/addons/web_kanban/i18n/en_GB.po b/addons/web_kanban/i18n/en_GB.po
index a2081a7a251..875e44c6a2e 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Undefined"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Are you sure you want to delete this record ?"
 
diff --git a/addons/web_kanban/i18n/es.po b/addons/web_kanban/i18n/es.po
index d53fb2d91db..eb95d1e956c 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Sin definir"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "¿Está seguro que quiere eliminar este registro?"
 
diff --git a/addons/web_kanban/i18n/es_CL.po b/addons/web_kanban/i18n/es_CL.po
index a924b1031bb..02c19d36a9d 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Sin definir"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "¿Está seguro que quiere eliminar este registro?"
 
diff --git a/addons/web_kanban/i18n/es_CR.po b/addons/web_kanban/i18n/es_CR.po
index 241fb526906..342dc36620d 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Indefinido"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "¿Está seguro/a que desea eliminar este registro?"
 
diff --git a/addons/web_kanban/i18n/es_EC.po b/addons/web_kanban/i18n/es_EC.po
index 4a145f58d66..12d2fffebc0 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Indefinido"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "¿Está seguro que quiere eliminar este registro?"
 
diff --git a/addons/web_kanban/i18n/fi.po b/addons/web_kanban/i18n/fi.po
index 97d61a1b6b0..948400ff6ce 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Määrittämätön"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Oletko varma että haluat poistaa tämän tietueen ?"
 
diff --git a/addons/web_kanban/i18n/fr.po b/addons/web_kanban/i18n/fr.po
index f9bb957dacd..8dcfa5a562f 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Sans valeur"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Voulez-vous réellement supprimer cet enregistrement?"
 
diff --git a/addons/web_kanban/i18n/gl.po b/addons/web_kanban/i18n/gl.po
index 4282a631bbe..8944caf8bab 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Sen definir"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "¿Está seguro que quere eliminar este rexistro?"
 
diff --git a/addons/web_kanban/i18n/hr.po b/addons/web_kanban/i18n/hr.po
index aefd933df50..ecaccac6bdb 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Nedefiniran"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Sigurno želite obrisati ovaj zapis?"
 
diff --git a/addons/web_kanban/i18n/hu.po b/addons/web_kanban/i18n/hu.po
index 220355bae8e..cfb388ee6f1 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Nem definiált"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Biztosan törölni szeretné ezt a bejegyzést?"
 
diff --git a/addons/web_kanban/i18n/it.po b/addons/web_kanban/i18n/it.po
index 47ea9c05964..4633191ff9f 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Non definito"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Sicuro di voler eliminare questo record?"
 
diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po
index e85cca47689..4f1b5a8e139 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "未定義"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "このレコードを削除しますか？"
 
diff --git a/addons/web_kanban/i18n/ka.po b/addons/web_kanban/i18n/ka.po
index af149b1f5c4..575223ca166 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "განუსაზღვრელი"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "ნამდვილად გსურთ აღნიშნული ჩანაწერის წაშლა?"
 
diff --git a/addons/web_kanban/i18n/mn.po b/addons/web_kanban/i18n/mn.po
index 8f79c56c638..d0271627848 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Тодорхойлогдоогүй"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Энэ бичлэгийг устгахдаа та итгэлтэй байна уу?"
 
diff --git a/addons/web_kanban/i18n/nl.po b/addons/web_kanban/i18n/nl.po
index 845d9fe16f7..fdc2af3f8e8 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Niet gedefinieerd"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Weet u zeker dat u dit record wilt verwijderen?"
 
diff --git a/addons/web_kanban/i18n/nl_BE.po b/addons/web_kanban/i18n/nl_BE.po
index 1566dca09ac..644fad67b71 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Onbepaald"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Wilt u dit record verwijderen?"
 
diff --git a/addons/web_kanban/i18n/pl.po b/addons/web_kanban/i18n/pl.po
index ac274f6c782..fffa1bdcfeb 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Niezdefiniowane"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Jesteś pewien, że chcesz usunąć ten rekord?"
 
diff --git a/addons/web_kanban/i18n/pt.po b/addons/web_kanban/i18n/pt.po
index f3b13127183..ca798c12afd 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Não definido"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Tem certeza que quer remover este registo?"
 
diff --git a/addons/web_kanban/i18n/pt_BR.po b/addons/web_kanban/i18n/pt_BR.po
index b4dc5224897..0e4647ed223 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Indefinido"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Você tem certeza que quer deletar este registro ?"
 
diff --git a/addons/web_kanban/i18n/ro.po b/addons/web_kanban/i18n/ro.po
index a67ab6aa494..d96e9e16414 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Nedefinit(a)"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Sunteti sigur(a) ca doriti sa stergeti aceasta inregistrare?"
 
diff --git a/addons/web_kanban/i18n/ru.po b/addons/web_kanban/i18n/ru.po
index 8ee8a9d60a5..8173007ab1b 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Не определено"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Вы действительно хотите удалить эту запись?"
 
diff --git a/addons/web_kanban/i18n/sr@latin.po b/addons/web_kanban/i18n/sr@latin.po
index 6e9280e9ae2..6dff2786baf 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Nedefinisan"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Jeste li sigurni da želite obrisati obaj zapis?"
 
diff --git a/addons/web_kanban/i18n/sv.po b/addons/web_kanban/i18n/sv.po
index a7fbc8227cb..1c191da6b56 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Odefinierad"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Är du säker på att du vill radera denna post?"
 
diff --git a/addons/web_kanban/i18n/tr.po b/addons/web_kanban/i18n/tr.po
index b4680d0093c..360618d887a 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "Tanımsız"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "Bu kayıdı silmek istediğinizden emin misiniz?"
 
diff --git a/addons/web_kanban/i18n/zh_CN.po b/addons/web_kanban/i18n/zh_CN.po
index afe95bf4374..267a136d70e 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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -28,7 +28,7 @@ msgid "Undefined"
 msgstr "未定义"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:468
+#: addons/web_kanban/static/src/js/kanban.js:471
 msgid "Are you sure you want to delete this record ?"
 msgstr "您确定要删除此记录吗？"
 
diff --git a/addons/web_mobile/i18n/ar.po b/addons/web_mobile/i18n/ar.po
index 3de8759b2dc..146e5e35711 100644
--- a/addons/web_mobile/i18n/ar.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/bg.po b/addons/web_mobile/i18n/bg.po
index ee00adfcd7d..019f04f1ab4 100644
--- a/addons/web_mobile/i18n/bg.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/bn.po b/addons/web_mobile/i18n/bn.po
index 1b44460ca2a..4f8f1a69dc5 100644
--- a/addons/web_mobile/i18n/bn.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/ca.po b/addons/web_mobile/i18n/ca.po
index 549fbe4c293..6481bd25841 100644
--- a/addons/web_mobile/i18n/ca.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/cs.po b/addons/web_mobile/i18n/cs.po
index e763d39f5f0..9777ac873ee 100644
--- a/addons/web_mobile/i18n/cs.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 "X-Poedit-Language: Czech\n"
 
 #. openerp-web
diff --git a/addons/web_mobile/i18n/da.po b/addons/web_mobile/i18n/da.po
index de50fabcc92..bce5f4665f1 100644
--- a/addons/web_mobile/i18n/da.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/de.po b/addons/web_mobile/i18n/de.po
index 333ff3dbe8b..0a3c6869ad8 100644
--- a/addons/web_mobile/i18n/de.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/en_GB.po b/addons/web_mobile/i18n/en_GB.po
index 3e5f28c0926..3a939a922f3 100644
--- a/addons/web_mobile/i18n/en_GB.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/es.po b/addons/web_mobile/i18n/es.po
index f759255d2e2..a3804b7ccd2 100644
--- a/addons/web_mobile/i18n/es.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/es_CL.po b/addons/web_mobile/i18n/es_CL.po
index 3740454da3e..5735252fb4d 100644
--- a/addons/web_mobile/i18n/es_CL.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/es_CR.po b/addons/web_mobile/i18n/es_CR.po
index 37d3cce2ece..897393df778 100644
--- a/addons/web_mobile/i18n/es_CR.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 "Language: es\n"
 
 #. openerp-web
diff --git a/addons/web_mobile/i18n/es_EC.po b/addons/web_mobile/i18n/es_EC.po
index 024f43fe95e..338c62e4529 100644
--- a/addons/web_mobile/i18n/es_EC.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/et.po b/addons/web_mobile/i18n/et.po
index 53a33579baa..76371411d8d 100644
--- a/addons/web_mobile/i18n/et.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/fi.po b/addons/web_mobile/i18n/fi.po
index 3dab2df2813..c18787af4c2 100644
--- a/addons/web_mobile/i18n/fi.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/fr.po b/addons/web_mobile/i18n/fr.po
index 5cf9858ae48..7988c524fe9 100644
--- a/addons/web_mobile/i18n/fr.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/gl.po b/addons/web_mobile/i18n/gl.po
index 76f288d644e..1027c734daa 100644
--- a/addons/web_mobile/i18n/gl.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/hr.po b/addons/web_mobile/i18n/hr.po
index d1bd2cbd2fe..bae6c72f4dd 100644
--- a/addons/web_mobile/i18n/hr.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/it.po b/addons/web_mobile/i18n/it.po
index 893f83f15ad..97e482624b1 100644
--- a/addons/web_mobile/i18n/it.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/ja.po b/addons/web_mobile/i18n/ja.po
index 1dd00df3e12..bf325b7bd47 100644
--- a/addons/web_mobile/i18n/ja.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/ka.po b/addons/web_mobile/i18n/ka.po
index ea0e4dd832c..bbe8fed4cc9 100644
--- a/addons/web_mobile/i18n/ka.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/mk.po b/addons/web_mobile/i18n/mk.po
index 8fdb193c5ee..9005eeda502 100644
--- a/addons/web_mobile/i18n/mk.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/mn.po b/addons/web_mobile/i18n/mn.po
index 23ab90661b9..21dc45e034f 100644
--- a/addons/web_mobile/i18n/mn.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/nb.po b/addons/web_mobile/i18n/nb.po
index d9a95d25005..406c72fa7ec 100644
--- a/addons/web_mobile/i18n/nb.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/nl.po b/addons/web_mobile/i18n/nl.po
index 4120c477353..b368e428ab1 100644
--- a/addons/web_mobile/i18n/nl.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/nl_BE.po b/addons/web_mobile/i18n/nl_BE.po
index 8b186d8b501..36d0a1a8331 100644
--- a/addons/web_mobile/i18n/nl_BE.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/pl.po b/addons/web_mobile/i18n/pl.po
index 37508eb5023..8a101bcc7bc 100644
--- a/addons/web_mobile/i18n/pl.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/pt.po b/addons/web_mobile/i18n/pt.po
index ce9ce0561d5..f0b70745c46 100644
--- a/addons/web_mobile/i18n/pt.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/pt_BR.po b/addons/web_mobile/i18n/pt_BR.po
index 0f36885dcdd..5b70bed3432 100644
--- a/addons/web_mobile/i18n/pt_BR.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/ro.po b/addons/web_mobile/i18n/ro.po
index d8d3fbe49c3..c7d1757018b 100644
--- a/addons/web_mobile/i18n/ro.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/ru.po b/addons/web_mobile/i18n/ru.po
index f2a9944526e..290f978e973 100644
--- a/addons/web_mobile/i18n/ru.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/sk.po b/addons/web_mobile/i18n/sk.po
index e4e20e359af..7212510c569 100644
--- a/addons/web_mobile/i18n/sk.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/sl.po b/addons/web_mobile/i18n/sl.po
index 61faff58ff4..456d4919aeb 100644
--- a/addons/web_mobile/i18n/sl.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/sq.po b/addons/web_mobile/i18n/sq.po
index 4b42897beb0..bb9f583d9e1 100644
--- a/addons/web_mobile/i18n/sq.po
+++ b/addons/web_mobile/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: 2012-08-28 07:23+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/sr@latin.po b/addons/web_mobile/i18n/sr@latin.po
index b89a6aa1a67..a3519d58d96 100644
--- a/addons/web_mobile/i18n/sr@latin.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/sv.po b/addons/web_mobile/i18n/sv.po
index 96346415130..389fef0e665 100644
--- a/addons/web_mobile/i18n/sv.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/tr.po b/addons/web_mobile/i18n/tr.po
index e7686c9ce6c..b34dcdac8fd 100644
--- a/addons/web_mobile/i18n/tr.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/uk.po b/addons/web_mobile/i18n/uk.po
index adb524f0f5c..5a3efb38fde 100644
--- a/addons/web_mobile/i18n/uk.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_mobile/i18n/zh_CN.po b/addons/web_mobile/i18n/zh_CN.po
index 74858dec30d..63a172eb75d 100644
--- a/addons/web_mobile/i18n/zh_CN.po
+++ b/addons/web_mobile/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_process/i18n/ar.po b/addons/web_process/i18n/ar.po
index 72a5c159837..3e1df341eca 100644
--- a/addons/web_process/i18n/ar.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/bg.po b/addons/web_process/i18n/bg.po
index 06e665e6461..9aa1fe53d69 100644
--- a/addons/web_process/i18n/bg.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/bn.po b/addons/web_process/i18n/bn.po
index 794f455c01b..a5a10d017da 100644
--- a/addons/web_process/i18n/bn.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/bs.po b/addons/web_process/i18n/bs.po
index ad3ce96d2e5..ca18ca5c8ba 100644
--- a/addons/web_process/i18n/bs.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/ca.po b/addons/web_process/i18n/ca.po
index 6651543f116..49ae4877ad8 100644
--- a/addons/web_process/i18n/ca.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/cs.po b/addons/web_process/i18n/cs.po
index 92fce23f2e2..64c1efebe9d 100644
--- a/addons/web_process/i18n/cs.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 "X-Poedit-Language: Czech\n"
 
 #. openerp-web
diff --git a/addons/web_process/i18n/da.po b/addons/web_process/i18n/da.po
index c281de396d7..eebabf25d23 100644
--- a/addons/web_process/i18n/da.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/de.po b/addons/web_process/i18n/de.po
index ef5675f43d2..9ad55a18bcc 100644
--- a/addons/web_process/i18n/de.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/en_GB.po b/addons/web_process/i18n/en_GB.po
index 02fd1a2a89f..c4317088faf 100644
--- a/addons/web_process/i18n/en_GB.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/es.po b/addons/web_process/i18n/es.po
index f7450da2c86..88a9f16ed1d 100644
--- a/addons/web_process/i18n/es.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/es_CL.po b/addons/web_process/i18n/es_CL.po
index da498591b30..636612638df 100644
--- a/addons/web_process/i18n/es_CL.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/es_CR.po b/addons/web_process/i18n/es_CR.po
index fe65649beae..b102f2838cd 100644
--- a/addons/web_process/i18n/es_CR.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/es_EC.po b/addons/web_process/i18n/es_EC.po
index 4a3f033a8fb..c2003008290 100644
--- a/addons/web_process/i18n/es_EC.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/fi.po b/addons/web_process/i18n/fi.po
index 75873df0fd0..b853bff6426 100644
--- a/addons/web_process/i18n/fi.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/fr.po b/addons/web_process/i18n/fr.po
index 79fd6884b65..325252c2f09 100644
--- a/addons/web_process/i18n/fr.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/gl.po b/addons/web_process/i18n/gl.po
index f2b93ca8761..a06a31db591 100644
--- a/addons/web_process/i18n/gl.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/hr.po b/addons/web_process/i18n/hr.po
index d1a42cbda04..7963cc01288 100644
--- a/addons/web_process/i18n/hr.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/hu.po b/addons/web_process/i18n/hu.po
index 611bfd998fb..c34533d9874 100644
--- a/addons/web_process/i18n/hu.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/it.po b/addons/web_process/i18n/it.po
index 78bbfbaa1f8..ed09b1d03a2 100644
--- a/addons/web_process/i18n/it.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/ja.po b/addons/web_process/i18n/ja.po
index a67043d1113..4c6292af40d 100644
--- a/addons/web_process/i18n/ja.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/ka.po b/addons/web_process/i18n/ka.po
index 3be606943a2..4c403c4efd2 100644
--- a/addons/web_process/i18n/ka.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/mk.po b/addons/web_process/i18n/mk.po
index 85167ec26e5..463fc07210d 100644
--- a/addons/web_process/i18n/mk.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/mn.po b/addons/web_process/i18n/mn.po
index 54394dacb7a..0faf71e1951 100644
--- a/addons/web_process/i18n/mn.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/nb.po b/addons/web_process/i18n/nb.po
index 5aa2a4603d6..9a15b148381 100644
--- a/addons/web_process/i18n/nb.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/nl.po b/addons/web_process/i18n/nl.po
index ad4cb1fbff3..3004298b899 100644
--- a/addons/web_process/i18n/nl.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/nl_BE.po b/addons/web_process/i18n/nl_BE.po
index 7a7359a3cfe..336f3823a57 100644
--- a/addons/web_process/i18n/nl_BE.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/pl.po b/addons/web_process/i18n/pl.po
index 441eb9115b0..bfa4691499f 100644
--- a/addons/web_process/i18n/pl.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/pt.po b/addons/web_process/i18n/pt.po
index e9ec4c7b663..fe9d449b15d 100644
--- a/addons/web_process/i18n/pt.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/pt_BR.po b/addons/web_process/i18n/pt_BR.po
index 68716f1fd13..fd1d766dbe2 100644
--- a/addons/web_process/i18n/pt_BR.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/ro.po b/addons/web_process/i18n/ro.po
index cded77fcbc6..d9445d19146 100644
--- a/addons/web_process/i18n/ro.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/ru.po b/addons/web_process/i18n/ru.po
index 873b2a6e223..01701676b0d 100644
--- a/addons/web_process/i18n/ru.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/sl.po b/addons/web_process/i18n/sl.po
index 853faab9eb0..0f426def60f 100644
--- a/addons/web_process/i18n/sl.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/sr@latin.po b/addons/web_process/i18n/sr@latin.po
index 44c4503f5cd..02dfe01f1f1 100644
--- a/addons/web_process/i18n/sr@latin.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/sv.po b/addons/web_process/i18n/sv.po
index cfb50ae035d..55467b65c2b 100644
--- a/addons/web_process/i18n/sv.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/tr.po b/addons/web_process/i18n/tr.po
index 29cccb89ce0..79fa1e0c208 100644
--- a/addons/web_process/i18n/tr.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_process/i18n/zh_CN.po b/addons/web_process/i18n/zh_CN.po
index 4af2e3fe9fd..0acc66b8584 100644
--- a/addons/web_process/i18n/zh_CN.po
+++ b/addons/web_process/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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/addons/web_rpc/i18n/es_CR.po b/addons/web_rpc/i18n/es_CR.po
index 5f4d870c7fe..085c920c095 100644
--- a/addons/web_rpc/i18n/es_CR.po
+++ b/addons/web_rpc/i18n/es_CR.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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 
diff --git a/addons/web_tests/i18n/es_CR.po b/addons/web_tests/i18n/es_CR.po
index 5f4d870c7fe..085c920c095 100644
--- a/addons/web_tests/i18n/es_CR.po
+++ b/addons/web_tests/i18n/es_CR.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: 2012-08-28 07:24+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
 
 

From b2485b147e74e09f99e1f7aa60b502be17427759 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 5 Sep 2012 11:26:27 +0530
Subject: [PATCH 830/999] [IMP] revert the changes in domain with one change

bzr revid: cha@tinyerp.com-20120905055627-3r4ivpcqv4zxc2r3
---
 addons/crm/crm_lead.py                  | 2 +-
 addons/hr_recruitment/hr_recruitment.py | 2 +-
 addons/project/project.py               | 2 +-
 addons/project_issue/project_issue.py   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index aa6a7a66e5c..f286efa24c2 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -213,7 +213,7 @@ class crm_lead(base_stage, osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'date_closed': fields.datetime('Closed', readonly=True),
         'stage_id': fields.many2one('crm.case.stage', 'Stage',
-                        domain="['&', '&', '|', ('fold', '=', False),('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"),
+                        domain="['&', ('fold', '=', False), '&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"),
         'user_id': fields.many2one('res.users', 'Salesperson'),
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 05c7a9df2bd..2a3fab58730 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -185,7 +185,7 @@ class hr_applicant(base_stage, osv.Model):
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage',
-                        domain="['&', '|', ('fold', '=', False), ('department_id', '=', department_id), ('department_id', '=', False)]"),
+                        domain="['&', ('fold', '=', False), '|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=AVAILABLE_STATES, string="State", readonly=True,
                 help='The state is set to \'Draft\', when a case is created.\
diff --git a/addons/project/project.py b/addons/project/project.py
index 55cb8c2ff37..c9bcb643150 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -739,7 +739,7 @@ class task(base_stage, osv.osv):
         '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',
-                        domain="['&', '|', ('fold', '=', False), ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=_TASK_STATE, string="State", readonly=True,
                 help='The state is set to \'Draft\', when a case is created.\
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index d5279e31e41..368ec2cb9d7 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -240,7 +240,7 @@ 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',
-                        domain="['&', '|', ('fold', '=', False), ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),

From 2a664d9429f1337304516b3a63f8f14d041b3573 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 5 Sep 2012 10:03:44 +0200
Subject: [PATCH 831/999] wip

bzr revid: nicolas.vanhoren@openerp.com-20120905080344-n61yuun3fuhgufbg
---
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index a369be28dc9..99ae2131006 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -301,7 +301,7 @@
                     <field name="category_id"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div class="oe_kanban_vignette">
+                            <div class="oe_kanban_vignette oe_semantic_html_override">
                                 <a type="open">
                                     <img t-att-src="kanban_image('res.partner', 'image_small', record.id.value)" class="oe_kanban_image"/>
                                 </a>

From a454d6fae3c2fee59ff61720c4ff6e13cbdc8868 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 5 Sep 2012 10:03:53 +0200
Subject: [PATCH 832/999] wip

bzr revid: nicolas.vanhoren@openerp.com-20120905080353-tquc3r3n27kt452v
---
 addons/web/static/src/css/base.css  | 51 +++++++++++++++++++++++------
 addons/web/static/src/css/base.sass |  7 ++--
 2 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 09432786ca0..07467317c7c 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -115,18 +115,33 @@
   margin: 0;
   padding: 0;
 }
-.openerp .oe_semantic_html_override_ul li {
+.openerp .oe_semantic_html_override_ul ul, .openerp .oe_semantic_html_override_ul ol, .openerp .oe_semantic_html_override_ul li {
   margin: 0;
   padding: 0;
+}
+.openerp .oe_semantic_html_override_ul li {
   list-style-type: none;
 }
 .openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol {
   margin: 0;
   padding: 0;
 }
-.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li {
+.openerp .oe_semantic_html_override ul ul, .openerp .oe_semantic_html_override ul ol, .openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol ul, .openerp .oe_semantic_html_override ol ol, .openerp .oe_semantic_html_override ol li {
   margin: 0;
   padding: 0;
+}
+.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li {
+  list-style-type: none;
+}
+.openerp ul.oe_semantic_html_override {
+  margin: 0;
+  padding: 0;
+}
+.openerp ul.oe_semantic_html_override ul, .openerp ul.oe_semantic_html_override ol, .openerp ul.oe_semantic_html_override li {
+  margin: 0;
+  padding: 0;
+}
+.openerp ul.oe_semantic_html_override li {
   list-style-type: none;
 }
 .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
@@ -603,18 +618,22 @@
   margin: 0;
   padding: 0;
 }
-.openerp .oe_notebook li {
+.openerp .oe_notebook ul, .openerp .oe_notebook ol, .openerp .oe_notebook li {
   margin: 0;
   padding: 0;
+}
+.openerp .oe_notebook li {
   list-style-type: none;
 }
 .openerp .oe_notebook ul, .openerp .oe_notebook ol {
   margin: 0;
   padding: 0;
 }
-.openerp .oe_notebook ul li, .openerp .oe_notebook ol li {
+.openerp .oe_notebook ul ul, .openerp .oe_notebook ul ol, .openerp .oe_notebook ul li, .openerp .oe_notebook ol ul, .openerp .oe_notebook ol ol, .openerp .oe_notebook ol li {
   margin: 0;
   padding: 0;
+}
+.openerp .oe_notebook ul li, .openerp .oe_notebook ol li {
   list-style-type: none;
 }
 .openerp .oe_notebook.ui-corner-all {
@@ -924,9 +943,11 @@
   margin: 0;
   padding: 0;
 }
-.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li {
+.openerp .oe_login .oe_login_pane ul ul, .openerp .oe_login .oe_login_pane ul ol, .openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol ul, .openerp .oe_login .oe_login_pane ol ol, .openerp .oe_login .oe_login_pane ol li {
   margin: 0;
   padding: 0;
+}
+.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li {
   list-style-type: none;
 }
 .openerp .oe_login .oe_login_pane h2 {
@@ -1012,9 +1033,11 @@
   margin: 0;
   padding: 0;
 }
-.openerp .oe_topbar ul li, .openerp .oe_topbar ol li {
+.openerp .oe_topbar ul ul, .openerp .oe_topbar ul ol, .openerp .oe_topbar ul li, .openerp .oe_topbar ol ul, .openerp .oe_topbar ol ol, .openerp .oe_topbar ol li {
   margin: 0;
   padding: 0;
+}
+.openerp .oe_topbar ul li, .openerp .oe_topbar ol li {
   list-style-type: none;
 }
 .openerp .oe_topbar .oe_topbar_item {
@@ -1093,9 +1116,11 @@
   margin: 0;
   padding: 0;
 }
-.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li {
+.openerp .oe_leftbar ul ul, .openerp .oe_leftbar ul ol, .openerp .oe_leftbar ul li, .openerp .oe_leftbar ol ul, .openerp .oe_leftbar ol ol, .openerp .oe_leftbar ol li {
   margin: 0;
   padding: 0;
+}
+.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li {
   list-style-type: none;
 }
 .openerp a.oe_logo {
@@ -1304,9 +1329,11 @@
   margin: 0;
   padding: 0;
 }
-.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li {
+.openerp .oe_view_manager table.oe_view_manager_header ul ul, .openerp .oe_view_manager table.oe_view_manager_header ul ol, .openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol ul, .openerp .oe_view_manager table.oe_view_manager_header ol ol, .openerp .oe_view_manager table.oe_view_manager_header ol li {
   margin: 0;
   padding: 0;
+}
+.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li {
   list-style-type: none;
 }
 .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row {
@@ -2447,14 +2474,18 @@
   margin: 0;
   padding: 0;
 }
-.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li {
+.openerp .oe_form_field_status ul ul, .openerp .oe_form_field_status ul ol, .openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol ul, .openerp .oe_form_field_status ol ol, .openerp .oe_form_field_status ol li {
   margin: 0;
   padding: 0;
+}
+.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li {
   list-style-type: none;
 }
-.openerp .oe_form_field_status li {
+.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol, .openerp .oe_form_field_status li {
   margin: 0;
   padding: 0;
+}
+.openerp .oe_form_field_status li {
   list-style-type: none;
 }
 .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 40766085008..495f88ad282 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -127,9 +127,10 @@ $sheet-max-width: 860px
 @mixin ul-html-override()
     margin: 0
     padding: 0
-    li
+    ul, ol, li
         margin: 0
         padding: 0
+    li
         list-style-type: none
 
 @mixin semantic-html-override()
@@ -199,9 +200,11 @@ $sheet-max-width: 860px
         vertical-align: middle
     h4
         margin: 4px 0
+    .oe_semantic_html_override_ul
+        @include ul-html-override
     .oe_semantic_html_override
         @include semantic-html-override
-    .oe_semantic_html_override_ul
+    ul.oe_semantic_html_override
         @include ul-html-override
     // }}}
     // Button style {{{

From 8c89e963c8a8fedc01653021d3d8f41d4d6e50c3 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 5 Sep 2012 10:04:02 +0200
Subject: [PATCH 833/999] wip

bzr revid: nicolas.vanhoren@openerp.com-20120905080402-mimiog42gosrb437
---
 addons/auth_openid/static/src/xml/auth_openid.xml | 2 +-
 addons/crm/crm_lead_view.xml                      | 2 +-
 addons/edi/static/src/xml/edi_account.xml         | 2 +-
 addons/edi/static/src/xml/edi_sale_purchase.xml   | 2 +-
 addons/hr_recruitment/hr_recruitment_view.xml     | 2 +-
 addons/mail/static/src/xml/mail.xml               | 2 +-
 addons/plugin_outlook/plugin_outlook.xml          | 2 +-
 addons/plugin_thunderbird/plugin_thunderbird.xml  | 2 +-
 addons/portal_crm/wizard/contact_view.xml         | 4 ++--
 addons/project_issue/project_issue_view.xml       | 2 +-
 addons/stock/product_view.xml                     | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/auth_openid/static/src/xml/auth_openid.xml b/addons/auth_openid/static/src/xml/auth_openid.xml
index 8c297320759..6a40439a012 100644
--- a/addons/auth_openid/static/src/xml/auth_openid.xml
+++ b/addons/auth_openid/static/src/xml/auth_openid.xml
@@ -4,7 +4,7 @@
 
     <t t-extend="Login">
         <t t-jquery=".oe_login .oe_login_logo" t-operation="after">
-            <ul class="openid_providers oe_semantic_html_override_ul">
+            <ul class="openid_providers oe_semantic_html_override">
                 <li><a href="#login,password" title="Password" data-url="" id="btn_password">Password</a></li>
                 <li><a href="#google" title="Google" data-url="https://www.google.com/accounts/o8/id">Google</a></li>
                 <li><a href="#googleapps" title="Google Apps" data-url="https://www.google.com/accounts/o8/site-xrds?hd={id}">Google</a></li>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 0575b17b36e..ef077090f6b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -299,7 +299,7 @@
                     <field name="needaction_pending"/>
                     <templates>
                         <t t-name="lead_details">
-                            <ul class="oe_kanban_tooltip oe_semantic_html_override_ul">
+                            <ul class="oe_kanban_tooltip oe_semantic_html_override">
                                 <li t-if="record.phone.raw_value"><b>Phone:</b> <field name="phone"/></li>
                                 <li><b>Probability:</b> <field name="probability"/>%%</li>
                                 <li><b>Creation date:</b> <field name="create_date"/></li>
diff --git a/addons/edi/static/src/xml/edi_account.xml b/addons/edi/static/src/xml/edi_account.xml
index 4dea048a02c..dc6ce3f8a1a 100644
--- a/addons/edi/static/src/xml/edi_account.xml
+++ b/addons/edi/static/src/xml/edi_account.xml
@@ -151,7 +151,7 @@
                      reference <strong><t t-esc="doc.internal_number"/></strong> on the transfer:
                      <br/><br/>
                 </p>
-                <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested oe_semantic_html_override_ul">
+                <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested oe_semantic_html_override">
                 <t t-foreach="doc.company_address.bank_ids" t-as="bank_info">
                     <li><t t-esc="bank_info[1]"/></li>
                 </t>
diff --git a/addons/edi/static/src/xml/edi_sale_purchase.xml b/addons/edi/static/src/xml/edi_sale_purchase.xml
index b2763c363b9..3b6497e4076 100644
--- a/addons/edi/static/src/xml/edi_sale_purchase.xml
+++ b/addons/edi/static/src/xml/edi_sale_purchase.xml
@@ -151,7 +151,7 @@
                      reference <strong><t t-esc="doc.name"/></strong> on the transfer:
                      <br/><br/>
                 </p>
-                <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested oe_semantic_html_override_ul">
+                <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested oe_semantic_html_override">
                 <t t-foreach="doc.company_address.bank_ids" t-as="bank_info">
                     <li><t t-esc="bank_info[1]"/></li>
                 </t>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index e4fbc0902f4..2754dc4d96e 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -271,7 +271,7 @@
                 <field name="categ_ids"/>
                 <templates>
                     <t t-name="kanban-tooltip">
-                        <ul class="oe_kanban_tooltip oe_semantic_html_override_ul">
+                        <ul class="oe_kanban_tooltip oe_semantic_html_override">
                             <li t-if="record.type_id.raw_value"><b>Degree:</b> <field name="type_id"/></li>
                             <li t-if="record.partner_id.raw_value"><b>Contact:</b> <field name="partner_id"/></li>
                             <li t-if="record.department_id.raw_value"><b>Departement:</b> <field name="department_id"/></li>
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index afb1323c62f..6b5a8b5abcc 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -26,7 +26,7 @@
             </tr>
           </tbody>
         </table>
-        <div class="oe_mail_wall_main">
+        <div class="oe_mail_wall_main oe_semantic_html_override">
             <div class="oe_mail_wall_action">
                 <!-- call the composition form -->
                 <t t-call ="mail.compose_message"/>
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 99751af1469..c2c035f532d 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -19,7 +19,7 @@
                         <separator string="Installation and Configuration Steps"/>
                         <p>Click on the link above to download the installer for either 32 or 64 bits, and execute it.</p>
                         <p>System requirements:</p>
-                        <ul class="oe_semantic_html_override_ul">
+                        <ul class="oe_semantic_html_override">
                             <li>1. MS Outlook 2005 or above.</li>
                             <li>2. MS .Net Framework 3.5 or above.</li>
                         </ul>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index b41e552d327..0f38dce117f 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -20,7 +20,7 @@
                         </group>
                         <separator string="Installation and Configuration Steps"/>
                         <p>Thunderbird plugin installation:</p>
-                        <ul class="oe_semantic_html_override_ul">
+                        <ul class="oe_semantic_html_override">
                             <li>1. Save the Thunderbird plug-in.</li>
                             <li>2. From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li>
                             <li>3. Select the plug-in (the file named openerp_plugin.xpi).</li>
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index c70319b9957..97c88651913 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -40,14 +40,14 @@
                                             <templates>
                                                 <t t-name="kanban-box">
                                                     <h4><field name="name"/></h4>
-                                                    <ul class="oe_portal_crm_address oe_semantic_html_override_ul">
+                                                    <ul class="oe_portal_crm_address oe_semantic_html_override">
                                                         <li t-if="record.street"><field name="street"/></li>
                                                         <li t-if="record.street2"><field name="street2"/></li>
                                                         <li t-if="record.zip"><field name="zip"/></li>
                                                         <li t-if="record.city"><field name="city"/></li>
                                                         <li t-if="record.country_id"><field name="country_id"/></li>
                                                     </ul>
-                                                    <ul class="oe_portal_crm_contact_info oe_semantic_html_override_ul">
+                                                    <ul class="oe_portal_crm_contact_info oe_semantic_html_override">
                                                         <li t-if="record.phone"><field name="phone"/></li>
                                                         <li t-if="record.email.raw_value">
                                                             <a title="Mail" t-att-href="'mailto:'+record.email.value">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 80c19907ef3..57e8d7a32a7 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -247,7 +247,7 @@
                     <field name="date_deadline"/>
                     <templates>
                         <t t-name="kanban-tooltip">
-                           <ul class="oe_kanban_tooltip oe_semantic_html_override_ul">
+                           <ul class="oe_kanban_tooltip oe_semantic_html_override">
                               <li><b>Project:</b> <field name="project_id"/></li>
                               <li><b>Category:</b> <field name="categ_ids"/></li>
                            </ul>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 66d61ea3054..3142a5a05ef 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -200,7 +200,7 @@
                         <t t-esc="record.delivery_count.value"/> Deliveries
                     </a>
                 </xpath>
-                <ul position="inside" class="oe_semantic_html_override_ul">
+                <ul position="inside" class="oe_semantic_html_override">
                     <li t-if="record.type.raw_value != 'service'">On hand: <field name="qty_available"/> <field name="uom_id"/></li>
                     <li t-if="record.type.raw_value != 'service'">Available: <field name="virtual_available"/> <field name="uom_id"/></li>
                 </ul>

From 509838a440219119b2ce8c7047d34b4c541d1429 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 5 Sep 2012 10:10:19 +0200
Subject: [PATCH 834/999] Solved problem with left menu

bzr revid: nicolas.vanhoren@openerp.com-20120905081019-o4x9d6v2meiwlfl7
---
 addons/web/static/src/css/base.css  | 8 ++++----
 addons/web/static/src/css/base.sass | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 07467317c7c..a05b1bc25e5 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1215,16 +1215,16 @@
   width: 100%;
   display: inline-block;
 }
-.openerp .oe_secondary_submenu > li {
+.openerp .oe_secondary_submenu li {
   position: relative;
-  padding: 1px 0 1px 20px;
+  padding: 1px 0 1px 20px !important;
 }
-.openerp .oe_secondary_submenu > li a {
+.openerp .oe_secondary_submenu li a {
   display: block;
   color: #4c4c4c;
   padding: 2px 4px 2px 0;
 }
-.openerp .oe_secondary_submenu > li .oe_menu_label {
+.openerp .oe_secondary_submenu li .oe_menu_label {
   position: absolute;
   top: 1px;
   right: 1px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 495f88ad282..438f59df11f 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -927,9 +927,9 @@ $sheet-max-width: 860px
         margin: 0
         width: 100%
         display: inline-block
-        > li
+        li
             position: relative
-            padding: 1px 0 1px 20px
+            padding: 1px 0 1px 20px !important
             a
                 display: block
                 color: #4c4c4c

From 9b6585b453f872075177aca8c294da5fd5e5b50d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Sep 2012 10:20:04 +0200
Subject: [PATCH 835/999] [IMP] Kanban quick create: replaced @original-title
 by @title

bzr revid: fme@openerp.com-20120905082004-ecd4r32srwvnulob
---
 addons/web_kanban/static/src/xml/web_kanban.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 17d45d90505..1f24feb2de8 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -32,7 +32,7 @@
         <t t-if="widget.view.group_by">
             <div class="oe_kanban_header">
                 <t t-if="widget.view._is_quick_create_enabled()">
-                    <div class="oe_kanban_add oe_e" original-title="Quick create">]</div>
+                    <div class="oe_kanban_add oe_e" title="Quick create">]</div>
                 </t>
                     <div class="oe_dropdown_toggle oe_dropdown_kanban">
                         <span class="oe_e">í</span>

From 56e4bc9d8a6e7f357f93b7bfeef72ccad13e842a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 5 Sep 2012 10:32:49 +0200
Subject: [PATCH 836/999] Fixed small problem

bzr revid: nicolas.vanhoren@openerp.com-20120905083249-r5azgyu5q7qnb83r
---
 addons/web_linkedin/web_linkedin_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_linkedin/web_linkedin_view.xml b/addons/web_linkedin/web_linkedin_view.xml
index 5fb9a916f16..8b4fa617bf3 100644
--- a/addons/web_linkedin/web_linkedin_view.xml
+++ b/addons/web_linkedin/web_linkedin_view.xml
@@ -18,7 +18,7 @@
             <field name="model">sale.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <div name="linkedin" position="inside" class="oe_semantic_html_override">
+                <div name="linkedin" position="inside">
                     <form string="Configure Linkedin" version="7.0" class="oe_form_configuration">
                         <p>
                             To use the LinkedIn module with this database, an API Key is required. Please follow this procedure:

From 8c9777d4ce5ba398969ee160e210cf7a1899731e Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 5 Sep 2012 11:05:44 +0200
Subject: [PATCH 837/999] [IMP] web_kanban: make kanban records non-draggable
 when user cannot edit them

bzr revid: rco@openerp.com-20120905090544-ru224cad11jyxwbv
---
 addons/web_kanban/static/src/js/kanban.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 3fa675c5edd..8a9db04b625 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -726,9 +726,10 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
             trigger: 'hover'
         });
 
-        // If no draghandle is found, make the whole card as draghandle
+        // If no draghandle is found, make the whole card as draghandle (provided one can edit)
         if (!this.$el.find('.oe_kanban_draghandle').length) {
-            this.$el.children(':first').addClass('oe_kanban_draghandle');
+            this.$el.children(':first')
+                .toggleClass('oe_kanban_draghandle', this.view.is_action_enabled('edit'));
         }
 
         this.$el.find('.oe_kanban_action').click(function() {

From 7b27e55d493147f0b7a9eee426bb6c0456632458 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 5 Sep 2012 11:16:20 +0200
Subject: [PATCH 838/999] [FIX] web_kanban: do not show the '+' in kanban
 groups when user cannot create

bzr revid: rco@openerp.com-20120905091620-2dmcx9h90ed2935p
---
 addons/web_kanban/static/src/js/kanban.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 8a9db04b625..9db56215866 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -65,7 +65,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         return $.when();
     },
     _is_quick_create_enabled: function() {
-        if (! this.options.quick_creatable)
+        if (!this.options.quick_creatable || !this.is_action_enabled('create'))
             return false;
         if (this.fields_view.arch.attrs.quick_create !== undefined)
             return JSON.parse(this.fields_view.arch.attrs.quick_create);

From 8a28d99783f8b02aa2fc329221f759515bdeff75 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 5 Sep 2012 14:48:56 +0530
Subject: [PATCH 839/999] [IMP] removed groups from fields which we made
 invisible

bzr revid: cha@tinyerp.com-20120905091856-a9i3yns577p871hv
---
 addons/crm/crm_lead_view.xml                              | 8 ++++----
 .../board_hr_recruitment_statistical_view.xml             | 2 +-
 addons/hr_recruitment/hr_recruitment_view.xml             | 2 +-
 addons/project/board_project_view.xml                     | 2 +-
 addons/project/project_view.xml                           | 6 +++---
 addons/project_issue/board_project_issue_view.xml         | 2 +-
 addons/project_issue/project_issue_view.xml               | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9c0fb812fcb..47d9f5410fe 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -211,7 +211,7 @@
                                 <field name="type_id" widget="selection"/>
                                 <field name="channel_id" widget="selection"/>
                                 <field name="referred"/>
-                                <field name="state" groups="base.group_no_one" invisible="1"/>
+                                <field name="state" invisible="1"/>
                             </group>
                             <group string="Mailings">
                                 <field name="opt_out" />
@@ -257,7 +257,7 @@
                     <field name="stage_id"/>
                     <field name="user_id" invisible="1"/>
                     <field name="section_id" invisible="context.get('invisible_section', True)" />
-                    <field name="state" groups="base.group_no_one" invisible="1"/>
+                    <field name="state" invisible="1"/>
                     <field name="type_id" invisible="1"/>
                     <field name="referred" invisible="1"/>
                     <field name="channel_id" invisible="1"/>
@@ -514,7 +514,7 @@
                                     <field name="day_open" groups="base.group_no_one"/>
                                     <field name="day_close" groups="base.group_no_one"/>
                                     <field name="referred"/>
-                                    <field name="state" groups="base.group_no_one" invisible="1"/>
+                                    <field name="state" invisible="1"/>
                                     <field name="type" invisible="1"/>
                                 </group>
                                 <group string="References">
@@ -561,7 +561,7 @@
                     <field name="section_id" invisible="context.get('invisible_section', True)" />
                     <field name="user_id"/>
                     <field name="priority" invisible="1"/>
-                    <field name="state" groups="base.group_no_one" invisible="1"/>
+                    <field name="state" invisible="1"/>
                     <field name="needaction_pending" invisible="1"/>
                 </tree>
             </field>
diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
index d39a5a74fc1..35986931068 100644
--- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
+++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
@@ -11,7 +11,7 @@
                 <field name="job_id"/>
                 <field name="partner_name"/>
                 <field name="stage_id"/>
-                <field name="state" groups="base.group_no_one" invisible="1"/>
+                <field name="state" invisible="1"/>
             </tree>
         </field>
     </record>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 7eb5187ad88..d5ef1f8d7c2 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -95,7 +95,7 @@
                 <field name="availability" invisible="1"/>
                 <field name="department_id" invisible="context.get('invisible_department', True)"/>
                 <field name="user_id"/>
-                <field name="state" groups="base.group_no_one" invisible="1"/>
+                <field name="state" invisible="1"/>
             </tree>
         </field>
     </record>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 122536d3690..931c661d211 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -16,7 +16,7 @@
                     <field name="effective_hours" widget="float_time"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="1" groups="base.group_no_one"/>
+                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5a805e153e3..3385175c565 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -484,7 +484,7 @@
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="stage_id"/>
-                                    <field name="state" groups="base.group_no_one" invisible="1"/>
+                                    <field name="state" invisible="1"/>
                                     <field name="effective_hours" widget="float_time"/>
                                     <field name="progress" widget="progressbar"/>
                                     <field name="remaining_hours" widget="float_time"/>
@@ -500,7 +500,7 @@
                                 <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
                                     groups="project.group_time_work_estimation_tasks"
                                     on_change="onchange_planned(planned_hours, effective_hours)"/>
-                                <field name="state" groups="base.group_no_one" invisible="1"/>
+                                <field name="state" invisible="1"/>
                             </group>
                         </page>
                     </notebook>
@@ -609,7 +609,7 @@
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="1" groups="base.group_no_one"/>
+                    <field name="state" invisible="1"/>
                     <field name="date_start" invisible="1" groups="base.group_no_one"/>
                     <field name="date_end" invisible="1" groups="base.group_no_one"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 9a8a3c3aaec..d7574042c37 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -16,7 +16,7 @@
                     <field name="version_id" widget="selection"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
-                    <field name="state" groups="base.group_no_one" invisible="1"/>
+                    <field name="state" invisible="1"/>
                     <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index f87ff9cf78d..9a9096ed0a9 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -182,7 +182,7 @@
                     <field name="user_id"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
-                    <field name="state" groups="base.group_no_one" invisible="1"/>
+                    <field name="state" invisible="1"/>
                     <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>

From 88105a043b010870d759f0e16a459ccbeac8741e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 5 Sep 2012 11:18:59 +0200
Subject: [PATCH 840/999] [FIX] small css problem with the "more" menu in form
 views

bzr revid: nicolas.vanhoren@openerp.com-20120905091859-jkequxaxo2qd8cz8
---
 addons/web/static/src/css/base.css  | 28 ++++++++++------------------
 addons/web/static/src/css/base.sass | 13 ++++++++++---
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index a05b1bc25e5..601133b2e7f 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -111,17 +111,6 @@
 .openerp h4 {
   margin: 4px 0;
 }
-.openerp .oe_semantic_html_override_ul {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_semantic_html_override_ul ul, .openerp .oe_semantic_html_override_ul ol, .openerp .oe_semantic_html_override_ul li {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_semantic_html_override_ul li {
-  list-style-type: none;
-}
 .openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol {
   margin: 0;
   padding: 0;
@@ -1325,16 +1314,15 @@
   width: 100%;
   table-layout: fixed;
 }
-.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header ol {
-  margin: 0;
+.openerp .oe_view_manager table.oe_view_manager_header ul {
   padding: 0;
+  margin-right: 0;
+  margin-top: 0;
+  margin-bottom: 0;
 }
-.openerp .oe_view_manager table.oe_view_manager_header ul ul, .openerp .oe_view_manager table.oe_view_manager_header ul ol, .openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol ul, .openerp .oe_view_manager table.oe_view_manager_header ol ol, .openerp .oe_view_manager table.oe_view_manager_header ol li {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li {
+.openerp .oe_view_manager table.oe_view_manager_header ul li {
   list-style-type: none;
+  margin: 0;
 }
 .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row {
   clear: both;
@@ -1445,11 +1433,15 @@
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
 }
+.openerp .oe_view_manager .oe_view_manager_switch {
+  margin-left: 8px;
+}
 .openerp .oe_view_manager .oe_view_manager_switch li {
   text-align: center;
   width: 24px;
   height: 24px;
   line-height: 16px;
+  padding: 0;
 }
 .openerp .oe_view_manager .oe_view_manager_switch li a {
   position: relative;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 438f59df11f..6ee03494e7d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -200,8 +200,6 @@ $sheet-max-width: 860px
         vertical-align: middle
     h4
         margin: 4px 0
-    .oe_semantic_html_override_ul
-        @include ul-html-override
     .oe_semantic_html_override
         @include semantic-html-override
     ul.oe_semantic_html_override
@@ -1014,7 +1012,14 @@ $sheet-max-width: 860px
         table.oe_view_manager_header
             width: 100%
             table-layout: fixed
-            @include semantic-html-override
+            ul
+                padding: 0
+                margin-right: 0
+                margin-top: 0
+                margin-bottom: 0
+                li
+                    list-style-type: none
+                    margin: 0
             .oe_header_row
                 //min-height: 26px
                 //line-height: 26px
@@ -1099,11 +1104,13 @@ $sheet-max-width: 860px
         // }}}
         // ViewManager.switches {{{
         .oe_view_manager_switch
+            margin-left: 8px
             li
                 text-align: center
                 width: 24px
                 height: 24px
                 line-height: 16px
+                padding: 0
                 a
                     position: relative
             .oe_vm_switch_list:after, .oe_vm_switch_tree:after

From 9ccc27e68c64c89eac5284199f84657ca98573b4 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 5 Sep 2012 11:42:19 +0200
Subject: [PATCH 841/999] [IMP] changed the semantic of "create_name_field"

bzr revid: nicolas.vanhoren@openerp.com-20120905094219-vyd76t7p4tw6ocsy
---
 addons/web/static/src/js/view_form.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 5f13f1c7a93..1cefd28a5a0 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2694,8 +2694,8 @@ instance.web.form.CompletionFieldMixin = {
     _create_context: function(name) {
         var tmp = {};
         var field = (this.options || {}).create_name_field;
-        if (field)
-            tmp["default_" + field] = name;
+        if (field !== false && (this.options || {}).quick_create !== false)
+            tmp["default_" + field] = name || "name";
         return tmp;
     },
 };

From 2d6829b70ecbac0008aba3c525f9642733c43d82 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 5 Sep 2012 11:54:35 +0200
Subject: [PATCH 842/999] [IMP] note name_create ok

bzr revid: fp@tinyerp.com-20120905095435-bio3buy24t4sdvze
---
 addons/note/note.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/note/note.py b/addons/note/note.py
index f6a46c72c88..bce54566e64 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -46,6 +46,9 @@ class note_note(osv.osv):
     _pad_fields = ['note_pad']
     _description = "Note"
 
+    def _set_note_first_line(self, cr, uid, id, name, value, args, context=None):
+        return self.write(cr, uid, [id], {'note': value}, context=context)
+
     def _get_note_first_line(self, cr, uid, ids, name, args, context=None):
         res = {}
         for note in self.browse(cr, uid, ids, context=context):
@@ -68,7 +71,7 @@ class note_note(osv.osv):
         return result
 
     _columns = {
-        'name': fields.function(_get_note_first_line, string='Note Summary', type="text", store=True),
+        'name': fields.function(_get_note_first_line, fnct_inv=_set_note_first_line, string='Note Summary', type="text"),
         'note': fields.text('Pad Content'),
         'note_pad_url': fields.char('Pad Url', size=250),
         'sequence': fields.integer('Sequence'),

From 6493b238d76e06bf132a33eb3c7c8ab84158f9ee Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 5 Sep 2012 13:23:43 +0200
Subject: [PATCH 843/999] [FIX] Fixed width in div.address_format's spans.

bzr revid: vta@openerp.com-20120905112343-bathemmuv6rtb0r9
---
 openerp/addons/base/res/res_partner_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 99ae2131006..7a7e6f155e3 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -130,8 +130,8 @@
                                 <field name="street2"/>
                                 <div class="address_format">
                                     <field name="city" placeholder="City" style="width: 40%%"/>
-                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%" options='{"no_open": true}'/>
-                                    <field name="zip" placeholder="ZIP" style="width: 34%%"/>
+                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": true}'/>
+                                    <field name="zip" placeholder="ZIP" style="width: 20%%"/>
                                 </div>
                                 <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
                             </div>

From dc6b5e92bf742c775eb4228dbae221321f31bedd Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 5 Sep 2012 13:24:46 +0200
Subject: [PATCH 844/999] [FIX] Fixed min-width input[type=text].

bzr revid: vta@openerp.com-20120905112446-yi6eyfde8pa31g0l
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index cb7ecddfa82..226ccbd3513 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2312,7 +2312,7 @@
   -ms-box-sizing: border-box;
   box-sizing: border-box;
   background: white;
-  min-width: 70px;
+  min-width: 60px;
   color: #1f1f1f;
 }
 .openerp .oe_form input[readonly], .openerp .oe_form select[readonly], .openerp .oe_form textarea[readonly], .openerp .oe_form input[disabled], .openerp .oe_form select[disabled] {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 6fb2c8d21c1..13f740f218c 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1751,7 +1751,7 @@ $sheet-max-width: 860px
         input[type="text"], input[type="password"], input[type="file"], select, textarea
             @include box-sizing(border)
             background: white
-            min-width: 70px
+            min-width: 60px
             color: #1f1f1f
         input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled]
             background: #E5E5E5 !important

From 80daa1b9565b2521d9b784878cbf81aca068a200 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 5 Sep 2012 14:04:55 +0200
Subject: [PATCH 845/999] [FIX] incorrect reversion of m2o autocomplete
 mouse-based selection fix by revision 
 vta@openerp.com-20120808154422-nbjabrc3cxcb030g

bzr revid: xmo@openerp.com-20120905120455-92llmuwv267xdrn5
---
 addons/web/static/src/js/view_form.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 1cefd28a5a0..f65da67d8fb 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2846,7 +2846,21 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                 self.tip_def.reject();
             }
         };
-        this.$input.focusout(anyoneLoosesFocus);
+        var ignore_blur = false;
+        this.$input.on({
+            focusout: anyoneLoosesFocus,
+            focus: function () { self.trigger('focused'); },
+            autocompleteopen: function () { ignore_blur = true; },
+            autocompleteclose: function () { ignore_blur = false; },
+            blur: function () {
+                // autocomplete open
+                if (ignore_blur) { return; }
+                if (_(self.getChildren()).any(function (child) {
+                    return child instanceof instance.web.form.AbstractFormPopup;
+                })) { return; }
+                self.trigger('blurred');
+            }
+        });
 
         var isSelecting = false;
         // autocomplete
@@ -2888,7 +2902,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
             }
             isSelecting = false;
         });
-        this.setupFocus(this.$input.add(this.$follow_button));
+        this.setupFocus(this.$follow_button);
     },
     render_value: function(no_recurse) {
         var self = this;

From 604bd9fa4da689e3162a295ecd2959a764bd4eef Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Sep 2012 14:35:32 +0200
Subject: [PATCH 846/999] [WIP] Notification on do_action and on_mode_switch

bzr revid: fme@openerp.com-20120905123532-oskxl7srmoabkqr5
---
 addons/web/static/src/js/chrome.js    |  3 +--
 addons/web/static/src/js/view_form.js |  5 ++++
 addons/web/static/src/js/views.js     | 38 ++++++++++++++++++++-------
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 736e10875f6..3dd7672287f 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1101,8 +1101,7 @@ instance.web.WebClient = instance.web.Client.extend({
                 if (options.needaction) {
                     action.context.search_default_needaction_pending = true;
                 }
-                self.action_manager.clear_breadcrumbs();
-                self.action_manager.do_action(action);
+                self.action_manager.do_action(action, null, true);
             });
     },
     do_action: function(action) {
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index f65da67d8fb..e6bbb664eaf 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -92,6 +92,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             self.on("change:actual_mode", self, self.init_pager);
             self.init_pager();
         });
+        this.on('about_to_destroy', this, function(e) {
+            if (!this.can_be_discarded()) {
+                e.preventDefault();
+            }
+        });
     },
     destroy: function() {
         _.each(this.get_widgets(), function(w) {
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 95693ca9c50..20f7b12c0ac 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -113,6 +113,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
         while (this.breadcrumbs.length) {
             this.remove_breadcrumb(0);
         }
+        this.inner_widget = null;
     },
     remove_breadcrumb: function(index) {
         var item = this.breadcrumbs.splice(index, 1)[0];
@@ -208,14 +209,14 @@ instance.web.ActionManager = instance.web.Widget.extend({
             }
         });
     },
-    do_action: function(action, on_close) {
+    do_action: function(action, on_close, clear_breadcrumbs) {
         if (_.isString(action) && instance.web.client_actions.contains(action)) {
             var action_client = { type: "ir.actions.client", tag: action };
-            return this.do_action(action_client);
+            return this.do_action(action_client, on_close, clear_breadcrumbs);
         } else if (_.isNumber(action) || _.isString(action)) {
             var self = this;
             return self.rpc("/web/action/load", { action_id: action }, function(result) {
-                self.do_action(result.result, on_close);
+                self.do_action(result.result, on_close, clear_breadcrumbs);
             });
         }
         if (!action.type) {
@@ -237,14 +238,23 @@ instance.web.ActionManager = instance.web.Widget.extend({
             console.error("Action manager can't handle action of type " + action.type, action);
             return null;
         }
-        return this[type](action, on_close);
+        return this[type](action, on_close, clear_breadcrumbs);
     },
     null_action: function() {
         this.dialog_stop();
         this.clear_breadcrumbs();
     },
-    ir_actions_common: function(action, on_close) {
+    ir_actions_common: function(action, on_close, clear_breadcrumbs) {
         var self = this, klass, widget, post_process;
+        if (this.inner_widget && (action.type === 'ir.actions.client' || action.target !== 'new')) {
+            var $e = $.Event("about_to_destroy");
+            this.inner_widget.trigger("about_to_destroy", $e);
+            if ($e.isDefaultPrevented()) {
+                return;
+            } else if (clear_breadcrumbs) {
+                this.clear_breadcrumbs();
+            }
+        }
         if (action.type === 'ir.actions.client') {
             var ClientWidget = instance.web.client_actions.get_object(action.tag);
             widget = new ClientWidget(this, action.params);
@@ -287,17 +297,17 @@ instance.web.ActionManager = instance.web.Widget.extend({
             this.inner_widget.appendTo(this.$el);
         }
     },
-    ir_actions_act_window: function (action, on_close) {
+    ir_actions_act_window: function (action, on_close, clear_breadcrumbs) {
         var self = this;
         if (action.target !== 'new') {
             if(action.menu_id) {
                 this.dialog_stop();
                 return this.getParent().do_action(action, function () {
                     instance.webclient.menu.open_menu(action.menu_id);
-                });
+                }, clear_breadcrumbs);
             }
         }
-        return this.ir_actions_common(action, on_close);
+        return this.ir_actions_common(action, on_close, clear_breadcrumbs);
     },
     ir_actions_client: function (action, on_close) {
         return this.ir_actions_common(action, on_close);
@@ -314,7 +324,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
             action_id: action.id,
             context: action.context || {}
         }).then(function (action) {
-            self.do_action(action, on_closed)
+            self.do_action(action, on_closed, clear_breadcrumbs)
         });
     },
     ir_actions_report_xml: function(action, on_closed) {
@@ -412,8 +422,10 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         var self = this;
         var view = this.views[view_type];
         var view_promise;
-        if(!view)
+        var form = this.views['form'];
+        if (!view || (form && form.controller && !form.controller.can_be_discarded())) {
             return $.Deferred().reject();
+        }
 
         if (!no_store) {
             this.views_history.push(view_type);
@@ -472,6 +484,12 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         }
         var controller = new viewclass(this, this.dataset, view.view_id, options);
 
+        if (view_type === 'form') {
+            this.on('about_to_destroy', this, function(e) {
+                controller.trigger('about_to_destroy', e);
+            });
+        }
+
         controller.on('history_back', this, function() {
             var am = self.getParent();
             if (am && am.trigger) {

From b675eb40de439b126fb4dffa00fde0c883f5f7b0 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Sep 2012 15:45:53 +0200
Subject: [PATCH 847/999] [ADD] Revert menu in case do_action fails

bzr revid: fme@openerp.com-20120905134553-k6ryuelp5fhsw6z9
---
 addons/web/static/src/js/chrome.js | 17 ++++++++++-------
 addons/web/static/src/js/views.js  | 10 +++++-----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 3dd7672287f..3180c21f88e 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -731,6 +731,8 @@ instance.web.Menu =  instance.web.Widget.extend({
      * @param {Number} id database id of the terminal menu to select
      */
     open_menu: function (id) {
+        this.current_menu = id;
+        this.session.active_id = id;
         var $clicked_menu, $sub_menu, $main_menu;
         $clicked_menu = this.$el.add(this.$secondary_menus).find('a[data-menu=' + id + ']');
         this.trigger('open_menu', id, $clicked_menu);
@@ -803,16 +805,15 @@ instance.web.Menu =  instance.web.Widget.extend({
                 }
             }
         }
-        this.open_menu(id);
-        this.current_menu = id;
-        this.session.active_id = id;
         if (action_id) {
             this.trigger('menu_click', {
                 action_id: action_id,
                 needaction: needaction,
-                id: id
+                id: id,
+                previous_menu_id: this.current_menu // Here we don't know if action will fail (in which case we have to revert menu)
             }, $item);
         }
+        this.open_menu(id);
     },
     /**
      * Jquery event handler for menu click
@@ -1095,13 +1096,15 @@ instance.web.WebClient = instance.web.Client.extend({
     },
     on_menu_action: function(options) {
         var self = this;
-        this.rpc("/web/action/load", { action_id: options.action_id })
-            .then(function (result) {
+        return this.rpc("/web/action/load", { action_id: options.action_id })
+            .pipe(function (result) {
                 var action = result.result;
                 if (options.needaction) {
                     action.context.search_default_needaction_pending = true;
                 }
-                self.action_manager.do_action(action, null, true);
+                return $.when(self.action_manager.do_action(action, null, true)).fail(function() {
+                    self.menu.open_menu(options.previous_menu_id);
+                });
             });
     },
     do_action: function(action) {
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 20f7b12c0ac..2f015dab7a0 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -215,13 +215,13 @@ instance.web.ActionManager = instance.web.Widget.extend({
             return this.do_action(action_client, on_close, clear_breadcrumbs);
         } else if (_.isNumber(action) || _.isString(action)) {
             var self = this;
-            return self.rpc("/web/action/load", { action_id: action }, function(result) {
-                self.do_action(result.result, on_close, clear_breadcrumbs);
+            return self.rpc("/web/action/load", { action_id: action }).pipe(function(result) {
+                return self.do_action(result.result, on_close, clear_breadcrumbs);
             });
         }
         if (!action.type) {
             console.error("No type for action", action);
-            return null;
+            return $.Deferred().reject();
         }
         var type = action.type.replace(/\./g,'_');
         var popup = action.target === 'new';
@@ -236,7 +236,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
         }, action.flags || {});
         if (!(type in this)) {
             console.error("Action manager can't handle action of type " + action.type, action);
-            return null;
+            return $.Deferred().reject();
         }
         return this[type](action, on_close, clear_breadcrumbs);
     },
@@ -250,7 +250,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
             var $e = $.Event("about_to_destroy");
             this.inner_widget.trigger("about_to_destroy", $e);
             if ($e.isDefaultPrevented()) {
-                return;
+                return $.Deferred().reject();
             } else if (clear_breadcrumbs) {
                 this.clear_breadcrumbs();
             }

From e257a0a9d3011e89624fbba8ab687a3e4d0cc419 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 5 Sep 2012 20:03:50 +0530
Subject: [PATCH 848/999] [FIX] hr_attendance: replace $element with $el

bzr revid: hmo@tinyerp.com-20120905143350-k4keoigazju6y7wn
---
 addons/hr_attendance/static/src/js/attendance.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index cff8f159251..58d49540857 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -14,12 +14,12 @@ openerp.hr_attendance = function(instance) {
                             }
             this._super(parent);
             this.session = parent.session;
-            this.parent_element = parent.$element ;            
+            this.parent_element = parent.$el ;            
         },
         renderElement: function(){
-            this.$element = $(QWeb.render(this.template,this.titles));            
-            this.parent_element.prepend(this.$element);
-            this.$oe_attendance_slider = this.$element.find(".oe_attendance_slider");
+            this.$el = $(QWeb.render(this.template,this.titles));            
+            this.parent_element.prepend(this.$el);
+            this.$oe_attendance_slider = this.$el.find(".oe_attendance_slider");
             this.$oe_attendance_slider.click(this.do_update_attendance);
         },
         do_update_attendance: function() {
@@ -62,11 +62,11 @@ openerp.hr_attendance = function(instance) {
         check_attendance: function(){
             var self = this;
             self.employee = false;
-            this.$element.find(".oe_attendance_status").hide();
+            this.$el.find(".oe_attendance_status").hide();
             var employee = new instance.web.DataSetSearch(self, 'hr.employee', self.session.user_context, [['user_id','=', self.session.uid]]);
             return employee.read_slice(['id','name','state']).pipe(function(res) {
                 if(_.isEmpty(res)) return;
-                self.$element.find(".oe_attendance_status").show();
+                self.$el.find(".oe_attendance_status").show();
                 self.employee = res[0];
                 self.do_slide(self.employee.state);
             });

From 29a931656681029526b55ca87f75fc6dedde97dc Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 5 Sep 2012 16:57:03 +0200
Subject: [PATCH 849/999] [REVERT] 4394, because Thu is stupid

bzr revid: nicolas.vanhoren@openerp.com-20120905145703-7t8uiyqur0l16n2b
---
 openerp/tests/__init__.py      | 3 +--
 openerp/tools/html_sanitize.py | 4 ++--
 setup.py                       | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/tests/__init__.py b/openerp/tests/__init__.py
index d3ab62ebc1c..2f7f6624885 100644
--- a/openerp/tests/__init__.py
+++ b/openerp/tests/__init__.py
@@ -8,7 +8,7 @@ Tests can be explicitely added to the `fast_suite` or `checks` lists or not.
 See the :ref:`test-framework` section in the :ref:`features` list.
 """
 
-from . import test_expression, test_html_sanitize, test_ir_sequence, test_orm,\
+from . import test_expression, test_ir_sequence, test_orm,\
               test_view_validation, test_uninstall
 
 fast_suite = [
@@ -17,7 +17,6 @@ fast_suite = [
 
 checks = [
     test_expression,
-    test_html_sanitize,
     test_orm,
     test_view_validation,
 ]
diff --git a/openerp/tools/html_sanitize.py b/openerp/tools/html_sanitize.py
index 6763b464ab1..5164ceb276e 100644
--- a/openerp/tools/html_sanitize.py
+++ b/openerp/tools/html_sanitize.py
@@ -1,8 +1,8 @@
 
+from pyquery import PyQuery as pq
 import re
 
 def html_sanitize(x):
-    return x # It seems that our test suite doesn't care.
     if not x:
         return x
     root = pq("<div />")
@@ -59,4 +59,4 @@ def append_to(new_ones, el):
             else:
                 children[-1].tail = i
         else:
-            el.append(i)
+            el.append(i)
\ No newline at end of file
diff --git a/setup.py b/setup.py
index a26b74e255d..a033921e70d 100755
--- a/setup.py
+++ b/setup.py
@@ -99,6 +99,7 @@ setuptools.setup(
           'mako',
           'psycopg2',
           'pydot',
+          'pyquery',
           'python-dateutil < 2',
           'python-ldap',
           'python-openid',

From 404acf222cb2b097c8da608e6bfd24ed494069a5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Sep 2012 17:03:41 +0200
Subject: [PATCH 850/999] [ADD] Implement dirty form check at the breadcrumbs
 level

bzr revid: fme@openerp.com-20120905150341-1188kodv77bys922
---
 addons/web/static/src/js/views.js | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 2f015dab7a0..0d8430d53ee 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -101,7 +101,9 @@ instance.web.ActionManager = instance.web.Widget.extend({
     select_breadcrumb: function(index, subindex) {
         for (var i = this.breadcrumbs.length - 1; i >= 0; i--) {
             if (i > index) {
-                this.remove_breadcrumb(i);
+                if (this.remove_breadcrumb(i) === false) {
+                    return false;
+                }
             }
         }
         var item = this.breadcrumbs[index];
@@ -110,10 +112,11 @@ instance.web.ActionManager = instance.web.Widget.extend({
         return true;
     },
     clear_breadcrumbs: function() {
-        while (this.breadcrumbs.length) {
-            this.remove_breadcrumb(0);
+        for (var i = this.breadcrumbs.length - 1; i >= 0; i--) {
+            if (this.remove_breadcrumb(0) === false) {
+                break;
+            }
         }
-        this.inner_widget = null;
     },
     remove_breadcrumb: function(index) {
         var item = this.breadcrumbs.splice(index, 1)[0];
@@ -122,9 +125,19 @@ instance.web.ActionManager = instance.web.Widget.extend({
                 return item.widget === it.widget;
             });
             if (!dups.length) {
-                item.destroy();
+                var $e = $.Event("about_to_destroy");
+                item.widget.trigger("about_to_destroy", $e);
+                if ($e.isDefaultPrevented()) {
+                    this.inner_widget = item.widget;
+                    this.breadcrumbs.splice(index, 0, item);
+                    return false;
+                } else {
+                    item.destroy();
+                }
             }
         }
+        var last_widget = this.breadcrumbs.slice(-1)[0];
+        this.inner_widget =  last_widget && last_widget.widget;
     },
     get_title: function() {
         var titles = [];

From 97de9d6d3ffcd5417d73d89d2145b7bab736d35d Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 5 Sep 2012 17:05:38 +0200
Subject: [PATCH 851/999] [FIX] point_of_sale: Set the right account for the
 internal account. [REF] point_of_sale: Review the code for the Take Money Out
 and Push Money In. [FIX] point_of_sale: Can post a session with an order in
 the invoiced state.

bzr revid: stw@openerp.com-20120905150538-v9ex7wehyebft7tu
---
 addons/account/demo/account_minimal.xml     |  2 +-
 addons/account/wizard/pos_box.py            | 22 +++++++----------
 addons/point_of_sale/point_of_sale.py       |  2 +-
 addons/point_of_sale/point_of_sale_view.xml | 10 ++++----
 addons/point_of_sale/wizard/pos_box.py      | 27 +++++++++++++++++++--
 5 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index b7bc34a3e35..94b3d2d4085 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -383,7 +383,7 @@
             <field name="type">cash</field>
             <field name="profit_account_id" model="account.account" ref="rsa" />
             <field name="loss_account_id" model="account.account" ref="rsa" />
-            <field name="internal_account_id" model="account.account" ref="chart0" />
+            <field name="internal_account_id" model="account.account" ref="rsa" />
             <field name="with_last_closing_balance" eval="True" />
             <field name="cash_control" eval="True" />
             <field name="view_id" ref="account_journal_bank_view"/>
diff --git a/addons/account/wizard/pos_box.py b/addons/account/wizard/pos_box.py
index b4254b5ba84..b5d1cc37776 100644
--- a/addons/account/wizard/pos_box.py
+++ b/addons/account/wizard/pos_box.py
@@ -40,6 +40,10 @@ class CashBox(osv.osv_memory):
 
         return {}
 
+    def _create_bank_statement_line(self, cr, uid, box, record, context=None):
+        values = self._compute_values_for_statement_line(cr, uid, box, record, context=context)
+        return self.pool.get('account.bank.statement.line').create(cr, uid, values, context=context)
+
 
 class CashBoxIn(CashBox):
     _name = 'cash.box.in'
@@ -49,30 +53,24 @@ class CashBoxIn(CashBox):
         'ref' : fields.char('Reference', size=32),
     })
 
-    def _create_bank_statement_line(self, cr, uid, box, record, context=None):
-        absl_proxy = self.pool.get('account.bank.statement.line')
-
-        values = {
+    def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
+        return {
             'statement_id' : record.id,
             'journal_id' : record.journal_id.id,
             'account_id' : record.journal_id.internal_account_id.id,
             'amount' : box.amount or 0.0,
-            'ref' : "%s" % (box.ref or ''),
+            'ref' : '%s' % (box.ref or ''),
             'name' : box.name,
         }
 
-        return absl_proxy.create(cr, uid, values, context=context)
-
 CashBoxIn()
 
 class CashBoxOut(CashBox):
     _name = 'cash.box.out'
 
-    def _create_bank_statement_line(self, cr, uid, box, record, context=None):
-        absl_proxy = self.pool.get('account.bank.statement.line')
-
+    def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
         amount = box.amount or 0.0
-        values = {
+        return {
             'statement_id' : record.id,
             'journal_id' : record.journal_id.id,
             'account_id' : record.journal_id.internal_account_id.id,
@@ -80,6 +78,4 @@ class CashBoxOut(CashBox):
             'name' : box.name,
         }
 
-        return absl_proxy.create(cr, uid, values, context=context)
-
 CashBoxOut()
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 24c482bd53c..2d6d8b92da1 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -422,7 +422,7 @@ class pos_session(osv.osv):
             self.pool.get('pos.order')._create_account_move_line(cr, uid, order_ids, session, move_id, context=context)
 
             for order in session.order_ids:
-                if order.state != 'paid':
+                if order.state not in ('paid', 'invoiced'):
                     raise osv.except_osv(
                         _('Error!'),
                         _("You cannot confirm all orders of this session, because they have not the 'paid' status"))
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 4a56c0dda3c..6dffbd82d19 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -897,7 +897,7 @@
                             </group>
                             <newline/>
 
-                            <group string="Opening Cash Control" attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', '=', 'closed')]}">
+                            <group string="Opening Cash Control" attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', 'in', ('opened', 'closing_control'))]}">
                                 <field name="opening_details_ids" nolabel="1" colspan="2" attrs="{'readonly' : [('state', 'not in', ('opening_control',))]}">
                                     <tree string="Opening Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
@@ -906,7 +906,7 @@
                                     </tree>
                                 </field>
                             </group>
-                            <group string="Closing Cash Control" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '!=', 'closing_control')]}">
+                            <group string="Closing Cash Control" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', 'in', ('opening_control', 'opened'))]}">
                                 <field name="details_ids" nolabel="1" colspan="2">
                                     <tree string="Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
@@ -916,14 +916,14 @@
                                 </field>
                             </group>
 
-                            <div attrs="{'invisible': [('state', '!=', 'closed')]}">
+                            <div attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', 'in', ('opened', 'closing_control'))]}">
                                 <group class="oe_subtotal_footer oe_right">
                                     <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator"/>
                                     <field name="cash_register_total_entry_encoding"  attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions"/>
                                     <field name="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Theorical Balance"/>
                                 </group>
                                 <div class="oe_clear"/>
-                                <div attrs="{'invisible' : [('cash_journal_id', '=', False)]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">
+                                <div attrs="{'invisible' : ['|', ('cash_journal_id', '=', False), ('state', '!=', 'opening_control')]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">
                                     <p class="oe_view_nocontent_create">
                                     You can define another list of available currencies on the
                                     <i>Cash Registers</i> tab of the <b><field name="cash_journal_id" class="oe_inline"/></b>
@@ -933,7 +933,7 @@
                             </div>
 
 
-                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '!=', 'closed')]}">
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', 'in', ('opening_control', 'opened'))]}">
                                 <field name="cash_register_balance_end_real" class="oe_subtotal_footer_separator"/>
                                 <field name="cash_register_difference"  class="oe_subtotal_footer_separator"/>
                             </group>
diff --git a/addons/point_of_sale/wizard/pos_box.py b/addons/point_of_sale/wizard/pos_box.py
index 8c3b0aa4607..2d1c1a8e0cf 100644
--- a/addons/point_of_sale/wizard/pos_box.py
+++ b/addons/point_of_sale/wizard/pos_box.py
@@ -15,8 +15,7 @@ class PosBox(CashBox):
         active_ids = context.get('active_ids', []) or []
 
         if active_model == 'pos.session':
-            records = self.pool.get(active_model).browse(cr, uid, context.get('active_ids', []) or [], context=context)
-
+            records = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)
             bank_statements = [record.cash_register_id for record in records if record.cash_register_id]
 
             if not bank_statements:
@@ -30,6 +29,30 @@ class PosBox(CashBox):
 class PosBoxIn(PosBox):
     _inherit = 'cash.box.in'
 
+    def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
+        values = super(PosBoxIn, self)._compute_values_for_statement_line(cr, uid, box, record, context=context)
+
+        active_model = context.get('active_model', False) or False
+        active_ids = context.get('active_ids', []) or []
+
+        if active_model == 'pos.session':
+            session = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)[0]
+            values['ref'] = session.name
+
+        return values
+
+
 class PosBoxOut(PosBox):
     _inherit = 'cash.box.out'
 
+    def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
+        values = super(PosBoxOut, self)._compute_values_for_statement_line(cr, uid, box, record, context=context)
+
+        active_model = context.get('active_model', False) or False
+        active_ids = context.get('active_ids', []) or []
+
+        if active_model == 'pos.session':
+            session = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)[0]
+            values['ref'] = session.name
+
+        return values

From bb6cf477e884d404750526c770752aa0e6eeb895 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 5 Sep 2012 17:14:51 +0200
Subject: [PATCH 852/999] [FIX] account_followup: typos/obsolete code

bzr revid: odo@openerp.com-20120905151451-24d4le11nl1921ep
---
 addons/account_followup/wizard/account_followup_print.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 2b573fe0275..1e84681b1ea 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -233,12 +233,7 @@ class account_followup_print_all(osv.osv_memory):
                     total_amt += line.debit - line.credit
                 dest = False
                 if partner:
-                    if partner.type=='contact':
-                        if adr.email:
-                            dest = [partner.email]
-                    if (not dest) and partner.type=='default':
-                        if partner.email:
-                            dest = [partner.email]
+                    dest = [partner.email]
                 if not data.partner_lang:
                     body = data.email_body
                 else:

From 910097617b0113237e6ecafea29556d4fa9288bb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 5 Sep 2012 17:18:40 +0200
Subject: [PATCH 853/999] [IMP] update qunit to 1.9.0

bzr revid: xmo@openerp.com-20120905151840-dopnvm12n0q67wue
---
 addons/web/static/lib/qunit/qunit.css |   43 +-
 addons/web/static/lib/qunit/qunit.js  | 1902 ++++++++++++++-----------
 2 files changed, 1122 insertions(+), 823 deletions(-)

diff --git a/addons/web/static/lib/qunit/qunit.css b/addons/web/static/lib/qunit/qunit.css
index 58101ea34ce..257b224ff44 100644
--- a/addons/web/static/lib/qunit/qunit.css
+++ b/addons/web/static/lib/qunit/qunit.css
@@ -1,5 +1,5 @@
 /**
- * QUnit v1.4.0pre - A JavaScript Unit Testing Framework
+ * QUnit v1.9.0 - A JavaScript Unit Testing Framework
  *
  * http://docs.jquery.com/QUnit
  *
@@ -38,10 +38,10 @@
 	line-height: 1em;
 	font-weight: normal;
 
-	border-radius: 15px 15px 0 0;
-	-moz-border-radius: 15px 15px 0 0;
-	-webkit-border-top-right-radius: 15px;
-	-webkit-border-top-left-radius: 15px;
+	border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	-webkit-border-top-right-radius: 5px;
+	-webkit-border-top-left-radius: 5px;
 }
 
 #qunit-header a {
@@ -54,8 +54,9 @@
 	color: #fff;
 }
 
-#qunit-header label {
+#qunit-testrunner-toolbar label {
 	display: inline-block;
+	padding: 0 .5em 0 .1em;
 }
 
 #qunit-banner {
@@ -112,13 +113,9 @@
 
 	background-color: #fff;
 
-	border-radius: 15px;
-	-moz-border-radius: 15px;
-	-webkit-border-radius: 15px;
-
-	box-shadow: inset 0px 2px 13px #999;
-	-moz-box-shadow: inset 0px 2px 13px #999;
-	-webkit-box-shadow: inset 0px 2px 13px #999;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
 }
 
 #qunit-tests table {
@@ -161,8 +158,7 @@
 #qunit-tests b.failed                       { color: #710909; }
 
 #qunit-tests li li {
-	margin: 0.5em;
-	padding: 0.4em 0.5em 0.4em 0.5em;
+	padding: 5px;
 	background-color: #fff;
 	border-bottom: none;
 	list-style-position: inside;
@@ -171,9 +167,9 @@
 /*** Passing Styles */
 
 #qunit-tests li li.pass {
-	color: #5E740B;
+	color: #3c510c;
 	background-color: #fff;
-	border-left: 26px solid #C6E746;
+	border-left: 10px solid #C6E746;
 }
 
 #qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
@@ -189,15 +185,15 @@
 #qunit-tests li li.fail {
 	color: #710909;
 	background-color: #fff;
-	border-left: 26px solid #EE5757;
+	border-left: 10px solid #EE5757;
 	white-space: pre;
 }
 
 #qunit-tests > li:last-child {
-	border-radius: 0 0 15px 15px;
-	-moz-border-radius: 0 0 15px 15px;
-	-webkit-border-bottom-right-radius: 15px;
-	-webkit-border-bottom-left-radius: 15px;
+	border-radius: 0 0 5px 5px;
+	-moz-border-radius: 0 0 5px 5px;
+	-webkit-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;
 }
 
 #qunit-tests .fail                          { color: #000000; background-color: #EE5757; }
@@ -220,6 +216,9 @@
 
 	border-bottom: 1px solid white;
 }
+#qunit-testresult .module-name {
+	font-weight: bold;
+}
 
 /** Fixture */
 
diff --git a/addons/web/static/lib/qunit/qunit.js b/addons/web/static/lib/qunit/qunit.js
index b71381313c7..65625336453 100644
--- a/addons/web/static/lib/qunit/qunit.js
+++ b/addons/web/static/lib/qunit/qunit.js
@@ -1,5 +1,5 @@
 /**
- * QUnit v1.4.0pre - A JavaScript Unit Testing Framework
+ * QUnit v1.9.0 - A JavaScript Unit Testing Framework
  *
  * http://docs.jquery.com/QUnit
  *
@@ -8,75 +8,89 @@
  * or GPL (GPL-LICENSE.txt) licenses.
  */
 
-(function(window) {
+(function( window ) {
 
-var defined = {
+var QUnit,
+	config,
+	onErrorFnPrev,
+	testId = 0,
+	fileName = (sourceFromStacktrace( 0 ) || "" ).replace(/(:\d+)+\)?/, "").replace(/.+\//, ""),
+	toString = Object.prototype.toString,
+	hasOwn = Object.prototype.hasOwnProperty,
+	defined = {
 	setTimeout: typeof window.setTimeout !== "undefined",
 	sessionStorage: (function() {
 		var x = "qunit-test-string";
 		try {
-			sessionStorage.setItem(x, x);
-			sessionStorage.removeItem(x);
+			sessionStorage.setItem( x, x );
+			sessionStorage.removeItem( x );
 			return true;
-		} catch(e) {
+		} catch( e ) {
 			return false;
 		}
-	})()
+	}())
 };
 
-var	testId = 0,
-	toString = Object.prototype.toString,
-	hasOwn = Object.prototype.hasOwnProperty;
-
-var Test = function(name, testName, expected, async, callback) {
-	this.name = name;
-	this.testName = testName;
-	this.expected = expected;
-	this.async = async;
-	this.callback = callback;
+function Test( settings ) {
+	extend( this, settings );
 	this.assertions = [];
-};
+	this.testNumber = ++Test.count;
+}
+
+Test.count = 0;
+
 Test.prototype = {
 	init: function() {
-		var tests = id("qunit-tests");
-		if (tests) {
-			var b = document.createElement("strong");
-				b.innerHTML = "Running " + this.name;
-			var li = document.createElement("li");
-				li.appendChild( b );
-				li.className = "running";
-				li.id = this.id = "test-output" + testId++;
+		var a, b, li,
+        tests = id( "qunit-tests" );
+
+		if ( tests ) {
+			b = document.createElement( "strong" );
+			b.innerHTML = this.name;
+
+			// `a` initialized at top of scope
+			a = document.createElement( "a" );
+			a.innerHTML = "Rerun";
+			a.href = QUnit.url({ testNumber: this.testNumber });
+
+			li = document.createElement( "li" );
+			li.appendChild( b );
+			li.appendChild( a );
+			li.className = "running";
+			li.id = this.id = "qunit-test-output" + testId++;
+
 			tests.appendChild( li );
 		}
 	},
 	setup: function() {
-		if (this.module != config.previousModule) {
+		if ( this.module !== config.previousModule ) {
 			if ( config.previousModule ) {
-				runLoggingCallbacks('moduleDone', QUnit, {
+				runLoggingCallbacks( "moduleDone", QUnit, {
 					name: config.previousModule,
 					failed: config.moduleStats.bad,
 					passed: config.moduleStats.all - config.moduleStats.bad,
 					total: config.moduleStats.all
-				} );
+				});
 			}
 			config.previousModule = this.module;
 			config.moduleStats = { all: 0, bad: 0 };
-			runLoggingCallbacks( 'moduleStart', QUnit, {
+			runLoggingCallbacks( "moduleStart", QUnit, {
 				name: this.module
-			} );
-		} else if (config.autorun) {
-			runLoggingCallbacks( 'moduleStart', QUnit, {
+			});
+		} else if ( config.autorun ) {
+			runLoggingCallbacks( "moduleStart", QUnit, {
 				name: this.module
-			} );
+			});
 		}
 
 		config.current = this;
+
 		this.testEnvironment = extend({
 			setup: function() {},
 			teardown: function() {}
-		}, this.moduleTestEnvironment);
+		}, this.moduleTestEnvironment );
 
-		runLoggingCallbacks( 'testStart', QUnit, {
+		runLoggingCallbacks( "testStart", QUnit, {
 			name: this.testName,
 			module: this.module
 		});
@@ -85,31 +99,41 @@ Test.prototype = {
 		// TODO why??
 		QUnit.current_testEnvironment = this.testEnvironment;
 
+		if ( !config.pollution ) {
+			saveGlobal();
+		}
+		if ( config.notrycatch ) {
+			this.testEnvironment.setup.call( this.testEnvironment );
+			return;
+		}
 		try {
-			if ( !config.pollution ) {
-				saveGlobal();
-			}
-
-			this.testEnvironment.setup.call(this.testEnvironment);
-		} catch(e) {
-			QUnit.ok( false, "Setup failed on " + this.testName + ": " + e.message );
+			this.testEnvironment.setup.call( this.testEnvironment );
+		} catch( e ) {
+			QUnit.pushFailure( "Setup failed on " + this.testName + ": " + e.message, extractStacktrace( e, 1 ) );
 		}
 	},
 	run: function() {
 		config.current = this;
+
+		var running = id( "qunit-testresult" );
+
+		if ( running ) {
+			running.innerHTML = "Running: <br/>" + this.name;
+		}
+
 		if ( this.async ) {
 			QUnit.stop();
 		}
 
 		if ( config.notrycatch ) {
-			this.callback.call(this.testEnvironment);
+			this.callback.call( this.testEnvironment, QUnit.assert );
 			return;
 		}
+
 		try {
-			this.callback.call(this.testEnvironment);
-		} catch(e) {
-			fail("Test " + this.testName + " died, exception and test follows", e, this.callback);
-			QUnit.ok( false, "Died on test #" + (this.assertions.length + 1) + ": " + e.message + " - " + QUnit.jsDump.parse(e) );
+			this.callback.call( this.testEnvironment, QUnit.assert );
+		} catch( e ) {
+			QUnit.pushFailure( "Died on test #" + (this.assertions.length + 1) + " " + this.stack + ": " + e.message, extractStacktrace( e, 0 ) );
 			// else next test will carry the responsibility
 			saveGlobal();
 
@@ -121,34 +145,46 @@ Test.prototype = {
 	},
 	teardown: function() {
 		config.current = this;
-		try {
-			this.testEnvironment.teardown.call(this.testEnvironment);
-			checkPollution();
-		} catch(e) {
-			QUnit.ok( false, "Teardown failed on " + this.testName + ": " + e.message );
+		if ( config.notrycatch ) {
+			this.testEnvironment.teardown.call( this.testEnvironment );
+			return;
+		} else {
+			try {
+				this.testEnvironment.teardown.call( this.testEnvironment );
+			} catch( e ) {
+				QUnit.pushFailure( "Teardown failed on " + this.testName + ": " + e.message, extractStacktrace( e, 1 ) );
+			}
 		}
+		checkPollution();
 	},
 	finish: function() {
 		config.current = this;
-		if ( this.expected != null && this.expected != this.assertions.length ) {
-			QUnit.ok( false, "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run" );
+		if ( config.requireExpects && this.expected == null ) {
+			QUnit.pushFailure( "Expected number of assertions to be defined, but expect() was not called.", this.stack );
+		} else if ( this.expected != null && this.expected != this.assertions.length ) {
+			QUnit.pushFailure( "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run", this.stack );
+		} else if ( this.expected == null && !this.assertions.length ) {
+			QUnit.pushFailure( "Expected at least one assertion, but none were run - call expect(0) to accept zero assertions.", this.stack );
 		}
 
-		var good = 0, bad = 0,
-			tests = id("qunit-tests");
+		var assertion, a, b, i, li, ol,
+			test = this,
+			good = 0,
+			bad = 0,
+			tests = id( "qunit-tests" );
 
 		config.stats.all += this.assertions.length;
 		config.moduleStats.all += this.assertions.length;
 
 		if ( tests ) {
-			var ol = document.createElement("ol");
+			ol = document.createElement( "ol" );
 
-			for ( var i = 0; i < this.assertions.length; i++ ) {
-				var assertion = this.assertions[i];
+			for ( i = 0; i < this.assertions.length; i++ ) {
+				assertion = this.assertions[i];
 
-				var li = document.createElement("li");
+				li = document.createElement( "li" );
 				li.className = assertion.result ? "pass" : "fail";
-				li.innerHTML = assertion.message || (assertion.result ? "okay" : "failed");
+				li.innerHTML = assertion.message || ( assertion.result ? "okay" : "failed" );
 				ol.appendChild( li );
 
 				if ( assertion.result ) {
@@ -162,49 +198,48 @@ Test.prototype = {
 
 			// store result when possible
 			if ( QUnit.config.reorder && defined.sessionStorage ) {
-				if (bad) {
-					sessionStorage.setItem("qunit-" + this.module + "-" + this.testName, bad);
+				if ( bad ) {
+					sessionStorage.setItem( "qunit-test-" + this.module + "-" + this.testName, bad );
 				} else {
-					sessionStorage.removeItem("qunit-" + this.module + "-" + this.testName);
+					sessionStorage.removeItem( "qunit-test-" + this.module + "-" + this.testName );
 				}
 			}
 
-			if (bad == 0) {
+			if ( bad === 0 ) {
 				ol.style.display = "none";
 			}
 
-			var b = document.createElement("strong");
+			// `b` initialized at top of scope
+			b = document.createElement( "strong" );
 			b.innerHTML = this.name + " <b class='counts'>(<b class='failed'>" + bad + "</b>, <b class='passed'>" + good + "</b>, " + this.assertions.length + ")</b>";
 
-			var a = document.createElement("a");
-			a.innerHTML = "Rerun";
-			a.href = QUnit.url({ filter: getText([b]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
-
 			addEvent(b, "click", function() {
 				var next = b.nextSibling.nextSibling,
 					display = next.style.display;
 				next.style.display = display === "none" ? "block" : "none";
 			});
 
-			addEvent(b, "dblclick", function(e) {
+			addEvent(b, "dblclick", function( e ) {
 				var target = e && e.target ? e.target : window.event.srcElement;
 				if ( target.nodeName.toLowerCase() == "span" || target.nodeName.toLowerCase() == "b" ) {
 					target = target.parentNode;
 				}
 				if ( window.location && target.nodeName.toLowerCase() === "strong" ) {
-					window.location = QUnit.url({ filter: getText([target]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
+					window.location = QUnit.url({ testNumber: test.testNumber });
 				}
 			});
 
-			var li = id(this.id);
+			// `li` initialized at top of scope
+			li = id( this.id );
 			li.className = bad ? "fail" : "pass";
 			li.removeChild( li.firstChild );
+			a = li.firstChild;
 			li.appendChild( b );
-			li.appendChild( a );
+			li.appendChild ( a );
 			li.appendChild( ol );
 
 		} else {
-			for ( var i = 0; i < this.assertions.length; i++ ) {
+			for ( i = 0; i < this.assertions.length; i++ ) {
 				if ( !this.assertions[i].result ) {
 					bad++;
 					config.stats.bad++;
@@ -213,23 +248,23 @@ Test.prototype = {
 			}
 		}
 
-		try {
-			QUnit.reset();
-		} catch(e) {
-			fail("reset() failed, following Test " + this.testName + ", exception and reset fn follows", e, QUnit.reset);
-		}
-
-		runLoggingCallbacks( 'testDone', QUnit, {
+		runLoggingCallbacks( "testDone", QUnit, {
 			name: this.testName,
 			module: this.module,
 			failed: bad,
 			passed: this.assertions.length - bad,
 			total: this.assertions.length
-		} );
+		});
+
+		QUnit.reset();
+
+		config.current = undefined;
 	},
 
 	queue: function() {
-		var test = this;
+		var bad,
+			test = this;
+
 		synchronize(function() {
 			test.init();
 		});
@@ -248,36 +283,42 @@ Test.prototype = {
 				test.finish();
 			});
 		}
+
+		// `bad` initialized at top of scope
 		// defer when previous test run passed, if storage is available
-		var bad = QUnit.config.reorder && defined.sessionStorage && +sessionStorage.getItem("qunit-" + this.module + "-" + this.testName);
-		if (bad) {
+		bad = QUnit.config.reorder && defined.sessionStorage &&
+						+sessionStorage.getItem( "qunit-test-" + this.module + "-" + this.testName );
+
+		if ( bad ) {
 			run();
 		} else {
-			synchronize(run, true);
-		};
+			synchronize( run, true );
+		}
 	}
-
 };
 
-var QUnit = {
+// Root QUnit object.
+// `QUnit` initialized at top of scope
+QUnit = {
 
 	// call on start of module test to prepend name to all tests
-	module: function(name, testEnvironment) {
+	module: function( name, testEnvironment ) {
 		config.currentModule = name;
 		config.currentModuleTestEnviroment = testEnvironment;
 	},
 
-	asyncTest: function(testName, expected, callback) {
+	asyncTest: function( testName, expected, callback ) {
 		if ( arguments.length === 2 ) {
 			callback = expected;
 			expected = null;
 		}
 
-		QUnit.test(testName, expected, callback, true);
+		QUnit.test( testName, expected, callback, true );
 	},
 
-	test: function(testName, expected, callback, async) {
-		var name = '<span class="test-name">' + escapeInnerText(testName) + '</span>';
+	test: function( testName, expected, callback, async ) {
+		var test,
+			name = "<span class='test-name'>" + escapeInnerText( testName ) + "</span>";
 
 		if ( arguments.length === 2 ) {
 			callback = expected;
@@ -285,180 +326,245 @@ var QUnit = {
 		}
 
 		if ( config.currentModule ) {
-			name = '<span class="module-name">' + config.currentModule + "</span>: " + name;
+			name = "<span class='module-name'>" + config.currentModule + "</span>: " + name;
 		}
 
-		if ( !validTest(config.currentModule + ": " + testName) ) {
+		test = new Test({
+			name: name,
+			testName: testName,
+			expected: expected,
+			async: async,
+			callback: callback,
+			module: config.currentModule,
+			moduleTestEnvironment: config.currentModuleTestEnviroment,
+			stack: sourceFromStacktrace( 2 )
+		});
+
+		if ( !validTest( test ) ) {
 			return;
 		}
 
-		var test = new Test(name, testName, expected, async, callback);
-		test.module = config.currentModule;
-		test.moduleTestEnvironment = config.currentModuleTestEnviroment;
 		test.queue();
 	},
 
-	/**
-	 * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
-	 */
-	expect: function(asserts) {
+	// Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
+	expect: function( asserts ) {
 		config.current.expected = asserts;
 	},
 
+	start: function( count ) {
+		config.semaphore -= count || 1;
+		// don't start until equal number of stop-calls
+		if ( config.semaphore > 0 ) {
+			return;
+		}
+		// ignore if start is called more often then stop
+		if ( config.semaphore < 0 ) {
+            config.semaphore = 0;
+		}
+		// A slight delay, to avoid any current callbacks
+		if ( defined.setTimeout ) {
+			window.setTimeout(function() {
+				if ( config.semaphore > 0 ) {
+					return;
+				}
+				if ( config.timeout ) {
+					clearTimeout( config.timeout );
+				}
+
+				config.blocking = false;
+				process( true );
+			}, 13);
+		} else {
+			config.blocking = false;
+			process( true );
+		}
+	},
+
+	stop: function( count ) {
+		config.semaphore += count || 1;
+		config.blocking = true;
+
+		if ( config.testTimeout && defined.setTimeout ) {
+			clearTimeout( config.timeout );
+			config.timeout = window.setTimeout(function() {
+				QUnit.ok( false, "Test timed out" );
+				config.semaphore = 1;
+				QUnit.start();
+			}, config.testTimeout );
+		}
+	}
+};
+
+// Asssert helpers
+// All of these must call either QUnit.push() or manually do:
+// - runLoggingCallbacks( "log", .. );
+// - config.current.assertions.push({ .. });
+QUnit.assert = {
 	/**
-	 * Asserts true.
+	 * Asserts rough true-ish result.
+	 * @name ok
+	 * @function
 	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
 	 */
-	ok: function(a, msg) {
-		if (!config.current) {
-			throw new Error("ok() assertion outside test context, was " + sourceFromStacktrace(2));
+	ok: function( result, msg ) {
+		if ( !config.current ) {
+			throw new Error( "ok() assertion outside test context, was " + sourceFromStacktrace(2) );
 		}
-		a = !!a;
-		var details = {
-			result: a,
-			message: msg
-		};
-		msg = escapeInnerText(msg);
-		runLoggingCallbacks( 'log', QUnit, details );
+		result = !!result;
+
+		var source,
+			details = {
+				result: result,
+				message: msg
+			};
+
+		msg = escapeInnerText( msg || (result ? "okay" : "failed" ) );
+		msg = "<span class='test-message'>" + msg + "</span>";
+
+		if ( !result ) {
+			source = sourceFromStacktrace( 2 );
+			if ( source ) {
+				details.source = source;
+				msg += "<table><tr class='test-source'><th>Source: </th><td><pre>" + escapeInnerText( source ) + "</pre></td></tr></table>";
+			}
+		}
+		runLoggingCallbacks( "log", QUnit, details );
 		config.current.assertions.push({
-			result: a,
+			result: result,
 			message: msg
 		});
 	},
 
 	/**
-	 * Checks that the first two arguments are equal, with an optional message.
+	 * Assert that the first two arguments are equal, with an optional message.
 	 * Prints out both actual and expected values.
-	 *
-	 * Prefered to ok( actual == expected, message )
-	 *
-	 * @example equal( format("Received {0} bytes.", 2), "Received 2 bytes." );
-	 *
-	 * @param Object actual
-	 * @param Object expected
-	 * @param String message (optional)
+	 * @name equal
+	 * @function
+	 * @example equal( format( "Received {0} bytes.", 2), "Received 2 bytes.", "format() replaces {0} with next argument" );
 	 */
-	equal: function(actual, expected, message) {
-		QUnit.push(expected == actual, actual, expected, message);
+	equal: function( actual, expected, message ) {
+		QUnit.push( expected == actual, actual, expected, message );
 	},
 
-	notEqual: function(actual, expected, message) {
-		QUnit.push(expected != actual, actual, expected, message);
+	/**
+	 * @name notEqual
+	 * @function
+	 */
+	notEqual: function( actual, expected, message ) {
+		QUnit.push( expected != actual, actual, expected, message );
 	},
 
-	deepEqual: function(actual, expected, message) {
-		QUnit.push(QUnit.equiv(actual, expected), actual, expected, message);
+	/**
+	 * @name deepEqual
+	 * @function
+	 */
+	deepEqual: function( actual, expected, message ) {
+		QUnit.push( QUnit.equiv(actual, expected), actual, expected, message );
 	},
 
-	notDeepEqual: function(actual, expected, message) {
-		QUnit.push(!QUnit.equiv(actual, expected), actual, expected, message);
+	/**
+	 * @name notDeepEqual
+	 * @function
+	 */
+	notDeepEqual: function( actual, expected, message ) {
+		QUnit.push( !QUnit.equiv(actual, expected), actual, expected, message );
 	},
 
-	strictEqual: function(actual, expected, message) {
-		QUnit.push(expected === actual, actual, expected, message);
+	/**
+	 * @name strictEqual
+	 * @function
+	 */
+	strictEqual: function( actual, expected, message ) {
+		QUnit.push( expected === actual, actual, expected, message );
 	},
 
-	notStrictEqual: function(actual, expected, message) {
-		QUnit.push(expected !== actual, actual, expected, message);
+	/**
+	 * @name notStrictEqual
+	 * @function
+	 */
+	notStrictEqual: function( actual, expected, message ) {
+		QUnit.push( expected !== actual, actual, expected, message );
 	},
 
-	raises: function(block, expected, message) {
-		var actual, ok = false;
+	throws: function( block, expected, message ) {
+		var actual,
+			ok = false;
 
-		if (typeof expected === 'string') {
+		// 'expected' is optional
+		if ( typeof expected === "string" ) {
 			message = expected;
 			expected = null;
 		}
 
+		config.current.ignoreGlobalErrors = true;
 		try {
-			block();
+			block.call( config.current.testEnvironment );
 		} catch (e) {
 			actual = e;
 		}
+		config.current.ignoreGlobalErrors = false;
 
-		if (actual) {
+		if ( actual ) {
 			// we don't want to validate thrown error
-			if (!expected) {
+			if ( !expected ) {
 				ok = true;
 			// expected is a regexp
-			} else if (QUnit.objectType(expected) === "regexp") {
-				ok = expected.test(actual);
+			} else if ( QUnit.objectType( expected ) === "regexp" ) {
+				ok = expected.test( actual );
 			// expected is a constructor
-			} else if (actual instanceof expected) {
+			} else if ( actual instanceof expected ) {
 				ok = true;
 			// expected is a validation function which returns true is validation passed
-			} else if (expected.call({}, actual) === true) {
+			} else if ( expected.call( {}, actual ) === true ) {
 				ok = true;
 			}
-		}
 
-		QUnit.ok(ok, message);
-	},
-
-	start: function(count) {
-		config.semaphore -= count || 1;
-		if (config.semaphore > 0) {
-			// don't start until equal number of stop-calls
-			return;
-		}
-		if (config.semaphore < 0) {
-			// ignore if start is called more often then stop
-			config.semaphore = 0;
-		}
-		// A slight delay, to avoid any current callbacks
-		if ( defined.setTimeout ) {
-			window.setTimeout(function() {
-				if (config.semaphore > 0) {
-					return;
-				}
-				if ( config.timeout ) {
-					clearTimeout(config.timeout);
-				}
-
-				config.blocking = false;
-				process(true);
-			}, 13);
+			QUnit.push( ok, actual, null, message );
 		} else {
-			config.blocking = false;
-			process(true);
-		}
-	},
-
-	stop: function(count) {
-		config.semaphore += count || 1;
-		config.blocking = true;
-
-		if ( config.testTimeout && defined.setTimeout ) {
-			clearTimeout(config.timeout);
-			config.timeout = window.setTimeout(function() {
-				QUnit.ok( false, "Test timed out" );
-				config.semaphore = 1;
-				QUnit.start();
-			}, config.testTimeout);
+			QUnit.pushFailure( message, null, 'No exception was thrown.' );
 		}
 	}
 };
 
-//We want access to the constructor's prototype
-(function() {
-	function F(){};
-	F.prototype = QUnit;
-	QUnit = new F();
-	//Make F QUnit's constructor so that we can add to the prototype later
-	QUnit.constructor = F;
-})();
+/**
+ * @deprecate since 1.8.0
+ * Kept assertion helpers in root for backwards compatibility
+ */
+extend( QUnit, QUnit.assert );
 
-// deprecated; still export them to window to provide clear error messages
-// next step: remove entirely
+/**
+ * @deprecated since 1.9.0
+ * Kept global "raises()" for backwards compatibility
+ */
+QUnit.raises = QUnit.assert.throws;
+
+/**
+ * @deprecated since 1.0.0, replaced with error pushes since 1.3.0
+ * Kept to avoid TypeErrors for undefined methods.
+ */
 QUnit.equals = function() {
-	throw new Error("QUnit.equals has been deprecated since 2009 (e88049a0), use QUnit.equal instead");
+	QUnit.push( false, false, false, "QUnit.equals has been deprecated since 2009 (e88049a0), use QUnit.equal instead" );
 };
 QUnit.same = function() {
-	throw new Error("QUnit.same has been deprecated since 2009 (e88049a0), use QUnit.deepEqual instead");
+	QUnit.push( false, false, false, "QUnit.same has been deprecated since 2009 (e88049a0), use QUnit.deepEqual instead" );
 };
 
-// Maintain internal state
-var config = {
+// We want access to the constructor's prototype
+(function() {
+	function F() {}
+	F.prototype = QUnit;
+	QUnit = new F();
+	// Make F QUnit's constructor so that we can add to the prototype later
+	QUnit.constructor = F;
+}());
+
+/**
+ * Config object: Maintain internal state
+ * Later exposed as QUnit.config
+ * `config` initialized at top of scope
+ */
+config = {
 	// The queue of tests to run
 	queue: [],
 
@@ -476,9 +582,25 @@ var config = {
 	// by default, modify document.title when suite is done
 	altertitle: true,
 
-	urlConfig: ['noglobals', 'notrycatch'],
+	// when enabled, all tests must call expect()
+	requireExpects: false,
 
-	//logging callback queues
+	// add checkboxes that are persisted in the query-string
+	// when enabled, the id is set to `true` as a `QUnit.config` property
+	urlConfig: [
+		{
+			id: "noglobals",
+			label: "Check for Globals",
+			tooltip: "Enabling this will test if any test introduces new properties on the `window` object. Stored as query-strings."
+		},
+		{
+			id: "notrycatch",
+			label: "No try-catch",
+			tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging exceptions in IE reasonable. Stored as query-strings."
+		}
+	],
+
+	// logging callback queues
 	begin: [],
 	done: [],
 	log: [],
@@ -488,16 +610,17 @@ var config = {
 	moduleDone: []
 };
 
-// Load paramaters
+// Initialize more QUnit.config and QUnit.urlParams
 (function() {
-	var location = window.location || { search: "", protocol: "file:" },
+	var i,
+		location = window.location || { search: "", protocol: "file:" },
 		params = location.search.slice( 1 ).split( "&" ),
 		length = params.length,
 		urlParams = {},
 		current;
 
 	if ( params[ 0 ] ) {
-		for ( var i = 0; i < length; i++ ) {
+		for ( i = 0; i < length; i++ ) {
 			current = params[ i ].split( "=" );
 			current[ 0 ] = decodeURIComponent( current[ 0 ] );
 			// allow just a key to turn on a flag, e.g., test.html?noglobals
@@ -507,31 +630,39 @@ var config = {
 	}
 
 	QUnit.urlParams = urlParams;
+
+	// String search anywhere in moduleName+testName
 	config.filter = urlParams.filter;
 
-	// Figure out if we're running the tests from a server or not
-	QUnit.isLocal = !!(location.protocol === 'file:');
-})();
+	// Exact match of the module name
+	config.module = urlParams.module;
 
-// Expose the API as global variables, unless an 'exports'
-// object exists, in that case we assume we're in CommonJS
-if ( typeof exports === "undefined" || typeof require === "undefined" ) {
-	extend(window, QUnit);
+	config.testNumber = parseInt( urlParams.testNumber, 10 ) || null;
+
+	// Figure out if we're running the tests from a server or not
+	QUnit.isLocal = location.protocol === "file:";
+}());
+
+// Export global variables, unless an 'exports' object exists,
+// in that case we assume we're in CommonJS (dealt with on the bottom of the script)
+if ( typeof exports === "undefined" ) {
+	extend( window, QUnit );
+
+	// Expose QUnit object
 	window.QUnit = QUnit;
-} else {
-	module.exports = QUnit;
 }
 
-// define these after exposing globals to keep them in these QUnit namespace only
-extend(QUnit, {
+// Extend QUnit object,
+// these after set here because they should not be exposed as global functions
+extend( QUnit, {
 	config: config,
 
 	// Initialize the configuration options
 	init: function() {
-		extend(config, {
+		extend( config, {
 			stats: { all: 0, bad: 0 },
 			moduleStats: { all: 0, bad: 0 },
-			started: +new Date,
+			started: +new Date(),
 			updateRate: 1000,
 			blocking: false,
 			autostart: true,
@@ -541,19 +672,21 @@ extend(QUnit, {
 			semaphore: 0
 		});
 
-		var qunit = id( "qunit" );
+		var tests, banner, result,
+			qunit = id( "qunit" );
+
 		if ( qunit ) {
 			qunit.innerHTML =
-				'<h1 id="qunit-header">' + escapeInnerText( document.title ) + '</h1>' +
-				'<h2 id="qunit-banner"></h2>' +
-				'<div id="qunit-testrunner-toolbar"></div>' +
-				'<h2 id="qunit-userAgent"></h2>' +
-				'<ol id="qunit-tests"></ol>';
+				"<h1 id='qunit-header'>" + escapeInnerText( document.title ) + "</h1>" +
+				"<h2 id='qunit-banner'></h2>" +
+				"<div id='qunit-testrunner-toolbar'></div>" +
+				"<h2 id='qunit-userAgent'></h2>" +
+				"<ol id='qunit-tests'></ol>";
 		}
 
-		var tests = id( "qunit-tests" ),
-			banner = id( "qunit-banner" ),
-			result = id( "qunit-testresult" );
+		tests = id( "qunit-tests" );
+		banner = id( "qunit-banner" );
+		result = id( "qunit-testresult" );
 
 		if ( tests ) {
 			tests.innerHTML = "";
@@ -572,43 +705,36 @@ extend(QUnit, {
 			result.id = "qunit-testresult";
 			result.className = "result";
 			tests.parentNode.insertBefore( result, tests );
-			result.innerHTML = 'Running...<br/>&nbsp;';
+			result.innerHTML = "Running...<br/>&nbsp;";
 		}
 	},
 
-	/**
-	 * Resets the test setup. Useful for tests that modify the DOM.
-	 *
-	 * If jQuery is available, uses jQuery's replaceWith(), otherwise use replaceChild
-	 */
+	// Resets the test setup. Useful for tests that modify the DOM.
+	// If jQuery is available, uses jQuery's html(), otherwise just innerHTML.
 	reset: function() {
-		var main = id( 'qunit-fixture' );
-		if ( main ) {
-			if ( window.jQuery ) {
-				jQuery( main ).replaceWith( config.fixture.cloneNode(true) );
-			} else {
-				main.parentNode.replaceChild(config.fixture.cloneNode(true), main);
+		var fixture;
+
+		if ( window.jQuery ) {
+			jQuery( "#qunit-fixture" ).html( config.fixture );
+		} else {
+			fixture = id( "qunit-fixture" );
+			if ( fixture ) {
+				fixture.innerHTML = config.fixture;
 			}
 		}
 	},
 
-	/**
-	 * Trigger an event on an element.
-	 *
-	 * @example triggerEvent( document.body, "click" );
-	 *
-	 * @param DOMElement elem
-	 * @param String type
-	 */
+	// Trigger an event on an element.
+	// @example triggerEvent( document.body, "click" );
 	triggerEvent: function( elem, type, event ) {
 		if ( document.createEvent ) {
-			event = document.createEvent("MouseEvents");
+			event = document.createEvent( "MouseEvents" );
 			event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
 				0, 0, 0, 0, 0, false, false, false, false, 0, null);
-			elem.dispatchEvent( event );
 
+			elem.dispatchEvent( event );
 		} else if ( elem.fireEvent ) {
-			elem.fireEvent("on"+type);
+			elem.fireEvent( "on" + type );
 		}
 	},
 
@@ -618,69 +744,74 @@ extend(QUnit, {
 	},
 
 	objectType: function( obj ) {
-		if (typeof obj === "undefined") {
+		if ( typeof obj === "undefined" ) {
 				return "undefined";
-
 		// consider: typeof null === object
 		}
-		if (obj === null) {
+		if ( obj === null ) {
 				return "null";
 		}
 
-		var type = toString.call( obj ).match(/^\[object\s(.*)\]$/)[1] || '';
+		var type = toString.call( obj ).match(/^\[object\s(.*)\]$/)[1] || "";
 
-		switch (type) {
-				case 'Number':
-						if (isNaN(obj)) {
-								return "nan";
-						} else {
-								return "number";
-						}
-				case 'String':
-				case 'Boolean':
-				case 'Array':
-				case 'Date':
-				case 'RegExp':
-				case 'Function':
-						return type.toLowerCase();
+		switch ( type ) {
+			case "Number":
+				if ( isNaN(obj) ) {
+					return "nan";
+				}
+				return "number";
+			case "String":
+			case "Boolean":
+			case "Array":
+			case "Date":
+			case "RegExp":
+			case "Function":
+				return type.toLowerCase();
 		}
-		if (typeof obj === "object") {
-				return "object";
+		if ( typeof obj === "object" ) {
+			return "object";
 		}
 		return undefined;
 	},
 
-	push: function(result, actual, expected, message) {
-		if (!config.current) {
-			throw new Error("assertion outside test context, was " + sourceFromStacktrace());
+	push: function( result, actual, expected, message ) {
+		if ( !config.current ) {
+			throw new Error( "assertion outside test context, was " + sourceFromStacktrace() );
 		}
-		var details = {
-			result: result,
-			message: message,
-			actual: actual,
-			expected: expected
-		};
 
-		message = escapeInnerText(message) || (result ? "okay" : "failed");
-		message = '<span class="test-message">' + message + "</span>";
-		var output = message;
-		if (!result) {
-			expected = escapeInnerText(QUnit.jsDump.parse(expected));
-			actual = escapeInnerText(QUnit.jsDump.parse(actual));
-			output += '<table><tr class="test-expected"><th>Expected: </th><td><pre>' + expected + '</pre></td></tr>';
-			if (actual != expected) {
-				output += '<tr class="test-actual"><th>Result: </th><td><pre>' + actual + '</pre></td></tr>';
-				output += '<tr class="test-diff"><th>Diff: </th><td><pre>' + QUnit.diff(expected, actual) +'</pre></td></tr>';
+		var output, source,
+			details = {
+				result: result,
+				message: message,
+				actual: actual,
+				expected: expected
+			};
+
+		message = escapeInnerText( message ) || ( result ? "okay" : "failed" );
+		message = "<span class='test-message'>" + message + "</span>";
+		output = message;
+
+		if ( !result ) {
+			expected = escapeInnerText( QUnit.jsDump.parse(expected) );
+			actual = escapeInnerText( QUnit.jsDump.parse(actual) );
+			output += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" + expected + "</pre></td></tr>";
+
+			if ( actual != expected ) {
+				output += "<tr class='test-actual'><th>Result: </th><td><pre>" + actual + "</pre></td></tr>";
+				output += "<tr class='test-diff'><th>Diff: </th><td><pre>" + QUnit.diff( expected, actual ) + "</pre></td></tr>";
 			}
-			var source = sourceFromStacktrace();
-			if (source) {
+
+			source = sourceFromStacktrace();
+
+			if ( source ) {
 				details.source = source;
-				output += '<tr class="test-source"><th>Source: </th><td><pre>' + escapeInnerText(source) + '</pre></td></tr>';
+				output += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeInnerText( source ) + "</pre></td></tr>";
 			}
+
 			output += "</table>";
 		}
 
-		runLoggingCallbacks( 'log', QUnit, details );
+		runLoggingCallbacks( "log", QUnit, details );
 
 		config.current.assertions.push({
 			result: !!result,
@@ -688,10 +819,47 @@ extend(QUnit, {
 		});
 	},
 
+	pushFailure: function( message, source, actual ) {
+		if ( !config.current ) {
+			throw new Error( "pushFailure() assertion outside test context, was " + sourceFromStacktrace(2) );
+		}
+
+		var output,
+			details = {
+				result: false,
+				message: message
+			};
+
+		message = escapeInnerText( message ) || "error";
+		message = "<span class='test-message'>" + message + "</span>";
+		output = message;
+
+		output += "<table>";
+
+		if ( actual ) {
+			output += "<tr class='test-actual'><th>Result: </th><td><pre>" + escapeInnerText( actual ) + "</pre></td></tr>";
+		}
+
+		if ( source ) {
+			details.source = source;
+			output += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeInnerText( source ) + "</pre></td></tr>";
+		}
+
+		output += "</table>";
+
+		runLoggingCallbacks( "log", QUnit, details );
+
+		config.current.assertions.push({
+			result: false,
+			message: output
+		});
+	},
+
 	url: function( params ) {
 		params = extend( extend( {}, QUnit.urlParams ), params );
-		var querystring = "?",
-			key;
+		var key,
+			querystring = "?";
+
 		for ( key in params ) {
 			if ( !hasOwn.call( params, key ) ) {
 				continue;
@@ -705,27 +873,39 @@ extend(QUnit, {
 	extend: extend,
 	id: id,
 	addEvent: addEvent
+	// load, equiv, jsDump, diff: Attached later
 });
 
-//QUnit.constructor is set to the empty F() above so that we can add to it's prototype later
-//Doing this allows us to tell if the following methods have been overwritten on the actual
-//QUnit object, which is a deprecated way of using the callbacks.
-extend(QUnit.constructor.prototype, {
+/**
+ * @deprecated: Created for backwards compatibility with test runner that set the hook function
+ * into QUnit.{hook}, instead of invoking it and passing the hook function.
+ * QUnit.constructor is set to the empty F() above so that we can add to it's prototype here.
+ * Doing this allows us to tell if the following methods have been overwritten on the actual
+ * QUnit object.
+ */
+extend( QUnit.constructor.prototype, {
+
 	// Logging callbacks; all receive a single argument with the listed properties
 	// run test/logs.html for any related changes
-	begin: registerLoggingCallback('begin'),
+	begin: registerLoggingCallback( "begin" ),
+
 	// done: { failed, passed, total, runtime }
-	done: registerLoggingCallback('done'),
+	done: registerLoggingCallback( "done" ),
+
 	// log: { result, actual, expected, message }
-	log: registerLoggingCallback('log'),
+	log: registerLoggingCallback( "log" ),
+
 	// testStart: { name }
-	testStart: registerLoggingCallback('testStart'),
+	testStart: registerLoggingCallback( "testStart" ),
+
 	// testDone: { name, failed, passed, total }
-	testDone: registerLoggingCallback('testDone'),
+	testDone: registerLoggingCallback( "testDone" ),
+
 	// moduleStart: { name }
-	moduleStart: registerLoggingCallback('moduleStart'),
+	moduleStart: registerLoggingCallback( "moduleStart" ),
+
 	// moduleDone: { name, failed, passed, total }
-	moduleDone: registerLoggingCallback('moduleDone')
+	moduleDone: registerLoggingCallback( "moduleDone" )
 });
 
 if ( typeof document === "undefined" || document.readyState === "complete" ) {
@@ -733,90 +913,140 @@ if ( typeof document === "undefined" || document.readyState === "complete" ) {
 }
 
 QUnit.load = function() {
-	runLoggingCallbacks( 'begin', QUnit, {} );
+	runLoggingCallbacks( "begin", QUnit, {} );
 
 	// Initialize the config, saving the execution queue
-	var oldconfig = extend({}, config);
+	var banner, filter, i, label, len, main, ol, toolbar, userAgent, val, urlConfigCheckboxes,
+		urlConfigHtml = "",
+		oldconfig = extend( {}, config );
+
 	QUnit.init();
 	extend(config, oldconfig);
 
 	config.blocking = false;
 
-	var urlConfigHtml = '', len = config.urlConfig.length;
-	for ( var i = 0, val; i < len, val = config.urlConfig[i]; i++ ) {
-		config[val] = QUnit.urlParams[val];
-		urlConfigHtml += '<label><input name="' + val + '" type="checkbox"' + ( config[val] ? ' checked="checked"' : '' ) + '>' + val + '</label>';
+	len = config.urlConfig.length;
+
+	for ( i = 0; i < len; i++ ) {
+		val = config.urlConfig[i];
+		if ( typeof val === "string" ) {
+			val = {
+				id: val,
+				label: val,
+				tooltip: "[no tooltip available]"
+			};
+		}
+		config[ val.id ] = QUnit.urlParams[ val.id ];
+		urlConfigHtml += "<input id='qunit-urlconfig-" + val.id + "' name='" + val.id + "' type='checkbox'" + ( config[ val.id ] ? " checked='checked'" : "" ) + " title='" + val.tooltip + "'><label for='qunit-urlconfig-" + val.id + "' title='" + val.tooltip + "'>" + val.label + "</label>";
 	}
 
-	var userAgent = id("qunit-userAgent");
+	// `userAgent` initialized at top of scope
+	userAgent = id( "qunit-userAgent" );
 	if ( userAgent ) {
 		userAgent.innerHTML = navigator.userAgent;
 	}
-	var banner = id("qunit-header");
+
+	// `banner` initialized at top of scope
+	banner = id( "qunit-header" );
 	if ( banner ) {
-		banner.innerHTML = '<a href="' + QUnit.url({ filter: undefined }) + '"> ' + banner.innerHTML + '</a> ' + urlConfigHtml;
-		addEvent( banner, "change", function( event ) {
-			var params = {};
-			params[ event.target.name ] = event.target.checked ? true : undefined;
-			window.location = QUnit.url( params );
-		});
+		banner.innerHTML = "<a href='" + QUnit.url({ filter: undefined, module: undefined, testNumber: undefined }) + "'>" + banner.innerHTML + "</a> ";
 	}
 
-	var toolbar = id("qunit-testrunner-toolbar");
+	// `toolbar` initialized at top of scope
+	toolbar = id( "qunit-testrunner-toolbar" );
 	if ( toolbar ) {
-		var filter = document.createElement("input");
+		// `filter` initialized at top of scope
+		filter = document.createElement( "input" );
 		filter.type = "checkbox";
 		filter.id = "qunit-filter-pass";
+
 		addEvent( filter, "click", function() {
-			var ol = document.getElementById("qunit-tests");
+			var tmp,
+				ol = document.getElementById( "qunit-tests" );
+
 			if ( filter.checked ) {
 				ol.className = ol.className + " hidepass";
 			} else {
-				var tmp = " " + ol.className.replace( /[\n\t\r]/g, " " ) + " ";
-				ol.className = tmp.replace(/ hidepass /, " ");
+				tmp = " " + ol.className.replace( /[\n\t\r]/g, " " ) + " ";
+				ol.className = tmp.replace( / hidepass /, " " );
 			}
 			if ( defined.sessionStorage ) {
 				if (filter.checked) {
-					sessionStorage.setItem("qunit-filter-passed-tests", "true");
+					sessionStorage.setItem( "qunit-filter-passed-tests", "true" );
 				} else {
-					sessionStorage.removeItem("qunit-filter-passed-tests");
+					sessionStorage.removeItem( "qunit-filter-passed-tests" );
 				}
 			}
 		});
-		if ( config.hidepassed || defined.sessionStorage && sessionStorage.getItem("qunit-filter-passed-tests") ) {
+
+		if ( config.hidepassed || defined.sessionStorage && sessionStorage.getItem( "qunit-filter-passed-tests" ) ) {
 			filter.checked = true;
-			var ol = document.getElementById("qunit-tests");
+			// `ol` initialized at top of scope
+			ol = document.getElementById( "qunit-tests" );
 			ol.className = ol.className + " hidepass";
 		}
 		toolbar.appendChild( filter );
 
-		var label = document.createElement("label");
-		label.setAttribute("for", "qunit-filter-pass");
+		// `label` initialized at top of scope
+		label = document.createElement( "label" );
+		label.setAttribute( "for", "qunit-filter-pass" );
+		label.setAttribute( "title", "Only show tests and assertons that fail. Stored in sessionStorage." );
 		label.innerHTML = "Hide passed tests";
 		toolbar.appendChild( label );
+
+		urlConfigCheckboxes = document.createElement( 'span' );
+		urlConfigCheckboxes.innerHTML = urlConfigHtml;
+		addEvent( urlConfigCheckboxes, "change", function( event ) {
+			var params = {};
+			params[ event.target.name ] = event.target.checked ? true : undefined;
+			window.location = QUnit.url( params );
+		});
+		toolbar.appendChild( urlConfigCheckboxes );
 	}
 
-	var main = id('qunit-fixture');
+	// `main` initialized at top of scope
+	main = id( "qunit-fixture" );
 	if ( main ) {
-		config.fixture = main.cloneNode(true);
+		config.fixture = main.innerHTML;
 	}
 
-	if (config.autostart) {
+	if ( config.autostart ) {
 		QUnit.start();
 	}
 };
 
-addEvent(window, "load", QUnit.load);
+addEvent( window, "load", QUnit.load );
 
-// addEvent(window, "error") gives us a useless event object
-window.onerror = function( message, file, line ) {
-	if ( QUnit.config.current ) {
-		ok( false, message + ", " + file + ":" + line );
-	} else {
-		test( "global failure", function() {
-			ok( false, message + ", " + file + ":" + line );
-		});
+// `onErrorFnPrev` initialized at top of scope
+// Preserve other handlers
+onErrorFnPrev = window.onerror;
+
+// Cover uncaught exceptions
+// Returning true will surpress the default browser handler,
+// returning false will let it run.
+window.onerror = function ( error, filePath, linerNr ) {
+	var ret = false;
+	if ( onErrorFnPrev ) {
+		ret = onErrorFnPrev( error, filePath, linerNr );
 	}
+
+	// Treat return value as window.onerror itself does,
+	// Only do our handling if not surpressed.
+	if ( ret !== true ) {
+		if ( QUnit.config.current ) {
+			if ( QUnit.config.current.ignoreGlobalErrors ) {
+				return true;
+			}
+			QUnit.pushFailure( error, filePath + ":" + linerNr );
+		} else {
+			QUnit.test( "global failure", function() {
+				QUnit.pushFailure( error, filePath + ":" + linerNr );
+			});
+		}
+		return false;
+	}
+
+	return ret;
 };
 
 function done() {
@@ -824,33 +1054,34 @@ function done() {
 
 	// Log the last module results
 	if ( config.currentModule ) {
-		runLoggingCallbacks( 'moduleDone', QUnit, {
+		runLoggingCallbacks( "moduleDone", QUnit, {
 			name: config.currentModule,
 			failed: config.moduleStats.bad,
 			passed: config.moduleStats.all - config.moduleStats.bad,
 			total: config.moduleStats.all
-		} );
+		});
 	}
 
-	var banner = id("qunit-banner"),
-		tests = id("qunit-tests"),
-		runtime = +new Date - config.started,
+	var i, key,
+		banner = id( "qunit-banner" ),
+		tests = id( "qunit-tests" ),
+		runtime = +new Date() - config.started,
 		passed = config.stats.all - config.stats.bad,
 		html = [
-			'Tests completed in ',
+			"Tests completed in ",
 			runtime,
-			' milliseconds.<br/>',
-			'<span class="passed">',
+			" milliseconds.<br/>",
+			"<span class='passed'>",
 			passed,
-			'</span> tests of <span class="total">',
+			"</span> tests of <span class='total'>",
 			config.stats.all,
-			'</span> passed, <span class="failed">',
+			"</span> passed, <span class='failed'>",
 			config.stats.bad,
-			'</span> failed.'
-		].join('');
+			"</span> failed."
+		].join( "" );
 
 	if ( banner ) {
-		banner.className = (config.stats.bad ? "qunit-fail" : "qunit-pass");
+		banner.className = ( config.stats.bad ? "qunit-fail" : "qunit-pass" );
 	}
 
 	if ( tests ) {
@@ -861,84 +1092,119 @@ function done() {
 		// show ✖ for good, ✔ for bad suite result in title
 		// use escape sequences in case file gets loaded with non-utf-8-charset
 		document.title = [
-			(config.stats.bad ? "\u2716" : "\u2714"),
-			document.title.replace(/^[\u2714\u2716] /i, "")
-		].join(" ");
+			( config.stats.bad ? "\u2716" : "\u2714" ),
+			document.title.replace( /^[\u2714\u2716] /i, "" )
+		].join( " " );
 	}
 
 	// clear own sessionStorage items if all tests passed
 	if ( config.reorder && defined.sessionStorage && config.stats.bad === 0 ) {
-		for (var key in sessionStorage) {
-			if (sessionStorage.hasOwnProperty(key) && key.indexOf("qunit-") === 0 ) {
-				sessionStorage.removeItem(key);
+		// `key` & `i` initialized at top of scope
+		for ( i = 0; i < sessionStorage.length; i++ ) {
+			key = sessionStorage.key( i++ );
+			if ( key.indexOf( "qunit-test-" ) === 0 ) {
+				sessionStorage.removeItem( key );
 			}
 		}
 	}
 
-	runLoggingCallbacks( 'done', QUnit, {
+	runLoggingCallbacks( "done", QUnit, {
 		failed: config.stats.bad,
 		passed: passed,
 		total: config.stats.all,
 		runtime: runtime
-	} );
+	});
 }
 
-function validTest( name ) {
-	var filter = config.filter,
-		run = false;
+/** @return Boolean: true if this test should be ran */
+function validTest( test ) {
+	var include,
+		filter = config.filter && config.filter.toLowerCase(),
+		module = config.module && config.module.toLowerCase(),
+		fullName = (test.module + ": " + test.testName).toLowerCase();
+
+	if ( config.testNumber ) {
+		return test.testNumber === config.testNumber;
+	}
+
+	if ( module && ( !test.module || test.module.toLowerCase() !== module ) ) {
+		return false;
+	}
 
 	if ( !filter ) {
 		return true;
 	}
 
-	var not = filter.charAt( 0 ) === "!";
-	if ( not ) {
+	include = filter.charAt( 0 ) !== "!";
+	if ( !include ) {
 		filter = filter.slice( 1 );
 	}
 
-	if ( name.indexOf( filter ) !== -1 ) {
-		return !not;
+	// If the filter matches, we need to honour include
+	if ( fullName.indexOf( filter ) !== -1 ) {
+		return include;
 	}
 
-	if ( not ) {
-		run = true;
-	}
-
-	return run;
+	// Otherwise, do the opposite
+	return !include;
 }
 
-// so far supports only Firefox, Chrome and Opera (buggy)
-// could be extended in the future to use something like https://github.com/csnover/TraceKit
-function sourceFromStacktrace(offset) {
-	offset = offset || 3;
+// so far supports only Firefox, Chrome and Opera (buggy), Safari (for real exceptions)
+// Later Safari and IE10 are supposed to support error.stack as well
+// See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack
+function extractStacktrace( e, offset ) {
+	offset = offset === undefined ? 3 : offset;
+
+	var stack, include, i, regex;
+
+	if ( e.stacktrace ) {
+		// Opera
+		return e.stacktrace.split( "\n" )[ offset + 3 ];
+	} else if ( e.stack ) {
+		// Firefox, Chrome
+		stack = e.stack.split( "\n" );
+		if (/^error$/i.test( stack[0] ) ) {
+			stack.shift();
+		}
+		if ( fileName ) {
+			include = [];
+			for ( i = offset; i < stack.length; i++ ) {
+				if ( stack[ i ].indexOf( fileName ) != -1 ) {
+					break;
+				}
+				include.push( stack[ i ] );
+			}
+			if ( include.length ) {
+				return include.join( "\n" );
+			}
+		}
+		return stack[ offset ];
+	} else if ( e.sourceURL ) {
+		// Safari, PhantomJS
+		// hopefully one day Safari provides actual stacktraces
+		// exclude useless self-reference for generated Error objects
+		if ( /qunit.js$/.test( e.sourceURL ) ) {
+			return;
+		}
+		// for actual exceptions, this is useful
+		return e.sourceURL + ":" + e.line;
+	}
+}
+function sourceFromStacktrace( offset ) {
 	try {
 		throw new Error();
 	} catch ( e ) {
-		if (e.stacktrace) {
-			// Opera
-			return e.stacktrace.split("\n")[offset + 3];
-		} else if (e.stack) {
-			// Firefox, Chrome
-			var stack = e.stack.split("\n");
-			if (/^error$/i.test(stack[0])) {
-				stack.shift();
-			}
-			return stack[offset];
-		} else if (e.sourceURL) {
-			// Safari, PhantomJS
-			// TODO sourceURL points at the 'throw new Error' line above, useless
-			//return e.sourceURL + ":" + e.line;
-		}
+		return extractStacktrace( e, offset );
 	}
 }
 
-function escapeInnerText(s) {
-	if (!s) {
+function escapeInnerText( s ) {
+	if ( !s ) {
 		return "";
 	}
 	s = s + "";
-	return s.replace(/[\&<>]/g, function(s) {
-		switch(s) {
+	return s.replace( /[\&<>]/g, function( s ) {
+		switch( s ) {
 			case "&": return "&amp;";
 			case "<": return "&lt;";
 			case ">": return "&gt;";
@@ -951,11 +1217,14 @@ function synchronize( callback, last ) {
 	config.queue.push( callback );
 
 	if ( config.autorun && !config.blocking ) {
-		process(last);
+		process( last );
 	}
 }
 
 function process( last ) {
+	function next() {
+		process( last );
+	}
 	var start = new Date().getTime();
 	config.depth = config.depth ? config.depth + 1 : 1;
 
@@ -963,9 +1232,7 @@ function process( last ) {
 		if ( !defined.setTimeout || config.updateRate <= 0 || ( ( new Date().getTime() - start ) < config.updateRate ) ) {
 			config.queue.shift()();
 		} else {
-			window.setTimeout( function(){
-				process( last );
-			}, 13 );
+			window.setTimeout( next, 13 );
 			break;
 		}
 	}
@@ -980,7 +1247,8 @@ function saveGlobal() {
 
 	if ( config.noglobals ) {
 		for ( var key in window ) {
-			if ( !hasOwn.call( window, key ) ) {
+			// in Opera sometimes DOM element ids show up here, ignore them
+			if ( !hasOwn.call( window, key ) || /^qunit-test-output/.test( key ) ) {
 				continue;
 			}
 			config.pollution.push( key );
@@ -989,27 +1257,32 @@ function saveGlobal() {
 }
 
 function checkPollution( name ) {
-	var old = config.pollution;
+	var newGlobals,
+		deletedGlobals,
+		old = config.pollution;
+
 	saveGlobal();
 
-	var newGlobals = diff( config.pollution, old );
+	newGlobals = diff( config.pollution, old );
 	if ( newGlobals.length > 0 ) {
-		ok( false, "Introduced global variable(s): " + newGlobals.join(", ") );
+		QUnit.pushFailure( "Introduced global variable(s): " + newGlobals.join(", ") );
 	}
 
-	var deletedGlobals = diff( old, config.pollution );
+	deletedGlobals = diff( old, config.pollution );
 	if ( deletedGlobals.length > 0 ) {
-		ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") );
+		QUnit.pushFailure( "Deleted global variable(s): " + deletedGlobals.join(", ") );
 	}
 }
 
 // returns a new Array with the elements that are in a but not in b
 function diff( a, b ) {
-	var result = a.slice();
-	for ( var i = 0; i < result.length; i++ ) {
-		for ( var j = 0; j < b.length; j++ ) {
+	var i, j,
+		result = a.slice();
+
+	for ( i = 0; i < result.length; i++ ) {
+		for ( j = 0; j < b.length; j++ ) {
 			if ( result[i] === b[j] ) {
-				result.splice(i, 1);
+				result.splice( i, 1 );
 				i--;
 				break;
 			}
@@ -1018,33 +1291,21 @@ function diff( a, b ) {
 	return result;
 }
 
-function fail(message, exception, callback) {
-	if ( typeof console !== "undefined" && console.error && console.warn ) {
-		console.error(message);
-		console.error(exception);
-		console.error(exception.stack);
-		console.warn(callback.toString());
-
-	} else if ( window.opera && opera.postError ) {
-		opera.postError(message, exception, callback.toString);
-	}
-}
-
-function extend(a, b) {
+function extend( a, b ) {
 	for ( var prop in b ) {
-		if ( b[prop] === undefined ) {
-			delete a[prop];
+		if ( b[ prop ] === undefined ) {
+			delete a[ prop ];
 
 		// Avoid "Member not found" error in IE8 caused by setting window.constructor
 		} else if ( prop !== "constructor" || a !== window ) {
-			a[prop] = b[prop];
+			a[ prop ] = b[ prop ];
 		}
 	}
 
 	return a;
 }
 
-function addEvent(elem, type, fn) {
+function addEvent( elem, type, fn ) {
 	if ( elem.addEventListener ) {
 		elem.addEventListener( type, fn, false );
 	} else if ( elem.attachEvent ) {
@@ -1054,215 +1315,214 @@ function addEvent(elem, type, fn) {
 	}
 }
 
-function id(name) {
-	return !!(typeof document !== "undefined" && document && document.getElementById) &&
+function id( name ) {
+	return !!( typeof document !== "undefined" && document && document.getElementById ) &&
 		document.getElementById( name );
 }
 
-function registerLoggingCallback(key){
-	return function(callback){
+function registerLoggingCallback( key ) {
+	return function( callback ) {
 		config[key].push( callback );
 	};
 }
 
 // Supports deprecated method of completely overwriting logging callbacks
-function runLoggingCallbacks(key, scope, args) {
+function runLoggingCallbacks( key, scope, args ) {
 	//debugger;
-	var callbacks;
-	if ( QUnit.hasOwnProperty(key) ) {
-		QUnit[key].call(scope, args);
+	var i, callbacks;
+	if ( QUnit.hasOwnProperty( key ) ) {
+		QUnit[ key ].call(scope, args );
 	} else {
-		callbacks = config[key];
-		for( var i = 0; i < callbacks.length; i++ ) {
-			callbacks[i].call( scope, args );
+		callbacks = config[ key ];
+		for ( i = 0; i < callbacks.length; i++ ) {
+			callbacks[ i ].call( scope, args );
 		}
 	}
 }
 
 // Test for equality any JavaScript type.
 // Author: Philippe Rathé <prathe@gmail.com>
-QUnit.equiv = function () {
-
-	var innerEquiv; // the real equiv function
-	var callers = []; // stack to decide between skip/abort functions
-	var parents = []; // stack to avoiding loops from circular referencing
+QUnit.equiv = (function() {
 
 	// Call the o related callback with the given arguments.
-	function bindCallbacks(o, callbacks, args) {
-		var prop = QUnit.objectType(o);
-		if (prop) {
-			if (QUnit.objectType(callbacks[prop]) === "function") {
-				return callbacks[prop].apply(callbacks, args);
+	function bindCallbacks( o, callbacks, args ) {
+		var prop = QUnit.objectType( o );
+		if ( prop ) {
+			if ( QUnit.objectType( callbacks[ prop ] ) === "function" ) {
+				return callbacks[ prop ].apply( callbacks, args );
 			} else {
-				return callbacks[prop]; // or undefined
+				return callbacks[ prop ]; // or undefined
 			}
 		}
 	}
 
-	var getProto = Object.getPrototypeOf || function (obj) {
-		return obj.__proto__;
-	};
+	// the real equiv function
+	var innerEquiv,
+		// stack to decide between skip/abort functions
+		callers = [],
+		// stack to avoiding loops from circular referencing
+		parents = [],
 
-	var callbacks = function () {
+		getProto = Object.getPrototypeOf || function ( obj ) {
+			return obj.__proto__;
+		},
+		callbacks = (function () {
 
-		// for string, boolean, number and null
-		function useStrictEquality(b, a) {
-			if (b instanceof a.constructor || a instanceof b.constructor) {
-				// to catch short annotaion VS 'new' annotation of a
-				// declaration
-				// e.g. var i = 1;
-				// var j = new Number(1);
-				return a == b;
-			} else {
-				return a === b;
+			// for string, boolean, number and null
+			function useStrictEquality( b, a ) {
+				if ( b instanceof a.constructor || a instanceof b.constructor ) {
+					// to catch short annotaion VS 'new' annotation of a
+					// declaration
+					// e.g. var i = 1;
+					// var j = new Number(1);
+					return a == b;
+				} else {
+					return a === b;
+				}
 			}
-		}
 
-		return {
-			"string" : useStrictEquality,
-			"boolean" : useStrictEquality,
-			"number" : useStrictEquality,
-			"null" : useStrictEquality,
-			"undefined" : useStrictEquality,
+			return {
+				"string": useStrictEquality,
+				"boolean": useStrictEquality,
+				"number": useStrictEquality,
+				"null": useStrictEquality,
+				"undefined": useStrictEquality,
 
-			"nan" : function(b) {
-				return isNaN(b);
-			},
+				"nan": function( b ) {
+					return isNaN( b );
+				},
 
-			"date" : function(b, a) {
-				return QUnit.objectType(b) === "date"
-						&& a.valueOf() === b.valueOf();
-			},
+				"date": function( b, a ) {
+					return QUnit.objectType( b ) === "date" && a.valueOf() === b.valueOf();
+				},
 
-			"regexp" : function(b, a) {
-				return QUnit.objectType(b) === "regexp"
-						&& a.source === b.source && // the regex itself
-						a.global === b.global && // and its modifers
-													// (gmi) ...
-						a.ignoreCase === b.ignoreCase
-						&& a.multiline === b.multiline;
-			},
+				"regexp": function( b, a ) {
+					return QUnit.objectType( b ) === "regexp" &&
+						// the regex itself
+						a.source === b.source &&
+						// and its modifers
+						a.global === b.global &&
+						// (gmi) ...
+						a.ignoreCase === b.ignoreCase &&
+						a.multiline === b.multiline;
+				},
 
-			// - skip when the property is a method of an instance (OOP)
-			// - abort otherwise,
-			// initial === would have catch identical references anyway
-			"function" : function() {
-				var caller = callers[callers.length - 1];
-				return caller !== Object && typeof caller !== "undefined";
-			},
+				// - skip when the property is a method of an instance (OOP)
+				// - abort otherwise,
+				// initial === would have catch identical references anyway
+				"function": function() {
+					var caller = callers[callers.length - 1];
+					return caller !== Object && typeof caller !== "undefined";
+				},
 
-			"array" : function(b, a) {
-				var i, j, loop;
-				var len;
+				"array": function( b, a ) {
+					var i, j, len, loop;
 
-				// b could be an object literal here
-				if (!(QUnit.objectType(b) === "array")) {
-					return false;
-				}
+					// b could be an object literal here
+					if ( QUnit.objectType( b ) !== "array" ) {
+						return false;
+					}
 
-				len = a.length;
-				if (len !== b.length) { // safe and faster
-					return false;
-				}
+					len = a.length;
+					if ( len !== b.length ) {
+						// safe and faster
+						return false;
+					}
 
-				// track reference to avoid circular references
-				parents.push(a);
-				for (i = 0; i < len; i++) {
-					loop = false;
-					for (j = 0; j < parents.length; j++) {
-						if (parents[j] === a[i]) {
-							loop = true;// dont rewalk array
+					// track reference to avoid circular references
+					parents.push( a );
+					for ( i = 0; i < len; i++ ) {
+						loop = false;
+						for ( j = 0; j < parents.length; j++ ) {
+							if ( parents[j] === a[i] ) {
+								loop = true;// dont rewalk array
+							}
+						}
+						if ( !loop && !innerEquiv(a[i], b[i]) ) {
+							parents.pop();
+							return false;
 						}
 					}
-					if (!loop && !innerEquiv(a[i], b[i])) {
-						parents.pop();
-						return false;
+					parents.pop();
+					return true;
+				},
+
+				"object": function( b, a ) {
+					var i, j, loop,
+						// Default to true
+						eq = true,
+						aProperties = [],
+						bProperties = [];
+
+					// comparing constructors is more strict than using
+					// instanceof
+					if ( a.constructor !== b.constructor ) {
+						// Allow objects with no prototype to be equivalent to
+						// objects with Object as their constructor.
+						if ( !(( getProto(a) === null && getProto(b) === Object.prototype ) ||
+							( getProto(b) === null && getProto(a) === Object.prototype ) ) ) {
+								return false;
+						}
 					}
-				}
-				parents.pop();
-				return true;
-			},
 
-			"object" : function(b, a) {
-				var i, j, loop;
-				var eq = true; // unless we can proove it
-				var aProperties = [], bProperties = []; // collection of
-														// strings
+					// stack constructor before traversing properties
+					callers.push( a.constructor );
+					// track reference to avoid circular references
+					parents.push( a );
 
-				// comparing constructors is more strict than using
-				// instanceof
-				if (a.constructor !== b.constructor) {
-					// Allow objects with no prototype to be equivalent to
-					// objects with Object as their constructor.
-					if (!((getProto(a) === null && getProto(b) === Object.prototype) ||
-						  (getProto(b) === null && getProto(a) === Object.prototype)))
-					{
-						return false;
+					for ( i in a ) { // be strict: don't ensures hasOwnProperty
+									// and go deep
+						loop = false;
+						for ( j = 0; j < parents.length; j++ ) {
+							if ( parents[j] === a[i] ) {
+								// don't go down the same path twice
+								loop = true;
+							}
+						}
+						aProperties.push(i); // collect a's properties
+
+						if (!loop && !innerEquiv( a[i], b[i] ) ) {
+							eq = false;
+							break;
+						}
 					}
-				}
 
-				// stack constructor before traversing properties
-				callers.push(a.constructor);
-				// track reference to avoid circular references
-				parents.push(a);
+					callers.pop(); // unstack, we are done
+					parents.pop();
 
-				for (i in a) { // be strict: don't ensures hasOwnProperty
-								// and go deep
-					loop = false;
-					for (j = 0; j < parents.length; j++) {
-						if (parents[j] === a[i])
-							loop = true; // don't go down the same path
-											// twice
+					for ( i in b ) {
+						bProperties.push( i ); // collect b's properties
 					}
-					aProperties.push(i); // collect a's properties
 
-					if (!loop && !innerEquiv(a[i], b[i])) {
-						eq = false;
-						break;
-					}
+					// Ensures identical properties name
+					return eq && innerEquiv( aProperties.sort(), bProperties.sort() );
 				}
-
-				callers.pop(); // unstack, we are done
-				parents.pop();
-
-				for (i in b) {
-					bProperties.push(i); // collect b's properties
-				}
-
-				// Ensures identical properties name
-				return eq
-						&& innerEquiv(aProperties.sort(), bProperties
-								.sort());
-			}
-		};
-	}();
+			};
+		}());
 
 	innerEquiv = function() { // can take multiple arguments
-		var args = Array.prototype.slice.apply(arguments);
-		if (args.length < 2) {
+		var args = [].slice.apply( arguments );
+		if ( args.length < 2 ) {
 			return true; // end transition
 		}
 
-		return (function(a, b) {
-			if (a === b) {
+		return (function( a, b ) {
+			if ( a === b ) {
 				return true; // catch the most you can
-			} else if (a === null || b === null || typeof a === "undefined"
-					|| typeof b === "undefined"
-					|| QUnit.objectType(a) !== QUnit.objectType(b)) {
+			} else if ( a === null || b === null || typeof a === "undefined" ||
+					typeof b === "undefined" ||
+					QUnit.objectType(a) !== QUnit.objectType(b) ) {
 				return false; // don't lose time with error prone cases
 			} else {
 				return bindCallbacks(a, callbacks, [ b, a ]);
 			}
 
 			// apply transition with (1..n) arguments
-		})(args[0], args[1])
-				&& arguments.callee.apply(this, args.splice(1,
-						args.length - 1));
+		}( args[0], args[1] ) && arguments.callee.apply( this, args.splice(1, args.length - 1 )) );
 	};
 
 	return innerEquiv;
-
-}();
+}());
 
 /**
  * jsDump Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com |
@@ -1276,188 +1536,215 @@ QUnit.equiv = function () {
  */
 QUnit.jsDump = (function() {
 	function quote( str ) {
-		return '"' + str.toString().replace(/"/g, '\\"') + '"';
-	};
+		return '"' + str.toString().replace( /"/g, '\\"' ) + '"';
+	}
 	function literal( o ) {
-		return o + '';
-	};
+		return o + "";
+	}
 	function join( pre, arr, post ) {
 		var s = jsDump.separator(),
 			base = jsDump.indent(),
 			inner = jsDump.indent(1);
-		if ( arr.join )
-			arr = arr.join( ',' + s + inner );
-		if ( !arr )
+		if ( arr.join ) {
+			arr = arr.join( "," + s + inner );
+		}
+		if ( !arr ) {
 			return pre + post;
+		}
 		return [ pre, inner + arr, base + post ].join(s);
-	};
+	}
 	function array( arr, stack ) {
-		var i = arr.length, ret = Array(i);
+		var i = arr.length, ret = new Array(i);
 		this.up();
-		while ( i-- )
+		while ( i-- ) {
 			ret[i] = this.parse( arr[i] , undefined , stack);
+		}
 		this.down();
-		return join( '[', ret, ']' );
-	};
+		return join( "[", ret, "]" );
+	}
 
-	var reName = /^function (\w+)/;
+	var reName = /^function (\w+)/,
+		jsDump = {
+			parse: function( obj, type, stack ) { //type is used mostly internally, you can fix a (custom)type in advance
+				stack = stack || [ ];
+				var inStack, res,
+					parser = this.parsers[ type || this.typeOf(obj) ];
 
-	var jsDump = {
-		parse:function( obj, type, stack ) { //type is used mostly internally, you can fix a (custom)type in advance
-			stack = stack || [ ];
-			var parser = this.parsers[ type || this.typeOf(obj) ];
-			type = typeof parser;
-			var inStack = inArray(obj, stack);
-			if (inStack != -1) {
-				return 'recursion('+(inStack - stack.length)+')';
-			}
-			//else
-			if (type == 'function')  {
-					stack.push(obj);
-					var res = parser.call( this, obj, stack );
+				type = typeof parser;
+				inStack = inArray( obj, stack );
+
+				if ( inStack != -1 ) {
+					return "recursion(" + (inStack - stack.length) + ")";
+				}
+				//else
+				if ( type == "function" )  {
+					stack.push( obj );
+					res = parser.call( this, obj, stack );
 					stack.pop();
 					return res;
-			}
-			// else
-			return (type == 'string') ? parser : this.parsers.error;
-		},
-		typeOf:function( obj ) {
-			var type;
-			if ( obj === null ) {
-				type = "null";
-			} else if (typeof obj === "undefined") {
-				type = "undefined";
-			} else if (QUnit.is("RegExp", obj)) {
-				type = "regexp";
-			} else if (QUnit.is("Date", obj)) {
-				type = "date";
-			} else if (QUnit.is("Function", obj)) {
-				type = "function";
-			} else if (typeof obj.setInterval !== undefined && typeof obj.document !== "undefined" && typeof obj.nodeType === "undefined") {
-				type = "window";
-			} else if (obj.nodeType === 9) {
-				type = "document";
-			} else if (obj.nodeType) {
-				type = "node";
-			} else if (
-				// native arrays
-				toString.call( obj ) === "[object Array]" ||
-				// NodeList objects
-				( typeof obj.length === "number" && typeof obj.item !== "undefined" && ( obj.length ? obj.item(0) === obj[0] : ( obj.item( 0 ) === null && typeof obj[0] === "undefined" ) ) )
-			) {
-				type = "array";
-			} else {
-				type = typeof obj;
-			}
-			return type;
-		},
-		separator:function() {
-			return this.multiline ?	this.HTML ? '<br />' : '\n' : this.HTML ? '&nbsp;' : ' ';
-		},
-		indent:function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing
-			if ( !this.multiline )
-				return '';
-			var chr = this.indentChar;
-			if ( this.HTML )
-				chr = chr.replace(/\t/g,'   ').replace(/ /g,'&nbsp;');
-			return Array( this._depth_ + (extra||0) ).join(chr);
-		},
-		up:function( a ) {
-			this._depth_ += a || 1;
-		},
-		down:function( a ) {
-			this._depth_ -= a || 1;
-		},
-		setParser:function( name, parser ) {
-			this.parsers[name] = parser;
-		},
-		// The next 3 are exposed so you can use them
-		quote:quote,
-		literal:literal,
-		join:join,
-		//
-		_depth_: 1,
-		// This is the list of parsers, to modify them, use jsDump.setParser
-		parsers:{
-			window: '[Window]',
-			document: '[Document]',
-			error:'[ERROR]', //when no parser is found, shouldn't happen
-			unknown: '[Unknown]',
-			'null':'null',
-			'undefined':'undefined',
-			'function':function( fn ) {
-				var ret = 'function',
-					name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE
-				if ( name )
-					ret += ' ' + name;
-				ret += '(';
-
-				ret = [ ret, QUnit.jsDump.parse( fn, 'functionArgs' ), '){'].join('');
-				return join( ret, QUnit.jsDump.parse(fn,'functionCode'), '}' );
-			},
-			array: array,
-			nodelist: array,
-			arguments: array,
-			object:function( map, stack ) {
-				var ret = [ ];
-				QUnit.jsDump.up();
-				for ( var key in map ) {
-					var val = map[key];
-					ret.push( QUnit.jsDump.parse(key,'key') + ': ' + QUnit.jsDump.parse(val, undefined, stack));
 				}
-				QUnit.jsDump.down();
-				return join( '{', ret, '}' );
+				// else
+				return ( type == "string" ) ? parser : this.parsers.error;
 			},
-			node:function( node ) {
-				var open = QUnit.jsDump.HTML ? '&lt;' : '<',
-					close = QUnit.jsDump.HTML ? '&gt;' : '>';
-
-				var tag = node.nodeName.toLowerCase(),
-					ret = open + tag;
-
-				for ( var a in QUnit.jsDump.DOMAttrs ) {
-					var val = node[QUnit.jsDump.DOMAttrs[a]];
-					if ( val )
-						ret += ' ' + a + '=' + QUnit.jsDump.parse( val, 'attribute' );
+			typeOf: function( obj ) {
+				var type;
+				if ( obj === null ) {
+					type = "null";
+				} else if ( typeof obj === "undefined" ) {
+					type = "undefined";
+				} else if ( QUnit.is( "regexp", obj) ) {
+					type = "regexp";
+				} else if ( QUnit.is( "date", obj) ) {
+					type = "date";
+				} else if ( QUnit.is( "function", obj) ) {
+					type = "function";
+				} else if ( typeof obj.setInterval !== undefined && typeof obj.document !== "undefined" && typeof obj.nodeType === "undefined" ) {
+					type = "window";
+				} else if ( obj.nodeType === 9 ) {
+					type = "document";
+				} else if ( obj.nodeType ) {
+					type = "node";
+				} else if (
+					// native arrays
+					toString.call( obj ) === "[object Array]" ||
+					// NodeList objects
+					( typeof obj.length === "number" && typeof obj.item !== "undefined" && ( obj.length ? obj.item(0) === obj[0] : ( obj.item( 0 ) === null && typeof obj[0] === "undefined" ) ) )
+				) {
+					type = "array";
+				} else {
+					type = typeof obj;
 				}
-				return ret + close + open + '/' + tag + close;
+				return type;
 			},
-			functionArgs:function( fn ) {//function calls it internally, it's the arguments part of the function
-				var l = fn.length;
-				if ( !l ) return '';
+			separator: function() {
+				return this.multiline ?	this.HTML ? "<br />" : "\n" : this.HTML ? "&nbsp;" : " ";
+			},
+			indent: function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing
+				if ( !this.multiline ) {
+					return "";
+				}
+				var chr = this.indentChar;
+				if ( this.HTML ) {
+					chr = chr.replace( /\t/g, "   " ).replace( / /g, "&nbsp;" );
+				}
+				return new Array( this._depth_ + (extra||0) ).join(chr);
+			},
+			up: function( a ) {
+				this._depth_ += a || 1;
+			},
+			down: function( a ) {
+				this._depth_ -= a || 1;
+			},
+			setParser: function( name, parser ) {
+				this.parsers[name] = parser;
+			},
+			// The next 3 are exposed so you can use them
+			quote: quote,
+			literal: literal,
+			join: join,
+			//
+			_depth_: 1,
+			// This is the list of parsers, to modify them, use jsDump.setParser
+			parsers: {
+				window: "[Window]",
+				document: "[Document]",
+				error: "[ERROR]", //when no parser is found, shouldn"t happen
+				unknown: "[Unknown]",
+				"null": "null",
+				"undefined": "undefined",
+				"function": function( fn ) {
+					var ret = "function",
+						name = "name" in fn ? fn.name : (reName.exec(fn) || [])[1];//functions never have name in IE
 
-				var args = Array(l);
-				while ( l-- )
-					args[l] = String.fromCharCode(97+l);//97 is 'a'
-				return ' ' + args.join(', ') + ' ';
+					if ( name ) {
+						ret += " " + name;
+					}
+					ret += "( ";
+
+					ret = [ ret, QUnit.jsDump.parse( fn, "functionArgs" ), "){" ].join( "" );
+					return join( ret, QUnit.jsDump.parse(fn,"functionCode" ), "}" );
+				},
+				array: array,
+				nodelist: array,
+				"arguments": array,
+				object: function( map, stack ) {
+					var ret = [ ], keys, key, val, i;
+					QUnit.jsDump.up();
+					if ( Object.keys ) {
+						keys = Object.keys( map );
+					} else {
+						keys = [];
+						for ( key in map ) {
+							keys.push( key );
+						}
+					}
+					keys.sort();
+					for ( i = 0; i < keys.length; i++ ) {
+						key = keys[ i ];
+						val = map[ key ];
+						ret.push( QUnit.jsDump.parse( key, "key" ) + ": " + QUnit.jsDump.parse( val, undefined, stack ) );
+					}
+					QUnit.jsDump.down();
+					return join( "{", ret, "}" );
+				},
+				node: function( node ) {
+					var a, val,
+						open = QUnit.jsDump.HTML ? "&lt;" : "<",
+						close = QUnit.jsDump.HTML ? "&gt;" : ">",
+						tag = node.nodeName.toLowerCase(),
+						ret = open + tag;
+
+					for ( a in QUnit.jsDump.DOMAttrs ) {
+						val = node[ QUnit.jsDump.DOMAttrs[a] ];
+						if ( val ) {
+							ret += " " + a + "=" + QUnit.jsDump.parse( val, "attribute" );
+						}
+					}
+					return ret + close + open + "/" + tag + close;
+				},
+				functionArgs: function( fn ) {//function calls it internally, it's the arguments part of the function
+					var args,
+						l = fn.length;
+
+					if ( !l ) {
+						return "";
+					}
+
+					args = new Array(l);
+					while ( l-- ) {
+						args[l] = String.fromCharCode(97+l);//97 is 'a'
+					}
+					return " " + args.join( ", " ) + " ";
+				},
+				key: quote, //object calls it internally, the key part of an item in a map
+				functionCode: "[code]", //function calls it internally, it's the content of the function
+				attribute: quote, //node calls it internally, it's an html attribute value
+				string: quote,
+				date: quote,
+				regexp: literal, //regex
+				number: literal,
+				"boolean": literal
 			},
-			key:quote, //object calls it internally, the key part of an item in a map
-			functionCode:'[code]', //function calls it internally, it's the content of the function
-			attribute:quote, //node calls it internally, it's an html attribute value
-			string:quote,
-			date:quote,
-			regexp:literal, //regex
-			number:literal,
-			'boolean':literal
-		},
-		DOMAttrs:{//attributes to dump from nodes, name=>realName
-			id:'id',
-			name:'name',
-			'class':'className'
-		},
-		HTML:false,//if true, entities are escaped ( <, >, \t, space and \n )
-		indentChar:'  ',//indentation unit
-		multiline:true //if true, items in a collection, are separated by a \n, else just a space.
-	};
+			DOMAttrs: {
+				//attributes to dump from nodes, name=>realName
+				id: "id",
+				name: "name",
+				"class": "className"
+			},
+			HTML: false,//if true, entities are escaped ( <, >, \t, space and \n )
+			indentChar: "  ",//indentation unit
+			multiline: true //if true, items in a collection, are separated by a \n, else just a space.
+		};
 
 	return jsDump;
-})();
+}());
 
 // from Sizzle.js
 function getText( elems ) {
-	var ret = "", elem;
+	var i, elem,
+		ret = "";
 
-	for ( var i = 0; elems[i]; i++ ) {
+	for ( i = 0; elems[i]; i++ ) {
 		elem = elems[i];
 
 		// Get the text from text nodes and CDATA nodes
@@ -1471,9 +1758,9 @@ function getText( elems ) {
 	}
 
 	return ret;
-};
+}
 
-//from jquery.js
+// from jquery.js
 function inArray( elem, array ) {
 	if ( array.indexOf ) {
 		return array.indexOf( elem );
@@ -1500,70 +1787,75 @@ function inArray( elem, array ) {
  *
  * Usage: QUnit.diff(expected, actual)
  *
- * QUnit.diff("the quick brown fox jumped over", "the quick fox jumps over") == "the  quick <del>brown </del> fox <del>jumped </del><ins>jumps </ins> over"
+ * QUnit.diff( "the quick brown fox jumped over", "the quick fox jumps over" ) == "the  quick <del>brown </del> fox <del>jumped </del><ins>jumps </ins> over"
  */
 QUnit.diff = (function() {
-	function diff(o, n) {
-		var ns = {};
-		var os = {};
+	function diff( o, n ) {
+		var i,
+			ns = {},
+			os = {};
 
-		for (var i = 0; i < n.length; i++) {
-			if (ns[n[i]] == null)
-				ns[n[i]] = {
+		for ( i = 0; i < n.length; i++ ) {
+			if ( ns[ n[i] ] == null ) {
+				ns[ n[i] ] = {
 					rows: [],
 					o: null
 				};
-			ns[n[i]].rows.push(i);
+			}
+			ns[ n[i] ].rows.push( i );
 		}
 
-		for (var i = 0; i < o.length; i++) {
-			if (os[o[i]] == null)
-				os[o[i]] = {
+		for ( i = 0; i < o.length; i++ ) {
+			if ( os[ o[i] ] == null ) {
+				os[ o[i] ] = {
 					rows: [],
 					n: null
 				};
-			os[o[i]].rows.push(i);
+			}
+			os[ o[i] ].rows.push( i );
 		}
 
-		for (var i in ns) {
+		for ( i in ns ) {
 			if ( !hasOwn.call( ns, i ) ) {
 				continue;
 			}
-			if (ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1) {
-				n[ns[i].rows[0]] = {
-					text: n[ns[i].rows[0]],
+			if ( ns[i].rows.length == 1 && typeof os[i] != "undefined" && os[i].rows.length == 1 ) {
+				n[ ns[i].rows[0] ] = {
+					text: n[ ns[i].rows[0] ],
 					row: os[i].rows[0]
 				};
-				o[os[i].rows[0]] = {
-					text: o[os[i].rows[0]],
+				o[ os[i].rows[0] ] = {
+					text: o[ os[i].rows[0] ],
 					row: ns[i].rows[0]
 				};
 			}
 		}
 
-		for (var i = 0; i < n.length - 1; i++) {
-			if (n[i].text != null && n[i + 1].text == null && n[i].row + 1 < o.length && o[n[i].row + 1].text == null &&
-			n[i + 1] == o[n[i].row + 1]) {
-				n[i + 1] = {
-					text: n[i + 1],
+		for ( i = 0; i < n.length - 1; i++ ) {
+			if ( n[i].text != null && n[ i + 1 ].text == null && n[i].row + 1 < o.length && o[ n[i].row + 1 ].text == null &&
+						n[ i + 1 ] == o[ n[i].row + 1 ] ) {
+
+				n[ i + 1 ] = {
+					text: n[ i + 1 ],
 					row: n[i].row + 1
 				};
-				o[n[i].row + 1] = {
-					text: o[n[i].row + 1],
+				o[ n[i].row + 1 ] = {
+					text: o[ n[i].row + 1 ],
 					row: i + 1
 				};
 			}
 		}
 
-		for (var i = n.length - 1; i > 0; i--) {
-			if (n[i].text != null && n[i - 1].text == null && n[i].row > 0 && o[n[i].row - 1].text == null &&
-			n[i - 1] == o[n[i].row - 1]) {
-				n[i - 1] = {
-					text: n[i - 1],
+		for ( i = n.length - 1; i > 0; i-- ) {
+			if ( n[i].text != null && n[ i - 1 ].text == null && n[i].row > 0 && o[ n[i].row - 1 ].text == null &&
+						n[ i - 1 ] == o[ n[i].row - 1 ]) {
+
+				n[ i - 1 ] = {
+					text: n[ i - 1 ],
 					row: n[i].row - 1
 				};
-				o[n[i].row - 1] = {
-					text: o[n[i].row - 1],
+				o[ n[i].row - 1 ] = {
+					text: o[ n[i].row - 1 ],
 					row: i - 1
 				};
 			}
@@ -1575,49 +1867,52 @@ QUnit.diff = (function() {
 		};
 	}
 
-	return function(o, n) {
-		o = o.replace(/\s+$/, '');
-		n = n.replace(/\s+$/, '');
-		var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/));
+	return function( o, n ) {
+		o = o.replace( /\s+$/, "" );
+		n = n.replace( /\s+$/, "" );
 
-		var str = "";
+		var i, pre,
+			str = "",
+			out = diff( o === "" ? [] : o.split(/\s+/), n === "" ? [] : n.split(/\s+/) ),
+			oSpace = o.match(/\s+/g),
+			nSpace = n.match(/\s+/g);
 
-		var oSpace = o.match(/\s+/g);
-		if (oSpace == null) {
-			oSpace = [" "];
+		if ( oSpace == null ) {
+			oSpace = [ " " ];
 		}
 		else {
-			oSpace.push(" ");
-		}
-		var nSpace = n.match(/\s+/g);
-		if (nSpace == null) {
-			nSpace = [" "];
-		}
-		else {
-			nSpace.push(" ");
+			oSpace.push( " " );
 		}
 
-		if (out.n.length == 0) {
-			for (var i = 0; i < out.o.length; i++) {
-				str += '<del>' + out.o[i] + oSpace[i] + "</del>";
+		if ( nSpace == null ) {
+			nSpace = [ " " ];
+		}
+		else {
+			nSpace.push( " " );
+		}
+
+		if ( out.n.length === 0 ) {
+			for ( i = 0; i < out.o.length; i++ ) {
+				str += "<del>" + out.o[i] + oSpace[i] + "</del>";
 			}
 		}
 		else {
-			if (out.n[0].text == null) {
-				for (n = 0; n < out.o.length && out.o[n].text == null; n++) {
-					str += '<del>' + out.o[n] + oSpace[n] + "</del>";
+			if ( out.n[0].text == null ) {
+				for ( n = 0; n < out.o.length && out.o[n].text == null; n++ ) {
+					str += "<del>" + out.o[n] + oSpace[n] + "</del>";
 				}
 			}
 
-			for (var i = 0; i < out.n.length; i++) {
+			for ( i = 0; i < out.n.length; i++ ) {
 				if (out.n[i].text == null) {
-					str += '<ins>' + out.n[i] + nSpace[i] + "</ins>";
+					str += "<ins>" + out.n[i] + nSpace[i] + "</ins>";
 				}
 				else {
-					var pre = "";
+					// `pre` initialized at top of scope
+					pre = "";
 
-					for (n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++) {
-						pre += '<del>' + out.o[n] + oSpace[n] + "</del>";
+					for ( n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++ ) {
+						pre += "<del>" + out.o[n] + oSpace[n] + "</del>";
 					}
 					str += " " + out.n[i].text + nSpace[i] + pre;
 				}
@@ -1626,7 +1921,12 @@ QUnit.diff = (function() {
 
 		return str;
 	};
-})();
+}());
+
+// for CommonJS enviroments, export everything
+if ( typeof exports !== "undefined" ) {
+	extend(exports, QUnit);
+}
 
 // get at whatever the global object is, like window in browsers
-})( (function() {return this}).call() );
+}( (function() {return this;}.call()) ));

From 4e23bcf80a1061ef1787a51147169081facc800d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 5 Sep 2012 17:19:14 +0200
Subject: [PATCH 854/999] [IMP] update test runner pages, fix intermittent
 failure due to async test which didn't stop the test runner

bzr revid: xmo@openerp.com-20120905151914-hkrstjh5698dnddg
---
 addons/web/static/test/Widget.js     |  2 +-
 addons/web/static/test/fulltest.html | 12 +++---------
 addons/web/static/test/test.html     |  8 ++------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/addons/web/static/test/Widget.js b/addons/web/static/test/Widget.js
index 102a7d94d29..3e6cc262565 100644
--- a/addons/web/static/test/Widget.js
+++ b/addons/web/static/test/Widget.js
@@ -220,7 +220,7 @@ $(document).ready(function () {
     });
 
     module('Widget.renderElement', mod);
-    test('repeated', function () {
+    asyncTest('repeated', 4, function () {
         var w = new (instance.web.Widget.extend({
             template: 'test.widget.template-value'
         }));
diff --git a/addons/web/static/test/fulltest.html b/addons/web/static/test/fulltest.html
index a031325966a..2917b246b8d 100644
--- a/addons/web/static/test/fulltest.html
+++ b/addons/web/static/test/fulltest.html
@@ -2,7 +2,7 @@
 <html style="height: 100%">
 <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <title>OpenERP</title>
+    <title>OpenERP Web Full Stack</title>
     <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
 
     <link rel="stylesheet" href="/web/static/lib/qunit/qunit.css">
@@ -12,7 +12,7 @@
     <script src="/web/static/lib/underscore/underscore.string.js" type="text/javascript"></script>
 
     <!-- jquery -->
-    <script src="/web/static/lib/jquery/jquery-1.6.4.js"></script>
+    <script src="/web/static/lib/jquery/jquery-1.7.2.js"></script>
     <script src="/web/static/lib/jquery.ui/js/jquery-ui-1.8.17.custom.min.js"></script>
     <script src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
     
@@ -37,13 +37,7 @@
     <script src="/web/static/src/js/test_support.js"></script>
 </head>
     <body id="oe" class="openerp">
-        <h1 id="qunit-header">
-            OpenERP Web Test Suite: javascript to XML-RPC (excluded)
-        </h1>
-        <h2 id="qunit-banner"></h2>
-        <div id="qunit-testrunner-toolbar"></div>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
+        <div id="qunit"></div>
         <div id="qunit-fixture"></div>
         <script type="text/javascript" src="/web/static/test/fulltest/dataset.js"></script>
     </body>
diff --git a/addons/web/static/test/test.html b/addons/web/static/test/test.html
index 35d57d3c3a6..209723af5a0 100644
--- a/addons/web/static/test/test.html
+++ b/addons/web/static/test/test.html
@@ -2,7 +2,7 @@
 <html style="height: 100%">
 <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <title>OpenERP</title>
+    <title>OpenERP Web Test Suite</title>
     <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
 
     <link rel="stylesheet" href="/web/static/lib/qunit/qunit.css">
@@ -46,11 +46,7 @@
     </script>
 </head>
     <body id="oe" class="openerp">
-        <h1 id="qunit-header">OpenERP web Test Suite</h1>
-        <h2 id="qunit-banner"></h2>
-        <div id="qunit-testrunner-toolbar"></div>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
+        <div id="qunit"></div>
         <div id="qunit-fixture"></div>
     </body>
     <script type="text/javascript" src="/web/static/test/class.js"></script>

From 5f1dce419b36f30fe237c647b18890db0fcb8a6b Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 5 Sep 2012 17:19:50 +0200
Subject: [PATCH 855/999] [IMP] mail*: implement auto-deletion mechanism for
 mail.message, mail.mail and the attachment

This is based on the auto_delete flag on mail.mail
and the assumption that mail.mail records created
without a parent message will be deleted as a whole,
including the parent message and its attachments.
This is contrasted with mail.mail records created
for notifications regarding a mail.message, and therefore
created with an existing `mail_message_id` parent.
For this last case the parent must not be deleted
along with the child mail.mail, as it exists on its own.

bzr revid: odo@openerp.com-20120905151950-7jv6hi0x5fx5iytp
---
 addons/email_template/email_template.py | 12 +++++----
 addons/mail/mail_followers.py           | 15 ++++++-----
 addons/mail/mail_mail.py                | 34 +++++++++++++++++--------
 addons/mail/mail_message.py             | 12 +++++++++
 addons/mail/tests/test_mail.py          | 33 ++++++++----------------
 5 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index b68005bd997..74a9ae99a4c 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -156,6 +156,10 @@ class email_template(osv.osv):
         'copyvalue': fields.char('Placeholder Expression', help="Final placeholder expression, to be copy-pasted in the desired template field."),
     }
 
+    _defaults = {
+        'auto_delete': True,
+    }
+
     def create_action(self, cr, uid, ids, context=None):
         vals = {}
         action_obj = self.pool.get('ir.actions.act_window')
@@ -277,14 +281,12 @@ class email_template(osv.osv):
             context = {}
         report_xml_pool = self.pool.get('ir.actions.report.xml')
         template = self.get_email_template(cr, uid, template_id, res_id, context)
-        values = {'model': template.model_id.model}
-
+        values = {}
         for field in ['subject', 'body_html', 'email_from',
                       'email_to', 'email_cc', 'reply_to']:
             values[field] = self.render_template(cr, uid, getattr(template, field),
                                                  template.model, res_id, context=context) \
                                                  or False
-
         if template.user_signature:
             signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
             values['body_html'] = append_content_to_html(values['body_html'], signature)
@@ -292,8 +294,8 @@ class email_template(osv.osv):
         if values['body_html']:
             values['body'] = html_sanitize(values['body_html'])
 
-        values.update(mail_server_id = template.mail_server_id.id or False,
-                      auto_delete = template.auto_delete,
+        values.update(mail_server_id=template.mail_server_id.id or False,
+                      auto_delete=template.auto_delete,
                       model=template.model,
                       res_id=res_id or False)
 
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 9205aa0b933..2aba685c4fa 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -100,11 +100,12 @@ class mail_notification(osv.Model):
         if signature:
             body_html = tools.append_content_to_html(body_html, signature)
 
-        towrite = {
+        mail_values = {
             'mail_message_id': msg.id,
             'email_to': [],
-            'auto_delete': False,
+            'auto_delete': True,
             'body_html': body_html,
+            'state': 'outgoing',
         }
 
         for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
@@ -123,10 +124,10 @@ class mail_notification(osv.Model):
             # Partner wants to receive only emails
             if partner.notification_email_send == 'email' and msg.type != 'email':
                 continue
-            if partner.email not in towrite['email_to']:
-                towrite['email_to'].append(partner.email)
-        if towrite['email_to']:
-            towrite['email_to'] = ', '.join(towrite['email_to'])
-            email_notif_id = mail_mail.create(cr, uid, towrite, context=context)
+            if partner.email not in mail_values['email_to']:
+                mail_values['email_to'].append(partner.email)
+        if mail_values['email_to']:
+            mail_values['email_to'] = ', '.join(mail_values['email_to'])
+            email_notif_id = mail_mail.create(cr, uid, mail_values, context=context)
             mail_mail.send(cr, uid, [email_notif_id], context=context)
         return True
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 36b71653556..7b593c5b998 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -54,8 +54,12 @@ class mail_mail(osv.Model):
         'email_from': fields.char('From', help='Message sender, taken from user preferences.'),
         'email_to': fields.text('To', help='Message recipients'),
         'email_cc': fields.char('Cc', help='Carbon copy message recipients'),
-        'reply_to':fields.char('Reply-To', help='Preferred response address for the message'),
+        'reply_to': fields.char('Reply-To', help='Preferred response address for the message'),
         'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML message"),
+
+        # Auto-detected based on create() - if 'mail_message_id' was passed then this mail is a notification
+        # and during unlink() we will cascade delete the parent and its attachments 
+        'notification': fields.boolean('Is Notification') 
     }
 
     def _get_default_from(self, cr, uid, context=None):
@@ -69,6 +73,19 @@ class mail_mail(osv.Model):
         'email_from': lambda self, cr, uid, ctx=None: self._get_default_from(cr, uid, ctx),
     }
 
+    def create(self, cr, uid, values, context=None):
+        if 'notification' not in values and values.get('mail_message_id'):
+            values['notification'] = True
+        return super(mail_mail,self).create(cr, uid, values, context=context)
+
+    def unlink(self, cr, uid, ids, context=None):
+        # cascade-delete the parent message for all mails that are not created for a notification
+        ids_to_cascade = self.search(cr, uid, [('notification','=',False),('id','in',ids)])
+        parent_msg_ids = [m.mail_message_id.id for m in self.browse(cr, uid, ids_to_cascade, context=context)]
+        res = super(mail_mail,self).unlink(cr, uid, ids, context=context)
+        self.pool.get('mail.message').unlink(cr, uid, parent_msg_ids, context=context)
+        return res
+
     def mark_outgoing(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'outgoing'}, context=context)
 
@@ -106,20 +123,17 @@ class mail_mail(osv.Model):
             _logger.exception("Failed processing mail queue")
         return res
 
-    def _postprocess_sent_message(self, cr, uid, message, context=None):
-        """Perform any post-processing necessary after sending ``message``
+    def _postprocess_sent_message(self, cr, uid, mail, context=None):
+        """Perform any post-processing necessary after sending ``mail``
         successfully, including deleting it completely along with its
-        attachment if the ``auto_delete`` flag of the message was set.
+        attachment if the ``auto_delete`` flag of the mail was set.
         Overridden by subclasses for extra post-processing behaviors. 
 
-        :param browse_record message: the message that was just sent
+        :param browse_record mail: the mail that was just sent
         :return: True
         """
-        if message.auto_delete:
-            self.pool.get('ir.attachment').unlink(cr, uid,
-                [x.id for x in message.attachment_ids],
-                context=context)
-            message.unlink()
+        if mail.auto_delete:
+            mail.unlink()
         return True
 
     def _send_get_mail_subject(self, cr, uid, mail, force=False, context=None):
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index bca46a3c91c..a9266ff07fc 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -297,6 +297,18 @@ class mail_message(osv.Model):
         self.notify(cr, uid, newid, context=context)
         return newid
 
+    def unlink(self, cr, uid, ids, context=None):
+        # cascade-delete attachments that are directly attached to the message (should only happen
+        # for mail.messages that act as parent for a standalone mail.mail record.
+        attachments_to_delete = []
+        for mail in self.browse(cr, uid, ids, context=context):
+            for attach in mail.attachment_ids:
+                if attach.res_model == 'mail.message' and attach.res_id == mail.id:
+                    attachments_to_delete.append(attach.id)
+        if attachments_to_delete:
+            self.pool.get('ir.attachment').unlink(cr, uid, attachments_to_delete, context=context)
+        return super(mail_message,self).unlink(cr, uid, ids, context=context)
+
     def notify(self, cr, uid, newid, context=None):
         """ Add the related record followers to the destination partner_ids.
             Call mail_notification.notify to manage the email sending
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index f8fd02bfb7e..b24ba94b891 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import base64
 import tools
 
 from openerp.tests import common
@@ -252,17 +251,13 @@ class test_mail(common.TransactionCase):
         # CASE1: post comment, body and subject specified
         msg_id = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body1, subject=_subject, type='comment')
         message = self.mail_message.browse(cr, uid, msg_id)
-        mail_ids = self.mail_mail.search(cr, uid, [], limit=1)
-        mail = self.mail_mail.browse(cr, uid, mail_ids[0])
         sent_email = self._build_email_kwargs
+
+        self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id','=',msg_id)]), 'mail.mail notifications should have been auto-deleted!')
         
         # Test: mail_message: subject is _subject, body is _body1 (no formatting done)
         self.assertEqual(message.subject, _subject, 'mail.message subject incorrect')
         self.assertEqual(message.body, _body1, 'mail.message body incorrect')
-        # Test: mail_mail: subject is _subject, body_html is _mail_body1 (signature appended)
-        self.assertEqual(mail.subject, _subject, 'mail.mail subject incorrect')
-        self.assertEqual(mail.body_html, _mail_body1, 'mail.mail body_html incorrect')
-        self.assertEqual(mail.mail_message_id.id, msg_id, 'mail_mail.mail_message_id is not the id of its related mail_message)')
         # Test: sent_email: email send by server: correct subject, body; body_alternative
         self.assertEqual(sent_email['subject'], _subject, 'sent_email subject incorrect')
         self.assertEqual(sent_email['body'], _mail_body1, 'sent_email body incorrect')
@@ -283,18 +278,13 @@ class test_mail(common.TransactionCase):
         msg_id2 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body2, type='email',
             partner_ids=[(6, 0, [p_d_id])], parent_id=msg_id, attachments=_attachments)
         message = self.mail_message.browse(cr, uid, msg_id2)
-        mail_ids = self.mail_mail.search(cr, uid, [], limit=1)
-        mail = self.mail_mail.browse(cr, uid, mail_ids[0])
         sent_email = self._build_email_kwargs
+        self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id','=',msg_id2)]), 'mail.mail notifications should have been auto-deleted!')
 
         # Test: mail_message: subject is False, body is _body2 (no formatting done), parent_id is msg_id
         self.assertEqual(message.subject, False, 'mail.message subject incorrect')
         self.assertEqual(message.body, _body2, 'mail.message body incorrect')
         self.assertEqual(message.parent_id.id, msg_id, 'mail.message parent_id incorrect')
-        # Test: mail_mail: subject is False, body_html is _mail_body2 (signature appended)
-        self.assertEqual(mail.subject, False, 'mail.mail subject is incorrect')
-        self.assertEqual(mail.body_html, _mail_body2, 'mail.mail body_html incorrect')
-        self.assertEqual(mail.mail_message_id.id, msg_id2, 'mail_mail.mail_message_id incorrect')
         # Test: sent_email: email send by server: correct subject, body, body_alternative
         self.assertEqual(sent_email['subject'], _mail_subject, 'sent_email subject incorrect')
         self.assertEqual(sent_email['body'], _mail_body2, 'sent_email body incorrect')
@@ -314,7 +304,7 @@ class test_mail(common.TransactionCase):
             self.assertEqual(message.attachment_ids[i].name, _attachments[i][0], 'mail.message attachment name incorrect')
             self.assertEqual(message.attachment_ids[i].res_model, 'mail.group', 'mail.message attachment res_model incorrect')
             self.assertEqual(message.attachment_ids[i].res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
-            self.assertEqual(base64.b64decode(message.attachment_ids[i].datas), _attachments[i][1], 'mail.message attachment data incorrect')
+            self.assertEqual(message.attachment_ids[i].datas.decode('base64'), _attachments[i][1], 'mail.message attachment data incorrect')
 
     def test_21_message_compose_wizard(self):
         """ Tests designed for the mail.compose.message wizard. """
@@ -333,8 +323,8 @@ class test_mail(common.TransactionCase):
         _body_html = '<html>Pigs rules</html>'
         _msg_body2 = '<html>Pigs rules</html>'
         _attachments = [
-            {'name': 'First', 'datas': base64.b64encode('My first attachment')},
-            {'name': 'Second', 'datas': base64.b64encode('My second attachment')}
+            {'name': 'First', 'datas': 'My first attachment'.encode('base64')},
+            {'name': 'Second', 'datas': 'My second attachment'.encode('base64')}
             ]
 
         # Create partners
@@ -400,7 +390,7 @@ class test_mail(common.TransactionCase):
             self.assertEqual(message.attachment_ids[i].name, _attachments[i]['name'], 'mail.message attachment name incorrect')
             self.assertEqual(message.attachment_ids[i].res_model, 'mail.group', 'mail.message attachment res_model incorrect')
             self.assertEqual(message.attachment_ids[i].res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
-            self.assertEqual(base64.b64decode(message.attachment_ids[i].datas), base64.b64decode(_attachments[i]['datas']), 'mail.message attachment data incorrect')
+            self.assertEqual(message.attachment_ids[i].datas.decode('base64'), _attachments[i]['datas'].decode('base64'), 'mail.message attachment data incorrect')
 
         # CASE3 - Create in mass_mail composition mode that should work with or without email_template installed
         compose_id = mail_compose.create(cr, uid,
@@ -491,8 +481,7 @@ class test_mail(common.TransactionCase):
             ('read', '=', False)
             ])
         na_count = self.mail_message._needaction_count(cr, uid, domain = [])
-        self.assertEqual(len(notif_ids), na_count,
-            'Number of unread notifications (%s) does not match the needaction count (%s)' % (len(notif_ids), na_count))
+        self.assertEqual(len(notif_ids), na_count, 'unread notifications count does not match needaction count')
 
         # Post 4 message on group_pigs
         for dummy in range(4):
@@ -504,13 +493,11 @@ class test_mail(common.TransactionCase):
             ('read', '=', False)
             ])
         na_count = self.mail_message._needaction_count(cr, uid, domain = [])
-        self.assertEqual(len(notif_ids), na_count,
-            'Number of unread notifications after posting messages (%s) does not match the needaction count (%s)' % (len(notif_ids), na_count))
+        self.assertEqual(len(notif_ids), na_count, 'unread notifications count does not match needaction count')
 
         # Check there are 4 needaction on mail.message with particular domain
         na_count = self.mail_message._needaction_count(cr, uid, domain = [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
-        self.assertEqual(na_count, 4,
-            'Number of posted message (4) does not match the needaction count with domain mail.group - group pigs (%s)' % (na_count))
+        self.assertEqual(na_count, 4, 'posted message count does not match needaction count')
 
     def test_50_thread_parent_resolution(self):
         """Verify parent/child relationships are correctly established when processing incoming mails"""

From 2cf1f7a7a6312066a8007eca53fe05039e416cf3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Sep 2012 17:20:30 +0200
Subject: [PATCH 856/999] [ADD] Added dirty form notification on on_logout

bzr revid: fme@openerp.com-20120905152030-qfrkrwg4k1srxtix
---
 addons/web/static/src/js/chrome.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 3180c21f88e..21b0c050365 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1049,11 +1049,15 @@ instance.web.WebClient = instance.web.Client.extend({
     },
     on_logout: function() {
         var self = this;
-        this.session.session_logout().then(function () {
-            $(window).unbind('hashchange', self.on_hashchange);
-            self.do_push_state({});
-            window.location.reload();
-        });
+        var $e = $.Event("about_to_destroy");
+        this.action_manager.inner_widget.trigger("about_to_destroy", $e);
+        if (!$e.isDefaultPrevented()) {
+            this.session.session_logout().then(function () {
+                $(window).unbind('hashchange', self.on_hashchange);
+                self.do_push_state({});
+                window.location.reload();
+            });
+        }
     },
     bind_hashchange: function() {
         var self = this;

From 51094bd0de30eac3363bed606e0def2d9477e7c4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Sep 2012 17:23:26 +0200
Subject: [PATCH 857/999] [IMP] Make footer's "Powered by OpenERP" an external
 link target _blank

bzr revid: fme@openerp.com-20120905152326-3z1b1imtm3mis8ff
---
 addons/web/static/src/xml/base.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index d206c538e1c..7319865688c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -79,7 +79,7 @@
             </form>
             <div class="oe_login_footer">
                 <a href="#" class="oe_login_manage_db">Manage Databases</a> |
-                <a href="http://www.openerp.com">Powered by <span>OpenERP</span></a>
+                <a href="http://www.openerp.com" target="_blank">Powered by <span>OpenERP</span></a>
             </div>
         </div>
     </div>
@@ -410,7 +410,7 @@
                 <a t-att-href="url" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
                 <div class="oe_secondary_menus_container"/>
                 <div class="oe_footer">
-                    Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a>
+                    Powered by <a href="http://www.openerp.com" target="_blank"><span>Open</span>ERP</a>
                 </div>
             </td>
             <td class="oe_application">

From 2d29ef18fdccb20a4748ec1f9866ea74e31e7637 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 5 Sep 2012 17:28:34 +0200
Subject: [PATCH 858/999] [DUMMY] res_company: spacing and indentation

bzr revid: rco@openerp.com-20120905152834-udjuxpz0vap25ikx
---
 openerp/addons/base/res/res_company.py       | 54 ++++++++++----------
 openerp/addons/base/res/res_company_view.xml |  8 +--
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index a013c963042..4118516f331 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -168,7 +168,7 @@ class res_company(osv.osv):
         'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
         'rml_footer': fields.function(_get_rml_footer, fnct_inv=_set_rml_footer, type='text', string='General Information Footer', store=True),
-        'rml_header': fields.text('RML Header and Footer', required=True),
+        'rml_header': fields.text('RML Header', required=True),
         'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
         'rml_header2': fields.text('RML Internal Header', required=True),
         'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True),
@@ -332,37 +332,37 @@ class res_company(osv.osv):
 
     _header_main = """
 <header>
-<pageTemplate>
-    <frame id="first" x1="1.3cm" y1="3.0cm" height="%s" width="19.0cm"/>
-    <pageGraphics>
-        <!-- You Logo - Change X,Y,Width and Height -->
-        <image x="1.3cm" y="%s" height="40.0" >[[ company.logo or removeParentNode('image') ]]</image>
-        <setFont name="DejaVu Sans" size="8"/>
-        <fill color="black"/>
-        <stroke color="black"/>
-        <lines>1.3cm %s 20cm %s</lines>
+    <pageTemplate>
+        <frame id="first" x1="1.3cm" y1="3.0cm" height="%s" width="19.0cm"/>
+        <pageGraphics>
+            <!-- You Logo - Change X,Y,Width and Height -->
+            <image x="1.3cm" y="%s" height="40.0" >[[ company.logo or removeParentNode('image') ]]</image>
+            <setFont name="DejaVu Sans" size="8"/>
+            <fill color="black"/>
+            <stroke color="black"/>
+            <lines>1.3cm %s 20cm %s</lines>
 
-        <drawRightString x="20cm" y="%s">[[ company.rml_header1 ]]</drawRightString>
+            <drawRightString x="20cm" y="%s">[[ company.rml_header1 ]]</drawRightString>
 
 
-        <drawString x="1.3cm" y="%s">[[ company.partner_id.name ]]</drawString>
-        <drawString x="1.3cm" y="%s">[[ company.partner_id.street or  '' ]]</drawString>
-        <drawString x="1.3cm" y="%s">[[ company.partner_id.city or '' ]] - [[ company.partner_id.country_id and company.partner_id.country_id.name  or '']]</drawString>
-        <drawString x="1.3cm" y="%s">Phone:</drawString>
-        <drawRightString x="7cm" y="%s">[[ company.partner_id.phone or '' ]]</drawRightString>
-        <drawString x="1.3cm" y="%s">Mail:</drawString>
-        <drawRightString x="7cm" y="%s">[[ company.partner_id.email or '' ]]</drawRightString>
-        <lines>1.3cm %s 7cm %s</lines>
+            <drawString x="1.3cm" y="%s">[[ company.partner_id.name ]]</drawString>
+            <drawString x="1.3cm" y="%s">[[ company.partner_id.street or  '' ]]</drawString>
+            <drawString x="1.3cm" y="%s">[[ company.partner_id.city or '' ]] - [[ company.partner_id.country_id and company.partner_id.country_id.name  or '']]</drawString>
+            <drawString x="1.3cm" y="%s">Phone:</drawString>
+            <drawRightString x="7cm" y="%s">[[ company.partner_id.phone or '' ]]</drawRightString>
+            <drawString x="1.3cm" y="%s">Mail:</drawString>
+            <drawRightString x="7cm" y="%s">[[ company.partner_id.email or '' ]]</drawRightString>
+            <lines>1.3cm %s 7cm %s</lines>
 
-        <!--page bottom-->
+            <!--page bottom-->
 
-        <lines>1.2cm 2.65cm 19.9cm 2.65cm</lines>
-        <drawCentredString x="10.5cm" y="2.3cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=0) ]]</drawCentredString>
-        <drawCentredString x="10.5cm" y="1.8cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=1) ]]</drawCentredString>
-        <drawCentredString x="10.5cm" y="1.3cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=2) ]]
-        <drawCentredString x="10.5cm" y="0.8cm">Contact : [[ user.name ]] - Page: <pageNumber/></drawCentredString>
-    </pageGraphics>
-</pageTemplate>
+            <lines>1.2cm 2.65cm 19.9cm 2.65cm</lines>
+            <drawCentredString x="10.5cm" y="2.3cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=0) ]]</drawCentredString>
+            <drawCentredString x="10.5cm" y="1.8cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=1) ]]</drawCentredString>
+            <drawCentredString x="10.5cm" y="1.3cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=2) ]]
+            <drawCentredString x="10.5cm" y="0.8cm">Contact : [[ user.name ]] - Page: <pageNumber/></drawCentredString>
+        </pageGraphics>
+    </pageTemplate>
 </header>"""
 
     _header_a4 = _header_main % ('23.0cm', '27.6cm', '27.7cm', '27.7cm', '27.8cm', '27.2cm', '26.8cm', '26.4cm', '26.0cm', '26.0cm', '25.6cm', '25.6cm', '25.5cm', '25.5cm')
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 79931475b08..875127ad12f 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -51,10 +51,10 @@
                                         </div>
                                         <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
                                     </div>
-                                   <label for="rml_header1"/>
-                                   <div>
-                                       <field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
-                                   </div>
+                                    <label for="rml_header1"/>
+                                    <div>
+                                        <field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
+                                    </div>
                                     <field name="website" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)" widget="url" placeholder="e.g. www.openerp.com"/>
                                 </group>
                                 <group>

From 8d1e3d06abae19598ce1bd854789327f56ef2536 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 5 Sep 2012 17:32:12 +0200
Subject: [PATCH 859/999] [IMP] removed dependency to pyquery

bzr revid: nicolas.vanhoren@openerp.com-20120905153212-0gi1wjhf9m4xtnml
---
 openerp/tests/test_html_sanitize.py |  8 ++++++--
 openerp/tools/html_sanitize.py      | 21 +++++++++++++--------
 setup.py                            |  1 -
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/openerp/tests/test_html_sanitize.py b/openerp/tests/test_html_sanitize.py
index 90ccc88cc1d..cb46b325144 100755
--- a/openerp/tests/test_html_sanitize.py
+++ b/openerp/tests/test_html_sanitize.py
@@ -26,11 +26,15 @@ class TestSanitizer(unittest.TestCase):
     def test_simple(self):
         x = "yop"
         self.assertEqual(x, html_sanitize(x))
+        
+    def test_trailing_text(self):
+        x = 'lala<p>yop</p>xxx'
+        self.assertEqual(x, html_sanitize(x))
     
-    def test_test_case(self):
+    def test_no_exception(self):
         html_sanitize(test_case)
         
-    def test_crm(self):
+    def test_unicode(self):
         html_sanitize("Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci")
 
 if __name__ == '__main__':
diff --git a/openerp/tools/html_sanitize.py b/openerp/tools/html_sanitize.py
index 5164ceb276e..65f17be074f 100644
--- a/openerp/tools/html_sanitize.py
+++ b/openerp/tools/html_sanitize.py
@@ -1,17 +1,22 @@
 
-from pyquery import PyQuery as pq
+import lxml.html
 import re
 
 def html_sanitize(x):
     if not x:
         return x
-    root = pq("<div />")
     if type(x) == str:
         x = unicode(x, "utf8", "replace")
-    root.html(x)
-    result = handle_element(root[0])
-    new = pq(result)
-    return new.html()
+    root = lxml.html.fromstring("<div>%s</div>" % x)
+    result = handle_element(root)
+    res = ""
+    for el in children(result[0]):
+        if type(el) == str or type(el) == unicode:
+            res += el
+        else:
+            el.tail = ""
+            res += lxml.html.tostring(el)
+    return res
 
 to_remove = set(["script", "head", "meta", "title", "link", "img"])
 to_unwrap = set(["html", "body"])
@@ -33,7 +38,7 @@ def handle_element(el):
         return []
     if el.tag in to_unwrap:
         return reduce(lambda x,y: x+y, [handle_element(x) for x in children(el)])
-    new = pq("<%s />" % el.tag)[0]
+    new = lxml.html.fromstring("<%s />" % el.tag)
     for i in children(el):
         append_to(handle_element(i), new)
     if el.tag in special:
@@ -59,4 +64,4 @@ def append_to(new_ones, el):
             else:
                 children[-1].tail = i
         else:
-            el.append(i)
\ No newline at end of file
+            el.append(i)
diff --git a/setup.py b/setup.py
index a033921e70d..a26b74e255d 100755
--- a/setup.py
+++ b/setup.py
@@ -99,7 +99,6 @@ setuptools.setup(
           'mako',
           'psycopg2',
           'pydot',
-          'pyquery',
           'python-dateutil < 2',
           'python-ldap',
           'python-openid',

From a01a27e4806a078a4b0258c102340a41fc9b94ef Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Sep 2012 17:41:21 +0200
Subject: [PATCH 860/999] [IMP] Make the logo trigger client action 'home'
 instead of a link

bzr revid: fme@openerp.com-20120905154121-8lokz9x0x7fraidd
---
 addons/web/static/src/js/chrome.js | 3 +++
 addons/web/static/src/xml/base.xml | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 21b0c050365..398e08f6887 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -964,6 +964,9 @@ instance.web.WebClient = instance.web.Client.extend({
     start: function() {
         var self = this;
         return $.when(this._super()).pipe(function() {
+            self.$el.on('click', '.oe_logo', function() {
+                self.action_manager.do_action('home');
+            });
             if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) {
                 $("body").addClass("kitten-mode-activated");
                 if ($.blockUI) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 7319865688c..a96ec8937a1 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -404,10 +404,7 @@
         </tr>
         <tr>
             <td class="oe_leftbar" valign="top">
-                <t t-js="d">
-                    d.url = '/' + (window.location.search || '');
-                </t>
-                <a t-att-href="url" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
+                <a class="oe_logo" href="#"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
                 <div class="oe_secondary_menus_container"/>
                 <div class="oe_footer">
                     Powered by <a href="http://www.openerp.com" target="_blank"><span>Open</span>ERP</a>

From b5b813162dd2c02c7ab142fa039c83810ef04591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 5 Sep 2012 17:51:21 +0200
Subject: [PATCH 861/999] [CLEAN] mail: cleaned mail_thread.py.

bzr revid: tde@openerp.com-20120905155121-1w3h43t10qsigusn
---
 addons/mail/mail_thread.py | 47 +++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 76787a8ac02..ea89dd61455 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -24,7 +24,6 @@ import dateutil
 import email
 import logging
 import pytz
-import re
 import time
 import tools
 import xmlrpclib
@@ -32,20 +31,19 @@ import xmlrpclib
 from email.message import Message
 from mail_message import decode
 from osv import osv, fields
-from tools.translate import _
 from tools.safe_eval import safe_eval as eval
 
 _logger = logging.getLogger(__name__)
 
 def decode_header(message, header, separator=' '):
-    return separator.join(map(decode,message.get_all(header, [])))
+    return separator.join(map(decode, message.get_all(header, [])))
 
 class many2many_reference(fields.many2many):
     """ many2many_reference manages many2many fields where one id is found
         by a reference-like key (a char column in addition to the foreign id).
         The reference_column attribute on the many2many fields is used;
         if not defined, ``res_model`` is used. """
-    
+
     def _get_query_and_where_params(self, cr, model, ids, values, where_params):
         """ Add in where condition like mail_followers.res_model = 'crm.lead' """
         reference_column = self.reference_column if self.reference_column else 'res_model'
@@ -119,7 +117,7 @@ class mail_thread(osv.AbstractModel):
     _description = 'Email Thread'
 
     def _get_message_data(self, cr, uid, ids, name, args, context=None):
-        res = dict( (id, dict(message_unread=False, message_summary='')) for id in ids)
+        res = dict((id, dict(message_unread=False, message_summary='')) for id in ids)
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
 
         notif_obj = self.pool.get('mail.notification')
@@ -149,7 +147,7 @@ class mail_thread(osv.AbstractModel):
         ], context=context)
         for notif in notif_obj.browse(cr, uid, notif_ids, context=context):
             res[notif.message_id.res_id] = True
-        return [('id','in',res.keys())]
+        return [('id', 'in', res.keys())]
 
     _columns = {
         'message_is_follower': fields.function(_get_message_data,
@@ -159,13 +157,13 @@ class mail_thread(osv.AbstractModel):
             reference_column='res_model', string='Followers'),
         'message_comment_ids': fields.one2many('mail.message', 'res_id',
             domain=lambda self: [('model', '=', self._name), ('type', 'in', ('comment', 'email'))],
-            string='Comments and emails', 
+            string='Comments and emails',
             help="Comments and emails"),
         'message_ids': fields.one2many('mail.message', 'res_id',
-            domain=lambda self: [('model','=',self._name)],
-            string='Messages', 
+            domain=lambda self: [('model', '=', self._name)],
+            string='Messages',
             help="Messages and communication history"),
-        'message_unread': fields.function(_get_message_data, fnct_search=_search_unread, 
+        'message_unread': fields.function(_get_message_data, fnct_search=_search_unread,
             type='boolean', string='Unread Messages', multi="_get_message_data",
             help="If checked new messages require your attention."),
         'message_summary': fields.function(_get_message_data, method=True,
@@ -229,7 +227,7 @@ class mail_thread(osv.AbstractModel):
     def _message_find_user_id(self, cr, uid, message, context=None):
         from_local_part = tools.email_split(decode(message.get('From')))[0]
         # FP Note: canonification required, the minimu: .lower()
-        user_ids = self.pool.get('res.users').search(cr, uid, ['|', 
+        user_ids = self.pool.get('res.users').search(cr, uid, ['|',
             ('login', '=', from_local_part),
             ('email', '=', from_local_part)], context=context)
         return user_ids[0] if user_ids else uid
@@ -453,7 +451,7 @@ class mail_thread(osv.AbstractModel):
                 filename = part.get_filename() # None if normal part
                 encoding = part.get_content_charset() # None if attachment
                 # 1) Explicit Attachments -> attachments
-                if filename or part.get('content-disposition','').strip().startswith('attachment'):
+                if filename or part.get('content-disposition', '').strip().startswith('attachment'):
                     attachments.append((filename or 'attachment', part.get_payload(decode=True)))
                     continue
                 # 2) text/plain -> <pre/>
@@ -515,7 +513,7 @@ class mail_thread(osv.AbstractModel):
         if 'Subject' in message:
             msg_dict['subject'] = decode(message.get('Subject'))
 
-        # Envelope fields not stored in  mail.message but made available for message_new() 
+        # Envelope fields not stored in  mail.message but made available for message_new()
         msg_dict['from'] = decode(message.get('from'))
         msg_dict['to'] = decode(message.get('to'))
         msg_dict['cc'] = decode(message.get('cc'))
@@ -524,7 +522,7 @@ class mail_thread(osv.AbstractModel):
             author_ids = self._message_find_partners(cr, uid, message, ['From'], context=context)
             if author_ids:
                 msg_dict['author_id'] = author_ids[0]
-        partner_ids = self._message_find_partners(cr, uid, message, ['From','To','Cc'], context=context)
+        partner_ids = self._message_find_partners(cr, uid, message, ['From', 'To', 'Cc'], context=context)
         msg_dict['partner_ids'] = partner_ids
 
         if 'Date' in message:
@@ -535,16 +533,16 @@ class mail_thread(osv.AbstractModel):
             msg_dict['date'] = date_server_datetime_str
 
         if 'In-Reply-To' in message:
-            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id','=',decode(message['In-Reply-To']))])
+            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]
 
         if 'References' in message and 'parent_id' not in msg_dict:
-            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id','in',
+            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', 'in',
                                                                          [x.strip() for x in decode(message['References']).split()])])
             if parent_ids:
                 msg_dict['parent_id'] = parent_ids[0]
-        
+
         msg_dict['body'], msg_dict['attachments'] = self._message_extract_payload(message)
         return msg_dict
 
@@ -574,7 +572,7 @@ class mail_thread(osv.AbstractModel):
             :param int parent_id: optional ID of parent message in this thread
             :param tuple(str,str) attachments: list of attachment tuples in the form
                 ``(name,content)``, where content is NOT base64 encoded
-            :return: ID of newly created mail.message 
+            :return: ID of newly created mail.message
         """
         context = context or {}
         attachments = attachments or []
@@ -595,10 +593,10 @@ class mail_thread(osv.AbstractModel):
                 'res_model': context.get('thread_model') or self._name,
                 'res_id': thread_id,
             }
-            attachment_ids.append((0,0, data_attach))
+            attachment_ids.append((0, 0, data_attach))
 
         values = kwargs
-        values.update( {
+        values.update({
             'model': context.get('thread_model', self._name) if thread_id else False,
             'res_id': thread_id or False,
             'body': body,
@@ -607,7 +605,7 @@ class mail_thread(osv.AbstractModel):
             'parent_id': parent_id,
             'attachment_ids': attachment_ids,
         })
-        for x in ('from','to','cc'): values.pop(x, None) # Avoid warnings 
+        for x in ('from', 'to', 'cc'): values.pop(x, None) # Avoid warnings 
         return self.pool.get('mail.message').create(cr, uid, values, context=context)
 
     #------------------------------------------------------
@@ -630,7 +628,6 @@ class mail_thread(osv.AbstractModel):
         if context and context.get('read_back'):
             return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
         return []
-        
 
     def message_unsubscribe_users(self, cr, uid, ids, user_ids=None, context=None):
         """ Wrapper on message_subscribe, using users. If user_ids is not
@@ -655,10 +652,9 @@ class mail_thread(osv.AbstractModel):
 
     def message_mark_as_unread(self, cr, uid, ids, context=None):
         """ Set as unread. """
-        notobj = self.pool.get('mail.notification')
         partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         cr.execute('''
-            UPDATE mail_notification SET 
+            UPDATE mail_notification SET
                 read=false
             WHERE
                 message_id IN (SELECT id from mail_message where res_id=any(%s) and model=%s limit 1) and
@@ -668,10 +664,9 @@ class mail_thread(osv.AbstractModel):
 
     def message_mark_as_read(self, cr, uid, ids, context=None):
         """ Set as read. """
-        notobj = self.pool.get('mail.notification')
         partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         cr.execute('''
-            UPDATE mail_notification SET 
+            UPDATE mail_notification SET
                 read=true
             WHERE
                 message_id IN (SELECT id FROM mail_message WHERE res_id=ANY(%s) AND model=%s) AND

From 9fb978ea8196aee4783641a7b3ea8c7f0da7b580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 5 Sep 2012 17:53:19 +0200
Subject: [PATCH 862/999] [IMP] mail: added and cleaned the tests. Fixed
 various small bugs in composer. Fixed mail_message.message_read() and
 flattening algorithm. Cleaned tests for message_read to have a more precise
 test.

bzr revid: tde@openerp.com-20120905155319-wd168m5snb25ari9
---
 addons/mail/mail_message.py                |  46 ++--
 addons/mail/tests/test_mail.py             | 249 +++++++++++++--------
 addons/mail/wizard/mail_compose_message.py |  65 +++---
 3 files changed, 207 insertions(+), 153 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index a9266ff07fc..98f419b3f08 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -20,10 +20,12 @@
 ##############################################################################
 
 import logging
-from email.header import decode_header
-from osv import osv, fields
 import tools
 
+from email.header import decode_header
+from operator import itemgetter
+from osv import osv, fields
+
 _logger = logging.getLogger(__name__)
 
 """ Some tools for parsing / creating email fields """
@@ -45,7 +47,7 @@ class mail_message(osv.Model):
     _message_record_name_length = 18
 
     def _shorten_name(self, name):
-        if len(name) <= (self._message_record_name_length+3):
+        if len(name) <= (self._message_record_name_length + 3):
             return name
         return name[:self._message_record_name_length] + '...'
 
@@ -73,7 +75,7 @@ class mail_message(osv.Model):
         return res
 
     def _search_unread(self, cr, uid, obj, name, domain, context=None):
-        """ Search for messages unread by the current user. Condition is 
+        """ Search for messages unread by the current user. Condition is
             inversed because we search unread message on a read column. """
         if domain[0][2]:
             read_cond = '(read = false or read is null)'
@@ -135,7 +137,7 @@ class mail_message(osv.Model):
     _defaults = {
         'type': 'email',
         'date': lambda *a: fields.datetime.now(),
-        'author_id': lambda self,cr,uid,ctx: self._get_default_author(cr, uid, ctx),
+        'author_id': lambda self, cr, uid, ctx={}: self._get_default_author(cr, uid, ctx),
         'body': '',
     }
 
@@ -169,12 +171,13 @@ class mail_message(osv.Model):
         """ Given a tree with several roots of following structure :
             [   {'id': 1, 'child_ids': [
                     {'id': 11, 'child_ids': [...] },],
-                },
                 {...}   ]
-            Flatten it to have a maximum number of level, with 0 being
-            completely flat.
+            Flatten it to have a maximum number of levels, 0 being flat and
+            sort messages in a level according to a key of the messages.
             Perform the flattening at leafs if above the maximum depth, then get
             back in the tree.
+            :param context: ``sort_key``: key for sorting (id by default)
+            :param context: ``sort_reverse``: reverser order for sorting (True by default)
         """
         def _flatten(msg_dict):
             """ from    {'id': x, 'child_ids': [{child1}, {child2}]}
@@ -183,19 +186,22 @@ class mail_message(osv.Model):
             child_ids = msg_dict.pop('child_ids', [])
             msg_dict['child_ids'] = []
             return [msg_dict] + child_ids
+            # return sorted([msg_dict] + child_ids, key=itemgetter('id'), reverse=True)
+        context = context or {}
         # Depth-first flattening
         for message in messages:
             if message.get('type') == 'expandable':
                 continue
-            message['child_ids'] = self.message_read_tree_flatten(cr, uid, message['child_ids'], current_level+1, level, context=context)
+            message['child_ids'] = self.message_read_tree_flatten(cr, uid, message['child_ids'], current_level + 1, level, context=context)
         # Flatten if above maximum depth
         if current_level < level:
-            return messages
-        new_list = []
-        for message in messages:
-            for flat_message in _flatten(message):
-                new_list.append(flat_message)
-        return new_list
+            return_list = messages
+        else:
+            return_list = []
+            for message in messages:
+                for flat_message in _flatten(message):
+                    return_list.append(flat_message)
+        return sorted(return_list, key=itemgetter(context.get('sort_key', 'id')), reverse=context.get('sort_reverse', True))
 
     def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, limit=None, context=None):
         """ If IDs are provided, fetch these records. Otherwise use the domain
@@ -213,7 +219,7 @@ class mail_message(osv.Model):
         result = []
         tree = {} # key: ID, value: record
         for msg in messages:
-            if len(result)<(limit-1):
+            if len(result) < (limit - 1):
                 record = self._message_dict_get(cr, uid, msg, context=context)
                 if thread_level and msg.parent_id:
                     while msg.parent_id:
@@ -233,7 +239,7 @@ class mail_message(osv.Model):
             else:
                 result.append({
                     'type': 'expandable',
-                    'domain': [('id','<=', msg.id)]+domain,
+                    'domain': [('id', '<=', msg.id)] + domain,
                     'context': context,
                     'thread_level': thread_level  # should be improve accodting to level of records
                 })
@@ -279,7 +285,7 @@ class mail_message(osv.Model):
             if not (rmod and rid):
                 continue
             document_ids.append(id)
-            model_record_ids.setdefault(rmod,set()).add(rid)
+            model_record_ids.setdefault(rmod, set()).add(rid)
         for model, mids in model_record_ids.items():
             model_obj = self.pool.get(model)
             mids = model_obj.exists(cr, uid, mids)
@@ -292,7 +298,7 @@ class mail_message(osv.Model):
 
     def create(self, cr, uid, values, context=None):
         if not values.get('message_id') and values.get('res_id') and values.get('model'):
-            values['message_id'] = tools.generate_tracking_message_id('%(model)s-%(res_id)s'% values)
+            values['message_id'] = tools.generate_tracking_message_id('%(model)s-%(res_id)s' % values)
         newid = super(mail_message, self).create(cr, uid, values, context)
         self.notify(cr, uid, newid, context=context)
         return newid
@@ -333,4 +339,4 @@ class mail_message(osv.Model):
         if default is None:
             default = {}
         default.update(message_id=False, headers=False)
-        return super(mail_message,self).copy(cr, uid, id, default=default, context=context)
+        return super(mail_message, self).copy(cr, uid, id, default=default, context=context)
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index b24ba94b891..15416c51a28 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-import tools
-
 from openerp.tests import common
 
 MAIL_TEMPLATE = """Return-Path: <whatever-2a840@postmaster.twitter.com>
@@ -93,10 +91,9 @@ class test_mail(common.TransactionCase):
         self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
 
         # groups@.. will cause the creation of new mail groups
-        self.mail_group_model_id = self.ir_model.search(self.cr, self.uid, [('model','=', 'mail.group')])[0]
+        self.mail_group_model_id = self.ir_model.search(self.cr, self.uid, [('model', '=', 'mail.group')])[0]
         self.mail_alias.create(self.cr, self.uid, {'alias_name': 'groups',
                                                    'alias_model_id': self.mail_group_model_id})
-        
         # create a 'pigs' group that will be used through the various tests
         self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
             {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
@@ -104,10 +101,10 @@ class test_mail(common.TransactionCase):
     def test_00_message_process(self):
         cr, uid = self.cr, self.uid
         # Incoming mail creates a new mail_group "frogs"
-        self.assertEqual(self.mail_group.search(cr, uid, [('name','=','frogs')]), [])
+        self.assertEqual(self.mail_group.search(cr, uid, [('name', '=', 'frogs')]), [])
         mail_frogs = MAIL_TEMPLATE.format(to='groups@example.com, other@gmail.com', subject='frogs', extra='')
         self.mail_thread.message_process(cr, uid, None, mail_frogs)
-        frog_groups = self.mail_group.search(cr, uid, [('name','=','frogs')])
+        frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'frogs')])
         self.assertTrue(len(frog_groups) == 1)
 
         # Previously-created group can be emailed now - it should have an implicit alias group+frogs@...
@@ -121,11 +118,11 @@ class test_mail(common.TransactionCase):
 
         # Even with a wrong destination, a reply should end up in the correct thread
         mail_reply = MAIL_TEMPLATE.format(to='erroneous@example.com>', subject='Re: news',
-                                          extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n'%frog_group.id)
+                                          extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
         self.mail_thread.message_process(cr, uid, None, mail_reply)
         frog_group.refresh()
         self.assertTrue(len(frog_group.message_ids) == 3, 'Group should contain 3 messages now')
-        
+
         # No model passed and no matching alias must raise
         mail_spam = MAIL_TEMPLATE.format(to='noone@example.com', subject='spam', extra='')
         self.assertRaises(Exception,
@@ -192,7 +189,7 @@ class test_mail(common.TransactionCase):
         self.assertEqual(follower_ids, set([partner_bert_id]), 'Bert should be the follower of dummy mail.thread data')
         fol_obj_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', group_dummy_id)])
         follower_ids = set([follower.partner_id.id for follower in self.mail_followers.browse(cr, uid, fol_obj_ids)])
-        self.assertEqual(follower_ids,set([partner_bert_id, user_admin.partner_id.id]), 'Bert and Admin should be the followers of dummy mail.group data')
+        self.assertEqual(follower_ids, set([partner_bert_id, user_admin.partner_id.id]), 'Bert and Admin should be the followers of dummy mail.group data')
 
     def test_11_message_followers(self):
         """ Tests designed for the subscriber API. """
@@ -252,9 +249,8 @@ class test_mail(common.TransactionCase):
         msg_id = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body1, subject=_subject, type='comment')
         message = self.mail_message.browse(cr, uid, msg_id)
         sent_email = self._build_email_kwargs
-
-        self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id','=',msg_id)]), 'mail.mail notifications should have been auto-deleted!')
-        
+        # Test: notifications have been deleted
+        self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id', '=', msg_id)]), 'mail.mail notifications should have been auto-deleted!')
         # Test: mail_message: subject is _subject, body is _body1 (no formatting done)
         self.assertEqual(message.subject, _subject, 'mail.message subject incorrect')
         self.assertEqual(message.body, _body1, 'mail.message body incorrect')
@@ -279,7 +275,7 @@ class test_mail(common.TransactionCase):
             partner_ids=[(6, 0, [p_d_id])], parent_id=msg_id, attachments=_attachments)
         message = self.mail_message.browse(cr, uid, msg_id2)
         sent_email = self._build_email_kwargs
-        self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id','=',msg_id2)]), 'mail.mail notifications should have been auto-deleted!')
+        self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id', '=', msg_id2)]), 'mail.mail notifications should have been auto-deleted!')
 
         # Test: mail_message: subject is False, body is _body2 (no formatting done), parent_id is msg_id
         self.assertEqual(message.subject, False, 'mail.message subject incorrect')
@@ -300,11 +296,11 @@ class test_mail(common.TransactionCase):
         # Test: sent_email: email_to should contain b@b, c@c, not a@a (writer)
         self.assertEqual(set(sent_email['email_to']), set(['b@b', 'c@c']), 'sent_email email_to incorrect')
         # Test: attachments
-        for i in range(len(message.attachment_ids)):
-            self.assertEqual(message.attachment_ids[i].name, _attachments[i][0], 'mail.message attachment name incorrect')
-            self.assertEqual(message.attachment_ids[i].res_model, 'mail.group', 'mail.message attachment res_model incorrect')
-            self.assertEqual(message.attachment_ids[i].res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
-            self.assertEqual(message.attachment_ids[i].datas.decode('base64'), _attachments[i][1], 'mail.message attachment data incorrect')
+        for attach in message.attachment_ids:
+            self.assertEqual(attach.res_model, 'mail.group', 'mail.message attachment res_model incorrect')
+            self.assertEqual(attach.res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
+            self.assertIn((attach.name, attach.datas.decode('base64')), _attachments,
+                'mail.message attachment name / data incorrect')
 
     def test_21_message_compose_wizard(self):
         """ Tests designed for the mail.compose.message wizard. """
@@ -313,19 +309,19 @@ class test_mail(common.TransactionCase):
         self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a'})
         user_admin = self.res_users.browse(cr, uid, uid)
         group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        group_bird_id = self.mail_group.create(cr, uid, {'name': 'Bird', 'description': 'Bird resistance'})
+        group_bird = self.mail_group.browse(cr, uid, group_bird_id)
 
         # Mail data
         _subject = 'Pigs'
-        _subject_reply = 'Re: Pigs'
-        _mail_subject = '%s posted on %s' % (user_admin.name, group_pigs.name)
         _body_text = 'Pigs rules'
-        _msg_body1 = '<pre>Pigs rules</pre>'
-        _body_html = '<html>Pigs rules</html>'
-        _msg_body2 = '<html>Pigs rules</html>'
+        _msg_reply = 'Re: Pigs'
+        _msg_body = '<pre>Pigs rules</pre>'
         _attachments = [
-            {'name': 'First', 'datas': 'My first attachment'.encode('base64')},
-            {'name': 'Second', 'datas': 'My second attachment'.encode('base64')}
+            {'name': 'First', 'datas_fname': 'first.txt', 'datas': 'My first attachment'.encode('base64')},
+            {'name': 'Second', 'datas_fname': 'second.txt', 'datas': 'My second attachment'.encode('base64')}
             ]
+        _attachments_test = [('first.txt', 'My first attachment'), ('second.txt', 'My second attachment')]
 
         # Create partners
         # 0 - Admin
@@ -340,23 +336,27 @@ class test_mail(common.TransactionCase):
         # Subscribe #1
         group_pigs.message_subscribe([p_b_id])
 
-        # CASE1: comment group_pigs with body_text and subject
+        # ----------------------------------------
+        # CASE1: comment on group_pigs
+        # ----------------------------------------
+
+        # 1. Comment group_pigs with body_text and subject
         compose_id = mail_compose.create(cr, uid,
             {'subject': _subject, 'body_text': _body_text, 'partner_ids': [(4, p_c_id), (4, p_d_id)]},
             {'default_composition_mode': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_pigs_id})
         compose = mail_compose.browse(cr, uid, compose_id)
-        # Test: mail.compose.message: model, res_id
+        # Test: mail.compose.message: composition_mode, model, res_id
+        self.assertEqual(compose.composition_mode,  'comment', 'mail.compose.message incorrect composition_mode')
         self.assertEqual(compose.model,  'mail.group', 'mail.compose.message incorrect model')
         self.assertEqual(compose.res_id, self.group_pigs_id, 'mail.compose.message incorrect res_id')
 
-        # Post the comment, get created message
+        # 2. Post the comment, get created message
         mail_compose.send_mail(cr, uid, [compose_id])
         group_pigs.refresh()
         message = group_pigs.message_ids[0]
-
         # Test: mail.message: subject, body inside pre
         self.assertEqual(message.subject,  False, 'mail.message incorrect subject')
-        self.assertEqual(message.body, _msg_body1, 'mail.message incorrect body')
+        self.assertEqual(message.body, _msg_body, 'mail.message incorrect body')
         # Test: mail.message: partner_ids = entries in mail.notification: group_pigs fans (a, b) + mail.compose.message partner_ids (c, d)
         msg_pids = [partner.id for partner in message.partner_ids]
         test_pids = [p_a_id, p_b_id, p_c_id, p_d_id]
@@ -364,114 +364,165 @@ class test_mail(common.TransactionCase):
         self.assertEqual(len(notif_ids), 4, 'mail.message: too much notifications created')
         self.assertEqual(set(msg_pids), set(test_pids), 'mail.message partner_ids incorrect')
 
-        # CASE2: reply to last comment (update its subject) with attachments
+        # ----------------------------------------
+        # CASE2: reply to last comment with attachments
+        # ----------------------------------------
+
+        # 1. Update last comment subject, reply with attachments
         message.write({'subject': _subject})
         compose_id = mail_compose.create(cr, uid,
             {'attachment_ids': [(0, 0, _attachments[0]), (0, 0, _attachments[1])]},
             {'default_composition_mode': 'reply', 'default_model': 'mail.thread', 'default_res_id': self.group_pigs_id, 'default_parent_id': message.id})
         compose = mail_compose.browse(cr, uid, compose_id)
-
-        # Test: form view methods
         # Test: model, res_id, parent_id, content_subtype
         self.assertEqual(compose.model,  'mail.group', 'mail.compose.message incorrect model')
         self.assertEqual(compose.res_id, self.group_pigs_id, 'mail.compose.message incorrect res_id')
         self.assertEqual(compose.parent_id.id, message.id, 'mail.compose.message incorrect parent_id')
         self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message incorrect content_subtype')
 
-        # Post the comment, get created message
+        # 2. Post the comment, get created message
         mail_compose.send_mail(cr, uid, [compose_id])
         group_pigs.refresh()
         message = group_pigs.message_ids[0]
-        # Test: subject as Re:.., body in html
-        self.assertEqual(message.subject, _subject_reply, 'mail.message incorrect subject')
+        # Test: mail.message: subject as Re:.., body in html
+        self.assertEqual(message.subject, _msg_reply, 'mail.message incorrect subject')
         self.assertIn('Administrator wrote:<blockquote><pre>Pigs rules</pre></blockquote></div>', message.body, 'mail.message body is incorrect')
-        # Test: attachments
-        for i in range(len(message.attachment_ids)):
-            self.assertEqual(message.attachment_ids[i].name, _attachments[i]['name'], 'mail.message attachment name incorrect')
-            self.assertEqual(message.attachment_ids[i].res_model, 'mail.group', 'mail.message attachment res_model incorrect')
-            self.assertEqual(message.attachment_ids[i].res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
-            self.assertEqual(message.attachment_ids[i].datas.decode('base64'), _attachments[i]['datas'].decode('base64'), 'mail.message attachment data incorrect')
+        # Test: mail.message: attachments
+        for attach in message.attachment_ids:
+            self.assertEqual(attach.res_model, 'mail.group', 'mail.message attachment res_model incorrect')
+            self.assertEqual(attach.res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
+            self.assertIn((attach.name, attach.datas.decode('base64')), _attachments_test,
+                'mail.message attachment name / data incorrect')
 
-        # CASE3 - Create in mass_mail composition mode that should work with or without email_template installed
+        # ----------------------------------------
+        # CASE3: mass_mail on Pigs and Bird
+        # ----------------------------------------
+
+        # 1. mass_mail on pigs and bird
         compose_id = mail_compose.create(cr, uid,
             {'subject': _subject, 'body': '${object.description}'},
             {'default_composition_mode': 'mass_mail', 'default_model': 'mail.group', 'default_res_id': -1,
-                'active_ids': [self.group_pigs_id]})
+                'active_ids': [self.group_pigs_id, group_bird_id]})
         compose = mail_compose.browse(cr, uid, compose_id)
+        # Test: content_subtype is html
+        self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message content_subtype incorrect')
 
-        # Post the comment, get created message
-        mail_compose.send_mail(cr, uid, [compose_id], {'default_res_id': -1, 'active_ids': [self.group_pigs_id]})
+        # 2. Post the comment, get created message for each group
+        mail_compose.send_mail(cr, uid, [compose_id],
+            context={'default_res_id': -1, 'active_ids': [self.group_pigs_id, group_bird_id]})
         group_pigs.refresh()
-        message = group_pigs.message_ids[0]
-        # Test: last message on Pigs = last created message
-        test_msg = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [], limit=1))[0]
-        self.assertEqual(message.id, test_msg.id, 'Pigs did not receive its mass mailing message')
+        group_bird.refresh()
+        message1 = group_pigs.message_ids[0]
+        message2 = group_bird.message_ids[0]
+        # Test: Pigs and Bird did receive their message
+        test_msg_ids = self.mail_message.search(cr, uid, [], limit=2)
+        self.assertIn(message1.id, test_msg_ids, 'Pigs did not receive its mass mailing message')
+        self.assertIn(message2.id, test_msg_ids, 'Bird did not receive its mass mailing message')
         # Test: mail.message: subject, body
-        self.assertEqual(message.subject, _subject, 'mail.message subject is incorrect')
-        self.assertEqual(message.body, group_pigs.description, 'mail.message body is incorrect')
+        self.assertEqual(message1.subject, _subject, 'mail.message subject incorrect')
+        self.assertEqual(message1.body, group_pigs.description, 'mail.message body incorrect')
+        self.assertEqual(message2.subject, _subject, 'mail.message subject incorrect')
+        self.assertEqual(message2.body, group_bird.description, 'mail.message body incorrect')
 
     def test_30_message_read(self):
         """ Tests designed for message_read. """
         # TDE NOTE: this test is not finished, as the message_read method is not fully specified.
-        # It wil be updated as soon as we have fixed specs !
-        cr, uid  = self.cr, self.uid
+        # It will be updated as soon as we have fixed specs !
+        cr, uid = self.cr, self.uid
         group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        def _compare_structures(struct1, struct2, n=0):
+            # print '%scompare structure' % ('\t' * n)
+            self.assertEqual(len(struct1), len(struct2), 'message_read structure number of childs incorrect')
+            for x in range(len(struct1)):
+                # print '%s' % ('\t' * n), struct1[x]['id'], struct2[x]['id'], struct1[x].get('subject') or ''
+                self.assertEqual(struct1[x]['id'], struct2[x]['id'], 'message_read failure %s' % struct1[x].get('subject'))
+                _compare_structures(struct1[x]['child_ids'], struct2[x]['child_ids'], n + 1)
+            # print '%send compare' % ('\t' * n)
 
-        # Test message_read_tree_flatten that flattens a thread according to a given thread_level
+        # ----------------------------------------
+        # CASE1: Flattening test
+        # ----------------------------------------
+
+        # Create dummy message structure
         import copy
-        tree = [{'id': 1, 'child_ids':[
-                    {'id': 3, 'child_ids': [] },
-                    {'id': 4, 'child_ids': [
-                        {'id': 5, 'child_ids': []},
-                        {'id': 12, 'child_ids': []},
-                        ] },
-                    {'id': 8, 'child_ids': [
-                        {'id': 10, 'child_ids': []},
-                        ] },
-                    ] },
-                {'id': 2, 'child_ids': [
+        tree = [{'id': 2, 'child_ids': [
+                    {'id': 6, 'child_ids': [
+                        {'id': 8, 'child_ids': []},
+                        ]},
+                    ]},
+                {'id': 1, 'child_ids':[
                     {'id': 7, 'child_ids': [
                         {'id': 9, 'child_ids': []},
-                        ] },
-                    ] },
-                {'id': 6, 'child_ids': [
-                    {'id': 11, 'child_ids': [] },
-                    ] },
+                        ]},
+                    {'id': 4, 'child_ids': [
+                        {'id': 10, 'child_ids': []},
+                        {'id': 5, 'child_ids': []},
+                        ]},
+                    {'id': 3, 'child_ids': []},
+                    ]},
                 ]
+        # Test: completely flat
         new_tree = self.mail_message.message_read_tree_flatten(cr, uid, copy.deepcopy(tree), 0, 0)
-        self.assertTrue(len(new_tree) == 12, 'Flattening wrongly produced')
+        self.assertEqual(len(new_tree), 10, 'message_read_tree_flatten wrong in flat')
+        # Test: 1 thread level
+        tree_test = [{'id': 2, 'child_ids': [
+                        {'id': 8, 'child_ids': []}, {'id': 6, 'child_ids': []},
+                    ]},
+                    {'id': 1, 'child_ids': [
+                        {'id': 10, 'child_ids': []}, {'id': 9, 'child_ids': []},
+                        {'id': 7, 'child_ids': []}, {'id': 5, 'child_ids': []},
+                        {'id': 4, 'child_ids': []}, {'id': 3, 'child_ids': []},
+                    ]},
+                    ]
         new_tree = self.mail_message.message_read_tree_flatten(cr, uid, copy.deepcopy(tree), 0, 1)
-        self.assertTrue(len(new_tree) == 3 and len(new_tree[0]['child_ids']) == 6 and len(new_tree[1]['child_ids']) == 2 and len(new_tree[2]['child_ids']) == 1,
-            'Flattening wrongly produced')
+        _compare_structures(new_tree, tree_test)
+        # Test: 2 thread levels
         new_tree = self.mail_message.message_read_tree_flatten(cr, uid, copy.deepcopy(tree), 0, 2)
-        self.assertTrue(len(new_tree) == 3 and len(new_tree[0]['child_ids']) == 3 and len(new_tree[0]['child_ids'][1]) == 2,
-            'Flattening wrongly produced')
+        _compare_structures(new_tree, tree)
 
-        # Add a few messages to pigs group
-        msgid1 = group_pigs.message_post(body='My Body', subject='1', parent_id=False)
-        msgid2 = group_pigs.message_post(body='My Body', subject='1-1', parent_id=msgid1)
-        msgid3 = group_pigs.message_post(body='My Body', subject='1-2', parent_id=msgid1)
-        msgid4 = group_pigs.message_post(body='My Body', subject='2', parent_id=False)
-        msgid5 = group_pigs.message_post(body='My Body', subject='1-1-1', parent_id=msgid2)
-        msgid6 = group_pigs.message_post(body='My Body', subject='2-1', parent_id=msgid4)
+        # ----------------------------------------
+        # CASE2: message_read test
+        # ----------------------------------------
 
-        # First try: read flat
-        first_try_ids = [msgid6, msgid5, msgid4, msgid3, msgid2, msgid1]
-        tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=0)
-        self.assertTrue(all(elem['id'] in first_try_ids for elem in tree) and len(tree) == 6,
-            'Incorrect structure and/or number of childs in purely flat message_read')
+        # 1. Add a few messages to pigs group
+        msgid1 = group_pigs.message_post(body='1', subject='1', parent_id=False)
+        msgid2 = group_pigs.message_post(body='2', subject='1-1', parent_id=msgid1)
+        msgid3 = group_pigs.message_post(body='3', subject='1-2', parent_id=msgid1)
+        msgid4 = group_pigs.message_post(body='4', subject='2', parent_id=False)
+        msgid5 = group_pigs.message_post(body='5', subject='1-1-1', parent_id=msgid2)
+        msgid6 = group_pigs.message_post(body='6', subject='2-1', parent_id=msgid4)
 
-        # Second try: read with thread_level 1
-        tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=1)
-        self.assertTrue(len(tree) == 2 and len(tree[1]['child_ids']) == 3, 'Incorrect number of child in message_read')
+        # Test: read all messages flat
+        tree_test = [{'id': msgid6, 'child_ids': []}, {'id': msgid5, 'child_ids': []},
+                        {'id': msgid4, 'child_ids': []}, {'id': msgid3, 'child_ids': []},
+                        {'id': msgid2, 'child_ids': []}, {'id': msgid1, 'child_ids': []}]
+        tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=0, limit=10)
+        _compare_structures(tree, tree_test)
+        # Test: read with 1 level of thread
+        tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]},
+                    {'id': msgid1, 'child_ids': [
+                        {'id': msgid5, 'child_ids': []}, {'id': msgid3, 'child_ids': []},
+                        {'id': msgid2, 'child_ids': []},
+                    ]},
+                    ]
+        tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=1, limit=10)
+        _compare_structures(tree, tree_test)
+        # Test: read with 2 levels of thread
+        tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]},
+                    {'id': msgid1, 'child_ids': [
+                        {'id': msgid3, 'child_ids': []},
+                        {'id': msgid2, 'child_ids': [{'id': msgid5, 'child_ids': []}, ]},
+                    ]},
+                    ]
+        tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=2, limit=10)
+        _compare_structures(tree, tree_test)
 
-        # Third try: read with thread_level 2
-        tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=2)
-        self.assertTrue(len(tree) == 2 and len(tree[1]['child_ids']) == 2 and len(tree[1]['child_ids'][0]['child_ids']) == 1, 'Incorrect number of child in message_read')
+        # 2. Test expandables
+        # TDE FIXME: add those tests when expandables are specified and implemented
 
     def test_40_needaction(self):
         """ Tests for mail.message needaction. """
-        cr, uid  = self.cr, self.uid
+        cr, uid = self.cr, self.uid
         group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
         user_admin = self.res_users.browse(cr, uid, uid)
 
@@ -480,7 +531,7 @@ class test_mail(common.TransactionCase):
             ('partner_id', '=', user_admin.partner_id.id),
             ('read', '=', False)
             ])
-        na_count = self.mail_message._needaction_count(cr, uid, domain = [])
+        na_count = self.mail_message._needaction_count(cr, uid, domain=[])
         self.assertEqual(len(notif_ids), na_count, 'unread notifications count does not match needaction count')
 
         # Post 4 message on group_pigs
@@ -492,11 +543,11 @@ class test_mail(common.TransactionCase):
             ('partner_id', '=', user_admin.partner_id.id),
             ('read', '=', False)
             ])
-        na_count = self.mail_message._needaction_count(cr, uid, domain = [])
+        na_count = self.mail_message._needaction_count(cr, uid, domain=[])
         self.assertEqual(len(notif_ids), na_count, 'unread notifications count does not match needaction count')
 
         # Check there are 4 needaction on mail.message with particular domain
-        na_count = self.mail_message._needaction_count(cr, uid, domain = [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
+        na_count = self.mail_message._needaction_count(cr, uid, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
         self.assertEqual(na_count, 4, 'posted message count does not match needaction count')
 
     def test_50_thread_parent_resolution(self):
@@ -505,7 +556,7 @@ class test_mail(common.TransactionCase):
         group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
         msg1 = group_pigs.message_post(body='My Body', subject='1')
         msg2 = group_pigs.message_post(body='My Body', subject='2')
-        msg1, msg2 = self.mail_message.browse(cr, uid, [msg1,msg2])
+        msg1, msg2 = self.mail_message.browse(cr, uid, [msg1, msg2])
         self.assertTrue(msg1.message_id, "New message should have a proper message_id")
 
         # Reply to msg1, make sure the reply is properly attached using the various reply identification mechanisms
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 3c93440642d..3153ccc2069 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -36,7 +36,7 @@ class mail_compose_message(osv.TransientModel):
         at model and view levels to provide specific features.
 
         The behavior of the wizard depends on the composition_mode field:
-        - 'reply': reply to a previous message. The wizard is pre-populated 
+        - 'reply': reply to a previous message. The wizard is pre-populated
             via ``get_message_data``.
         - 'comment': new post on a record. The wizard is pre-populated via
             ``get_record_data``
@@ -63,7 +63,6 @@ class mail_compose_message(osv.TransientModel):
                 - active_ids: record IDs
                 - default_model or active_model
         """
-        # get some important values from context
         if context is None:
             context = {}
         result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
@@ -81,7 +80,7 @@ class mail_compose_message(osv.TransientModel):
         elif composition_mode == 'comment' and model and res_id:
             vals = self.get_record_data(cr, uid, model, res_id, context=context)
         elif composition_mode == 'mass_mail' and model and active_ids:
-            vals = {'model': model, 'res_id': res_id}
+            vals = {'model': model, 'res_id': res_id, 'content_subtype': 'html'}
         else:
             vals = {'model': model, 'res_id': res_id}
         if composition_mode:
@@ -114,10 +113,10 @@ class mail_compose_message(osv.TransientModel):
 
     _defaults = {
         'composition_mode': 'comment',
-        'content_subtype': lambda self,cr, uid, context={}: 'plain',
-        'body_text': lambda self,cr, uid, context={}: False,
-        'body': lambda self,cr, uid, context={}: '',
-        'subject': lambda self,cr, uid, context={}: False,
+        'content_subtype': lambda self, cr, uid, ctx={}: 'plain',
+        'body_text': lambda self, cr, uid, ctx={}: False,
+        'body': lambda self, cr, uid, ctx={}: '',
+        'subject': lambda self, cr, uid, ctx={}: False,
     }
 
     def notify(self, cr, uid, newid, context=None):
@@ -144,13 +143,10 @@ class mail_compose_message(osv.TransientModel):
             :param int message_id: id of the mail.message to which the user
                 is replying.
         """
+        if not message_id:
+            return {}
         if context is None:
             context = {}
-        result = {}
-        if not message_id:
-            return result
-
-        current_user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         message_data = self.pool.get('mail.message').browse(cr, uid, message_id, context=context)
 
         # create subject
@@ -159,15 +155,16 @@ class mail_compose_message(osv.TransientModel):
         if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)):
             reply_subject = "%s %s" % (re_prefix, reply_subject)
         # create the reply in the body
-        reply_header = _('On %(date)s, %(sender_name)s wrote:') % {
+        reply_body = _('<div>On %(date)s, %(sender_name)s wrote:<blockquote>%(body)s</blockquote></div>') % {
             'date': message_data.date if message_data.date else '',
-            'sender_name': message_data.author_id.name }
-        reply_body = '<div>%s<blockquote>%s</blockquote></div>' % (reply_header, message_data.body)
+            'sender_name': message_data.author_id.name,
+            'body': message_data.body,
+            }
         # get partner_ids from original message
         partner_ids = [partner.id for partner in message_data.partner_ids] if message_data.partner_ids else []
 
         # update the result
-        result.update({
+        result = {
             'model': message_data.model,
             'res_id': message_data.res_id,
             'parent_id': message_data.id,
@@ -175,11 +172,11 @@ class mail_compose_message(osv.TransientModel):
             'subject': reply_subject,
             'partner_ids': partner_ids,
             'content_subtype': 'html',
-        })
+        }
         return result
 
     def toggle_content_subtype(self, cr, uid, ids, context=None):
-        """ hit toggle formatting mode button: calls onchange_formatting to 
+        """ hit toggle formatting mode button: calls onchange_formatting to
             emulate an on_change, then writes the value to update the form. """
         for record in self.browse(cr, uid, ids, context=context):
             content_st_new_value = 'plain' if record.content_subtype == 'html' else 'html'
@@ -209,17 +206,18 @@ class mail_compose_message(osv.TransientModel):
             warning_msg += '\n- %s' % (partner.name)
         return {'warning': {
                     'title': _('Partners email addresses not found'),
-                    'message': warning_msg }
+                    'message': warning_msg,
+                    }
                 }
 
     def onchange_partner_ids(self, cr, uid, ids, value, context=None):
-        """ onchange_partner_ids (value format: [[6, False, [3, 4]]]). The
+        """ onchange_partner_ids (value format: [[6, 0, [3, 4]]]). The
             basic purpose of this method is to check that destination partners
             effectively have email addresses. Otherwise a warning is thrown.
         """
         res = {'value': {}}
         if not value or not value[0] or not value[0][0] == 6:
-            return 
+            return
         res.update(self._verify_partner_email(cr, uid, value[0][2], context=context))
         return res
 
@@ -227,7 +225,7 @@ class mail_compose_message(osv.TransientModel):
         # Cascade delete all attachments, as they are owned by the composition wizard
         for wizard in self.read(cr, uid, ids, ['attachment_ids'], context=context):
             self.pool.get('ir.attachment').unlink(cr, uid, wizard['attachment_ids'], context=context)
-        return super(mail_compose_message,self).unlink(cr, uid, ids, context=context)
+        return super(mail_compose_message, self).unlink(cr, uid, ids, context=context)
 
     def dummy(self, cr, uid, ids, context=None):
         """ TDE: defined to have buttons that do basically nothing. It is
@@ -258,13 +256,13 @@ class mail_compose_message(osv.TransientModel):
                     'subject': wizard.subject if wizard.content_subtype == 'html' else False,
                     'body': wizard.body if wizard.content_subtype == 'html' else '<pre>%s</pre>' % tools.ustr(wizard.body_text),
                     'partner_ids': [(4, partner.id) for partner in wizard.partner_ids],
-                    'attachments': [(attach.name or attach.datas_fname, base64.b64decode(attach.datas)) for attach in wizard.attachment_ids],
+                    'attachments': [(attach.datas_fname or attach.name, base64.b64decode(attach.datas)) for attach in wizard.attachment_ids],
                 }
                 # mass mailing: render and override default values
                 if mass_mail_mode and wizard.model:
-                    email_dict = self.render_message(cr, uid, wizard, wizard.model, res_id, context=context)
+                    email_dict = self.render_message(cr, uid, wizard, res_id, context=context)
                     new_partner_ids = email_dict.pop('partner_ids', [])
-                    post_values['partner_ids'] += new_partner_ids
+                    post_values['partner_ids'] += [(4, partner_id) for partner_id in new_partner_ids]
                     new_attachments = email_dict.pop('attachments', [])
                     post_values['attachments'] += new_attachments
                     post_values.update(email_dict)
@@ -273,14 +271,13 @@ class mail_compose_message(osv.TransientModel):
 
         return {'type': 'ir.actions.act_window_close'}
 
-    def render_message(self, cr, uid, wizard, model, res_id, context=None):
-        """ Generate an email from the template for given (model, res_id) pair.
-            This method is meant to be inherited by email_template that will
-            produce a more complete dictionary, with email_to, ...
-        """
+    def render_message(self, cr, uid, wizard, res_id, context=None):
+        """ Generate an email from the template for given (wizard.model, res_id)
+            pair. This method is meant to be inherited by email_template that
+            will produce a more complete dictionary. """
         return {
-            'subject': self.render_template(cr, uid, wizard.subject, model, res_id, context),
-            'body': self.render_template(cr, uid, wizard.body, model, res_id, context),
+            'subject': self.render_template(cr, uid, wizard.subject, wizard.model, res_id, context),
+            'body': self.render_template(cr, uid, wizard.body, wizard.model, res_id, context),
         }
 
     def render_template(self, cr, uid, template, model, res_id, context=None):
@@ -302,8 +299,8 @@ class mail_compose_message(osv.TransientModel):
         def merge(match):
             exp = str(match.group()[2:-1]).strip()
             result = eval(exp, {
-                'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
-                'object' : self.pool.get(model).browse(cr, uid, res_id, context=context),
+                'user': self.pool.get('res.users').browse(cr, uid, uid, context=context),
+                'object': self.pool.get(model).browse(cr, uid, res_id, context=context),
                 'context': dict(context), # copy context to prevent side-effects of eval
                 })
             return result and tools.ustr(result) or ''

From 089b64214d94af46705d7291743451f38ab50085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 5 Sep 2012 17:56:26 +0200
Subject: [PATCH 863/999] [FIX] email_template: various improvements and fixes.
 email_template.py: fixed attachments mail.compose.message: fixed various bugs
 of onchanges and the use of templates with the composer. Cleaned and added
 tests related to the composer using email_template. mail.compose.message form
 view: the use of templates is now for advanced formatting only.

bzr revid: tde@openerp.com-20120905155626-h6laee191ttnglkh
---
 addons/email_template/email_template.py       |   4 +-
 addons/email_template/tests/test_mail.py      | 136 ++++++++++++------
 .../wizard/mail_compose_message.py            |  98 ++++++-------
 .../wizard/mail_compose_message_view.xml      |   6 +-
 4 files changed, 139 insertions(+), 105 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 74a9ae99a4c..4080e62f002 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -99,7 +99,7 @@ class email_template(osv.osv):
         mod_name = False
         if model_id:
             mod_name = self.pool.get('ir.model').browse(cr, uid, model_id, context).model
-        return {'value':{'model': mod_name}}
+        return {'value': {'model': mod_name}}
 
     _columns = {
         'name': fields.char('Name'),
@@ -320,7 +320,7 @@ class email_template(osv.osv):
 
         # Add template attachments
         for attach in template.attachment_ids:
-            attachments.append(attach.datas_fname, attach.datas)
+            attachments.append((attach.datas_fname, attach.datas))
 
         values['attachments'] = attachments
         return values
diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
index 05f8f81d76d..85ab3afc902 100644
--- a/addons/email_template/tests/test_mail.py
+++ b/addons/email_template/tests/test_mail.py
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
+import base64
 from openerp.tests import common
-import tools
 
 class test_message_compose(common.TransactionCase):
 
@@ -44,10 +44,12 @@ class test_message_compose(common.TransactionCase):
         self.build_email_real = self.registry('ir.mail_server').build_email
         self.registry('ir.mail_server').build_email = self._mock_build_email
         self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
-        
-        # create a 'pigs' group that will be used through the various tests
+
+        # create a 'pigs' and 'bird' groups that will be used through the various tests
         self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
             {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
+        self.group_bird_id = self.mail_group.create(self.cr, self.uid,
+            {'name': 'Bird', 'description': 'I am angry !'})
 
     def test_00_message_compose_wizard(self):
         """ Tests designed for the mail.compose.message wizard updated by email_template. """
@@ -55,74 +57,116 @@ class test_message_compose(common.TransactionCase):
         mail_compose = self.registry('mail.compose.message')
         self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a.a'})
         user_admin = self.res_users.browse(cr, uid, uid)
+        p_a_id = user_admin.partner_id.id
         group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
-        group_bird_id = self.mail_group.create(cr, uid, {'name': 'Bird', 'description': 'I am angry !'})
-        group_bird = self.mail_group.browse(cr, uid, group_bird_id)
+        group_bird = self.mail_group.browse(cr, uid, self.group_bird_id)
 
-        # Create template on mail.group
+        # Mail data
+        _subject1 = 'Pigs'
+        _subject2 = 'Bird'
+        _body_html1 = 'Fans of Pigs, unite !\n<pre>Admin</pre>\n'
+        _body_html2 = 'I am angry !\n<pre>Admin</pre>\n'
+        _attachments = [
+            {'name': 'First', 'datas_fname': 'first.txt', 'datas': base64.b64encode('My first attachment')},
+            {'name': 'Second', 'datas_fname': 'second.txt', 'datas': base64.b64encode('My second attachment')}
+            ]
+        _attachments_test = [('first.txt', 'My first attachment'), ('second.txt', 'My second attachment')]
+
+        # Create template on mail.group, with attachments
         group_model_id = self.registry('ir.model').search(cr, uid, [('model', '=', 'mail.group')])[0]
         email_template = self.registry('email.template')
         email_template_id = email_template.create(cr, uid, {'model_id': group_model_id,
             'name': 'Pigs Template', 'subject': '${object.name}',
             'body_html': '${object.description}', 'user_signature': True,
+            'attachment_ids': [(0, 0, _attachments[0]), (0, 0, _attachments[1])],
             'email_to': 'b@b.b c@c.c', 'email_cc': 'd@d.d'})
 
-        # Mail data
-        _subject1 = 'Pigs'
-        _subject2 = 'Bird'
-        _body_text1 = 'Pigs rules'
-        _body_text_html1 = 'Fans of Pigs, unite !\n<pre>Admin</pre>\n'
-        _body_text2 = 'I am angry !'
-        _body_text_html2 = 'I am angry !<pre>Admin</pre>'
+        # ----------------------------------------
+        # CASE1: comment and save as template
+        # ----------------------------------------
 
-        # CASE1: create in comment
+        # 1. Comment on pigs
+        compose_id = mail_compose.create(cr, uid,
+            {'subject': 'Forget me subject', 'body': '<p>Dummy body</p>'},
+            {'default_composition_mode': 'comment', 'default_model': 'mail.group',
+                'default_res_id': self.group_pigs_id,
+                'default_template_id': email_template_id,
+                'active_ids': [self.group_pigs_id, self.group_bird_id]})
+        compose = mail_compose.browse(cr, uid, compose_id)
+
+        # 2. Save current composition form as a template
+        mail_compose.save_as_template(cr, uid, [compose_id], context={'default_model': 'mail.group'})
+        # Test: email_template subject, body_html, model
+        last_template_id = email_template.search(cr, uid, [('model', '=', 'mail.group'), ('subject', '=', 'Forget me subject')], limit=1)[0]
+        self.assertTrue(last_template_id, 'email_template not found for model mail.group, subject Forget me subject')
+        last_template = email_template.browse(cr, uid, last_template_id)
+        self.assertEqual(last_template.body_html, '<p>Dummy body</p>', 'email_template incorrect body_html')
+
+        # ----------------------------------------
+        # CASE2: comment with template, save as template
+        # ----------------------------------------
+
+        # 1. Comment on pigs
         compose_id = mail_compose.create(cr, uid,
             {'subject': 'Forget me subject', 'body': 'Dummy body'},
             {'default_composition_mode': 'comment', 'default_model': 'mail.group',
-                'default_res_id': self.group_pigs_id, 'default_use_template': True,
-                'active_ids': [self.group_pigs_id, group_bird_id] })
+                'default_res_id': self.group_pigs_id,
+                'default_template_id': email_template_id,
+                'active_ids': [self.group_pigs_id, self.group_bird_id]})
         compose = mail_compose.browse(cr, uid, compose_id)
 
-        # Perform 'onchange_template_id' with 'use_template' set
-        values = mail_compose.onchange_template_id(cr, uid, [], compose.use_template, email_template_id, compose.composition_mode, compose.model, compose.res_id)
-        compose.write(values.get('value', {}), {'default_composition_mode': 'comment', 'default_model': 'mail.group'})
+        # 2. Perform 'toggle_template', to set use_template and use template_id
+        mail_compose.toggle_template(cr, uid, [compose_id], {'default_composition_mode': 'comment', 'default_model': 'mail.group'})
         compose.refresh()
         message_pids = [partner.id for partner in compose.partner_ids]
         partner_ids = self.res_partner.search(cr, uid, [('email', 'in', ['b@b.b', 'c@c.c', 'd@d.d'])])
-        partners = self.res_partner.browse(cr, uid, partner_ids)
-        # Test: subject, body, partner_ids
+        # Test: mail.compose.message: subject, body, content_subtype, partner_ids
         self.assertEqual(compose.subject, _subject1, 'mail.compose.message subject incorrect')
-        self.assertEqual(compose.body, _body_text_html1, 'mail.compose.message body incorrect')
+        self.assertEqual(compose.body, _body_html1, 'mail.compose.message body incorrect')
+        self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message content_subtype incorrect')
         self.assertEqual(set(message_pids), set(partner_ids), 'mail.compose.message partner_ids incorrect')
+        # Test: mail.compose.message: attachments
+        # Test: mail.message: attachments
+        for attach in compose.attachment_ids:
+            self.assertEqual(attach.res_model, 'mail.group', 'mail.message attachment res_model incorrect')
+            self.assertEqual(attach.res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
+            self.assertIn((attach.name, base64.b64decode(attach.datas)), _attachments_test,
+                'mail.message attachment name / data incorrect')
 
-        # Perform 'onchange_use_template': use_template is not set anymore
-        values = mail_compose.onchange_use_template(cr, uid, [], not compose.use_template, compose.template_id, compose.composition_mode, compose.model, compose.res_id)
-        compose.write(values.get('value', {}), {'default_composition_mode': 'comment', 'default_model': 'mail.group'})
+        # 3. Perform 'toggle_template': template is not set anymore
+        mail_compose.toggle_template(cr, uid, [compose_id], {'default_composition_mode': 'comment', 'default_model': 'mail.group'})
         compose.refresh()
         # Test: subject, body, partner_ids
         self.assertEqual(compose.subject, False, 'mail.compose.message subject incorrect')
         self.assertEqual(compose.body, '', 'mail.compose.message body incorrect')
 
-        # CASE12 create in mass_mail composition
+        # ----------------------------------------
+        # CASE3: mass_mail with template
+        # ----------------------------------------
+
+        # 1. Mass_mail on pigs and bird, with a default_partner_ids set to check he is correctly added
         compose_id = mail_compose.create(cr, uid,
             {'subject': 'Forget me subject', 'body': 'Dummy body'},
             {'default_composition_mode': 'mass_mail', 'default_model': 'mail.group',
-                'default_res_id': -1, 'default_use_template': True,
-                'active_ids': [self.group_pigs_id, group_bird_id] })
+                'default_res_id': self.group_pigs_id,
+                'default_template_id': email_template_id,
+                'default_partner_ids': [p_a_id],
+                'active_ids': [self.group_pigs_id, self.group_bird_id]})
         compose = mail_compose.browse(cr, uid, compose_id)
 
-        # Test 'onchange_template_id' with 'use_template' set
-        values = mail_compose.onchange_template_id(cr, uid, [], compose.use_template, email_template_id, compose.composition_mode, compose.model, compose.res_id)
-        print values
-        # self.assertEqual()
-        # compose.write(values['value'])
-        values = mail_compose.onchange_use_template(cr, uid, [], not compose.use_template, compose.template_id, compose.composition_mode, compose.model, compose.res_id)
-        print values
-
+        # 2. Perform 'toggle_template', to set use_template and use template_id
+        mail_compose.toggle_template(cr, uid, [compose_id], {'default_composition_mode': 'comment', 'default_model': 'mail.group'})
         compose.refresh()
+        message_pids = [partner.id for partner in compose.partner_ids]
+        partner_ids = [p_a_id]
+        # Test: mail.compose.message: subject, body, content_subtype, partner_ids
+        self.assertEqual(compose.subject, '${object.name}', 'mail.compose.message subject incorrect')
+        self.assertEqual(compose.body, '${object.description}', 'mail.compose.message body incorrect')
+        self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message content_subtype incorrect')
+        self.assertEqual(set(message_pids), set(partner_ids), 'mail.compose.message partner_ids incorrect')
 
-        # Post the comment, get created message
-        mail_compose.send_mail(cr, uid, [compose_id],  {'default_res_id': -1, 'active_ids': [self.group_pigs_id, group_bird_id]})
+        # 3. Post the comment, get created message
+        mail_compose.send_mail(cr, uid, [compose_id],  {'default_res_id': -1, 'active_ids': [self.group_pigs_id, self.group_bird_id]})
         group_pigs.refresh()
         group_bird.refresh()
         message_pigs = group_pigs.message_ids[0]
@@ -130,9 +174,13 @@ class test_message_compose(common.TransactionCase):
         # Test: subject, body
         self.assertEqual(message_pigs.subject, _subject1, 'mail.message subject on Pigs incorrect')
         self.assertEqual(message_bird.subject, _subject2, 'mail.message subject on Bird incorrect')
-        self.assertEqual(message_pigs.body, _body_text_html1, 'mail.message body on Pigs incorrect')
-        self.assertEqual(message_bird.body, _body_text_html2, 'mail.message body on Bird incorrect')
-        # Test: partner_ids
-        print message_pigs.partner_ids
-        print message_pigs.partner_ids
-        self.assertEqual(len(message_pigs.partner_ids), 6, 'mail.message partner_ids incorrect')
\ No newline at end of file
+        self.assertEqual(message_pigs.body, _body_html1, 'mail.message body on Pigs incorrect')
+        self.assertEqual(message_bird.body, _body_html2, 'mail.message body on Bird incorrect')
+        # Test: partner_ids: p_a_id (default) + 3 newly created partners
+        message_pigs_pids = [partner.id for partner in message_pigs.partner_ids]
+        message_bird_pids = [partner.id for partner in message_bird.partner_ids]
+        partner_ids = self.res_partner.search(cr, uid, [('email', 'in', ['b@b.b', 'c@c.c', 'd@d.d'])]) + [p_a_id]
+        self.assertEqual(len(message_pigs_pids), len(partner_ids), 'mail.message on pigs incorrect number of partner_ids')
+        self.assertEqual(len(message_bird_pids), len(partner_ids), 'mail.message on bird partner_ids incorrect')
+        self.assertEqual(set(message_pigs_pids), set(partner_ids), 'mail.message on pigs incorrect number of partner_ids')
+        self.assertEqual(set(message_bird_pids), set(partner_ids), 'mail.message on bird partner_ids incorrect')
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 85dfe8bc843..2baef6e6c90 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -19,22 +19,19 @@
 #
 ##############################################################################
 
-import base64
 import tools
 
 from osv import osv
 from osv import fields
-from tools.translate import _
 
 class mail_compose_message(osv.osv_memory):
     _inherit = 'mail.compose.message'
-    _compose_fields = ['body', 'body_html', 'subject', 'partner_ids', 'attachment_ids']
 
     def _get_templates(self, cr, uid, context=None):
         if context is None:
             context = {}
         model = False
-        email_template_obj= self.pool.get('email.template')
+        email_template_obj = self.pool.get('email.template')
         message_id = context.get('default_parent_id', context.get('message_id', context.get('active_id')))
 
         if context.get('default_composition_mode') == 'reply' and message_id:
@@ -54,6 +51,9 @@ class mail_compose_message(osv.osv_memory):
             context = {}
         result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
         result['template_id'] = context.get('default_template_id', context.get('mail.compose.template_id', False))
+        # force html when using templates
+        if result.get('use_template'):
+            result['content_subtype'] = 'html'
         return result
 
     _columns = {
@@ -67,34 +67,50 @@ class mail_compose_message(osv.osv_memory):
             - use_template set in mass_mailing: we cannot render, so return the template values
             - use_template set: return rendered values """
         if use_template and template_id and composition_mode == 'mass_mail':
-            values = self.pool.get('email.template').read(cr, uid, template_id, self._compose_fields, context)
+            values = self.pool.get('email.template').read(cr, uid, template_id, ['subject', 'body_html'], context)
+            values.pop('id')
         elif use_template and template_id:
             values = self.generate_email_for_composer(cr, uid, template_id, res_id, context=context)
+            # transform attachments into attachment_ids
+            values['attachment_ids'] = []
+            ir_attach_obj = self.pool.get('ir.attachment')
+            for attach_fname, attach_datas in values.pop('attachments', []):
+                data_attach = {
+                    'name': attach_fname,
+                    'datas': attach_datas,
+                    'datas_fname': attach_fname,
+                    'res_model': model,
+                    'res_id': res_id,
+                }
+                values['attachment_ids'].append(ir_attach_obj.create(cr, uid, data_attach, context=context))
         else:
-            values = self.default_get(cr, uid, self._compose_fields, context=context)
+            values = self.default_get(cr, uid, ['body', 'body_html', 'subject', 'partner_ids', 'attachment_ids'], context=context)
 
         if values.get('body_html'):
             values['body'] = values.pop('body_html')
         values.update(use_template=use_template, template_id=template_id)
-
         return {'value': values}
 
     def toggle_template(self, cr, uid, ids, context=None):
-        """ hit toggle template mode button: calls onchange_use_template to 
-            emulate an on_change, then writes the value to update the form. """
+        """ hit toggle template mode button: calls onchange_use_template to
+            emulate an on_change, then writes the values to update the form. """
         for record in self.browse(cr, uid, ids, context=context):
             onchange_res = self.onchange_use_template(cr, uid, ids, not record.use_template,
-                record.template_id, record.composition_mode, record.model, record.res_id, context=context)['value']
-            record.write(onchange_res.get('value', {}))
+                record.template_id, record.composition_mode, record.model, record.res_id, context=context).get('value', {})
+            # update partner_ids and attachment_ids
+            onchange_res['partner_ids'] = [(4, partner_id) for partner_id in onchange_res.pop('partner_ids', [])]
+            onchange_res['attachment_ids'] = [(4, attachment_id) for attachment_id in onchange_res.pop('attachment_ids', [])]
+            record.write(onchange_res)
         return True
 
     def onchange_use_template(self, cr, uid, ids, use_template, template_id, composition_mode, model, res_id, context=None):
         """ onchange_use_template (values: True or False).  If use_template is
-            False, we do like an onchange with template_id False for values """
+            False, we do as an onchange with template_id False for values """
         values = self.onchange_template_id(cr, uid, ids, use_template,
             template_id, composition_mode, model, res_id, context=context)
+        # force html when using templates
         if use_template:
-            values['content_subtype'] = 'html'
+            values['value']['content_subtype'] = 'html'
         return values
 
     def save_as_template(self, cr, uid, ids, context=None):
@@ -112,7 +128,7 @@ class mail_compose_message(osv.osv_memory):
             values = {
                 'name': template_name,
                 'subject': record.subject or False,
-                'body': record.body or False,
+                'body_html': record.body or False,
                 'model_id': model_id or False,
                 'attachment_ids': [(6, 0, [att.id for att in record.attachment_ids])]
             }
@@ -127,61 +143,29 @@ class mail_compose_message(osv.osv_memory):
     def generate_email_for_composer(self, cr, uid, template_id, res_id, context=None):
         """ Call email_template.generate_email(), get fields relevant for
             mail.compose.message, transform email_cc and email_to into partner_ids """
-        fields = ['body', 'body_html', 'subject', 'email_to', 'email_cc', 'attachment_ids']
         template_values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
-        values = {field: template_values[field] for field in fields if template_values.get(field)}
-
+        # filter template values
+        fields = ['body', 'body_html', 'subject', 'email_to', 'email_cc', 'attachments']
+        values = dict((field, template_values[field]) for field in fields if template_values.get(field))
+        values['body'] = values.pop('body_html', '')
         # transform email_to, email_cc into partner_ids
         values['partner_ids'] = []
         mails = tools.email_split(values.pop('email_to', '') + ' ' + values.pop('email_cc', ''))
         for mail in mails:
-            partner_search_ids = self.pool.get('res.partner').search(cr, uid, [('email', 'ilike', mail)], context=context)
-            if partner_search_ids:
-                values['partner_ids'].append((4, partner_search_ids[0]))
-            else:
-                partner_id = self.pool.get('res.partner').name_create(cr, uid, mail, context=context)[0]
-                partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
-                values['partner_ids'].append((4, partner_id))
-
-        # transform attachments into attachment_ids
-        values['attachment_ids'] = []
-        for attach_fname, attach_datas in template_values.get('attachments', []):
-            data_attach = {
-                'name': attach_fname,
-                'datas': attach_datas,
-                'datas_fname': attach_fname,
-                'res_model': model,
-                'res_id': res_id,
-            }
-            values['attachment_ids'].append((0, 0, data_attach))
-
+            partner_id = self.pool.get('res.partner').find_or_create(cr, uid, mail, context=context)
+            values['partner_ids'].append(partner_id)
         return values
 
-    def render_message(self, cr, uid, wizard, model, res_id, context=None):
+    def render_message(self, cr, uid, wizard, res_id, context=None):
         """ Generate an email from the template for given (model, res_id) pair.
             This method is meant to be inherited by email_template that will
             produce a more complete dictionary, with email_to, ...
         """
-        # render the template to get the email
-        fields = ['body', 'body_html', 'subject', 'email_to', 'email_cc', 'partner_ids', 'attachment_ids']
-        template_values = self.pool.get('email.template').generate_email(cr, uid, wizard.template_id, res_id, context=context)
-        template_values = {field: template_values[field] for field in fields if template_values.get(field)}
-
-        # transform email_to, email_cc into partner_ids
-        partner_ids = []
-        mails = tools.email_split(template_values.pop('email_to', '') + ' ' + template_values.pop('email_cc', ''))
-        for mail in mails:
-            partner_search_ids = self.pool.get('res.partner').search(cr, uid, [('email', 'ilike', mail)], context=context)
-            if partner_search_ids:
-                partner_ids.append((4, partner_search_ids[0]))
-            else:
-                partner_id = self.pool.get('res.partner').name_create(cr, uid, mail, context=context)[0]
-                partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
-                partner_ids.append((4, partner_id))
-
+        # generate the composer email
+        values = self.generate_email_for_composer(cr, uid, wizard.template_id, res_id, context=context)
         # get values to return
-        email_dict = super(mail_compose_message, self).render_message(cr, uid, wizard, model, res_id, context)
-        email_dict.update(template_values, partner_ids=partner_ids)
+        email_dict = super(mail_compose_message, self).render_message(cr, uid, wizard, res_id, context)
+        email_dict.update(values)
         return email_dict
 
     def render_template(self, cr, uid, template, model, res_id, context=None):
diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index 228dcc2745a..96aaa1cfaae 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -42,10 +42,12 @@
                     <xpath expr="//button[@class='oe_mail_compose_message_attachment']" position="before">
                         <button icon="/email_template/static/src/img/email_template.png"
                             type="object" name="toggle_template" string=""
-                            help="Use a message template"/>
+                            help="Use a message template"
+                            attrs="{'invisible':[('content_subtype','!=','html')]}"/>
                         <button icon="/email_template/static/src/img/email_template_save.png"
                             type="object" name="save_as_template" string=""
-                            help="Save as a new template"/>
+                            help="Save as a new template"
+                            attrs="{'invisible':[('content_subtype','!=','html')]}"/>
                     </xpath>
                 </data>
             </field>

From 1275d524f2dd13e8a2423a172814a6f33a6a8b48 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 5 Sep 2012 18:01:45 +0200
Subject: [PATCH 864/999] [IMP] mail: fix and test parsing of plaintext
 messages

bzr revid: odo@openerp.com-20120905160145-2e11txqm5jffij6v
---
 addons/mail/mail_thread.py     |  3 +++
 addons/mail/tests/test_mail.py | 27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index ea89dd61455..c0d6ac90fe6 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -443,6 +443,9 @@ class mail_thread(osv.AbstractModel):
             encoding = message.get_content_charset()
             body = message.get_payload(decode=True)
             body = tools.ustr(body, encoding, errors='replace')
+            if message.get_content_type() == 'text/plain':
+                # text/plain -> <pre/>
+                body = tools.append_content_to_html(u'', body)
         else:
             alternative = (message.get_content_type() == 'multipart/alternative')
             for part in message.walk():
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 15416c51a28..fc829fe791b 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -62,6 +62,25 @@ Content-Transfer-Encoding: quoted-printable
 ------=_Part_4200734_24778174.1344608186754--
 """
 
+MAIL_TEMPLATE_PLAINTEXT = """Return-Path: <whatever-2a840@postmaster.twitter.com>
+To: {to}
+Received: by mail1.openerp.com (Postfix, from userid 10002)
+    id 5DF9ABFB2A; Fri, 10 Aug 2012 16:16:39 +0200 (CEST)
+From: Sylvie Lelitre <sylvie.lelitre@agrolait.com>
+Subject: {subject}
+MIME-Version: 1.0
+Content-Type: text/plain
+Date: Fri, 10 Aug 2012 14:16:26 +0000
+Message-ID: {msg_id}
+{extra}
+
+Please call me as soon as possible this afternoon!
+
+--
+Sylvie
+"""
+
+
 class test_mail(common.TransactionCase):
 
     def _mock_smtp_gateway(self, *args, **kwargs):
@@ -129,6 +148,14 @@ class test_mail(common.TransactionCase):
                           self.mail_thread.message_process,
                           cr, uid, None, mail_spam)
 
+        # plain text content should be wrapped and stored as html
+        test_msg_id = '<deadcafe.1337@smtp.agrolait.com>'
+        mail_text = MAIL_TEMPLATE_PLAINTEXT.format(to='groups@example.com', subject='frogs', extra='', msg_id=test_msg_id)
+        self.mail_thread.message_process(cr, uid, None, mail_text)
+        new_mail = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [('message_id','=',test_msg_id)])[0])
+        self.assertEqual(new_mail.body, '\n<pre>\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n</pre>\n',
+                         'plaintext mail incorrectly parsed')
+
     def test_10_many2many_reference_field(self):
         """ Tests designed for the many2many_reference field (follower_ids).
             We will test to perform writes using the many2many commands 0, 3, 4,

From 3754ded70730b7a1193f6f90b4fccc285a6a4ede Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 5 Sep 2012 22:55:39 +0200
Subject: [PATCH 865/999] [IMP] pad demo daa

bzr revid: fp@openerp.com-20120905205539-sokhzgjpu0wi2pyo
---
 addons/pad/__openerp__.py         | 1 +
 addons/pad/pad_demo.xml           | 9 +++++++++
 addons/pad/res_company.xml        | 3 ++-
 addons/pad/static/src/xml/pad.xml | 3 +--
 4 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 addons/pad/pad_demo.xml

diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index 620d677a5bf..50b280d2c32 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -14,6 +14,7 @@ pads (by default, http://ietherpad.com/).
     'website': 'http://openerp.com',
     'depends': ['base'],
     'data': ['res_company.xml'],
+    'demo': ['pad_demo.xml'],
     'installable': True,
     'auto_install': False,
     'web': True,
diff --git a/addons/pad/pad_demo.xml b/addons/pad/pad_demo.xml
new file mode 100644
index 00000000000..407f90e8242
--- /dev/null
+++ b/addons/pad/pad_demo.xml
@@ -0,0 +1,9 @@
+<openerp>
+  <data noupdate="1">
+
+    <record id="base.main_company" model="res.company">
+      <field name="pad_server">pad.openerp.com</field>
+    </record>
+
+  </data>
+</openerp>
diff --git a/addons/pad/res_company.xml b/addons/pad/res_company.xml
index 5a9164db2f4..1e2184c61a3 100644
--- a/addons/pad/res_company.xml
+++ b/addons/pad/res_company.xml
@@ -7,11 +7,12 @@
       <field name="arch" type="xml">
         <xpath expr="//group[@name='account_grp']" position="after">
             <group string="Pads">
-                <field name="pad_server" placeholder="e.g. beta.primarypad.org"/>
+                <field name="pad_server" placeholder="e.g. beta.primarypad.com"/>
                 <field name="pad_key"/>
             </group>
         </xpath>
       </field>
     </record>
+
   </data>
 </openerp>
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index e84414dd4e8..ce79df52684 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -11,7 +11,6 @@
     </div>
 </t>
 <t t-name="FieldPad.unconfigured">
-    Please configure your etherpad server.<br/>
-    OpenERP Entreprise customers may safely use pad.openerp.com<br/>
+    You must configure the etherpad through the menu Setting > Companies > Companies, in the configuration tab of your company.<br/>
 </t>
 </templates>

From 874171a8a14e5033b28b86625064eab6b30d10c0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 5 Sep 2012 23:01:18 +0200
Subject: [PATCH 866/999] [IMP] correct logo of company for base.main_company

bzr revid: fp@openerp.com-20120905210118-fs3cs8ioai164idb
---
 openerp/addons/base/base_data.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 8e99fe9bc47..6f4af968ec0 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1054,9 +1054,8 @@
             <field name="code">zw</field>
         </record>
 
-        <record id="main_partner" model="res.partner">
+        <record id="main_partner" model="res.partner" context="{'default_is_company': True}">
             <field name="name">Your Company</field>
-            <!-- Address and Company ID will be set later -->
             <field name="company_id" eval="None"/>
             <field name="customer" eval="False"/>
             <field name="is_company" eval="True"/>

From ba6ab6f65165fdf6c35e46b925333d0e0d4d172d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 5 Sep 2012 23:19:20 +0200
Subject: [PATCH 867/999] [IMP] loading msgs

bzr revid: fp@openerp.com-20120905211920-0910fm4com68lnve
---
 addons/web/static/src/js/coresetup.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 0c10d40f0ca..ab3e355e818 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -593,11 +593,11 @@ if ($.blockUI) {
 var messages_by_seconds = function() {
     return [
         [0, _t("Loading...")],
-        [30, _t("Still loading...")],
+        [20, _t("Still loading...")],
         [60, _t("Still loading...<br />Please be patient.")],
         [120, _t("Don't leave yet,<br />it's still loading...")],
         [300, _t("You may not believe it,<br />but the application is actually loading...")],
-        [600, _t("You know, sometimes,<br />OpenERP can be a little bit slow,<br />because it's loading...")],
+        [600, _t("Take a minute to get a coffee,<br />because it's loading...")],
         [3600, _t("Maybe you should consider pressing F5...")],
     ];
 };

From 220766fcc45e4c6b21adc5ffb9c7b5151443b7d2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 5 Sep 2012 23:30:08 +0200
Subject: [PATCH 868/999] [IMP] sale order line invisible type

bzr revid: fp@openerp.com-20120905213008-r40ejmxmgxtmsvxq
---
 addons/sale/sale_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a2f44034db3..95af6803391 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -269,18 +269,18 @@
                                         groups="base.group_user" 
                                         on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, True, parent.date_order, False, parent.fiscal_position, False, context)"/>
                                     <field name="name"/>
-                                    <field name="type"/>
+                                    <field name="type" invisible="1"/>
                                     <field name="product_uom_qty"
                                         context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                         on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, False, parent.fiscal_position, True, context)"/>
                                     <field name="product_uom"
                                         on_change="product_uom_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, context)"
                                         groups="product.group_uom" options='{"no_open": true}'/>
-                                    <field name="product_uos_qty" groups="product.group_uos"/>
-                                    <field name="product_uos" string="UoS" groups="product.group_uos"/>
-                                    <field name="discount" groups="sale.group_discount_per_so_line"/>
-                                    <field name="price_unit"/>
+                                    <field name="product_uos_qty" groups="product.group_uos" invisible="1"/>
+                                    <field name="product_uos" string="UoS" groups="product.group_uos" invisible="1"/>
                                     <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                                    <field name="price_unit"/>
+                                    <field name="discount" groups="sale.group_discount_per_so_line"/>
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>

From efa0f9b26367289a67ad1fc3524bcf74dfd6f925 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 6 Sep 2012 00:57:46 +0200
Subject: [PATCH 869/999] [IMP] html_sanitize: attempt to make slightly more
 pythonic/readable + re-enable test. Proper review + test still needed.

bzr revid: odo@openerp.com-20120905225746-npjjzy1w00k05vtc
---
 openerp/tests/__init__.py      |   1 +
 openerp/tools/html_sanitize.py | 111 ++++++++++++++++++++-------------
 2 files changed, 69 insertions(+), 43 deletions(-)

diff --git a/openerp/tests/__init__.py b/openerp/tests/__init__.py
index 908df676fc0..aa3055f471c 100644
--- a/openerp/tests/__init__.py
+++ b/openerp/tests/__init__.py
@@ -17,6 +17,7 @@ fast_suite = [
 
 checks = [
     test_expression,
+    test_html_sanitize,
     test_orm,
     test_view_validation,
     test_misc,
diff --git a/openerp/tools/html_sanitize.py b/openerp/tools/html_sanitize.py
index 65f17be074f..6ea7b90e2ba 100644
--- a/openerp/tools/html_sanitize.py
+++ b/openerp/tools/html_sanitize.py
@@ -1,67 +1,92 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2012 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
+#    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 lxml.html
+import operator
 import re
 
-def html_sanitize(x):
-    if not x:
-        return x
-    if type(x) == str:
-        x = unicode(x, "utf8", "replace")
-    root = lxml.html.fromstring("<div>%s</div>" % x)
-    result = handle_element(root)
-    res = ""
-    for el in children(result[0]):
-        if type(el) == str or type(el) == unicode:
-            res += el
-        else:
-            el.tail = ""
-            res += lxml.html.tostring(el)
-    return res
+from openerp.loglevels import ustr
 
+def html_sanitize(src):
+    if not src:
+        return src
+    src = ustr(src, errors='replace')
+    root = lxml.html.fromstring(u"<div>%s</div>" % src)
+    result = handle_element(root)
+    res = []
+    for element in children(result[0]):
+        if isinstance(element, basestring):
+            res.append(element)
+        else:
+            element.tail = ""
+            res.append(lxml.html.tostring(element))
+    return ''.join(res)
+
+# FIXME: shouldn't this be a whitelist rather than a blacklist?!
 to_remove = set(["script", "head", "meta", "title", "link", "img"])
 to_unwrap = set(["html", "body"])
 
-javascript_regex = re.compile("""^\s*javascript\s*\:.*$""")
+javascript_regex = re.compile(r"^\s*javascript\s*:.*$", re.IGNORECASE)
+
 def handle_a(el, new):
     href = el.get("href", "#")
     if javascript_regex.search(href):
         href = "#"
     new.set("href", href)
+
 special = {
     "a": handle_a,
 }
 
-def handle_element(el):
-    if type(el) == str or type(el) == unicode:
-        return [el]
-    if el.tag in to_remove:
+def handle_element(element):
+    if isinstance(element, basestring):
+        return [element]
+    if element.tag in to_remove:
         return []
-    if el.tag in to_unwrap:
-        return reduce(lambda x,y: x+y, [handle_element(x) for x in children(el)])
-    new = lxml.html.fromstring("<%s />" % el.tag)
-    for i in children(el):
-        append_to(handle_element(i), new)
-    if el.tag in special:
-        special[el.tag](el, new)
-    return [new]
-    
-def children(el):
+    if element.tag in to_unwrap:
+        return reduce(operator.add, [handle_element(x) for x in children(element)])
+    result = lxml.html.fromstring("<%s />" % element.tag)
+    for c in children(element):
+        append_to(handle_element(c), result)
+    if element.tag in special:
+        special[element.tag](element, result)
+    return [result]
+
+def children(node):
     res = []
-    if el.text is not None:
-        res.append(el.text)
-    for i in el.getchildren():
-        res.append(i)
-        if i.tail is not None:
-            res.append(i.tail)
+    if node.text is not None:
+        res.append(node.text)
+    for child_node in node.getchildren():
+        res.append(child_node)
+        if child_node.tail is not None:
+            res.append(child_node.tail)
     return res
 
-def append_to(new_ones, el):
-    for i in new_ones:
-        if type(i) == str or type(i) == unicode:
-            children = el.getchildren()
+def append_to(elements, dest_node):
+    for element in elements:
+        if isinstance(element, basestring):
+            children = dest_node.getchildren()
             if len(children) == 0:
-                el.text = i
+                dest_node.text = element
             else:
-                children[-1].tail = i
+                children[-1].tail = element
         else:
-            el.append(i)
+            dest_node.append(element)

From 1eedac6928852e1b2ad44d5a109c6759111fa1b0 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 6 Sep 2012 01:07:43 +0200
Subject: [PATCH 870/999] [FIX] mail: fix tests now that html sanitization is
 enabled on fields.html

bzr revid: odo@openerp.com-20120905230743-3lnadi2jf2azx2rr
---
 addons/mail/tests/test_mail.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index fc829fe791b..f45745f31dc 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.tests import common
+from openerp.tools.html_sanitize import html_sanitize
 
 MAIL_TEMPLATE = """Return-Path: <whatever-2a840@postmaster.twitter.com>
 To: {to}
@@ -268,8 +269,8 @@ class test_mail(common.TransactionCase):
         _mail_body1 = 'Pigs rules\n<pre>Admin</pre>\n'
         _mail_bodyalt1 = 'Pigs rules\nAdmin'
         _body2 = '<html>Pigs rules</html>'
-        _mail_body2 = '<html>Pigs rules\n<pre>Admin</pre>\n</html>'
-        _mail_bodyalt2 = 'Pigs rules\nAdmin\n'
+        _mail_body2 = html_sanitize('<html>Pigs rules\n<pre>Admin</pre>\n</html>')
+        _mail_bodyalt2 = 'Pigs rules\nAdmin'
         _attachments = [('First', 'My first attachment'), ('Second', 'My second attachment')]
 
         # CASE1: post comment, body and subject specified
@@ -306,7 +307,7 @@ class test_mail(common.TransactionCase):
 
         # Test: mail_message: subject is False, body is _body2 (no formatting done), parent_id is msg_id
         self.assertEqual(message.subject, False, 'mail.message subject incorrect')
-        self.assertEqual(message.body, _body2, 'mail.message body incorrect')
+        self.assertEqual(message.body, html_sanitize(_body2), 'mail.message body incorrect')
         self.assertEqual(message.parent_id.id, msg_id, 'mail.message parent_id incorrect')
         # Test: sent_email: email send by server: correct subject, body, body_alternative
         self.assertEqual(sent_email['subject'], _mail_subject, 'sent_email subject incorrect')

From a4f30bf11fbfed0978f09eba8c5b29a44f20c14f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 6 Sep 2012 01:12:32 +0200
Subject: [PATCH 871/999] [IMP] fields: review/simplify patch for callable
 domains on fields.one2many

bzr revid: odo@openerp.com-20120905231232-u6dx3ak9b0y95zvl
---
 openerp/osv/fields.py | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index d4b519764a8..037d2a90986 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -515,10 +515,8 @@ class one2many(_column):
         for id in ids:
             res[id] = []
 
-        dom = self._domain
-        if isinstance(self._domain, type(lambda: None)):
-            dom = self._domain(obj)
-        ids2 = obj.pool.get(self._obj).search(cr, user, dom + [(self._fields_id, 'in', ids)], limit=self._limit, context=context)
+        domain = self._domain(obj) if callable(self._domain) else self._domain
+        ids2 = obj.pool.get(self._obj).search(cr, user, domain + [(self._fields_id, 'in', ids)], limit=self._limit, context=context)
         for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
             if r[self._fields_id] in res:
                 res[r[self._fields_id]].append(r['id'])
@@ -560,10 +558,8 @@ class one2many(_column):
                 reverse_rel = obj._all_columns.get(self._fields_id)
                 assert reverse_rel, 'Trying to unlink the content of a o2m but the pointed model does not have a m2o'
                 # if the o2m has a static domain we must respect it when unlinking
-                dom = self._domain
-                if isinstance(self._domain, type(lambda: None)):
-                    dom = self._domain(obj)
-                extra_domain = dom or []
+                domain = self._domain(obj) if callable(self._domain) else self._domain
+                extra_domain = domain or []
                 ids_to_unlink = obj.search(cr, user, [(self._fields_id,'=',id)] + extra_domain, context=context)
                 # If the model has cascade deletion, we delete the rows because it is the intended behavior,
                 # otherwise we only nullify the reverse foreign key column.
@@ -581,10 +577,8 @@ class one2many(_column):
         return result
 
     def search(self, cr, obj, args, name, value, offset=0, limit=None, uid=None, operator='like', context=None):
-        dom = self._domain
-        if isinstance(self._domain, type(lambda: None)):
-            dom = self._domain(obj)
-        return obj.pool.get(self._obj).name_search(cr, uid, value, dom, operator, context=context,limit=limit)
+        domain = self._domain(obj) if callable(self._domain) else self._domain
+        return obj.pool.get(self._obj).name_search(cr, uid, value, domain, operator, context=context,limit=limit)
 
     
     @classmethod
@@ -1549,14 +1543,12 @@ def field_to_dict(model, cr, user, field, context=None):
     """
 
     res = {'type': field._type}
-    # This additional attributes for M2M and function field is added
-    # because we need to display tooltip with this additional information
-    # when client is started in debug mode.
+    # some attributes for m2m/function field are added as debug info only
     if isinstance(field, function):
         res['function'] = field._fnct and field._fnct.func_name or False
-    #    res['store'] = field.store
-    #    if isinstance(field.store, dict):
-    #        res['store'] = str(field.store)
+        res['store'] = field.store
+        if isinstance(field.store, dict):
+            res['store'] = str(field.store)
         res['fnct_search'] = field._fnct_search and field._fnct_search.func_name or False
         res['fnct_inv'] = field._fnct_inv and field._fnct_inv.func_name or False
         res['fnct_inv_arg'] = field._fnct_inv_arg or False
@@ -1586,10 +1578,7 @@ def field_to_dict(model, cr, user, field, context=None):
             res['selection'] = field.selection(model, cr, user, context)
     if res['type'] in ('one2many', 'many2many', 'many2one'):
         res['relation'] = field._obj
-        dom = field._domain
-        if isinstance(field._domain, type(lambda: None)):
-            dom = field._domain(model)
-        res['domain'] = dom
+        res['domain'] = field._domain(model) if callable(field._domain) else field._domain
         res['context'] = field._context
 
     if isinstance(field, one2many):

From 20c8d13822cebafd9e9a09a0cb6b1e594a7e44fe Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 6 Sep 2012 01:49:19 +0200
Subject: [PATCH 872/999] [FIX] mail.message: default order by `id` should work
 on expandable node as well - but this still looks ugly

bzr revid: odo@openerp.com-20120905234919-ty9eojpgyib3ohwd
---
 addons/mail/mail_message.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 98f419b3f08..e4862ca9fb9 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -241,7 +241,8 @@ class mail_message(osv.Model):
                     'type': 'expandable',
                     'domain': [('id', '<=', msg.id)] + domain,
                     'context': context,
-                    'thread_level': thread_level  # should be improve accodting to level of records
+                    'thread_level': thread_level,  # should be improve accodting to level of records
+                    'id': -1,
                 })
                 break
 

From 8ce3484f3e71fd3bde6657e6944613856c4f8831 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 6 Sep 2012 12:19:12 +0530
Subject: [PATCH 873/999] [FIX] res_users: tips on groups

bzr revid: hmo@tinyerp.com-20120906064912-pp1xgtjswbykh2gh
---
 openerp/addons/base/res/res_users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 19e954bf7b0..246b05cbd1f 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -818,7 +818,7 @@ class users_view(osv.osv):
         for app, kind, gs in self.pool.get('res.groups').get_groups_by_application(cr, uid, context):
             if kind == 'selection':
                 # selection group field
-                tips = ['%s' % (g.comment or '') for g in gs]
+                tips = ['%s: %s' % (g.name, g.comment) for g in gs if g.comment]
                 res[name_selection_groups(map(int, gs))] = {
                     'type': 'selection',
                     'string': app and app.name or _('Other'),

From 01ceabea6f42068c0049161c1de4b01d8f8223fd Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 6 Sep 2012 12:19:36 +0530
Subject: [PATCH 874/999] [FIX] sale,hr: tips on user groups

bzr revid: hmo@tinyerp.com-20120906064936-qrckr0avzpjpm4m4
---
 addons/hr/security/hr_security.xml     | 6 +++---
 addons/sale/security/sale_security.xml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index b7848827f18..d46a0f0ba19 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -3,18 +3,18 @@
     <data noupdate="1">
 
     <record model="res.groups" id="base.group_user">
-        <field name="comment">Employee: the user will be able to manage his own human resources stuff (leave request, timesheets, ...), if he is linked to an employee in the system.</field>
+        <field name="comment">the user will be able to manage his own human resources stuff (leave request, timesheets, ...), if he is linked to an employee in the system.</field>
     </record>
 
     <record id="base.group_hr_user" model="res.groups">
         <field name="name">Officer</field>
         <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
-        <field name="comment">Officer: the user will be able to approve document created by employees</field>
+        <field name="comment">the user will be able to approve document created by employees.</field>
     </record>
     <record id="base.group_hr_manager" model="res.groups">
         <field name="name">Manager</field>
-        <field name="comment">Manager: the user will have an access to the human resources configuration as well as statistic reports</field>
+        <field name="comment">the user will have an access to the human resources configuration as well as statistic reports.</field>
         <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 8b633583902..742b84304e2 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -5,19 +5,19 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">User - Own Leads Only</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
-        <field name="comment">User - Own Leads Only: the user will have access to his own data in the sales application.</field>
+        <field name="comment">the user will have access to his own data in the sales application.</field>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
         <field name="name">User - All Leads</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
-        <field name="comment">User - All Leads: the user will have access to all records of everyone in the sales application.</field>
+        <field name="comment">the user will have access to all records of everyone in the sales application.</field>
     </record>
 
     <record id="base.group_sale_manager" model="res.groups">
         <field name="name">Manager</field>
-        <field name="comment">Manager: the user will have an access to the sales configuration as well as statistic reports.</field>
+        <field name="comment">the user will have an access to the sales configuration as well as statistic reports.</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>

From 194a692019f191b279484c3c729e15e591cf7f34 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 6 Sep 2012 12:48:27 +0530
Subject: [PATCH 875/999] [FIX] sale: change name of user group

bzr revid: hmo@tinyerp.com-20120906071827-osb57ivq7xqviy7q
---
 addons/sale/security/sale_security.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 742b84304e2..5e1f4e25b52 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -3,13 +3,13 @@
 <data noupdate="0">
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">User - Own Leads Only</field>
+        <field name="name">See Own Leads</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="comment">the user will have access to his own data in the sales application.</field>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
-        <field name="name">User - All Leads</field>
+        <field name="name">See all Leads</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
         <field name="comment">the user will have access to all records of everyone in the sales application.</field>

From 29dba2a64f258f781f482d47b6e379c547cc66ea Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Sep 2012 10:03:31 +0200
Subject: [PATCH 876/999] [IMP] no temporal stuff or trends in demo data

bzr revid: fp@tinyerp.com-20120906080331-sex2idb5r8ba7dvt
---
 addons/note/note_demo.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/note/note_demo.xml b/addons/note/note_demo.xml
index e322f362ef5..e6ab25198a6 100644
--- a/addons/note/note_demo.xml
+++ b/addons/note/note_demo.xml
@@ -58,7 +58,7 @@
 
     <record id="note_4" model="note.note">
       <field name="note"><![CDATA[Read some documentation about OpenERP before diving into the code
-      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
@@ -93,7 +93,7 @@
 
     <record id="note_6" model="note.note">
       <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
@@ -104,7 +104,7 @@
 
     <record id="note_7" model="note.note">
       <field name="note"><![CDATA[Read some documentation about OpenERP before diving into the code
-      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
@@ -115,7 +115,7 @@
 
     <record id="note_8" model="note.note">
       <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
@@ -127,7 +127,7 @@
 
     <record id="note_9" model="note.note">
       <field name="note"><![CDATA[Read some documentation about OpenERP before diving into the code
-      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>
@@ -139,7 +139,7 @@
 
     <record id="note_10" model="note.note">
       <field name="note"><![CDATA[Read those books
-      * Open ERP Version 6: a modern approach to integrated business management
+      * Open ERP: a modern approach to integrated business management
       * Open ERP for Retail and Industrial Management
       ]]>
       </field>

From 8fc8fb3feefff26d8ab9285e062253ef6dc64680 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 6 Sep 2012 10:38:48 +0200
Subject: [PATCH 877/999] [FIX] res_company: fix RML header main

bzr revid: rco@openerp.com-20120906083848-b5rsoztviclksgd0
---
 openerp/addons/base/res/res_company.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 4118516f331..dcd6d378dc2 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -359,7 +359,7 @@ class res_company(osv.osv):
             <lines>1.2cm 2.65cm 19.9cm 2.65cm</lines>
             <drawCentredString x="10.5cm" y="2.3cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=0) ]]</drawCentredString>
             <drawCentredString x="10.5cm" y="1.8cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=1) ]]</drawCentredString>
-            <drawCentredString x="10.5cm" y="1.3cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=2) ]]
+            <drawCentredString x="10.5cm" y="1.3cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=2) ]]</drawCentredString>
             <drawCentredString x="10.5cm" y="0.8cm">Contact : [[ user.name ]] - Page: <pageNumber/></drawCentredString>
         </pageGraphics>
     </pageTemplate>

From c58b567d941196e70d395795af2d77a17708dec0 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 6 Sep 2012 12:15:47 +0200
Subject: [PATCH 878/999] [ADD] Added trigger_children and trigger_ancestors in
 corelib EventDispatcherMixin

bzr revid: fme@openerp.com-20120906101547-2fa0r9d0lqhzzemi
---
 addons/web/static/src/js/corelib.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index c74c2d5dc03..7ef00b420e3 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -359,6 +359,26 @@ instance.web.EventDispatcherMixin = _.extend({}, instance.web.ParentedMixin, {
         this.__edispatcherEvents.trigger.apply(this.__edispatcherEvents, arguments);
         return this;
     },
+    trigger_children: function(events) {
+        var children = this.getChildren();
+        for (var i = 0; i < children.length; i++) {
+            var child = children[i];
+            if (child.__eventDispatcherMixin) {
+                child.__edispatcherEvents.trigger.apply(child.__edispatcherEvents, arguments);
+                child.trigger_children.apply(child, arguments);
+            }
+        }
+        return this;
+    },
+    trigger_ancestors: function(events) {
+        var parent = this;
+        while (parent = parent.getParent()) {
+            parent.__edispatcherEvents.trigger.apply(parent.__edispatcherEvents, arguments);
+            parent.trigger_ancestors.apply(parent, arguments);
+
+        }
+        return this;
+    },
     destroy: function() {
         var self = this;
         _.each(this.__edispatcherRegisteredEvents, function(event) {

From aac17b11a4508686eb50f99db1090d5440578720 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 6 Sep 2012 12:17:23 +0200
Subject: [PATCH 879/999] [FIX] remove semantic part1

bzr revid: al@openerp.com-20120906101723-eeieyzhj4racxq14
---
 addons/edi/static/src/xml/edi_account.xml        | 2 +-
 addons/edi/static/src/xml/edi_sale_purchase.xml  | 2 +-
 addons/plugin_outlook/plugin_outlook.xml         | 2 +-
 addons/plugin_thunderbird/plugin_thunderbird.xml | 2 +-
 addons/point_of_sale/static/src/css/pos.css      | 6 ++++++
 addons/point_of_sale/static/src/xml/pos.xml      | 2 +-
 addons/portal_crm/wizard/contact_view.xml        | 4 ++--
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/edi/static/src/xml/edi_account.xml b/addons/edi/static/src/xml/edi_account.xml
index dc6ce3f8a1a..3ce1daebf93 100644
--- a/addons/edi/static/src/xml/edi_account.xml
+++ b/addons/edi/static/src/xml/edi_account.xml
@@ -151,7 +151,7 @@
                      reference <strong><t t-esc="doc.internal_number"/></strong> on the transfer:
                      <br/><br/>
                 </p>
-                <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested oe_semantic_html_override">
+                <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
                 <t t-foreach="doc.company_address.bank_ids" t-as="bank_info">
                     <li><t t-esc="bank_info[1]"/></li>
                 </t>
diff --git a/addons/edi/static/src/xml/edi_sale_purchase.xml b/addons/edi/static/src/xml/edi_sale_purchase.xml
index 3b6497e4076..8d6bab67761 100644
--- a/addons/edi/static/src/xml/edi_sale_purchase.xml
+++ b/addons/edi/static/src/xml/edi_sale_purchase.xml
@@ -151,7 +151,7 @@
                      reference <strong><t t-esc="doc.name"/></strong> on the transfer:
                      <br/><br/>
                 </p>
-                <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested oe_semantic_html_override">
+                <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
                 <t t-foreach="doc.company_address.bank_ids" t-as="bank_info">
                     <li><t t-esc="bank_info[1]"/></li>
                 </t>
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index c2c035f532d..e99fbf72b6d 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -19,7 +19,7 @@
                         <separator string="Installation and Configuration Steps"/>
                         <p>Click on the link above to download the installer for either 32 or 64 bits, and execute it.</p>
                         <p>System requirements:</p>
-                        <ul class="oe_semantic_html_override">
+                        <ul>
                             <li>1. MS Outlook 2005 or above.</li>
                             <li>2. MS .Net Framework 3.5 or above.</li>
                         </ul>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 0f38dce117f..5ea5fc38219 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -20,7 +20,7 @@
                         </group>
                         <separator string="Installation and Configuration Steps"/>
                         <p>Thunderbird plugin installation:</p>
-                        <ul class="oe_semantic_html_override">
+                        <ul>
                             <li>1. Save the Thunderbird plug-in.</li>
                             <li>2. From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li>
                             <li>3. Select the plug-in (the file named openerp_plugin.xpi).</li>
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index bfe2ef7f9dc..9ac7d4405d0 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -20,6 +20,12 @@
             user-select: none;
 }
 
+.point-of-sale ul, .point-of-sale li  {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+}
+
 .point-of-sale .shadow-top{
     position: absolute;
     top:0;
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index ab5f99a149e..bbe278758d5 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -4,7 +4,7 @@
 <templates id="template" xml:space="preserve">
 
     <t t-name="PosWidget">
-        <div class="point-of-sale oe_semantic_html_override">
+        <div class="point-of-sale">
             <div id="topheader">
                 <div id="branding">
                     <img src="/point_of_sale/static/src/img/logo.png" />
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 97c88651913..1776632d7ab 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -40,14 +40,14 @@
                                             <templates>
                                                 <t t-name="kanban-box">
                                                     <h4><field name="name"/></h4>
-                                                    <ul class="oe_portal_crm_address oe_semantic_html_override">
+                                                    <ul class="oe_portal_crm_address">
                                                         <li t-if="record.street"><field name="street"/></li>
                                                         <li t-if="record.street2"><field name="street2"/></li>
                                                         <li t-if="record.zip"><field name="zip"/></li>
                                                         <li t-if="record.city"><field name="city"/></li>
                                                         <li t-if="record.country_id"><field name="country_id"/></li>
                                                     </ul>
-                                                    <ul class="oe_portal_crm_contact_info oe_semantic_html_override">
+                                                    <ul class="oe_portal_crm_contact_info">
                                                         <li t-if="record.phone"><field name="phone"/></li>
                                                         <li t-if="record.email.raw_value">
                                                             <a title="Mail" t-att-href="'mailto:'+record.email.value">

From 6207ab27bf26976d1bcb4c8918953c3cf6586a97 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 6 Sep 2012 12:18:52 +0200
Subject: [PATCH 880/999] removed lot of stupid stuff

bzr revid: nicolas.vanhoren@openerp.com-20120906101852-xf3pkjjdnl4x7xnn
---
 .../hr_attendance/static/src/js/attendance.js | 48 ++-----------------
 .../static/src/xml/attendance.xml             |  4 +-
 2 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 58d49540857..197f85f6d92 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -2,8 +2,6 @@ openerp.hr_attendance = function(instance) {
     var QWeb = instance.web.qweb;
     _t = instance.web._t;
     
-    instance.web.currentform = false;
-    instance.web.currentlist = false;
     instance.web.attendanceslider = false;
     
     instance.hr_attendance.AttendanceSlider = instance.web.Widget.extend({
@@ -16,9 +14,7 @@ openerp.hr_attendance = function(instance) {
             this.session = parent.session;
             this.parent_element = parent.$el ;            
         },
-        renderElement: function(){
-            this.$el = $(QWeb.render(this.template,this.titles));            
-            this.parent_element.prepend(this.$el);
+        start: function() {
             this.$oe_attendance_slider = this.$el.find(".oe_attendance_slider");
             this.$oe_attendance_slider.click(this.do_update_attendance);
         },
@@ -33,20 +29,6 @@ openerp.hr_attendance = function(instance) {
                 else
                     self.employee.state = 'present';
                 self.do_slide(self.employee.state);
-                if(instance.web.currentlist){
-                    instance.web.currentlist.reload();
-                }
-                if(instance.web.currentform){
-                    //tofix: it should be in hr_timesheet_sheet module
-                    if (instance.web.currentform.model == 'hr_timesheet_sheet.sheet'){
-                        model = new instance.web.DataSet(self, instance.web.currentform.model);
-                        model.call('date_today', [instance.web.currentform.dataset.ids]).done(function(result){instance.web.currentform.reload();});
-                    }
-                    else{
-                        instance.web.currentform.reload();
-                    }
-                    
-                }
             });
         },
         do_slide:function(attendance_state)
@@ -73,38 +55,14 @@ openerp.hr_attendance = function(instance) {
         },
     });
     
-    instance.web.ListView.include({
-        init:function(parent, dataset, view_id, options)
-        {
-            this._super(parent, dataset, view_id, options);
-            if (this.model == 'hr.employee' || this.model == 'hr.attendance' || this.model == 'hr_timesheet_sheet.sheet')
-                instance.web.currentlist = this;
-        }
-    });
-    
-    
-    instance.web.FormView.include({
-        init: function(parent, dataset, view_id, options) {
-            this._super(parent, dataset, view_id, options);
-            if (this.model == 'hr.employee' || this.model == 'hr.attendance' || this.model == 'hr_timesheet_sheet.sheet')
-                instance.web.currentform = this;
-        },
-        reload: function(){
-            var re = this._super();
-            if (!instance.web.attendanceslider) return re;
-            if (this.model == 'hr.employee' || this.model == 'hr.attendance' || this.model == 'hr_timesheet_sheet.sheet')
-                instance.web.attendanceslider.check_attendance();            
-            return re;            
-        },                
-    }),
-    
     instance.web.UserMenu.include({
         do_update: function () {
             this._super();
             var self = this;
             var fct = function() {                
                 instance.web.attendanceslider = new instance.hr_attendance.AttendanceSlider(self);
-                instance.web.attendanceslider.renderElement();
+                
+                instance.web.attendanceslider.prependTo(self.$el);
                 return instance.web.attendanceslider.check_attendance();                
             };
             this.update_promise = this.update_promise.pipe(fct, fct);
diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml
index 5670545e26c..aadfe0155e0 100644
--- a/addons/hr_attendance/static/src/xml/attendance.xml
+++ b/addons/hr_attendance/static/src/xml/attendance.xml
@@ -3,8 +3,8 @@
     <t t-name="AttendanceSlider">
          <li>
                <div class="oe_attendance_status">
-                    <div class="oe_attendance_present"><t t-esc="present"/></div>
-                    <div class="oe_attendance_absent"><t t-esc="absent"/></div>
+                    <div class="oe_attendance_present"><t t-esc="widget.titles.present"/></div>
+                    <div class="oe_attendance_absent"><t t-esc="widget.titles.absent"/></div>
                     <div class="oe_attendance_slider"><span  class="oe_attendance_text">slider</span></div>
                </div>
          </li>

From c43e9bce279e3de67c145321c932bfada8c12ef3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 6 Sep 2012 12:25:26 +0200
Subject: [PATCH 881/999] [IMP] Refactored has_uncommitted_changes in order to
 use trigger_children

bzr revid: fme@openerp.com-20120906102526-vthdib9qfeijywo8
---
 addons/web/static/src/js/chrome.js    | 31 ++++++++++++++++++---------
 addons/web/static/src/js/view_form.js |  2 +-
 addons/web/static/src/js/views.js     | 14 ++----------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 398e08f6887..62c73f7d419 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -871,10 +871,12 @@ instance.web.UserMenu =  instance.web.Widget.extend({
     },
     on_menu_settings: function() {
         var self = this;
-        self.rpc("/web/action/load", { action_id: "base.action_res_users_my" }, function(result) {
-            result.result.res_id = instance.session.uid;
-            self.getParent().action_manager.do_action(result.result);
-        });
+        if (!this.getParent().has_uncommitted_changes()) {
+            self.rpc("/web/action/load", { action_id: "base.action_res_users_my" }, function(result) {
+                result.result.res_id = instance.session.uid;
+                self.getParent().action_manager.do_action(result.result);
+            });
+        }
     },
     on_menu_about: function() {
         var self = this;
@@ -952,7 +954,10 @@ instance.web.Client = instance.web.Widget.extend({
     },
     toggle_bars: function(value) {
         this.$('tr:has(td.oe_topbar),.oe_leftbar').toggle(value);
-    }
+    },
+    has_uncommitted_changes: function() {
+        return false;
+    },
 });
 
 instance.web.WebClient = instance.web.Client.extend({
@@ -1051,10 +1056,7 @@ instance.web.WebClient = instance.web.Client.extend({
         n.warn.apply(n, arguments);
     },
     on_logout: function() {
-        var self = this;
-        var $e = $.Event("about_to_destroy");
-        this.action_manager.inner_widget.trigger("about_to_destroy", $e);
-        if (!$e.isDefaultPrevented()) {
+        if (!this.has_uncommitted_changes()) {
             this.session.session_logout().then(function () {
                 $(window).unbind('hashchange', self.on_hashchange);
                 self.do_push_state({});
@@ -1131,7 +1133,16 @@ instance.web.WebClient = instance.web.Client.extend({
             $(".oe_webclient", this.$el).removeClass("oe_content_full_screen");
             $("body").css({'overflow-y':'scroll'});
         }
-    }
+    },
+    has_uncommitted_changes: function() {
+        var $e = $.Event('clear_uncommitted_changes');
+        this.trigger_children('clear_uncommitted_changes', $e);
+        if ($e.isDefaultPrevented()) {
+            return true;
+        } else {
+            return this._super.apply(this, arguments);
+        }
+    },
 });
 
 instance.web.EmbeddedClient = instance.web.Client.extend({
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e6bbb664eaf..95d367ba75f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -92,7 +92,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             self.on("change:actual_mode", self, self.init_pager);
             self.init_pager();
         });
-        this.on('about_to_destroy', this, function(e) {
+        this.on('clear_uncommitted_changes', this, function(e) {
             if (!this.can_be_discarded()) {
                 e.preventDefault();
             }
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 0d8430d53ee..bbf835aa9db 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -125,9 +125,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
                 return item.widget === it.widget;
             });
             if (!dups.length) {
-                var $e = $.Event("about_to_destroy");
-                item.widget.trigger("about_to_destroy", $e);
-                if ($e.isDefaultPrevented()) {
+                if (this.getParent().has_uncommitted_changes()) {
                     this.inner_widget = item.widget;
                     this.breadcrumbs.splice(index, 0, item);
                     return false;
@@ -260,9 +258,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
     ir_actions_common: function(action, on_close, clear_breadcrumbs) {
         var self = this, klass, widget, post_process;
         if (this.inner_widget && (action.type === 'ir.actions.client' || action.target !== 'new')) {
-            var $e = $.Event("about_to_destroy");
-            this.inner_widget.trigger("about_to_destroy", $e);
-            if ($e.isDefaultPrevented()) {
+            if (this.getParent().has_uncommitted_changes()) {
                 return $.Deferred().reject();
             } else if (clear_breadcrumbs) {
                 this.clear_breadcrumbs();
@@ -497,12 +493,6 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         }
         var controller = new viewclass(this, this.dataset, view.view_id, options);
 
-        if (view_type === 'form') {
-            this.on('about_to_destroy', this, function(e) {
-                controller.trigger('about_to_destroy', e);
-            });
-        }
-
         controller.on('history_back', this, function() {
             var am = self.getParent();
             if (am && am.trigger) {

From 3152c3e7eb6b5c8290669b59aa71aeb1b8fa9d48 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 6 Sep 2012 12:27:21 +0200
Subject: [PATCH 882/999] beautify javascript

bzr revid: nicolas.vanhoren@openerp.com-20120906102721-wgjpkq7ryu2kvgfy
---
 .../hr_attendance/static/src/js/attendance.js | 73 +++++++++++--------
 1 file changed, 41 insertions(+), 32 deletions(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 197f85f6d92..42611e6e87f 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -1,69 +1,78 @@
-openerp.hr_attendance = function(instance) {
+
+openerp.hr_attendance = function (instance) {
+    
     var QWeb = instance.web.qweb;
     _t = instance.web._t;
-    
+
     instance.web.attendanceslider = false;
-    
+
     instance.hr_attendance.AttendanceSlider = instance.web.Widget.extend({
         template: 'AttendanceSlider',
-        init: function(parent){
-            this.titles = {'present' :_t("Present"),
-                             'absent' :_t("Absent")          
-                            }
+        init: function (parent) {
+            this.titles = {
+                'present': _t("Present"),
+                'absent': _t("Absent")
+            }
             this._super(parent);
             this.session = parent.session;
-            this.parent_element = parent.$el ;            
+            this.parent_element = parent.$el;
         },
-        start: function() {
+        start: function () {
             this.$oe_attendance_slider = this.$el.find(".oe_attendance_slider");
             this.$oe_attendance_slider.click(this.do_update_attendance);
         },
-        do_update_attendance: function() {
+        do_update_attendance: function () {
             var self = this;
-            if(!self.employee)return;
+            if (!self.employee) return;
             hr_employee = new instance.web.DataSet(self, 'hr.employee');
-            hr_employee.call('attendance_action_change', [[self.employee.id]]).done(function(result){
+            hr_employee.call('attendance_action_change', [
+                [self.employee.id]
+            ]).done(function (result) {
                 if (!result) return;
-                if(self.employee.state == 'present')
-                    self.employee.state = 'absent';
-                else
-                    self.employee.state = 'present';
+                if (self.employee.state == 'present') self.employee.state = 'absent';
+                else self.employee.state = 'present';
                 self.do_slide(self.employee.state);
             });
         },
-        do_slide:function(attendance_state)
-        {
-            if(attendance_state == 'present'){
-                this.$oe_attendance_slider.attr("title",_t("Sign Out"));
-                this.$oe_attendance_slider.animate({"left": "48px"}, "slow");}
-            else{
-                this.$oe_attendance_slider.attr("title",_t("Sign In"));
-                this.$oe_attendance_slider.animate({"left": "-8px"}, "slow");}
+        do_slide: function (attendance_state) {
+            if (attendance_state == 'present') {
+                this.$oe_attendance_slider.attr("title", _t("Sign Out"));
+                this.$oe_attendance_slider.animate({
+                    "left": "48px"
+                }, "slow");
+            } else {
+                this.$oe_attendance_slider.attr("title", _t("Sign In"));
+                this.$oe_attendance_slider.animate({
+                    "left": "-8px"
+                }, "slow");
+            }
 
         },
-        check_attendance: function(){
+        check_attendance: function () {
             var self = this;
             self.employee = false;
             this.$el.find(".oe_attendance_status").hide();
-            var employee = new instance.web.DataSetSearch(self, 'hr.employee', self.session.user_context, [['user_id','=', self.session.uid]]);
-            return employee.read_slice(['id','name','state']).pipe(function(res) {
-                if(_.isEmpty(res)) return;
+            var employee = new instance.web.DataSetSearch(self, 'hr.employee', self.session.user_context, [
+                ['user_id', '=', self.session.uid]
+            ]);
+            return employee.read_slice(['id', 'name', 'state']).pipe(function (res) {
+                if (_.isEmpty(res)) return;
                 self.$el.find(".oe_attendance_status").show();
                 self.employee = res[0];
                 self.do_slide(self.employee.state);
             });
         },
     });
-    
+
     instance.web.UserMenu.include({
         do_update: function () {
             this._super();
             var self = this;
-            var fct = function() {                
+            var fct = function () {
                 instance.web.attendanceslider = new instance.hr_attendance.AttendanceSlider(self);
-                
+
                 instance.web.attendanceslider.prependTo(self.$el);
-                return instance.web.attendanceslider.check_attendance();                
+                return instance.web.attendanceslider.check_attendance();
             };
             this.update_promise = this.update_promise.pipe(fct, fct);
         },

From 0c5c00d86d7d6b08a61ce8f2def0ed8a261ce21c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Sep 2012 12:29:52 +0200
Subject: [PATCH 883/999] [IMP] launch tests from the debugger mode

bzr revid: fp@tinyerp.com-20120906102952-zu0l39kk39s3sm7b
---
 addons/web/static/src/js/views.js  | 8 ++++++++
 addons/web/static/src/xml/base.xml | 1 +
 2 files changed, 9 insertions(+)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 95693ca9c50..4820cc065dc 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -732,6 +732,14 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
                 var dialog = new instance.web.Dialog(this, { title: _t("Fields View Get"), width: '95%' }).open();
                 $('<pre>').text(instance.web.json_node_to_xml(current_view.fields_view.arch, true)).appendTo(dialog.$el);
                 break;
+            case 'tests':
+                this.do_action({
+                    name: "JS Tests",
+                    target: 'new',
+                    type : 'ir.actions.act_url',
+                    url: '/web/static/test/test.html'
+                })
+                break;
             case 'perm_read':
                 var ids = current_view.get_selected_ids();
                 if (ids.length === 1) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index d206c538e1c..f280119be99 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -479,6 +479,7 @@
     <option value="">Debug View#<t t-esc="view.fields_view.view_id"/></option>
     <option t-if="view_manager.active_view === 'form'" value="perm_read" data-views="form,page">View Log (perm_read)</option>
     <option t-if="view_manager.active_view === 'form'" value="toggle_layout_outline">Toggle Form Layout Outline</option>
+    <option value="tests">JS Tests</option>
     <option value="fields">View Fields</option>
     <option value="fvg">Fields View Get</option>
     <option value="manage_filters">Manage Filters</option>

From 61b67909e91b2e788e8c3df487b32f07f089c911 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 6 Sep 2012 12:33:17 +0200
Subject: [PATCH 884/999] put signin/out in systray

bzr revid: nicolas.vanhoren@openerp.com-20120906103317-4n9x9fbp63b32s9d
---
 addons/hr_attendance/static/src/js/attendance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 42611e6e87f..074109947b9 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -71,7 +71,7 @@ openerp.hr_attendance = function (instance) {
             var fct = function () {
                 instance.web.attendanceslider = new instance.hr_attendance.AttendanceSlider(self);
 
-                instance.web.attendanceslider.prependTo(self.$el);
+                instance.web.attendanceslider.prependTo(instance.webclient.$('.oe_systray'));
                 return instance.web.attendanceslider.check_attendance();
             };
             this.update_promise = this.update_promise.pipe(fct, fct);

From ad670b6887097b14888b8f960f03ae1f64e6150b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Sep 2012 12:35:16 +0200
Subject: [PATCH 885/999] [FIX] field-selection UI in import table: replace
 jquery-autocomplete by select2

* jQuery autocomplete requires complex hacks to work out and look
  select-ish
* select2 is more straightforward to use for people
  expecting <select> as it's styled similarly to a (non-standard)
  select
* select2 includes built-in support for groups, no need to hack it via
  interspersed fake options
* select2 provides a nice [x] button to remove the current choice
  without having to e.g. manually remove the content of the input

Why select2 instead of Chosen? Because Chosen isn't really setup to
work from array data, it wants selects serialized in the DOM, and
while the webkit bug I'd identified previously (see web client
revid:xmo@openerp.com-20110922085812-3u1esk6czraskm01) seems fixed in
the very latest webkits, it's still present in e.g. Safari 5.1 which
I'm using. So there.

And chosen's APIDoc is almost as bad as OpenERP's.

bzr revid: xmo@openerp.com-20120906103516-h94e6hd76w41bmyx
---
 addons/base_import/__openerp__.py             |   10 +-
 addons/base_import/static/lib/select2/LICENSE |   12 +
 .../base_import/static/lib/select2/README.md  |   68 +
 .../base_import/static/lib/select2/release.sh |   77 +
 .../static/lib/select2/select2.css            |  524 ++++
 .../base_import/static/lib/select2/select2.js | 2407 +++++++++++++++++
 .../static/lib/select2/select2.png            |  Bin 0 -> 613 bytes
 .../static/lib/select2/select2x2.png          |  Bin 0 -> 845 bytes
 .../static/lib/select2/spinner.gif            |  Bin 0 -> 1849 bytes
 addons/base_import/static/src/css/import.css  |   14 +-
 addons/base_import/static/src/js/import.js    |   73 +-
 addons/base_import/static/src/xml/import.xml  |    3 +-
 12 files changed, 3144 insertions(+), 44 deletions(-)
 create mode 100644 addons/base_import/static/lib/select2/LICENSE
 create mode 100755 addons/base_import/static/lib/select2/README.md
 create mode 100755 addons/base_import/static/lib/select2/release.sh
 create mode 100755 addons/base_import/static/lib/select2/select2.css
 create mode 100755 addons/base_import/static/lib/select2/select2.js
 create mode 100644 addons/base_import/static/lib/select2/select2.png
 create mode 100644 addons/base_import/static/lib/select2/select2x2.png
 create mode 100755 addons/base_import/static/lib/select2/spinner.gif

diff --git a/addons/base_import/__openerp__.py b/addons/base_import/__openerp__.py
index ab97e237909..eff20bc90ab 100644
--- a/addons/base_import/__openerp__.py
+++ b/addons/base_import/__openerp__.py
@@ -27,7 +27,13 @@ Re-implement openerp's file import system:
     'depends': ['base'],
     'installable': True,
     'auto_install': False, # set to true and allow uninstall?
-    'css': ['static/src/css/import.css'],
-    'js': ['static/src/js/import.js'],
+    'css': [
+        'static/lib/select2/select2.css',
+        'static/src/css/import.css',
+    ],
+    'js': [
+        'static/lib/select2/select2.js',
+        'static/src/js/import.js',
+    ],
     'qweb': ['static/src/xml/import.xml'],
 }
diff --git a/addons/base_import/static/lib/select2/LICENSE b/addons/base_import/static/lib/select2/LICENSE
new file mode 100644
index 00000000000..627fddef413
--- /dev/null
+++ b/addons/base_import/static/lib/select2/LICENSE
@@ -0,0 +1,12 @@
+Copyright 2012 Igor Vaynberg
+ 
+Version: @@ver@@ Timestamp: @@timestamp@@
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in
+compliance with the License. You may obtain a copy of the License in the LICENSE file, or at:
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is
+distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and limitations under the License.
\ No newline at end of file
diff --git a/addons/base_import/static/lib/select2/README.md b/addons/base_import/static/lib/select2/README.md
new file mode 100755
index 00000000000..3a6dcaf1ba4
--- /dev/null
+++ b/addons/base_import/static/lib/select2/README.md
@@ -0,0 +1,68 @@
+Select2
+=================
+
+Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results. Look and feel of Select2 is based on the excellent [Chosen](http://harvesthq.github.com/chosen/) library.
+
+To get started -- checkout http://ivaynberg.github.com/select2!
+
+What Does Select2 Support That Chosen Does Not?
+-------------------------------------------------
+
+* Working with large datasets: Chosen requires the entire dataset to be loaded as `option` tags in the DOM, which limits
+it to working with small-ish datasets. Select2 uses a function to find results on-the-fly, which allows it to partially
+load results.
+* Paging of results: Since Select2 works with large datasets and only loads a small amount of matching results at a time
+it has to support paging. Select2 will call the search function when the user scrolls to the bottom of currently loaded
+result set allowing for the 'infinite scrolling' of results.
+* Custom markup for results: Chosen only supports rendering text results because that is the only markup supported by
+`option` tags. Select2 provides an extension point which can be used to produce any kind of markup to represent results.
+* Ability to add results on the fly: Select2 provides the ability to add results from the search term entered by the user, which allows it to be used for
+tagging.
+
+Browser Compatibility
+--------------------
+* IE 8+ (7 mostly works except for [issue with z-index](https://github.com/ivaynberg/select2/issues/37))
+* Chrome 8+
+* Firefox 3.5+
+* Safari 3+
+* Opera 10.6+
+
+Integrations
+------------
+
+* [Wicket-Select2](https://github.com/ivaynberg/wicket-select2) (Java / Apache Wicket)
+* [select2-rails](https://github.com/argerim/select2-rails) (Ruby on Rails)
+* [AngularUI](http://angular-ui.github.com/#directives-select2) ([AngularJS](angularjs.org))
+* [Django](https://github.com/applegrew/django-select2)
+
+Bug tracker
+-----------
+
+Have a bug? Please create an issue here on GitHub!
+
+https://github.com/ivaynberg/select2/issues
+
+
+Mailing list
+------------
+
+Have a question? Ask on our mailing list!
+
+select2@googlegroups.com
+
+https://groups.google.com/d/forum/select2
+
+
+Copyright and License
+---------------------
+
+Copyright 2012 Igor Vaynberg
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in
+compliance with the License. You may obtain a copy of the License in the LICENSE file, or at:
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is
+distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and limitations under the License.
\ No newline at end of file
diff --git a/addons/base_import/static/lib/select2/release.sh b/addons/base_import/static/lib/select2/release.sh
new file mode 100755
index 00000000000..79eaabd621d
--- /dev/null
+++ b/addons/base_import/static/lib/select2/release.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+set -e
+
+echo -n "Enter the version for this release: "
+
+read ver
+
+if [ ! $ver ]; then 
+	echo "Invalid version."
+	exit
+fi
+
+name="select2"
+js="$name.js"
+mini="$name.min.js"
+css="$name.css"
+release="$name-$ver"
+releasedir="/tmp/$release"
+tag="release-$ver"
+branch="build-$ver"
+curbranch=`git branch | grep "*" | sed "s/* //"`
+timestamp=$(date)
+tokens="s/@@ver@@/$ver/g;s/\@@timestamp@@/$timestamp/g"
+remote="github"
+
+git branch "$branch"
+git checkout "$branch"
+
+echo "Tokenizing..."
+
+find . -name "$js" | xargs sed -i -e "$tokens"
+find . -name "$css" | xargs sed -i -e "$tokens"
+
+git add "$js"
+git add "$css"
+
+echo "Minifying..."
+
+echo "/*" > "$mini"
+cat LICENSE | sed "$tokens" >> "$mini"
+echo "*/" >> "$mini"
+
+curl -s \
+	-d compilation_level=SIMPLE_OPTIMIZATIONS \
+	-d output_format=text \
+	-d output_info=compiled_code \
+	--data-urlencode "js_code@$js" \
+	http://closure-compiler.appspot.com/compile \
+	>> "$mini"
+
+git add "$mini"
+	
+git commit -m "release $ver"
+
+echo "Tagging..."
+
+git tag -a "$tag" -m "tagged version $ver"
+git push "$remote" --tags
+
+echo "Archiving..."
+
+rm -rf "$releasedir"
+mkdir "$releasedir"
+
+cp $name.* "$releasedir"
+cp spinner.gif "$releasedir"
+cp README.* "$releasedir"
+
+zip -r "$releasedir.zip" "$releasedir"
+rm -rf "$releasedir"
+
+echo "Cleaning Up..."
+
+git checkout "$curbranch"
+git branch -D "$branch"
+
+echo "Done. Release archive created: $releasedir.zip"
diff --git a/addons/base_import/static/lib/select2/select2.css b/addons/base_import/static/lib/select2/select2.css
new file mode 100755
index 00000000000..f0bdfb82f04
--- /dev/null
+++ b/addons/base_import/static/lib/select2/select2.css
@@ -0,0 +1,524 @@
+/*
+Version: @@ver@@ Timestamp: @@timestamp@@
+*/
+.select2-container {
+    position: relative;
+    display: inline-block;
+    /* inline-block for ie7 */
+    zoom: 1;
+    *display: inline;
+    vertical-align: top;
+}
+
+.select2-container,
+.select2-drop,
+.select2-search,
+.select2-search input{
+  /*
+    Force border-box so that % widths fit the parent
+    container without overlap because of margin/padding.
+
+    More Info : http://www.quirksmode.org/css/box.html
+  */
+  -moz-box-sizing: border-box;    /* firefox */
+  -ms-box-sizing: border-box;     /* ie */
+  -webkit-box-sizing: border-box; /* webkit */
+  -khtml-box-sizing: border-box;  /* konqueror */
+  box-sizing: border-box;         /* css3 */
+}
+
+.select2-container .select2-choice {
+    background-color: #fff;
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.5, white));
+    background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 50%);
+    background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 50%);
+    background-image: -o-linear-gradient(bottom, #eeeeee 0%, #ffffff 50%);
+    background-image: -ms-linear-gradient(top, #eeeeee 0%, #ffffff 50%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#eeeeee', endColorstr = '#ffffff', GradientType = 0);
+    background-image: linear-gradient(top, #eeeeee 0%, #ffffff 50%);
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    -moz-background-clip: padding;
+    -webkit-background-clip: padding-box;
+    background-clip: padding-box;
+    border: 1px solid #aaa;
+    display: block;
+    overflow: hidden;
+    white-space: nowrap;
+    position: relative;
+    height: 26px;
+    line-height: 26px;
+    padding: 0 0 0 8px;
+    color: #444;
+    text-decoration: none;
+}
+
+.select2-container.select2-drop-above .select2-choice
+{
+    border-bottom-color: #aaa;
+    -webkit-border-radius:0px 0px 4px 4px;
+    -moz-border-radius:0px 0px 4px 4px;
+    border-radius:0px 0px 4px 4px;
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.9, white));
+    background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 90%);
+    background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 90%);
+    background-image: -o-linear-gradient(bottom, #eeeeee 0%, white 90%);
+    background-image: -ms-linear-gradient(top, #eeeeee 0%,#ffffff 90%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#ffffff',GradientType=0 );
+    background-image: linear-gradient(top, #eeeeee 0%,#ffffff 90%);
+}
+
+.select2-container .select2-choice span {
+    margin-right: 26px;
+    display: block;
+    overflow: hidden;
+    white-space: nowrap;
+    -o-text-overflow: ellipsis;
+    -ms-text-overflow: ellipsis;
+    text-overflow: ellipsis;
+}
+
+.select2-container .select2-choice abbr {
+  display: block;
+  position: absolute;
+  right: 26px;
+  top: 8px;
+  width: 12px;
+  height: 12px;
+  font-size: 1px;
+  background: url('select2.png') right top no-repeat;
+  cursor: pointer;
+  text-decoration: none;
+  border:0;
+  outline: 0;
+}
+.select2-container .select2-choice abbr:hover {
+  background-position: right -11px;
+  cursor: pointer;
+}
+
+.select2-drop {
+    background: #fff;
+    color: #000;
+    border: 1px solid #aaa;
+    border-top: 0;
+    position: absolute;
+    top: 100%;
+    -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+    -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+    -o-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+    box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+    z-index: 9999;
+    width:100%;
+    margin-top:-1px;
+
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
+  border-radius: 0 0 4px 4px;
+}
+
+.select2-drop.select2-drop-above {
+    -webkit-border-radius: 4px 4px 0px 0px;
+    -moz-border-radius: 4px 4px 0px 0px;
+    border-radius: 4px 4px 0px 0px;
+    margin-top:1px;
+    border-top: 1px solid #aaa;
+    border-bottom: 0;
+
+    -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+    -moz-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+    -o-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+    box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+}
+
+.select2-container .select2-choice div {
+    -webkit-border-radius: 0 4px 4px 0;
+    -moz-border-radius: 0 4px 4px 0;
+    border-radius: 0 4px 4px 0;
+    -moz-background-clip: padding;
+    -webkit-background-clip: padding-box;
+    background-clip: padding-box;
+    background: #ccc;
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee));
+    background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%);
+    background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%);
+    background-image: -o-linear-gradient(bottom, #ccc 0%, #eee 60%);
+    background-image: -ms-linear-gradient(top, #cccccc 0%, #eeeeee 60%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#cccccc', endColorstr = '#eeeeee', GradientType = 0);
+    background-image: linear-gradient(top, #cccccc 0%, #eeeeee 60%);
+    border-left: 1px solid #aaa;
+    position: absolute;
+    right: 0;
+    top: 0;
+    display: block;
+    height: 100%;
+    width: 18px;
+}
+
+.select2-container .select2-choice div b {
+    background: url('select2.png') no-repeat 0 1px;
+    display: block;
+    width: 100%;
+    height: 100%;
+}
+
+.select2-search {
+  display: inline-block;
+    white-space: nowrap;
+    z-index: 10000;
+  min-height: 26px;
+  width: 100%;
+  margin: 0;
+  padding-left: 4px;
+  padding-right: 4px;
+}
+
+.select2-search-hidden {
+  display: block;
+  position: absolute;
+  left: -10000px;
+}
+
+.select2-search input {
+    background: #fff url('select2.png') no-repeat 100% -22px;
+    background: url('select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+    background: url('select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: url('select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: url('select2.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+    background: url('select2.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+    background: url('select2.png') no-repeat 100% -22px, linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+    padding: 4px 20px 4px 5px;
+    outline: 0;
+    border: 1px solid #aaa;
+    font-family: sans-serif;
+    font-size: 1em;
+    width:100%;
+    margin:0;
+    height:auto !important;
+    min-height: 26px;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+    border-radius: 0;
+    -moz-border-radius: 0;
+    -webkit-border-radius: 0;
+}
+
+.select2-drop.select2-drop-above .select2-search input
+{
+    margin-top:4px;
+}
+
+.select2-search input.select2-active {
+    background: #fff url('spinner.gif') no-repeat 100%;
+    background: url('spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+    background: url('spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: url('spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: url('spinner.gif') no-repeat 100%, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+    background: url('spinner.gif') no-repeat 100%, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+    background: url('spinner.gif') no-repeat 100%, linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+}
+
+
+.select2-container-active .select2-choice,
+.select2-container-active .select2-choices {
+    -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
+    -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
+    -o-box-shadow     : 0 0 5px rgba(0,0,0,.3);
+    box-shadow        : 0 0 5px rgba(0,0,0,.3);
+    border: 1px solid #5897fb;
+    outline: none;
+}
+
+.select2-dropdown-open .select2-choice {
+  border: 1px solid #aaa;
+  border-bottom-color: transparent;
+  -webkit-box-shadow: 0 1px 0 #fff inset;
+  -moz-box-shadow   : 0 1px 0 #fff inset;
+  -o-box-shadow     : 0 1px 0 #fff inset;
+  box-shadow        : 0 1px 0 #fff inset;
+  background-color: #eee;
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, white), color-stop(0.5, #eeeeee));
+  background-image: -webkit-linear-gradient(center bottom, white 0%, #eeeeee 50%);
+  background-image: -moz-linear-gradient(center bottom, white 0%, #eeeeee 50%);
+  background-image: -o-linear-gradient(bottom, white 0%, #eeeeee 50%);
+  background-image: -ms-linear-gradient(top, #ffffff 0%,#eeeeee 50%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
+  background-image: linear-gradient(top, #ffffff 0%,#eeeeee 50%);
+  -webkit-border-bottom-left-radius : 0;
+  -webkit-border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft : 0;
+  -moz-border-radius-bottomright: 0;
+  border-bottom-left-radius : 0;
+  border-bottom-right-radius: 0;
+}
+
+.select2-dropdown-open .select2-choice div {
+  background: transparent;
+  border-left: none;
+}
+.select2-dropdown-open .select2-choice div b {
+  background-position: -18px 1px;
+}
+
+/* results */
+.select2-results {
+  margin: 4px 4px 4px 0;
+  padding: 0 0 0 4px;
+  position: relative;
+  overflow-x: hidden;
+  overflow-y: auto;
+  max-height: 200px;
+}
+
+.select2-results ul.select2-result-sub {
+  margin: 0 0 0 0;
+}
+
+.select2-results ul.select2-result-sub > li .select2-result-label { padding-left: 20px }
+.select2-results ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 40px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 60px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 80px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 100px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 110px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 120px }
+
+.select2-results li {
+  list-style: none;
+  display: list-item;
+}
+
+.select2-results li.select2-result-with-children > .select2-result-label {
+  font-weight: bold;
+}
+
+.select2-results .select2-result-label {
+  padding: 3px 7px 4px;
+  margin: 0;
+  cursor: pointer;
+}
+
+.select2-results .select2-highlighted {
+  background: #3875d7;
+  color: #fff;
+}
+.select2-results li em {
+  background: #feffde;
+  font-style: normal;
+}
+.select2-results .select2-highlighted em {
+  background: transparent;
+}
+.select2-results .select2-no-results,
+.select2-results .select2-searching,
+.select2-results .select2-selection-limit {
+  background: #f4f4f4;
+  display: list-item;
+}
+
+/*
+disabled look for already selected choices in the results dropdown
+.select2-results .select2-disabled.select2-highlighted {
+    color: #666;
+    background: #f4f4f4;
+    display: list-item;
+    cursor: default;
+}
+.select2-results .select2-disabled {
+  background: #f4f4f4;
+  display: list-item;
+  cursor: default;
+}
+*/
+.select2-results .select2-disabled {
+    display: none;
+}
+
+.select2-more-results.select2-active {
+    background: #f4f4f4 url('spinner.gif') no-repeat 100%;
+}
+
+.select2-more-results {
+  background: #f4f4f4;
+  display: list-item;
+}
+
+/* disabled styles */
+
+.select2-container.select2-container-disabled .select2-choice {
+    background-color: #f4f4f4;
+    background-image: none;
+    border: 1px solid #ddd;
+    cursor: default;
+}
+
+.select2-container.select2-container-disabled .select2-choice div {
+    background-color: #f4f4f4;
+    background-image: none;
+    border-left: 0;
+}
+
+
+/* multiselect */
+
+.select2-container-multi .select2-choices {
+    background-color: #fff;
+      background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
+      background-image: -webkit-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+      background-image: -moz-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+      background-image: -o-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+      background-image: -ms-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+      background-image: linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+      border: 1px solid #aaa;
+      margin: 0;
+      padding: 0;
+      cursor: text;
+      overflow: hidden;
+      height: auto !important;
+      height: 1%;
+      position: relative;
+}
+
+.select2-container-multi .select2-choices {
+    min-height: 26px;
+}
+
+.select2-container-multi.select2-container-active .select2-choices {
+    -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
+    -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
+    -o-box-shadow     : 0 0 5px rgba(0,0,0,.3);
+    box-shadow        : 0 0 5px rgba(0,0,0,.3);
+    border: 1px solid #5897fb;
+    outline: none;
+}
+.select2-container-multi .select2-choices li {
+  float: left;
+  list-style: none;
+}
+.select2-container-multi .select2-choices .select2-search-field {
+  white-space: nowrap;
+  margin: 0;
+  padding: 0;
+}
+
+.select2-container-multi .select2-choices .select2-search-field input {
+  color: #666;
+  background: transparent !important;
+  font-family: sans-serif;
+  font-size: 100%;
+  height: 15px;
+  padding: 5px;
+  margin: 1px 0;
+  outline: 0;
+  border: 0;
+  -webkit-box-shadow: none;
+  -moz-box-shadow   : none;
+  -o-box-shadow     : none;
+  box-shadow        : none;
+}
+
+.select2-container-multi .select2-choices .select2-search-field input.select2-active {
+    background: #fff url('spinner.gif') no-repeat 100% !important;
+}
+
+.select2-default {
+  color: #999 !important;
+}
+
+.select2-container-multi .select2-choices .select2-search-choice {
+  -webkit-border-radius: 3px;
+  -moz-border-radius   : 3px;
+  border-radius        : 3px;
+  -moz-background-clip   : padding;
+  -webkit-background-clip: padding-box;
+  background-clip        : padding-box;
+  background-color: #e4e4e4;
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f4f4', endColorstr='#eeeeee', GradientType=0 );
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
+  background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: -ms-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  -webkit-box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+  -moz-box-shadow   : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+  box-shadow        : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+  color: #333;
+  border: 1px solid #aaaaaa;
+  line-height: 13px;
+  padding: 3px 5px 3px 18px;
+  margin: 3px 0 3px 5px;
+  position: relative;
+  cursor: default;
+}
+.select2-container-multi .select2-choices .select2-search-choice span {
+  cursor: default;
+}
+.select2-container-multi .select2-choices .select2-search-choice-focus {
+  background: #d4d4d4;
+}
+
+.select2-search-choice-close {
+  display: block;
+  position: absolute;
+  right: 3px;
+  top: 4px;
+  width: 12px;
+  height: 13px;
+  font-size: 1px;
+  background: url('select2.png') right top no-repeat;
+  outline: none;
+}
+
+.select2-container-multi .select2-search-choice-close {
+  left: 3px;
+}
+
+
+.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
+  background-position: right -11px;
+}
+.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close {
+  background-position: right -11px;
+}
+
+/* disabled styles */
+
+.select2-container-multi.select2-container-disabled .select2-choices{
+    background-color: #f4f4f4;
+    background-image: none;
+    border: 1px solid #ddd;
+    cursor: default;
+}
+
+.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice {
+    background-image: none;
+    background-color: #f4f4f4;
+    border: 1px solid #ddd;
+    padding: 3px 5px 3px 5px;
+}
+
+.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close {
+    display: none;
+}
+/* end multiselect */
+
+.select2-result-selectable .select2-match,
+.select2-result-unselectable .select2-result-selectable .select2-match { text-decoration: underline; }
+.select2-result-unselectable .select2-match { text-decoration: none; }
+
+.select2-offscreen { position: absolute; left: -10000px; }
+
+/* Retina-ize icons */
+
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+	.select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice div b {
+		background-image: url(select2x2.png) !important;
+		background-repeat: no-repeat !important;
+		background-size: 60px 40px !important;
+	}
+	.select2-search input {
+		background-position: 100% -21px !important;
+	}
+}
\ No newline at end of file
diff --git a/addons/base_import/static/lib/select2/select2.js b/addons/base_import/static/lib/select2/select2.js
new file mode 100755
index 00000000000..42ce0a928b8
--- /dev/null
+++ b/addons/base_import/static/lib/select2/select2.js
@@ -0,0 +1,2407 @@
+/*
+ Copyright 2012 Igor Vaynberg
+
+ Version: @@ver@@ Timestamp: @@timestamp@@
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in
+ compliance with the License. You may obtain a copy of the License in the LICENSE file, or at:
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software distributed under the License is
+ distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and limitations under the License.
+ */
+ (function ($) {
+ 	if(typeof $.fn.each2 == "undefined"){
+ 		$.fn.extend({
+ 			/*
+			* 4-10 times faster .each replacement
+			* use it carefully, as it overrides jQuery context of element on each iteration
+			*/
+			each2 : function (c) {
+				var j = $([0]), i = -1, l = this.length;
+				while (
+					++i < l
+					&& (j.context = j[0] = this[i])
+					&& c.call(j[0], i, j) !== false //"this"=DOM, i=index, j=jQuery object
+				);
+				return this;
+			}
+ 		});
+ 	}
+})(jQuery);
+
+(function ($, undefined) {
+    "use strict";
+    /*global document, window, jQuery, console */
+
+    if (window.Select2 !== undefined) {
+        return;
+    }
+
+    var KEY, AbstractSelect2, SingleSelect2, MultiSelect2, nextUid, sizer;
+
+    KEY = {
+        TAB: 9,
+        ENTER: 13,
+        ESC: 27,
+        SPACE: 32,
+        LEFT: 37,
+        UP: 38,
+        RIGHT: 39,
+        DOWN: 40,
+        SHIFT: 16,
+        CTRL: 17,
+        ALT: 18,
+        PAGE_UP: 33,
+        PAGE_DOWN: 34,
+        HOME: 36,
+        END: 35,
+        BACKSPACE: 8,
+        DELETE: 46,
+        isArrow: function (k) {
+            k = k.which ? k.which : k;
+            switch (k) {
+            case KEY.LEFT:
+            case KEY.RIGHT:
+            case KEY.UP:
+            case KEY.DOWN:
+                return true;
+            }
+            return false;
+        },
+        isControl: function (e) {
+            var k = e.which;
+            switch (k) {
+            case KEY.SHIFT:
+            case KEY.CTRL:
+            case KEY.ALT:
+                return true;
+            }
+
+            if (e.metaKey) return true;
+
+            return false;
+        },
+        isFunctionKey: function (k) {
+            k = k.which ? k.which : k;
+            return k >= 112 && k <= 123;
+        }
+    };
+
+    nextUid=(function() { var counter=1; return function() { return counter++; }; }());
+
+    function indexOf(value, array) {
+        var i = 0, l = array.length, v;
+
+        if (typeof value === "undefined") {
+          return -1;
+        }
+
+        if (value.constructor === String) {
+            for (; i < l; i = i + 1) if (value.localeCompare(array[i]) === 0) return i;
+        } else {
+            for (; i < l; i = i + 1) {
+                v = array[i];
+                if (v.constructor === String) {
+                    if (v.localeCompare(value) === 0) return i;
+                } else {
+                    if (v === value) return i;
+                }
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Compares equality of a and b taking into account that a and b may be strings, in which case localeCompare is used
+     * @param a
+     * @param b
+     */
+    function equal(a, b) {
+        if (a === b) return true;
+        if (a === undefined || b === undefined) return false;
+        if (a === null || b === null) return false;
+        if (a.constructor === String) return a.localeCompare(b) === 0;
+        if (b.constructor === String) return b.localeCompare(a) === 0;
+        return false;
+    }
+
+    /**
+     * Splits the string into an array of values, trimming each value. An empty array is returned for nulls or empty
+     * strings
+     * @param string
+     * @param separator
+     */
+    function splitVal(string, separator) {
+        var val, i, l;
+        if (string === null || string.length < 1) return [];
+        val = string.split(separator);
+        for (i = 0, l = val.length; i < l; i = i + 1) val[i] = $.trim(val[i]);
+        return val;
+    }
+
+    function getSideBorderPadding(element) {
+        return element.outerWidth() - element.width();
+    }
+
+    function installKeyUpChangeEvent(element) {
+        var key="keyup-change-value";
+        element.bind("keydown", function () {
+            if ($.data(element, key) === undefined) {
+                $.data(element, key, element.val());
+            }
+        });
+        element.bind("keyup", function () {
+            var val= $.data(element, key);
+            if (val !== undefined && element.val() !== val) {
+                $.removeData(element, key);
+                element.trigger("keyup-change");
+            }
+        });
+    }
+
+    $(document).delegate("*", "mousemove", function (e) {
+        $.data(document, "select2-lastpos", {x: e.pageX, y: e.pageY});
+    });
+
+    /**
+     * filters mouse events so an event is fired only if the mouse moved.
+     *
+     * filters out mouse events that occur when mouse is stationary but
+     * the elements under the pointer are scrolled.
+     */
+    function installFilteredMouseMove(element) {
+	    element.bind("mousemove", function (e) {
+            var lastpos = $.data(document, "select2-lastpos");
+            if (lastpos === undefined || lastpos.x !== e.pageX || lastpos.y !== e.pageY) {
+                $(e.target).trigger("mousemove-filtered", e);
+            }
+        });
+    }
+
+    /**
+     * Debounces a function. Returns a function that calls the original fn function only if no invocations have been made
+     * within the last quietMillis milliseconds.
+     *
+     * @param quietMillis number of milliseconds to wait before invoking fn
+     * @param fn function to be debounced
+     * @param ctx object to be used as this reference within fn
+     * @return debounced version of fn
+     */
+    function debounce(quietMillis, fn, ctx) {
+        ctx = ctx || undefined;
+        var timeout;
+        return function () {
+            var args = arguments;
+            window.clearTimeout(timeout);
+            timeout = window.setTimeout(function() {
+                fn.apply(ctx, args);
+            }, quietMillis);
+        };
+    }
+
+    /**
+     * A simple implementation of a thunk
+     * @param formula function used to lazily initialize the thunk
+     * @return {Function}
+     */
+    function thunk(formula) {
+        var evaluated = false,
+            value;
+        return function() {
+            if (evaluated === false) { value = formula(); evaluated = true; }
+            return value;
+        };
+    };
+
+    function installDebouncedScroll(threshold, element) {
+        var notify = debounce(threshold, function (e) { element.trigger("scroll-debounced", e);});
+        element.bind("scroll", function (e) {
+            if (indexOf(e.target, element.get()) >= 0) notify(e);
+        });
+    }
+
+    function killEvent(event) {
+        event.preventDefault();
+        event.stopPropagation();
+    }
+
+    function measureTextWidth(e) {
+        if (!sizer){
+        	var style = e[0].currentStyle || window.getComputedStyle(e[0], null);
+        	sizer = $("<div></div>").css({
+	            position: "absolute",
+	            left: "-10000px",
+	            top: "-10000px",
+	            display: "none",
+	            fontSize: style.fontSize,
+	            fontFamily: style.fontFamily,
+	            fontStyle: style.fontStyle,
+	            fontWeight: style.fontWeight,
+	            letterSpacing: style.letterSpacing,
+	            textTransform: style.textTransform,
+	            whiteSpace: "nowrap"
+	        });
+        	$("body").append(sizer);
+        }
+        sizer.text(e.val());
+        return sizer.width();
+    }
+
+    function markMatch(text, term, markup) {
+        var match=text.toUpperCase().indexOf(term.toUpperCase()),
+            tl=term.length;
+
+        if (match<0) {
+            markup.push(text);
+            return;
+        }
+
+        markup.push(text.substring(0, match));
+        markup.push("<span class='select2-match'>");
+        markup.push(text.substring(match, match + tl));
+        markup.push("</span>");
+        markup.push(text.substring(match + tl, text.length));
+    }
+
+    /**
+     * Produces an ajax-based query function
+     *
+     * @param options object containing configuration paramters
+     * @param options.transport function that will be used to execute the ajax request. must be compatible with parameters supported by $.ajax
+     * @param options.url url for the data
+     * @param options.data a function(searchTerm, pageNumber, context) that should return an object containing query string parameters for the above url.
+     * @param options.dataType request data type: ajax, jsonp, other datatatypes supported by jQuery's $.ajax function or the transport function if specified
+     * @param options.traditional a boolean flag that should be true if you wish to use the traditional style of param serialization for the ajax request
+     * @param options.quietMillis (optional) milliseconds to wait before making the ajaxRequest, helps debounce the ajax function if invoked too often
+     * @param options.results a function(remoteData, pageNumber) that converts data returned form the remote request to the format expected by Select2.
+     *      The expected format is an object containing the following keys:
+     *      results array of objects that will be used as choices
+     *      more (optional) boolean indicating whether there are more results available
+     *      Example: {results:[{id:1, text:'Red'},{id:2, text:'Blue'}], more:true}
+     */
+    function ajax(options) {
+        var timeout, // current scheduled but not yet executed request
+            requestSequence = 0, // sequence used to drop out-of-order responses
+            handler = null,
+            quietMillis = options.quietMillis || 100;
+
+        return function (query) {
+            window.clearTimeout(timeout);
+            timeout = window.setTimeout(function () {
+                requestSequence += 1; // increment the sequence
+                var requestNumber = requestSequence, // this request's sequence number
+                    data = options.data, // ajax data function
+                    transport = options.transport || $.ajax,
+                    traditional = options.traditional || false,
+                    type = options.type || 'GET'; // set type of request (GET or POST)
+
+                data = data.call(this, query.term, query.page, query.context);
+
+                if( null !== handler) { handler.abort(); }
+
+                handler = transport.call(null, {
+                    url: options.url,
+                    dataType: options.dataType,
+                    data: data,
+                    type: type,
+                    traditional: traditional,
+                    success: function (data) {
+                        if (requestNumber < requestSequence) {
+                            return;
+                        }
+                        // TODO 3.0 - replace query.page with query so users have access to term, page, etc.
+                        var results = options.results(data, query.page);
+                        query.callback(results);
+                    }
+                });
+            }, quietMillis);
+        };
+    }
+
+    /**
+     * Produces a query function that works with a local array
+     *
+     * @param options object containing configuration parameters. The options parameter can either be an array or an
+     * object.
+     *
+     * If the array form is used it is assumed that it contains objects with 'id' and 'text' keys.
+     *
+     * If the object form is used ti is assumed that it contains 'data' and 'text' keys. The 'data' key should contain
+     * an array of objects that will be used as choices. These objects must contain at least an 'id' key. The 'text'
+     * key can either be a String in which case it is expected that each element in the 'data' array has a key with the
+     * value of 'text' which will be used to match choices. Alternatively, text can be a function(item) that can extract
+     * the text.
+     */
+    function local(options) {
+        var data = options, // data elements
+            dataText,
+            text = function (item) { return ""+item.text; }; // function used to retrieve the text portion of a data item that is matched against the search
+
+        if (!$.isArray(data)) {
+            text = data.text;
+            // if text is not a function we assume it to be a key name
+            if (!$.isFunction(text)) {
+              dataText = data.text; // we need to store this in a separate variable because in the next step data gets reset and data.text is no longer available
+              text = function (item) { return item[dataText]; };
+            }
+            data = data.results;
+        }
+
+        return function (query) {
+            var t = query.term, filtered = { results: [] }, process;
+            if (t === "") {
+                query.callback({results: data});
+                return;
+            }
+
+            process = function(datum, collection) {
+                var group, attr;
+                datum = datum[0];
+                if (datum.children) {
+                    group = {};
+                    for (attr in datum) {
+                        if (datum.hasOwnProperty(attr)) group[attr]=datum[attr];
+                    }
+                    group.children=[];
+                    $(datum.children).each2(function(i, childDatum) { process(childDatum, group.children); });
+                    if (group.children.length) {
+                        collection.push(group);
+                    }
+                } else {
+                    if (query.matcher(t, text(datum))) {
+                        collection.push(datum);
+                    }
+                }
+            };
+
+            $(data).each2(function(i, datum) { process(datum, filtered.results); });
+            query.callback(filtered);
+        };
+    }
+
+    // TODO javadoc
+    function tags(data) {
+        // TODO even for a function we should probably return a wrapper that does the same object/string check as
+        // the function for arrays. otherwise only functions that return objects are supported.
+        if ($.isFunction(data)) {
+            return data;
+        }
+
+        // if not a function we assume it to be an array
+
+        return function (query) {
+            var t = query.term, filtered = {results: []};
+            $(data).each(function () {
+                var isObject = this.text !== undefined,
+                    text = isObject ? this.text : this;
+                if (t === "" || query.matcher(t, text)) {
+                    filtered.results.push(isObject ? this : {id: this, text: this});
+                }
+            });
+            query.callback(filtered);
+        };
+    }
+
+    /**
+     * Checks if the formatter function should be used.
+     *
+     * Throws an error if it is not a function. Returns true if it should be used,
+     * false if no formatting should be performed.
+     *
+     * @param formatter
+     */
+    function checkFormatter(formatter, formatterName) {
+        if ($.isFunction(formatter)) return true;
+        if (!formatter) return false;
+        throw new Error("formatterName must be a function or a falsy value");
+    }
+
+    function evaluate(val) {
+        return $.isFunction(val) ? val() : val;
+    }
+
+    function countResults(results) {
+        var count = 0;
+        $.each(results, function(i, item) {
+            if (item.children) {
+                count += countResults(item.children);
+            } else {
+                count++;
+            }
+        });
+        return count;
+    }
+
+    /**
+     * Default tokenizer. This function uses breaks the input on substring match of any string from the
+     * opts.tokenSeparators array and uses opts.createSearchChoice to create the choice object. Both of those
+     * two options have to be defined in order for the tokenizer to work.
+     *
+     * @param input text user has typed so far or pasted into the search field
+     * @param selection currently selected choices
+     * @param selectCallback function(choice) callback tho add the choice to selection
+     * @param opts select2's opts
+     * @return undefined/null to leave the current input unchanged, or a string to change the input to the returned value
+     */
+    function defaultTokenizer(input, selection, selectCallback, opts) {
+        var original = input, // store the original so we can compare and know if we need to tell the search to update its text
+            dupe = false, // check for whether a token we extracted represents a duplicate selected choice
+            token, // token
+            index, // position at which the separator was found
+            i, l, // looping variables
+            separator; // the matched separator
+
+        if (!opts.createSearchChoice || !opts.tokenSeparators || opts.tokenSeparators.length < 1) return undefined;
+
+        while (true) {
+            index = -1;
+
+            for (i = 0, l = opts.tokenSeparators.length; i < l; i++) {
+                separator = opts.tokenSeparators[i];
+                index = input.indexOf(separator);
+                if (index >= 0) break;
+            }
+
+            if (index < 0) break; // did not find any token separator in the input string, bail
+
+            token = input.substring(0, index);
+            input = input.substring(index + separator.length);
+
+            if (token.length > 0) {
+                token = opts.createSearchChoice(token, selection);
+                if (token !== undefined && token !== null && opts.id(token) !== undefined && opts.id(token) !== null) {
+                    dupe = false;
+                    for (i = 0, l = selection.length; i < l; i++) {
+                        if (equal(opts.id(token), opts.id(selection[i]))) {
+                            dupe = true; break;
+                        }
+                    }
+
+                    if (!dupe) selectCallback(token);
+                }
+            }
+        }
+
+        if (original.localeCompare(input) != 0) return input;
+    }
+
+    /**
+     * blurs any Select2 container that has focus when an element outside them was clicked or received focus
+     *
+     * also takes care of clicks on label tags that point to the source element
+     */
+    $(document).ready(function () {
+        $(document).delegate("*", "mousedown touchend", function (e) {
+            var target = $(e.target).closest("div.select2-container").get(0), attr;
+            if (target) {
+                $(document).find("div.select2-container-active").each(function () {
+                    if (this !== target) $(this).data("select2").blur();
+                });
+            } else {
+                target = $(e.target).closest("div.select2-drop").get(0);
+                $(document).find("div.select2-drop-active").each(function () {
+                    if (this !== target) $(this).data("select2").blur();
+                });
+            }
+
+            target=$(e.target);
+            attr = target.attr("for");
+            if ("LABEL" === e.target.tagName && attr && attr.length > 0) {
+                target = $("#"+attr);
+                target = target.data("select2");
+                if (target !== undefined) { target.focus(); e.preventDefault();}
+            }
+        });
+    });
+
+    /**
+     * Creates a new class
+     *
+     * @param superClass
+     * @param methods
+     */
+    function clazz(SuperClass, methods) {
+        var constructor = function () {};
+        constructor.prototype = new SuperClass;
+        constructor.prototype.constructor = constructor;
+        constructor.prototype.parent = SuperClass.prototype;
+        constructor.prototype = $.extend(constructor.prototype, methods);
+        return constructor;
+    }
+
+    AbstractSelect2 = clazz(Object, {
+
+        // abstract
+        bind: function (func) {
+            var self = this;
+            return function () {
+                func.apply(self, arguments);
+            };
+        },
+
+        // abstract
+        init: function (opts) {
+            var results, search, resultsSelector = ".select2-results";
+
+            // prepare options
+            this.opts = opts = this.prepareOpts(opts);
+
+            this.id=opts.id;
+
+            // destroy if called on an existing component
+            if (opts.element.data("select2") !== undefined &&
+                opts.element.data("select2") !== null) {
+                this.destroy();
+            }
+
+            this.enabled=true;
+            this.container = this.createContainer();
+
+            this.containerId="s2id_"+(opts.element.attr("id") || "autogen"+nextUid());
+            this.containerSelector="#"+this.containerId.replace(/([;&,\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1');
+            this.container.attr("id", this.containerId);
+
+            // cache the body so future lookups are cheap
+            this.body = thunk(function() { return opts.element.closest("body"); });
+
+            if (opts.element.attr("class") !== undefined) {
+                this.container.addClass(opts.element.attr("class").replace(/validate\[[\S ]+] ?/, ''));
+            }
+
+            this.container.css(evaluate(opts.containerCss));
+            this.container.addClass(evaluate(opts.containerCssClass));
+
+            // swap container for the element
+            this.opts.element
+                .data("select2", this)
+                .hide()
+                .before(this.container);
+            this.container.data("select2", this);
+
+            this.dropdown = this.container.find(".select2-drop");
+            this.dropdown.addClass(evaluate(opts.dropdownCssClass));
+            this.dropdown.data("select2", this);
+
+            this.results = results = this.container.find(resultsSelector);
+            this.search = search = this.container.find("input.select2-input");
+
+            search.attr("tabIndex", this.opts.element.attr("tabIndex"));
+
+            this.resultsPage = 0;
+            this.context = null;
+
+            // initialize the container
+            this.initContainer();
+            this.initContainerWidth();
+
+            installFilteredMouseMove(this.results);
+            this.dropdown.delegate(resultsSelector, "mousemove-filtered", this.bind(this.highlightUnderEvent));
+
+            installDebouncedScroll(80, this.results);
+            this.dropdown.delegate(resultsSelector, "scroll-debounced", this.bind(this.loadMoreIfNeeded));
+
+            // if jquery.mousewheel plugin is installed we can prevent out-of-bounds scrolling of results via mousewheel
+            if ($.fn.mousewheel) {
+                results.mousewheel(function (e, delta, deltaX, deltaY) {
+                    var top = results.scrollTop(), height;
+                    if (deltaY > 0 && top - deltaY <= 0) {
+                        results.scrollTop(0);
+                        killEvent(e);
+                    } else if (deltaY < 0 && results.get(0).scrollHeight - results.scrollTop() + deltaY <= results.height()) {
+                        results.scrollTop(results.get(0).scrollHeight - results.height());
+                        killEvent(e);
+                    }
+                });
+            }
+
+            installKeyUpChangeEvent(search);
+            search.bind("keyup-change", this.bind(this.updateResults));
+            search.bind("focus", function () { search.addClass("select2-focused"); if (search.val() === " ") search.val(""); });
+            search.bind("blur", function () { search.removeClass("select2-focused");});
+
+            this.dropdown.delegate(resultsSelector, "mouseup", this.bind(function (e) {
+                if ($(e.target).closest(".select2-result-selectable:not(.select2-disabled)").length > 0) {
+                    this.highlightUnderEvent(e);
+                    this.selectHighlighted(e);
+                } else {
+                    this.focusSearch();
+                }
+                killEvent(e);
+            }));
+
+            // trap all mouse events from leaving the dropdown. sometimes there may be a modal that is listening
+            // for mouse events outside of itself so it can close itself. since the dropdown is now outside the select2's
+            // dom it will trigger the popup close, which is not what we want
+            this.dropdown.bind("click mouseup mousedown", function (e) { e.stopPropagation(); });
+
+            if ($.isFunction(this.opts.initSelection)) {
+                // initialize selection based on the current value of the source element
+                this.initSelection();
+
+                // if the user has provided a function that can set selection based on the value of the source element
+                // we monitor the change event on the element and trigger it, allowing for two way synchronization
+                this.monitorSource();
+            }
+
+            if (opts.element.is(":disabled") || opts.element.is("[readonly='readonly']")) this.disable();
+        },
+
+        // abstract
+        destroy: function () {
+            var select2 = this.opts.element.data("select2");
+            if (select2 !== undefined) {
+                select2.container.remove();
+                select2.dropdown.remove();
+                select2.opts.element
+                    .removeData("select2")
+                    .unbind(".select2")
+                    .show();
+            }
+        },
+
+        // abstract
+        prepareOpts: function (opts) {
+            var element, select, idKey, ajaxUrl;
+
+            element = opts.element;
+
+            if (element.get(0).tagName.toLowerCase() === "select") {
+                this.select = select = opts.element;
+            }
+
+            if (select) {
+                // these options are not allowed when attached to a select because they are picked up off the element itself
+                $.each(["id", "multiple", "ajax", "query", "createSearchChoice", "initSelection", "data", "tags"], function () {
+                    if (this in opts) {
+                        throw new Error("Option '" + this + "' is not allowed for Select2 when attached to a <select> element.");
+                    }
+                });
+            }
+
+            opts = $.extend({}, {
+                populateResults: function(container, results, query) {
+                    var populate,  data, result, children, id=this.opts.id, self=this;
+
+                    populate=function(results, container, depth) {
+
+                        var i, l, result, selectable, compound, node, label, innerContainer, formatted;
+                        for (i = 0, l = results.length; i < l; i = i + 1) {
+
+                            result=results[i];
+                            selectable=id(result) !== undefined;
+                            compound=("children" in result) && result.children.length > 0;
+
+                            node=$("<li></li>");
+                            node.addClass("select2-results-dept-"+depth);
+                            node.addClass("select2-result");
+                            node.addClass(selectable ? "select2-result-selectable" : "select2-result-unselectable");
+                            if (compound) { node.addClass("select2-result-with-children"); }
+                            node.addClass(self.opts.formatResultCssClass(result));
+
+                            label=$("<div></div>");
+                            label.addClass("select2-result-label");
+
+                            formatted=opts.formatResult(result, label, query);
+                            if (formatted!==undefined) {
+                                label.html(self.opts.escapeMarkup(formatted));
+                            }
+
+                            node.append(label);
+
+                            if (compound) {
+
+                                innerContainer=$("<ul></ul>");
+                                innerContainer.addClass("select2-result-sub");
+                                populate(result.children, innerContainer, depth+1);
+                                node.append(innerContainer);
+                            }
+
+                            node.data("select2-data", result);
+                            container.append(node);
+                        }
+                    };
+
+                    populate(results, container, 0);
+                }
+            }, $.fn.select2.defaults, opts);
+
+            if (typeof(opts.id) !== "function") {
+                idKey = opts.id;
+                opts.id = function (e) { return e[idKey]; };
+            }
+
+            if (select) {
+                opts.query = this.bind(function (query) {
+                    var data = { results: [], more: false },
+                        term = query.term,
+                        children, firstChild, process;
+
+                    process=function(element, collection) {
+                        var group;
+                        if (element.is("option")) {
+                            if (query.matcher(term, element.text(), element)) {
+                                collection.push({id:element.attr("value"), text:element.text(), element: element.get(), css: element.attr("class")});
+                            }
+                        } else if (element.is("optgroup")) {
+                            group={text:element.attr("label"), children:[], element: element.get(), css: element.attr("class")};
+                            element.children().each2(function(i, elm) { process(elm, group.children); });
+                            if (group.children.length>0) {
+                                collection.push(group);
+                            }
+                        }
+                    };
+
+                    children=element.children();
+
+                    // ignore the placeholder option if there is one
+                    if (this.getPlaceholder() !== undefined && children.length > 0) {
+                        firstChild = children[0];
+                        if ($(firstChild).text() === "") {
+                            children=children.not(firstChild);
+                        }
+                    }
+
+                    children.each2(function(i, elm) { process(elm, data.results); });
+
+                    query.callback(data);
+                });
+                // this is needed because inside val() we construct choices from options and there id is hardcoded
+                opts.id=function(e) { return e.id; };
+                opts.formatResultCssClass = function(data) { return data.css; }
+            } else {
+                if (!("query" in opts)) {
+                    if ("ajax" in opts) {
+                        ajaxUrl = opts.element.data("ajax-url");
+                        if (ajaxUrl && ajaxUrl.length > 0) {
+                            opts.ajax.url = ajaxUrl;
+                        }
+                        opts.query = ajax(opts.ajax);
+                    } else if ("data" in opts) {
+                        opts.query = local(opts.data);
+                    } else if ("tags" in opts) {
+                        opts.query = tags(opts.tags);
+                        opts.createSearchChoice = function (term) { return {id: term, text: term}; };
+                        opts.initSelection = function (element, callback) {
+                            var data = [];
+                            $(splitVal(element.val(), opts.separator)).each(function () {
+                                var id = this, text = this, tags=opts.tags;
+                                if ($.isFunction(tags)) tags=tags();
+                                $(tags).each(function() { if (equal(this.id, id)) { text = this.text; return false; } });
+                                data.push({id: id, text: text});
+                            });
+
+                            callback(data);
+                        };
+                    }
+                }
+            }
+            if (typeof(opts.query) !== "function") {
+                throw "query function not defined for Select2 " + opts.element.attr("id");
+            }
+
+            return opts;
+        },
+
+        /**
+         * Monitor the original element for changes and update select2 accordingly
+         */
+        // abstract
+        monitorSource: function () {
+            this.opts.element.bind("change.select2", this.bind(function (e) {
+                if (this.opts.element.data("select2-change-triggered") !== true) {
+                    this.initSelection();
+                }
+            }));
+        },
+
+        /**
+         * Triggers the change event on the source element
+         */
+        // abstract
+        triggerChange: function (details) {
+
+            details = details || {};
+            details= $.extend({}, details, { type: "change", val: this.val() });
+            // prevents recursive triggering
+            this.opts.element.data("select2-change-triggered", true);
+            this.opts.element.trigger(details);
+            this.opts.element.data("select2-change-triggered", false);
+
+            // some validation frameworks ignore the change event and listen instead to keyup, click for selects
+            // so here we trigger the click event manually
+            this.opts.element.click();
+
+            // ValidationEngine ignorea the change event and listens instead to blur
+            // so here we trigger the blur event manually if so desired
+            if (this.opts.blurOnChange)
+                this.opts.element.blur();
+        },
+
+
+        // abstract
+        enable: function() {
+            if (this.enabled) return;
+
+            this.enabled=true;
+            this.container.removeClass("select2-container-disabled");
+        },
+
+        // abstract
+        disable: function() {
+            if (!this.enabled) return;
+
+            this.close();
+
+            this.enabled=false;
+            this.container.addClass("select2-container-disabled");
+        },
+
+        // abstract
+        opened: function () {
+            return this.container.hasClass("select2-dropdown-open");
+        },
+
+        // abstract
+        positionDropdown: function() {
+            var offset = this.container.offset(),
+                height = this.container.outerHeight(),
+                width = this.container.outerWidth(),
+                dropHeight = this.dropdown.outerHeight(),
+                viewportBottom = $(window).scrollTop() + document.documentElement.clientHeight,
+                dropTop = offset.top + height,
+                dropLeft = offset.left,
+                enoughRoomBelow = dropTop + dropHeight <= viewportBottom,
+                enoughRoomAbove = (offset.top - dropHeight) >= this.body().scrollTop(),
+                aboveNow = this.dropdown.hasClass("select2-drop-above"),
+                bodyOffset,
+                above,
+                css;
+
+            // console.log("below/ droptop:", dropTop, "dropHeight", dropHeight, "sum", (dropTop+dropHeight)+" viewport bottom", viewportBottom, "enough?", enoughRoomBelow);
+            // console.log("above/ offset.top", offset.top, "dropHeight", dropHeight, "top", (offset.top-dropHeight), "scrollTop", this.body().scrollTop(), "enough?", enoughRoomAbove);
+
+            // fix positioning when body has an offset and is not position: static
+
+            if (this.body().css('position') !== 'static') {
+                bodyOffset = this.body().offset();
+                dropTop -= bodyOffset.top;
+                dropLeft -= bodyOffset.left;
+            }
+
+            // always prefer the current above/below alignment, unless there is not enough room
+
+            if (aboveNow) {
+                above = true;
+                if (!enoughRoomAbove && enoughRoomBelow) above = false;
+            } else {
+                above = false;
+                if (!enoughRoomBelow && enoughRoomAbove) above = true;
+            }
+
+            if (above) {
+                dropTop = offset.top - dropHeight;
+                this.container.addClass("select2-drop-above");
+                this.dropdown.addClass("select2-drop-above");
+            }
+            else {
+                this.container.removeClass("select2-drop-above");
+                this.dropdown.removeClass("select2-drop-above");
+            }
+
+            css = $.extend({
+                top: dropTop,
+                left: dropLeft,
+                width: width
+            }, evaluate(this.opts.dropdownCss));
+
+            this.dropdown.css(css);
+        },
+
+        // abstract
+        shouldOpen: function() {
+            var event;
+
+            if (this.opened()) return false;
+
+            event = jQuery.Event("open");
+            this.opts.element.trigger(event);
+            return !event.isDefaultPrevented();
+        },
+
+        // abstract
+        clearDropdownAlignmentPreference: function() {
+            // clear the classes used to figure out the preference of where the dropdown should be opened
+            this.container.removeClass("select2-drop-above");
+            this.dropdown.removeClass("select2-drop-above");
+        },
+
+        /**
+         * Opens the dropdown
+         *
+         * @return {Boolean} whether or not dropdown was opened. This method will return false if, for example,
+         * the dropdown is already open, or if the 'open' event listener on the element called preventDefault().
+         */
+        // abstract
+        open: function () {
+
+            if (!this.shouldOpen()) return false;
+
+            window.setTimeout(this.bind(this.opening), 1);
+
+            return true;
+        },
+
+        /**
+         * Performs the opening of the dropdown
+         */
+        // abstract
+        opening: function() {
+            var cid = this.containerId, selector = this.containerSelector,
+                scroll = "scroll." + cid, resize = "resize." + cid;
+
+            this.container.parents().each(function() {
+                $(this).bind(scroll, function() {
+                    var s2 = $(selector);
+                    if (s2.length == 0) {
+                        $(this).unbind(scroll);
+                    }
+                    s2.select2("close");
+                });
+            });
+
+            $(window).bind(resize, function() {
+                var s2 = $(selector);
+                if (s2.length == 0) {
+                    $(window).unbind(resize);
+                }
+                s2.select2("close");
+            });
+
+            this.clearDropdownAlignmentPreference();
+
+            if (this.search.val() === " ") { this.search.val(""); }
+
+            this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
+
+            this.updateResults(true);
+
+            if(this.dropdown[0] !== this.body().children().last()[0]) {
+                this.dropdown.detach().appendTo(this.body());
+            }
+
+            this.dropdown.show();
+
+            this.positionDropdown();
+            this.dropdown.addClass("select2-drop-active");
+
+            this.ensureHighlightVisible();
+
+            this.focusSearch();
+        },
+
+        // abstract
+        close: function () {
+            if (!this.opened()) return;
+
+            var self = this;
+
+            this.container.parents().each(function() {
+                $(this).unbind("scroll." + self.containerId);
+            });
+            $(window).unbind("resize." + this.containerId);
+
+            this.clearDropdownAlignmentPreference();
+
+            this.dropdown.hide();
+            this.container.removeClass("select2-dropdown-open").removeClass("select2-container-active");
+            this.results.empty();
+            this.clearSearch();
+
+            this.opts.element.trigger(jQuery.Event("close"));
+        },
+
+        // abstract
+        clearSearch: function () {
+
+        },
+
+        // abstract
+        ensureHighlightVisible: function () {
+            var results = this.results, children, index, child, hb, rb, y, more;
+
+            index = this.highlight();
+
+            if (index < 0) return;
+
+            if (index == 0) {
+
+                // if the first element is highlighted scroll all the way to the top,
+                // that way any unselectable headers above it will also be scrolled
+                // into view
+
+                results.scrollTop(0);
+                return;
+            }
+
+            children = results.find(".select2-result-selectable");
+
+            child = $(children[index]);
+
+            hb = child.offset().top + child.outerHeight();
+
+            // if this is the last child lets also make sure select2-more-results is visible
+            if (index === children.length - 1) {
+                more = results.find("li.select2-more-results");
+                if (more.length > 0) {
+                    hb = more.offset().top + more.outerHeight();
+                }
+            }
+
+            rb = results.offset().top + results.outerHeight();
+            if (hb > rb) {
+                results.scrollTop(results.scrollTop() + (hb - rb));
+            }
+            y = child.offset().top - results.offset().top;
+
+            // make sure the top of the element is visible
+            if (y < 0) {
+                results.scrollTop(results.scrollTop() + y); // y is negative
+            }
+        },
+
+        // abstract
+        moveHighlight: function (delta) {
+            var choices = this.results.find(".select2-result-selectable"),
+                index = this.highlight();
+
+            while (index > -1 && index < choices.length) {
+                index += delta;
+                var choice = $(choices[index]);
+                if (choice.hasClass("select2-result-selectable") && !choice.hasClass("select2-disabled")) {
+                    this.highlight(index);
+                    break;
+                }
+            }
+        },
+
+        // abstract
+        highlight: function (index) {
+            var choices = this.results.find(".select2-result-selectable").not(".select2-disabled");
+
+            if (arguments.length === 0) {
+                return indexOf(choices.filter(".select2-highlighted")[0], choices.get());
+            }
+
+            if (index >= choices.length) index = choices.length - 1;
+            if (index < 0) index = 0;
+
+            choices.removeClass("select2-highlighted");
+
+            $(choices[index]).addClass("select2-highlighted");
+            this.ensureHighlightVisible();
+
+        },
+
+        // abstract
+        countSelectableResults: function() {
+            return this.results.find(".select2-result-selectable").not(".select2-disabled").length;
+        },
+
+        // abstract
+        highlightUnderEvent: function (event) {
+            var el = $(event.target).closest(".select2-result-selectable");
+            if (el.length > 0 && !el.is(".select2-highlighted")) {
+        		var choices = this.results.find('.select2-result-selectable');
+                this.highlight(choices.index(el));
+            } else if (el.length == 0) {
+                // if we are over an unselectable item remove al highlights
+                this.results.find(".select2-highlighted").removeClass("select2-highlighted");
+            }
+        },
+
+        // abstract
+        loadMoreIfNeeded: function () {
+            var results = this.results,
+                more = results.find("li.select2-more-results"),
+                below, // pixels the element is below the scroll fold, below==0 is when the element is starting to be visible
+                offset = -1, // index of first element without data
+                page = this.resultsPage + 1,
+                self=this,
+                term=this.search.val(),
+                context=this.context;
+
+            if (more.length === 0) return;
+            below = more.offset().top - results.offset().top - results.height();
+
+            if (below <= 0) {
+                more.addClass("select2-active");
+                this.opts.query({
+                        term: term,
+                        page: page,
+                        context: context,
+                        matcher: this.opts.matcher,
+                        callback: this.bind(function (data) {
+
+                    // ignore a response if the select2 has been closed before it was received
+                    if (!self.opened()) return;
+
+
+                    self.opts.populateResults.call(this, results, data.results, {term: term, page: page, context:context});
+
+                    if (data.more===true) {
+                        more.detach().appendTo(results).text(self.opts.formatLoadMore(page+1));
+                        window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
+                    } else {
+                        more.remove();
+                    }
+                    self.positionDropdown();
+                    self.resultsPage = page;
+                })});
+            }
+        },
+
+        /**
+         * Default tokenizer function which does nothing
+         */
+        tokenize: function() {
+
+        },
+
+        /**
+         * @param initial whether or not this is the call to this method right after the dropdown has been opened
+         */
+        // abstract
+        updateResults: function (initial) {
+            var search = this.search, results = this.results, opts = this.opts, data, self=this, input;
+
+            // if the search is currently hidden we do not alter the results
+            if (initial !== true && (this.showSearchInput === false || !this.opened())) {
+                return;
+            }
+
+            search.addClass("select2-active");
+
+            function postRender() {
+                results.scrollTop(0);
+                search.removeClass("select2-active");
+                self.positionDropdown();
+            }
+
+            function render(html) {
+                results.html(self.opts.escapeMarkup(html));
+                postRender();
+            }
+
+            if (opts.maximumSelectionSize >=1) {
+                data = this.data();
+                if ($.isArray(data) && data.length >= opts.maximumSelectionSize && checkFormatter(opts.formatSelectionTooBig, "formatSelectionTooBig")) {
+            	    render("<li class='select2-selection-limit'>" + opts.formatSelectionTooBig(opts.maximumSelectionSize) + "</li>");
+            	    return;
+                }
+            }
+
+            if (search.val().length < opts.minimumInputLength && checkFormatter(opts.formatInputTooShort, "formatInputTooShort")) {
+                render("<li class='select2-no-results'>" + opts.formatInputTooShort(search.val(), opts.minimumInputLength) + "</li>");
+                return;
+            }
+            else {
+                render("<li class='select2-searching'>" + opts.formatSearching() + "</li>");
+            }
+
+            // give the tokenizer a chance to pre-process the input
+            input = this.tokenize();
+            if (input != undefined && input != null) {
+                search.val(input);
+            }
+
+            this.resultsPage = 1;
+            opts.query({
+                    term: search.val(),
+                    page: this.resultsPage,
+                    context: null,
+                    matcher: opts.matcher,
+                    callback: this.bind(function (data) {
+                var def; // default choice
+
+                // ignore a response if the select2 has been closed before it was received
+                if (!this.opened()) return;
+
+                // save context, if any
+                this.context = (data.context===undefined) ? null : data.context;
+
+                // create a default choice and prepend it to the list
+                if (this.opts.createSearchChoice && search.val() !== "") {
+                    def = this.opts.createSearchChoice.call(null, search.val(), data.results);
+                    if (def !== undefined && def !== null && self.id(def) !== undefined && self.id(def) !== null) {
+                        if ($(data.results).filter(
+                            function () {
+                                return equal(self.id(this), self.id(def));
+                            }).length === 0) {
+                            data.results.unshift(def);
+                        }
+                    }
+                }
+
+                if (data.results.length === 0 && checkFormatter(opts.formatNoMatches, "formatNoMatches")) {
+                    render("<li class='select2-no-results'>" + opts.formatNoMatches(search.val()) + "</li>");
+                    return;
+                }
+
+                results.empty();
+                self.opts.populateResults.call(this, results, data.results, {term: search.val(), page: this.resultsPage, context:null});
+
+                if (data.more === true && checkFormatter(opts.formatLoadMore, "formatLoadMore")) {
+                    results.append("<li class='select2-more-results'>" + self.opts.escapeMarkup(opts.formatLoadMore(this.resultsPage)) + "</li>");
+                    window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
+                }
+
+                this.postprocessResults(data, initial);
+
+                postRender();
+            })});
+        },
+
+        // abstract
+        cancel: function () {
+            this.close();
+        },
+
+        // abstract
+        blur: function () {
+            this.close();
+            this.container.removeClass("select2-container-active");
+            this.dropdown.removeClass("select2-drop-active");
+            // synonymous to .is(':focus'), which is available in jquery >= 1.6
+            if (this.search[0] === document.activeElement) { this.search.blur(); }
+            this.clearSearch();
+            this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
+        },
+
+        // abstract
+        focusSearch: function () {
+            // need to do it here as well as in timeout so it works in IE
+            this.search.show();
+            this.search.focus();
+
+            /* we do this in a timeout so that current event processing can complete before this code is executed.
+             this makes sure the search field is focussed even if the current event would blur it */
+            window.setTimeout(this.bind(function () {
+                // reset the value so IE places the cursor at the end of the input box
+                this.search.show();
+                this.search.focus();
+                this.search.val(this.search.val());
+            }), 10);
+        },
+
+        // abstract
+        selectHighlighted: function () {
+            var index=this.highlight(),
+                highlighted=this.results.find(".select2-highlighted").not(".select2-disabled"),
+                data = highlighted.closest('.select2-result-selectable').data("select2-data");
+            if (data) {
+                highlighted.addClass("select2-disabled");
+                this.highlight(index);
+                this.onSelect(data);
+            }
+        },
+
+        // abstract
+        getPlaceholder: function () {
+            return this.opts.element.attr("placeholder") ||
+                this.opts.element.attr("data-placeholder") || // jquery 1.4 compat
+                this.opts.element.data("placeholder") ||
+                this.opts.placeholder;
+        },
+
+        /**
+         * Get the desired width for the container element.  This is
+         * derived first from option `width` passed to select2, then
+         * the inline 'style' on the original element, and finally
+         * falls back to the jQuery calculated element width.
+         */
+        // abstract
+        initContainerWidth: function () {
+            function resolveContainerWidth() {
+                var style, attrs, matches, i, l;
+
+                if (this.opts.width === "off") {
+                    return null;
+                } else if (this.opts.width === "element"){
+                    return this.opts.element.outerWidth() === 0 ? 'auto' : this.opts.element.outerWidth() + 'px';
+                } else if (this.opts.width === "copy" || this.opts.width === "resolve") {
+                    // check if there is inline style on the element that contains width
+                    style = this.opts.element.attr('style');
+                    if (style !== undefined) {
+                        attrs = style.split(';');
+                        for (i = 0, l = attrs.length; i < l; i = i + 1) {
+                            matches = attrs[i].replace(/\s/g, '')
+                                .match(/width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/);
+                            if (matches !== null && matches.length >= 1)
+                                return matches[1];
+                        }
+                    }
+
+                    if (this.opts.width === "resolve") {
+                        // next check if css('width') can resolve a width that is percent based, this is sometimes possible
+                        // when attached to input type=hidden or elements hidden via css
+                        style = this.opts.element.css('width');
+                        if (style.indexOf("%") > 0) return style;
+
+                        // finally, fallback on the calculated width of the element
+                        return (this.opts.element.outerWidth() === 0 ? 'auto' : this.opts.element.outerWidth() + 'px');
+                    }
+
+                    return null;
+                } else if ($.isFunction(this.opts.width)) {
+                    return this.opts.width();
+                } else {
+                    return this.opts.width;
+               }
+            };
+
+            var width = resolveContainerWidth.call(this);
+            if (width !== null) {
+                this.container.attr("style", "width: "+width);
+            }
+        }
+    });
+
+    SingleSelect2 = clazz(AbstractSelect2, {
+
+        // single
+
+		createContainer: function () {
+            var container = $("<div></div>", {
+                "class": "select2-container"
+            }).html([
+                "    <a href='#' onclick='return false;' class='select2-choice'>",
+                "   <span></span><abbr class='select2-search-choice-close' style='display:none;'></abbr>",
+                "   <div><b></b></div>" ,
+                "</a>",
+                "    <div class='select2-drop select2-offscreen'>" ,
+                "   <div class='select2-search'>" ,
+                "       <input type='text' autocomplete='off' class='select2-input'/>" ,
+                "   </div>" ,
+                "   <ul class='select2-results'>" ,
+                "   </ul>" ,
+                "</div>"].join(""));
+            return container;
+        },
+
+        // single
+        opening: function () {
+            this.search.show();
+            this.parent.opening.apply(this, arguments);
+            this.dropdown.removeClass("select2-offscreen");
+        },
+
+        // single
+        close: function () {
+            if (!this.opened()) return;
+            this.parent.close.apply(this, arguments);
+            this.dropdown.removeAttr("style").addClass("select2-offscreen").insertAfter(this.selection).show();
+        },
+
+        // single
+        focus: function () {
+            this.close();
+            this.selection.focus();
+        },
+
+        // single
+        isFocused: function () {
+            return this.selection[0] === document.activeElement;
+        },
+
+        // single
+        cancel: function () {
+            this.parent.cancel.apply(this, arguments);
+            this.selection.focus();
+        },
+
+        // single
+        initContainer: function () {
+
+            var selection,
+                container = this.container,
+                dropdown = this.dropdown,
+                clickingInside = false;
+
+            this.selection = selection = container.find(".select2-choice");
+
+            this.search.bind("keydown", this.bind(function (e) {
+                if (!this.enabled) return;
+
+                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
+                    // prevent the page from scrolling
+                    killEvent(e);
+                    return;
+                }
+
+                if (this.opened()) {
+                    switch (e.which) {
+                        case KEY.UP:
+                        case KEY.DOWN:
+                            this.moveHighlight((e.which === KEY.UP) ? -1 : 1);
+                            killEvent(e);
+                            return;
+                        case KEY.TAB:
+                        case KEY.ENTER:
+                            this.selectHighlighted();
+                            killEvent(e);
+                            return;
+                        case KEY.ESC:
+                            this.cancel(e);
+                            killEvent(e);
+                            return;
+                    }
+                } else {
+
+                    if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e) || e.which === KEY.ESC) {
+                        return;
+                    }
+
+                    if (this.opts.openOnEnter === false && e.which === KEY.ENTER) {
+                        return;
+                    }
+
+                    this.open();
+
+                    if (e.which === KEY.ENTER) {
+                        // do not propagate the event otherwise we open, and propagate enter which closes
+                        return;
+                    }
+                }
+            }));
+
+            this.search.bind("focus", this.bind(function() {
+                this.selection.attr("tabIndex", "-1");
+            }));
+            this.search.bind("blur", this.bind(function() {
+                if (!this.opened()) this.container.removeClass("select2-container-active");
+                window.setTimeout(this.bind(function() { this.selection.attr("tabIndex", this.opts.element.attr("tabIndex")); }), 10);
+            }));
+
+            selection.bind("mousedown", this.bind(function (e) {
+                clickingInside = true;
+
+                if (this.opened()) {
+                    this.close();
+                    this.selection.focus();
+                } else if (this.enabled) {
+                    this.open();
+                }
+
+                clickingInside = false;
+            }));
+
+            dropdown.bind("mousedown", this.bind(function() { this.search.focus(); }));
+
+            selection.bind("focus", this.bind(function() {
+                this.container.addClass("select2-container-active");
+                // hide the search so the tab key does not focus on it
+                this.search.attr("tabIndex", "-1");
+            }));
+
+            selection.bind("blur", this.bind(function() {
+                if (!this.opened()) {
+                    this.container.removeClass("select2-container-active");
+                }
+                window.setTimeout(this.bind(function() { this.search.attr("tabIndex", this.opts.element.attr("tabIndex")); }), 10);
+            }));
+
+            selection.bind("keydown", this.bind(function(e) {
+                if (!this.enabled) return;
+
+                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
+                    // prevent the page from scrolling
+                    killEvent(e);
+                    return;
+                }
+
+                if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e)
+                 || e.which === KEY.ESC) {
+                    return;
+                }
+
+                if (this.opts.openOnEnter === false && e.which === KEY.ENTER) {
+                    return;
+                }
+
+                if (e.which == KEY.DELETE) {
+                    if (this.opts.allowClear) {
+                        this.clear();
+                    }
+                    return;
+                }
+
+                this.open();
+
+                if (e.which === KEY.ENTER) {
+                    // do not propagate the event otherwise we open, and propagate enter which closes
+                    killEvent(e);
+                    return;
+                }
+
+                // do not set the search input value for non-alpha-numeric keys
+                // otherwise pressing down results in a '(' being set in the search field
+                if (e.which < 48 ) { // '0' == 48
+                    killEvent(e);
+                    return;
+                }
+
+                var keyWritten = String.fromCharCode(e.which).toLowerCase();
+
+                if (e.shiftKey) {
+                    keyWritten = keyWritten.toUpperCase();
+                }
+
+                // focus the field before calling val so the cursor ends up after the value instead of before
+                this.search.focus();
+                this.search.val(keyWritten);
+
+                // prevent event propagation so it doesnt replay on the now focussed search field and result in double key entry
+                killEvent(e);
+            }));
+
+            selection.delegate("abbr", "mousedown", this.bind(function (e) {
+                if (!this.enabled) return;
+                this.clear();
+                killEvent(e);
+                this.close();
+                this.triggerChange();
+                this.selection.focus();
+            }));
+
+            this.setPlaceholder();
+
+            this.search.bind("focus", this.bind(function() {
+                this.container.addClass("select2-container-active");
+            }));
+        },
+
+        // single
+        clear: function() {
+            this.opts.element.val("");
+            this.selection.find("span").empty();
+            this.selection.removeData("select2-data");
+            this.setPlaceholder();
+        },
+
+        /**
+         * Sets selection based on source element's value
+         */
+        // single
+        initSelection: function () {
+            var selected;
+            if (this.opts.element.val() === "") {
+                this.close();
+                this.setPlaceholder();
+            } else {
+                var self = this;
+                this.opts.initSelection.call(null, this.opts.element, function(selected){
+                    if (selected !== undefined && selected !== null) {
+                        self.updateSelection(selected);
+                        self.close();
+                        self.setPlaceholder();
+                    }
+                });
+            }
+        },
+
+        // single
+        prepareOpts: function () {
+            var opts = this.parent.prepareOpts.apply(this, arguments);
+
+            if (opts.element.get(0).tagName.toLowerCase() === "select") {
+                // install the selection initializer
+                opts.initSelection = function (element, callback) {
+                    var selected = element.find(":selected");
+                    // a single select box always has a value, no need to null check 'selected'
+                    if ($.isFunction(callback))
+                        callback({id: selected.attr("value"), text: selected.text()});
+                };
+            }
+
+            return opts;
+        },
+
+        // single
+        setPlaceholder: function () {
+            var placeholder = this.getPlaceholder();
+
+            if (this.opts.element.val() === "" && placeholder !== undefined) {
+
+                // check for a first blank option if attached to a select
+                if (this.select && this.select.find("option:first").text() !== "") return;
+
+                this.selection.find("span").html(this.opts.escapeMarkup(placeholder));
+
+                this.selection.addClass("select2-default");
+
+                this.selection.find("abbr").hide();
+            }
+        },
+
+        // single
+        postprocessResults: function (data, initial) {
+            var selected = 0, self = this, showSearchInput = true;
+
+            // find the selected element in the result list
+
+            this.results.find(".select2-result-selectable").each2(function (i, elm) {
+                if (equal(self.id(elm.data("select2-data")), self.opts.element.val())) {
+                    selected = i;
+                    return false;
+                }
+            });
+
+            // and highlight it
+
+            this.highlight(selected);
+
+            // hide the search box if this is the first we got the results and there are a few of them
+
+            if (initial === true) {
+                showSearchInput = this.showSearchInput = countResults(data.results) >= this.opts.minimumResultsForSearch;
+                this.dropdown.find(".select2-search")[showSearchInput ? "removeClass" : "addClass"]("select2-search-hidden");
+
+                //add "select2-with-searchbox" to the container if search box is shown
+                $(this.dropdown, this.container)[showSearchInput ? "addClass" : "removeClass"]("select2-with-searchbox");
+            }
+
+        },
+
+        // single
+        onSelect: function (data) {
+            var old = this.opts.element.val();
+
+            this.opts.element.val(this.id(data));
+            this.updateSelection(data);
+            this.close();
+            this.selection.focus();
+
+            if (!equal(old, this.id(data))) { this.triggerChange(); }
+        },
+
+        // single
+        updateSelection: function (data) {
+
+            var container=this.selection.find("span"), formatted;
+
+            this.selection.data("select2-data", data);
+
+            container.empty();
+            formatted=this.opts.formatSelection(data, container);
+            if (formatted !== undefined) {
+                container.append(this.opts.escapeMarkup(formatted));
+            }
+
+            this.selection.removeClass("select2-default");
+
+            if (this.opts.allowClear && this.getPlaceholder() !== undefined) {
+                this.selection.find("abbr").show();
+            }
+        },
+
+        // single
+        val: function () {
+            var val, data = null, self = this;
+
+            if (arguments.length === 0) {
+                return this.opts.element.val();
+            }
+
+            val = arguments[0];
+
+            if (this.select) {
+                this.select
+                    .val(val)
+                    .find(":selected").each2(function (i, elm) {
+                        data = {id: elm.attr("value"), text: elm.text()};
+                        return false;
+                    });
+                this.updateSelection(data);
+                this.setPlaceholder();
+            } else {
+                if (this.opts.initSelection === undefined) {
+                    throw new Error("cannot call val() if initSelection() is not defined");
+                }
+                // val is an id. !val is true for [undefined,null,'']
+                if (!val) {
+                    this.clear();
+                    return;
+                }
+                this.opts.element.val(val);
+                this.opts.initSelection(this.opts.element, function(data){
+                    self.opts.element.val(!data ? "" : self.id(data));
+                    self.updateSelection(data);
+                    self.setPlaceholder();
+                });
+            }
+        },
+
+        // single
+        clearSearch: function () {
+            this.search.val("");
+        },
+
+        // single
+        data: function(value) {
+            var data;
+
+            if (arguments.length === 0) {
+                data = this.selection.data("select2-data");
+                if (data == undefined) data = null;
+                return data;
+            } else {
+                if (!value || value === "") {
+                    this.clear();
+                } else {
+                    this.opts.element.val(!value ? "" : this.id(value));
+                    this.updateSelection(value);
+                }
+            }
+        }
+    });
+
+    MultiSelect2 = clazz(AbstractSelect2, {
+
+        // multi
+        createContainer: function () {
+            var container = $("<div></div>", {
+                "class": "select2-container select2-container-multi"
+            }).html([
+                "    <ul class='select2-choices'>",
+                //"<li class='select2-search-choice'><span>California</span><a href="javascript:void(0)" class="select2-search-choice-close"></a></li>" ,
+                "  <li class='select2-search-field'>" ,
+                "    <input type='text' autocomplete='off' class='select2-input'>" ,
+                "  </li>" ,
+                "</ul>" ,
+                "<div class='select2-drop select2-drop-multi' style='display:none;'>" ,
+                "   <ul class='select2-results'>" ,
+                "   </ul>" ,
+                "</div>"].join(""));
+			return container;
+        },
+
+        // multi
+        prepareOpts: function () {
+            var opts = this.parent.prepareOpts.apply(this, arguments);
+
+            // TODO validate placeholder is a string if specified
+
+            if (opts.element.get(0).tagName.toLowerCase() === "select") {
+                // install sthe selection initializer
+                opts.initSelection = function (element,callback) {
+
+                    var data = [];
+                    element.find(":selected").each2(function (i, elm) {
+                        data.push({id: elm.attr("value"), text: elm.text()});
+                    });
+
+                    if ($.isFunction(callback))
+                        callback(data);
+                };
+            }
+
+            return opts;
+        },
+
+        // multi
+        initContainer: function () {
+
+            var selector = ".select2-choices", selection;
+
+            this.searchContainer = this.container.find(".select2-search-field");
+            this.selection = selection = this.container.find(selector);
+
+            this.search.bind("keydown", this.bind(function (e) {
+                if (!this.enabled) return;
+
+                if (e.which === KEY.BACKSPACE && this.search.val() === "") {
+                    this.close();
+
+                    var choices,
+                        selected = selection.find(".select2-search-choice-focus");
+                    if (selected.length > 0) {
+                        this.unselect(selected.first());
+                        this.search.width(10);
+                        killEvent(e);
+                        return;
+                    }
+
+                    choices = selection.find(".select2-search-choice");
+                    if (choices.length > 0) {
+                        choices.last().addClass("select2-search-choice-focus");
+                    }
+                } else {
+                    selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
+                }
+
+                if (this.opened()) {
+                    switch (e.which) {
+                    case KEY.UP:
+                    case KEY.DOWN:
+                        this.moveHighlight((e.which === KEY.UP) ? -1 : 1);
+                        killEvent(e);
+                        return;
+                    case KEY.ENTER:
+                    case KEY.TAB:
+                        this.selectHighlighted();
+                        killEvent(e);
+                        return;
+                    case KEY.ESC:
+                        this.cancel(e);
+                        killEvent(e);
+                        return;
+                    }
+                }
+
+                if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e)
+                 || e.which === KEY.BACKSPACE || e.which === KEY.ESC) {
+                    return;
+                }
+
+                if (this.opts.openOnEnter === false && e.which === KEY.ENTER) {
+                    return;
+                }
+
+                this.open();
+
+                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
+                    // prevent the page from scrolling
+                    killEvent(e);
+                }
+            }));
+
+            this.search.bind("keyup", this.bind(this.resizeSearch));
+
+            this.search.bind("blur", this.bind(function(e) {
+                this.container.removeClass("select2-container-active");
+                this.search.removeClass("select2-focused");
+                this.clearSearch();
+                e.stopImmediatePropagation();
+            }));
+
+            this.container.delegate(selector, "mousedown", this.bind(function (e) {
+                if (!this.enabled) return;
+                if ($(e.target).closest(".select2-search-choice").length > 0) {
+                    // clicked inside a select2 search choice, do not open
+                    return;
+                }
+                this.clearPlaceholder();
+                this.open();
+                this.focusSearch();
+                e.preventDefault();
+            }));
+
+            this.container.delegate(selector, "focus", this.bind(function () {
+                if (!this.enabled) return;
+                this.container.addClass("select2-container-active");
+                this.dropdown.addClass("select2-drop-active");
+                this.clearPlaceholder();
+            }));
+
+            // set the placeholder if necessary
+            this.clearSearch();
+        },
+
+        // multi
+        enable: function() {
+            if (this.enabled) return;
+
+            this.parent.enable.apply(this, arguments);
+
+            this.search.removeAttr("disabled");
+        },
+
+        // multi
+        disable: function() {
+            if (!this.enabled) return;
+
+            this.parent.disable.apply(this, arguments);
+
+            this.search.attr("disabled", true);
+        },
+
+        // multi
+        initSelection: function () {
+            var data;
+            if (this.opts.element.val() === "") {
+                this.updateSelection([]);
+                this.close();
+                // set the placeholder if necessary
+                this.clearSearch();
+            }
+            if (this.select || this.opts.element.val() !== "") {
+                var self = this;
+                this.opts.initSelection.call(null, this.opts.element, function(data){
+                    if (data !== undefined && data !== null) {
+                        self.updateSelection(data);
+                        self.close();
+                        // set the placeholder if necessary
+                        self.clearSearch();
+                    }
+                });
+            }
+        },
+
+        // multi
+        clearSearch: function () {
+            var placeholder = this.getPlaceholder();
+
+            if (placeholder !== undefined  && this.getVal().length === 0 && this.search.hasClass("select2-focused") === false) {
+                this.search.val(placeholder).addClass("select2-default");
+                // stretch the search box to full width of the container so as much of the placeholder is visible as possible
+                this.resizeSearch();
+            } else {
+                // we set this to " " instead of "" and later clear it on focus() because there is a firefox bug
+                // that does not properly render the caret when the field starts out blank
+                this.search.val(" ").width(10);
+            }
+        },
+
+        // multi
+        clearPlaceholder: function () {
+            if (this.search.hasClass("select2-default")) {
+                this.search.val("").removeClass("select2-default");
+            } else {
+                // work around for the space character we set to avoid firefox caret bug
+                if (this.search.val() === " ") this.search.val("");
+            }
+        },
+
+        // multi
+        opening: function () {
+            this.parent.opening.apply(this, arguments);
+
+            this.clearPlaceholder();
+			this.resizeSearch();
+            this.focusSearch();
+        },
+
+        // multi
+        close: function () {
+            if (!this.opened()) return;
+            this.parent.close.apply(this, arguments);
+        },
+
+        // multi
+        focus: function () {
+            this.close();
+            this.search.focus();
+        },
+
+        // multi
+        isFocused: function () {
+            return this.search.hasClass("select2-focused");
+        },
+
+        // multi
+        updateSelection: function (data) {
+            var ids = [], filtered = [], self = this;
+
+            // filter out duplicates
+            $(data).each(function () {
+                if (indexOf(self.id(this), ids) < 0) {
+                    ids.push(self.id(this));
+                    filtered.push(this);
+                }
+            });
+            data = filtered;
+
+            this.selection.find(".select2-search-choice").remove();
+            $(data).each(function () {
+                self.addSelectedChoice(this);
+            });
+            self.postprocessResults();
+        },
+
+        tokenize: function() {
+            var input = this.search.val();
+            input = this.opts.tokenizer(input, this.data(), this.bind(this.onSelect), this.opts);
+            if (input != null && input != undefined) {
+                this.search.val(input);
+                if (input.length > 0) {
+                    this.open();
+                }
+            }
+
+        },
+
+        // multi
+        onSelect: function (data) {
+            this.addSelectedChoice(data);
+            if (this.select) { this.postprocessResults(); }
+
+            if (this.opts.closeOnSelect) {
+                this.close();
+                this.search.width(10);
+            } else {
+                if (this.countSelectableResults()>0) {
+                    this.search.width(10);
+                    this.resizeSearch();
+                    this.positionDropdown();
+                } else {
+                    // if nothing left to select close
+                    this.close();
+                }
+            }
+
+            // since its not possible to select an element that has already been
+            // added we do not need to check if this is a new element before firing change
+            this.triggerChange({ added: data });
+
+            this.focusSearch();
+        },
+
+        // multi
+        cancel: function () {
+            this.close();
+            this.focusSearch();
+        },
+
+        // multi
+        addSelectedChoice: function (data) {
+            var choice=$(
+                    "<li class='select2-search-choice'>" +
+                    "    <div></div>" +
+                    "    <a href='#' onclick='return false;' class='select2-search-choice-close' tabindex='-1'></a>" +
+                    "</li>"),
+                id = this.id(data),
+                val = this.getVal(),
+                formatted;
+
+            formatted=this.opts.formatSelection(data, choice);
+            choice.find("div").replaceWith("<div>"+this.opts.escapeMarkup(formatted)+"</div>");
+            choice.find(".select2-search-choice-close")
+                .bind("mousedown", killEvent)
+                .bind("click dblclick", this.bind(function (e) {
+                if (!this.enabled) return;
+
+                $(e.target).closest(".select2-search-choice").fadeOut('fast', this.bind(function(){
+                    this.unselect($(e.target));
+                    this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
+                    this.close();
+                    this.focusSearch();
+                })).dequeue();
+                killEvent(e);
+            })).bind("focus", this.bind(function () {
+                if (!this.enabled) return;
+                this.container.addClass("select2-container-active");
+                this.dropdown.addClass("select2-drop-active");
+            }));
+
+            choice.data("select2-data", data);
+            choice.insertBefore(this.searchContainer);
+
+            val.push(id);
+            this.setVal(val);
+        },
+
+        // multi
+        unselect: function (selected) {
+            var val = this.getVal(),
+                data,
+                index;
+
+            selected = selected.closest(".select2-search-choice");
+
+            if (selected.length === 0) {
+                throw "Invalid argument: " + selected + ". Must be .select2-search-choice";
+            }
+
+            data = selected.data("select2-data");
+
+            index = indexOf(this.id(data), val);
+
+            if (index >= 0) {
+                val.splice(index, 1);
+                this.setVal(val);
+                if (this.select) this.postprocessResults();
+            }
+            selected.remove();
+            this.triggerChange({ removed: data });
+        },
+
+        // multi
+        postprocessResults: function () {
+            var val = this.getVal(),
+                choices = this.results.find(".select2-result-selectable"),
+                compound = this.results.find(".select2-result-with-children"),
+                self = this;
+
+            choices.each2(function (i, choice) {
+                var id = self.id(choice.data("select2-data"));
+                if (indexOf(id, val) >= 0) {
+                    choice.addClass("select2-disabled").removeClass("select2-result-selectable");
+                } else {
+                    choice.removeClass("select2-disabled").addClass("select2-result-selectable");
+                }
+            });
+
+            compound.each2(function(i, e) {
+                if (e.find(".select2-result-selectable").length==0) {
+                    e.addClass("select2-disabled");
+                } else {
+                    e.removeClass("select2-disabled");
+                }
+            });
+
+            choices.each2(function (i, choice) {
+                if (!choice.hasClass("select2-disabled") && choice.hasClass("select2-result-selectable")) {
+                    self.highlight(0);
+                    return false;
+                }
+            });
+
+        },
+
+        // multi
+        resizeSearch: function () {
+
+            var minimumWidth, left, maxWidth, containerLeft, searchWidth,
+            	sideBorderPadding = getSideBorderPadding(this.search);
+
+            minimumWidth = measureTextWidth(this.search) + 10;
+
+            left = this.search.offset().left;
+
+            maxWidth = this.selection.width();
+            containerLeft = this.selection.offset().left;
+
+            searchWidth = maxWidth - (left - containerLeft) - sideBorderPadding;
+            if (searchWidth < minimumWidth) {
+                searchWidth = maxWidth - sideBorderPadding;
+            }
+
+            if (searchWidth < 40) {
+                searchWidth = maxWidth - sideBorderPadding;
+            }
+            this.search.width(searchWidth);
+        },
+
+        // multi
+        getVal: function () {
+            var val;
+            if (this.select) {
+                val = this.select.val();
+                return val === null ? [] : val;
+            } else {
+                val = this.opts.element.val();
+                return splitVal(val, this.opts.separator);
+            }
+        },
+
+        // multi
+        setVal: function (val) {
+            var unique;
+            if (this.select) {
+                this.select.val(val);
+            } else {
+                unique = [];
+                // filter out duplicates
+                $(val).each(function () {
+                    if (indexOf(this, unique) < 0) unique.push(this);
+                });
+                this.opts.element.val(unique.length === 0 ? "" : unique.join(this.opts.separator));
+            }
+        },
+
+        // multi
+        val: function () {
+            var val, data = [], self=this;
+
+            if (arguments.length === 0) {
+                return this.getVal();
+            }
+
+            val = arguments[0];
+
+            if (!val) {
+                this.opts.element.val("");
+                this.updateSelection([]);
+                this.clearSearch();
+                return;
+            }
+
+            // val is a list of ids
+            this.setVal(val);
+
+            if (this.select) {
+                this.select.find(":selected").each(function () {
+                    data.push({id: $(this).attr("value"), text: $(this).text()});
+                });
+                this.updateSelection(data);
+            } else {
+                if (this.opts.initSelection === undefined) {
+                    throw new Error("val() cannot be called if initSelection() is not defined")
+                }
+
+                this.opts.initSelection(this.opts.element, function(data){
+                    var ids=$(data).map(self.id);
+                    self.setVal(ids);
+                    self.updateSelection(data);
+                    self.clearSearch();
+                });
+            }
+            this.clearSearch();
+        },
+
+        // multi
+        onSortStart: function() {
+            if (this.select) {
+                throw new Error("Sorting of elements is not supported when attached to <select>. Attach to <input type='hidden'/> instead.");
+            }
+
+            // collapse search field into 0 width so its container can be collapsed as well
+            this.search.width(0);
+            // hide the container
+            this.searchContainer.hide();
+        },
+
+        // multi
+        onSortEnd:function() {
+
+            var val=[], self=this;
+
+            // show search and move it to the end of the list
+            this.searchContainer.show();
+            // make sure the search container is the last item in the list
+            this.searchContainer.appendTo(this.searchContainer.parent());
+            // since we collapsed the width in dragStarted, we resize it here
+            this.resizeSearch();
+
+            // update selection
+
+            this.selection.find(".select2-search-choice").each(function() {
+                val.push(self.opts.id($(this).data("select2-data")));
+            });
+            this.setVal(val);
+            this.triggerChange();
+        },
+
+        // multi
+        data: function(values) {
+            var self=this, ids;
+            if (arguments.length === 0) {
+                 return this.selection
+                     .find(".select2-search-choice")
+                     .map(function() { return $(this).data("select2-data"); })
+                     .get();
+            } else {
+                if (!values) { values = []; }
+                ids = $.map(values, function(e) { return self.opts.id(e)});
+                this.setVal(ids);
+                this.updateSelection(values);
+                this.clearSearch();
+            }
+        }
+    });
+
+    $.fn.select2 = function () {
+
+        var args = Array.prototype.slice.call(arguments, 0),
+            opts,
+            select2,
+            value, multiple, allowedMethods = ["val", "destroy", "opened", "open", "close", "focus", "isFocused", "container", "onSortStart", "onSortEnd", "enable", "disable", "positionDropdown", "data"];
+
+        this.each(function () {
+            if (args.length === 0 || typeof(args[0]) === "object") {
+                opts = args.length === 0 ? {} : $.extend({}, args[0]);
+                opts.element = $(this);
+
+                if (opts.element.get(0).tagName.toLowerCase() === "select") {
+                    multiple = opts.element.attr("multiple");
+                } else {
+                    multiple = opts.multiple || false;
+                    if ("tags" in opts) {opts.multiple = multiple = true;}
+                }
+
+                select2 = multiple ? new MultiSelect2() : new SingleSelect2();
+                select2.init(opts);
+            } else if (typeof(args[0]) === "string") {
+
+                if (indexOf(args[0], allowedMethods) < 0) {
+                    throw "Unknown method: " + args[0];
+                }
+
+                value = undefined;
+                select2 = $(this).data("select2");
+                if (select2 === undefined) return;
+                if (args[0] === "container") {
+                    value=select2.container;
+                } else {
+                    value = select2[args[0]].apply(select2, args.slice(1));
+                }
+                if (value !== undefined) {return false;}
+            } else {
+                throw "Invalid arguments to select2 plugin: " + args;
+            }
+        });
+        return (value === undefined) ? this : value;
+    };
+
+    // plugin defaults, accessible to users
+    $.fn.select2.defaults = {
+        width: "copy",
+        closeOnSelect: true,
+        openOnEnter: true,
+        containerCss: {},
+        dropdownCss: {},
+        containerCssClass: "",
+        dropdownCssClass: "",
+        formatResult: function(result, container, query) {
+            var markup=[];
+            markMatch(result.text, query.term, markup);
+            return markup.join("");
+        },
+        formatSelection: function (data, container) {
+            return data.text;
+        },
+        formatResultCssClass: function(data) {return undefined;},
+        formatNoMatches: function () { return "No matches found"; },
+        formatInputTooShort: function (input, min) { return "Please enter " + (min - input.length) + " more characters"; },
+        formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); },
+        formatLoadMore: function (pageNumber) { return "Loading more results..."; },
+        formatSearching: function () { return "Searching..."; },
+        minimumResultsForSearch: 0,
+        minimumInputLength: 0,
+        maximumSelectionSize: 0,
+        id: function (e) { return e.id; },
+        matcher: function(term, text) {
+            return text.toUpperCase().indexOf(term.toUpperCase()) >= 0;
+        },
+        separator: ",",
+        tokenSeparators: [],
+        tokenizer: defaultTokenizer,
+        escapeMarkup: function (markup) {
+            if (markup && typeof(markup) === "string") {
+                return markup.replace(/&/g, "&amp;");
+            }
+            return markup;
+        },
+        blurOnChange: false
+    };
+
+    // exports
+    window.Select2 = {
+        query: {
+            ajax: ajax,
+            local: local,
+            tags: tags
+        }, util: {
+            debounce: debounce,
+            markMatch: markMatch
+        }, "class": {
+            "abstract": AbstractSelect2,
+            "single": SingleSelect2,
+            "multi": MultiSelect2
+        }
+    };
+
+}(jQuery));
diff --git a/addons/base_import/static/lib/select2/select2.png b/addons/base_import/static/lib/select2/select2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d804ffb99699b9e030f1010314de0970b5a000d
GIT binary patch
literal 613
zcmV-r0-F7aP)<h;3K|Lk000e1NJLTq002Ay001Zm1^@s6qPv;@0006kNkl<Zc-rmR
z&r1|x9LMps2uh5F)-GaQDk#Z_4iR>#WY!I$JQV$)A5aAS1BM||2XVJl=+L1^1S1H%
zM-&lx?NZpUrHhn>fk<>POqf2sh40}xxGZfc+t+#Eb(q<Oecn6I%nq|DNy|zSyexzN
z$5AL0?&Dan9pN5UxC<ug5`<4^!bTJ!40{Z2#(M~pn1C$$pw}f`kJpeHM`McNHFyg?
zK;|>Hy9_3*1(U%t9t)QDnI#YAL(|ACV(>)>6WD-t!8tutHkdb^#3`HzoJG3A2@T`%
zA|K@o*b!`R#(7)PWrMFn2))Ca3MR4(zaT`Zr61*kZK5NPnZwQszxh$fyv3?&4c>$q
z2m=+yc0dRXRAsPDxF6sD;@rK4JGdR_``1S~o6Xi@2&aR6hcSrEp9HVRzEqVDqB<bN
zXhRETAUt&UJ4{pqo<W$!4+ziE?D9@4ilQ3gUO=XZ)oyPsiQA7akeNo#WiVk!@H1G(
zkAmgh?J@W$gqNtpN{mA2@w%j2(GYBBaKPD;E<cjsBsd99f~(<?&RR6i%jfeou7io}
z!W3j)q1|OLVRs>n<1%hR=D4e1f^ra^A|34Cjc=Gny{F(o#MrvPYgZuTJOz(n)-F<|
zj()qR;C={)N<0RRvDZ^@6ND+W*}gh-Lip(MDt!(zMSO)!j2j+*hxgzC-e3$@(O2p*
zu;+gddm(cZwXTCLx*Ky4THOa*^b^F`woveIeCK^0aR|TJ00000NkvXXu0mjfA#WC6

literal 0
HcmV?d00001

diff --git a/addons/base_import/static/lib/select2/select2x2.png b/addons/base_import/static/lib/select2/select2x2.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bdd5c961d452c49dfa0789c2c7ffb82c238fc24
GIT binary patch
literal 845
zcmV-T1G4;yP)<h;3K|Lk000e1NJLTq004LZ002-31^@s6(wnh~0009NNkl<Zc-rlq
zv2GJV5I`eA5ebSzqy-%%f8hdLP~9h_qV^Xci^>upQ6WKflyv?C|ADVW!U!t`EpA+x
zB)5#EjWk-_X77YJZtQo`E0SF)^1bZr%<ScI;+%s6=ICz#f&syRU}(wBHJi=KJtvV%
z&q1&qv^eJpB{$ANuo1Mlh~(%T1ltp=DYaY#8zmuerN1Ub+fTAw3X&{)g1bmADU*y5
zUblqhl?+n{vw|Hrl|2~9qJcUX=wx*w)_|YxX&9mxeE=mzu0C`g40D>)B7Cd`*OK*r
z5WG-7e-R9G9^69ksDt29&oyHqxPSt|-S>xi3%PTd+GjY+BGF|nWC(7D-sd(kxqd9~
zS@2YF5vB+>dP8+$l^{oO3-lEWiGA*QI<ZQyKyWv~v4m^Xqu?O1N>U)Wds#9M6RZ9N
zcQ4y4)xqQOxD=vwu%7cz1nY#$lT&y8HCmkWgpwQP#3dhnYj9|2aS_R}IUF_^6s#$=
zTm%~>A#oM?KIg$kh=<`gJkeoHa2LrulVy$Yx+N_0R3$4I!R*0677f(FKqm`2_o4~W
z0h}fQZ`lC^1A+m;fM7uI(R1`S0KtG@KrkQ}5DW+&@cTnDVIow56KciMk7a899t0bC
zC1KI<NAq=n6MhK=f(@YLo(pv#^;)>{TsMe5NAR%GD_5`B-@<p{rSMpIB)k$<!Y=ql
zC=fhg{GPi}!nVSD;k03YekgqMb862<$PheS!4oBGC%j9%)a;J%LAX>ad4k~K3SO%H
z_M31|`HV?E6)u$E3c&*<*n20+V@mRCop>R5;DWuZCmjSo7p@R&OYl<!6QXYf&j`^5
z2wIX~h5Ie!o(UI9@DjnpE|YYF<D+mlkwJf^OtRPLs6AUR@T@`Z1L2FXRdRPirluiy
zpsh;Xe!LWZ2ycXE!VBT8@Kdi`MTuYwhYjIDL;SG8HBchh)^TC22*vJVk`Zj@z<=2w
zxbkC}P{t%9`0)R&U5Q}xg42=_Y+Z0#a)n^ig42=_Y+P_C8Nv2R^{Fc*c#2>^@G<ZQ
XF(xQ&SEjMs00000NkvXXu0mjf{}FjY

literal 0
HcmV?d00001

diff --git a/addons/base_import/static/lib/select2/spinner.gif b/addons/base_import/static/lib/select2/spinner.gif
new file mode 100755
index 0000000000000000000000000000000000000000..5b33f7e54f4e55b6b8774d86d96895db9af044b4
GIT binary patch
literal 1849
zcma*odr(tX9tZI2z31lM+(&YVk%mZ}5P~KlG2s=WSbGzm0!x7^P##Mnh7t-jP!X0Q
zk_SQ}Po-L1tlDK;6l?(>v)e5ZBQx4|Y-Q?nr@Px3?9h(3ZWr3^tj=`TP57gKr87N$
zp2wWee1GRRCwo_xahnw)5cxNPJbCg2L6DV|6`#+yw6v6!mDS$f9-JvFD^n;GQ&UrZ
zzh5jCkByB101O60U0q#p_1BM>Cv-vP?&s4@g_((4_1L=L$(a91)0=J91Gas#R{McE
znYG^9*0A5YZ>#;~+Wkn(W5B0^yELIYLP!K}mB~<)AM@1&nqekynuaEGqP<JE0#l+(
z*R9joTN$nZ{F;;f_Nv(QpzP65;W)SYC;1+?>rzoH|KodRXJy)%+w_fu3nE5>@Bd_b
zqC$EQ;{c`T&?EsNO|igL9gC7Ygxv?aQUEXMq?~>wg{EyW;VcJ37CUF#HjrT=KQO_*
zS>M9yydXk18D(+QDJ1>r);Lav_uYKp$T?4vr{Q$lTo&pKv^?(>L-)G2*lwH!Ah7k?
z7oH<8h-(KTKt5V6$8gF)C7Io&P5=SjTh)=zV=E2EUhQZ<Wjvi)ks6lL7NUI41Suec
z%#@RZvp$b|KCxLd`PA8_!Ub^;+J%TE^_K&d6(i&k---epB#nC`b3_`MdhtuWMEe%I
z(wJ2$`EGgJTz=trW>P##L8S{d%UK>>+y82>+FV+#^BzW7u3F)Bb>=lYQ%%j`F>ASe
zo*cw@V#u6T`A2He;70mR(V&iV&-7{qP~=SRf&jm9-T{*ZeZ}$rd0#6c&fLG^xJcf5
z+p<`wJYgW+_s*V{uI$nMB;%8`S_3>PfGOj3Rq}@Cx^+j?rk92fANSFDBYnOqQ>Vdj
z)(|$AhP4t&Lb=Gvo2#3Gl%9<=Gv`Mz?Po@P4iLF!x}GUWJICDlFk-hS^Whyh7x~VH
z@0vD1>HYD4&e+~yzS*-sFR{9`{QEEZO1zg7>R&7cHts-6j!xHVdA8eI+ZlVzd%`es
zJT@$#GX(gvCJ1oJN%yLBK}{V=V;seo;!w|Yte!W1%5qLNFWqvZW>h&IiH+oPT=b@E
zPhGzv5=(Un*X>v`><w7vN-j#h05gB-F9AZf<&Z~SLlC&Nz^-G6DuPj|`n3d!<l7n!
z^9j1qeh2{s+i0tZ4@>%8h_nj^NdY<en;#4d>cE6NHS_ifkCV$*D)Tqrbu`s;<=t<4
zAHNqNV?6(g<1PY-w@#I-WYFViz?9TrkMr)u0g`O`u|>T;k|2sV*YF^pun<C(O34ry
z@yg-q+#%4rv$|41Y!PHPrjmV%@S3%TUelmz%~6?hLG4%mWKO9NB}mrI%KlhB`{^!g
zT?{Y#<ON%sq<!{buD;iH%`hL}N;>vT;$SuTy{j3Gv)yqD!R_CF>yR)MzmmYS5v+~R
zXAdD<Jm>%ng9?df;wd8GxR#%3O+gz};Vo;)sK%Bj-q>Oq%R7JU-KD?vYu>#2UjaDo
z&8$>5xW~?KPD_#XFToU1hIb*VOMidUr6iYiO0N|i-7s`T8!cFT`rN!^1Pt78J93i6
z5HI1wIM$94m{3SLDvISDe6$ZG1;eq_D9RTaaC>=cO{@Bs>$IlP<c+8wUtK_tPUz3j
z)>CPJJ$h$)-3vzNUQ6<Wm&Z5JfeG_o#I^S?ZP9*QGjsiJM3jH{?94}z{@d%97nOVw
zacge+X&InNUL3U(BUlor87ff?2qEf2c|yCI=Id~LI~<KyVA#R%nwHS3S<^IBTu|Jj
zW^-Xv#UBDqOwy>OsN#_zWxey!_9%hxwH2_dEJi=yY|1c7nDm2_Lm!Cof8-R_+9UkS
zcBE(o47yE)oMR(Q=dp1a2wTX5Kv<M)VDKP@wb$5DNEX!VTUn1Pd`taYrL9bpe}d9v
zqx3tu5NTGv8=X63WXPWMm1T8=ujh#QvSw5|(EZJ3$quU9*?0NxQKGsTrnFNF-ygOt
zYWPggi66%$nuj|v6!Ow2)>vGyLqlWTa7V&!A*|w|)ax~1_~aJ0=_Lilg*0iQk7#ZD
EAHN$8j{pDw

literal 0
HcmV?d00001

diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css
index c613357537b..6f4770ce34c 100644
--- a/addons/base_import/static/src/css/import.css
+++ b/addons/base_import/static/src/css/import.css
@@ -44,15 +44,7 @@
     text-align: right;
 }
 
-.ui-menu .oe_import_completion_category {
-    background-color: #f0f0f0;
-    /* jquery-ui requirements otherwise background color is buggy */
-    float: left;
-    zoom: 1;
-    width: 100%;
-    padding: 0;
-    margin: 0;
-}
-.ui-menu .ui-menu-item .oe_import_completion_required {
-    color: #2962ff;
+.oe_import_selector ul,
+.oe_import_selector li {
+    margin: 0; padding: 0;
 }
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 2ec0caf1fc0..947955d94af 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -75,7 +75,6 @@ openerp.base_import = function (instance) {
             // import object id
             this.id = null;
             this.Import = new instance.web.Model('base_import.import');
-            this.field_label_to_name = {};
         },
         start: function () {
             var self = this;
@@ -130,38 +129,49 @@ openerp.base_import = function (instance) {
 
             var $fields = this.$('.oe_import_fields input');
             this.render_fields_matches(result, $fields);
-            $fields.autocomplete({
-                minLength: 0,
-                html: true,
-                source: this.generate_fields_completion(result)
-            }).data('autocomplete')._renderItem = function (ul, item) {
-                var $item = $('<li>').data('item.autocomplete', item).appendTo(ul);
-
-                if (item.category) {
-                    return $item
-                        .addClass('oe_import_completion_category')
-                        .text(item.label);
-                } else {
-                    return $item.append(
-                        $('<a>')
-                            .toggleClass('oe_import_completion_required', !!item.required)
-                            .text(item.label));
+            var data = this.generate_fields_completion(result);
+            var item_finder = function (id, items) {
+                items = items || data;
+                for (var i=0; i < items.length; ++i) {
+                    var item = items[i];
+                    if (item.id === id) {
+                        return item;
+                    }
+                    var val;
+                    if (item.children && (val = item_finder(id, item.children))) {
+                        return val;
+                    }
                 }
+                return '';
             };
+            $fields.select2({
+                allowClear: true,
+                minimumInputLength: 0,
+                data: data,
+                initSelection: function (element, callback) {
+                    var default_value = element.val();
+                    if (!default_value) {
+                        callback('');
+                        return;
+                    }
+
+                    callback(item_finder(default_value));
+                },
+
+                width: 'resolve',
+                dropdownCssClass: 'oe_import_selector'
+            });
             this.import_dryrun();
         },
         generate_fields_completion: function (root) {
-            // Display nice names to user, but send logical names to server
-            this.field_label_to_name = {};
             var basic = [];
-            var regulars = [{label: _t("Normal Fields"), category: true}];
-            var o2m = [{label: _t("Relation Fields (o2m)"), category: true}];
-            var self = this;
+            var regulars = [];
+            var o2m = [];
             function traverse(field, ancestors, collection) {
                 var subfields = field.fields;
                 var field_path = ancestors.concat(field);
                 var label = _(field_path).pluck('string').join(' / ');
-                self.field_label_to_name[label] = _(field_path).pluck('name').join('/');
+                var id = _(field_path).pluck('name').join('/');
 
                 // If non-relational, m2o or m2m, collection is regulars
                 if (!collection) {
@@ -176,7 +186,8 @@ openerp.base_import = function (instance) {
                 }
 
                 collection.push({
-                    label: label,
+                    id: id,
+                    text: label,
                     required: field.required
                 });
 
@@ -188,7 +199,10 @@ openerp.base_import = function (instance) {
                 traverse(field, []);
             });
 
-            return basic.concat(regulars, o2m);
+            return basic.concat([
+                { text: _t("Normal Fields"), children: regulars },
+                { text: _t("Relation Fields"), children: o2m }
+            ]);
         },
         render_fields_matches: function (result, $fields) {
             if (_(result.matches).isEmpty()) { return; }
@@ -205,18 +219,17 @@ openerp.base_import = function (instance) {
                             return subfield.name === name;
                         });
                     })
-                    .pluck('string')
+                    .pluck('name')
                     .value()
-                    .join(' / ');
+                    .join('/');
             });
         },
 
         //- import itself
         call_import: function (options) {
             var self = this;
-            var fields = this.$('.oe_import_fields input').map(function (index, el) {
-                // Convert user-readable field label to logical db-backed name
-                return self.field_label_to_name[el.value] || false;
+            var fields = this.$('.oe_import_fields input.oe_import_match_field').map(function (index, el) {
+                return $(el).select2('val') || false;
             }).get();
             return this.Import.call(
                 'do', [this.id, fields, this.import_options()], options);
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index a2844f8d7b9..733a93fd104 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -71,7 +71,8 @@
         <tr class="oe_import_fields">
             <!-- Iterate on first row to ensure we have all columns -->
             <td t-foreach="preview[0]" t-as="column">
-                <input placeholder="Don't Import"/>
+                <input placeholder="Don't Import"
+                       class="oe_import_match_field"/>
             </td>
         </tr>
         <tr t-foreach="preview" t-as="row" class="oe_import_grid-row">

From 937e465da8c4208759118e962daa0717c56d982c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 6 Sep 2012 12:36:44 +0200
Subject: [PATCH 886/999] minor improvement

bzr revid: nicolas.vanhoren@openerp.com-20120906103644-ifr75hpbac7zcg1e
---
 addons/hr_attendance/static/src/js/attendance.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 074109947b9..082fb0d628b 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -4,8 +4,6 @@ openerp.hr_attendance = function (instance) {
     var QWeb = instance.web.qweb;
     _t = instance.web._t;
 
-    instance.web.attendanceslider = false;
-
     instance.hr_attendance.AttendanceSlider = instance.web.Widget.extend({
         template: 'AttendanceSlider',
         init: function (parent) {
@@ -68,13 +66,14 @@ openerp.hr_attendance = function (instance) {
         do_update: function () {
             this._super();
             var self = this;
-            var fct = function () {
-                instance.web.attendanceslider = new instance.hr_attendance.AttendanceSlider(self);
+            this.update_promise = this.update_promise.then(function () {
+                if (self.attendanceslider)
+                    return;
+                self.attendanceslider = new instance.hr_attendance.AttendanceSlider(self);
 
-                instance.web.attendanceslider.prependTo(instance.webclient.$('.oe_systray'));
-                return instance.web.attendanceslider.check_attendance();
-            };
-            this.update_promise = this.update_promise.pipe(fct, fct);
+                self.attendanceslider.prependTo(instance.webclient.$('.oe_systray'));
+                self.attendanceslider.check_attendance();
+            });
         },
     });
 }

From 7a5e670e5b649081fba7f902a33009c9df91a661 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 6 Sep 2012 12:37:13 +0200
Subject: [PATCH 887/999] removed global variable

bzr revid: nicolas.vanhoren@openerp.com-20120906103713-iat9aa4apqb0hqp2
---
 addons/hr_attendance/static/src/js/attendance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 082fb0d628b..bdad1aed4e9 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -2,7 +2,7 @@
 openerp.hr_attendance = function (instance) {
     
     var QWeb = instance.web.qweb;
-    _t = instance.web._t;
+    var _t = instance.web._t;
 
     instance.hr_attendance.AttendanceSlider = instance.web.Widget.extend({
         template: 'AttendanceSlider',

From c3f9e44aeece102b08e073edf6a810996fe5bc88 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 6 Sep 2012 12:38:52 +0200
Subject: [PATCH 888/999] [REM] Removed trigger_children and trigger_ancestors
 from corelib.

niv is back from holidays, let's give him some time to accept the concept.
"the Seven Stages Of Grief".currentStage === 4

bzr revid: fme@openerp.com-20120906103852-mm8bo8tgzl8dtfnq
---
 addons/web/static/src/js/chrome.js  | 14 ++++++++++++++
 addons/web/static/src/js/corelib.js | 20 --------------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 62c73f7d419..bd68f4ad7a8 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -958,6 +958,20 @@ instance.web.Client = instance.web.Widget.extend({
     has_uncommitted_changes: function() {
         return false;
     },
+    trigger_children: function(events) {
+        // TODO: In the future, if we have more valid use cases in other objects, let's
+        //       put this back in the EventDispatcherMixin as an option of trigger()
+        var children = this.getChildren();
+        for (var i = 0; i < children.length; i++) {
+            var child = children[i];
+            if (child.__eventDispatcherMixin) {
+                child.__edispatcherEvents.trigger.apply(child.__edispatcherEvents, arguments);
+                instance.webclient // Yuck!
+                    .trigger_children.apply(child, arguments);
+            }
+        }
+        return this;
+    },
 });
 
 instance.web.WebClient = instance.web.Client.extend({
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 7ef00b420e3..c74c2d5dc03 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -359,26 +359,6 @@ instance.web.EventDispatcherMixin = _.extend({}, instance.web.ParentedMixin, {
         this.__edispatcherEvents.trigger.apply(this.__edispatcherEvents, arguments);
         return this;
     },
-    trigger_children: function(events) {
-        var children = this.getChildren();
-        for (var i = 0; i < children.length; i++) {
-            var child = children[i];
-            if (child.__eventDispatcherMixin) {
-                child.__edispatcherEvents.trigger.apply(child.__edispatcherEvents, arguments);
-                child.trigger_children.apply(child, arguments);
-            }
-        }
-        return this;
-    },
-    trigger_ancestors: function(events) {
-        var parent = this;
-        while (parent = parent.getParent()) {
-            parent.__edispatcherEvents.trigger.apply(parent.__edispatcherEvents, arguments);
-            parent.trigger_ancestors.apply(parent, arguments);
-
-        }
-        return this;
-    },
     destroy: function() {
         var self = this;
         _.each(this.__edispatcherRegisteredEvents, function(event) {

From 8d0669461f08499a48ac4ab602a6e86674351174 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 6 Sep 2012 12:40:12 +0200
Subject: [PATCH 889/999] removed one more global variable

bzr revid: nicolas.vanhoren@openerp.com-20120906104012-miuh1ddwsbpgam3v
---
 addons/hr_attendance/static/src/js/attendance.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index bdad1aed4e9..2499b42f054 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -21,14 +21,17 @@ openerp.hr_attendance = function (instance) {
         },
         do_update_attendance: function () {
             var self = this;
-            if (!self.employee) return;
-            hr_employee = new instance.web.DataSet(self, 'hr.employee');
+            if (!self.employee)
+                return;
+            var hr_employee = new instance.web.DataSet(self, 'hr.employee');
             hr_employee.call('attendance_action_change', [
                 [self.employee.id]
             ]).done(function (result) {
                 if (!result) return;
-                if (self.employee.state == 'present') self.employee.state = 'absent';
-                else self.employee.state = 'present';
+                if (self.employee.state == 'present')
+                    self.employee.state = 'absent';
+                else
+                    self.employee.state = 'present';
                 self.do_slide(self.employee.state);
             });
         },
@@ -54,7 +57,8 @@ openerp.hr_attendance = function (instance) {
                 ['user_id', '=', self.session.uid]
             ]);
             return employee.read_slice(['id', 'name', 'state']).pipe(function (res) {
-                if (_.isEmpty(res)) return;
+                if (_.isEmpty(res))
+                    return;
                 self.$el.find(".oe_attendance_status").show();
                 self.employee = res[0];
                 self.do_slide(self.employee.state);

From 03f7eb10f4ca22c1586f6f320b37758fd65782de Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 6 Sep 2012 12:46:24 +0200
Subject: [PATCH 890/999] [FIX] remove semantic part2

bzr revid: al@openerp.com-20120906104624-sq3cd652vevmij6c
---
 addons/board/static/src/css/Makefile                        | 3 +++
 addons/board/static/src/css/dashboard.css                   | 5 +++++
 addons/board/static/src/css/dashboard.sass                  | 5 +++++
 addons/board/static/src/xml/board.xml                       | 2 +-
 addons/crm/crm_lead_view.xml                                | 6 +++---
 addons/hr/hr_view.xml                                       | 2 +-
 addons/hr/static/src/css/hr.css                             | 4 ++++
 addons/hr_recruitment/hr_recruitment_view.xml               | 2 +-
 addons/portal_hr_employees/hr_employee_view.xml             | 2 +-
 .../static/src/css/portal_hr_employees.css                  | 5 +++++
 addons/project/project_view.xml                             | 4 ++--
 addons/project/static/src/css/project.css                   | 6 ++++++
 addons/project_issue/project_issue_view.xml                 | 2 +-
 addons/stock/product_view.xml                               | 2 +-
 addons/survey/static/src/css/survey.css                     | 5 +++++
 addons/survey/survey_view.xml                               | 2 +-
 addons/web_shortcuts/static/src/xml/web_shortcuts.xml       | 2 +-
 17 files changed, 46 insertions(+), 13 deletions(-)
 create mode 100644 addons/board/static/src/css/Makefile

diff --git a/addons/board/static/src/css/Makefile b/addons/board/static/src/css/Makefile
new file mode 100644
index 00000000000..0cb5ae70f4a
--- /dev/null
+++ b/addons/board/static/src/css/Makefile
@@ -0,0 +1,3 @@
+dashboard.css: dashboard.sass
+	sass --trace -t expanded dashboard.sass dashboard.css
+
diff --git a/addons/board/static/src/css/dashboard.css b/addons/board/static/src/css/dashboard.css
index 6907b4271a0..38e224daf42 100644
--- a/addons/board/static/src/css/dashboard.css
+++ b/addons/board/static/src/css/dashboard.css
@@ -5,6 +5,11 @@
 .openerp .oe_dashboard {
   width: 100%;
 }
+.openerp .oe_dashboard .oe_dashboard_layout_selector ul, .openerp .oe_dashboard .oe_dashboard_layout_selector li {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
 .openerp .oe_dashboard .oe_action {
   margin: 0 8px 8px 0;
   background-color: white;
diff --git a/addons/board/static/src/css/dashboard.sass b/addons/board/static/src/css/dashboard.sass
index 4bacc7bd892..1bfc01a3809 100644
--- a/addons/board/static/src/css/dashboard.sass
+++ b/addons/board/static/src/css/dashboard.sass
@@ -14,6 +14,11 @@
     margin: 0 4px 6px 0
   .oe_dashboard
     width: 100%
+    .oe_dashboard_layout_selector
+      ul, li
+        margin: 0
+        padding: 0
+        list-style-type: none
     .oe_action
       margin: 0 8px 8px 0
       background-color: white
diff --git a/addons/board/static/src/xml/board.xml b/addons/board/static/src/xml/board.xml
index 3cd7090f1e0..b2363cafd53 100644
--- a/addons/board/static/src/xml/board.xml
+++ b/addons/board/static/src/xml/board.xml
@@ -36,7 +36,7 @@
     </div>
 </t>
 <t t-name="DashBoard.layouts">
-    <div class="oe_dashboard_layout_selector oe_semantic_html_override">
+    <div class="oe_dashboard_layout_selector">
         <p>
             <strong>Choose dashboard layout</strong>
         </p>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f763f0a598a..e75f5f389ed 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -298,7 +298,7 @@
                     <field name="message_unread"/>
                     <templates>
                         <t t-name="lead_details">
-                            <ul class="oe_kanban_tooltip oe_semantic_html_override">
+                            <ul class="oe_kanban_tooltip">
                                 <li t-if="record.phone.raw_value"><b>Phone:</b> <field name="phone"/></li>
                                 <li><b>Probability:</b> <field name="probability"/>%%</li>
                                 <li><b>Creation date:</b> <field name="create_date"/></li>
@@ -306,8 +306,8 @@
                             </ul>
                         </t>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
-                                <div class="oe_dropdown_toggle oe_dropdown_kanban oe_semantic_html_override">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
                                         <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index d126c455d0b..e8ed1d61157 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -128,7 +128,7 @@
                 <field name="last_login"/>
                 <templates>
                     <t t-name="kanban-box">
-                        <div class="oe_employee_vignette oe_semantic_html_override">
+                        <div class="oe_employee_vignette">
                             <div class="oe_employee_image">
                                 <a type="open"><img t-att-src="kanban_image('hr.employee', 'image_medium', record.id.value)" class="oe_employee_picture"/></a>
                             </div>
diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css
index 11e72fad31e..acb8cccf3cc 100644
--- a/addons/hr/static/src/css/hr.css
+++ b/addons/hr/static/src/css/hr.css
@@ -3,6 +3,9 @@
   min-height: 100px;
 }
 
+.oe_employee_vignette ul, .oe_employee_vignette li {
+}
+
 .oe_employee_image, .oe_employee_details {
   display: inline-block;
   vertical-align: top;
@@ -65,4 +68,5 @@
 
 .oe_employee_details li {
   margin: 2px 0;
+  padding: 0;
 }
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index cea3b1279ef..9fa07c51cab 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -271,7 +271,7 @@
                 <field name="categ_ids"/>
                 <templates>
                     <t t-name="kanban-tooltip">
-                        <ul class="oe_kanban_tooltip oe_semantic_html_override">
+                        <ul class="oe_kanban_tooltip">
                             <li t-if="record.type_id.raw_value"><b>Degree:</b> <field name="type_id"/></li>
                             <li t-if="record.partner_id.raw_value"><b>Contact:</b> <field name="partner_id"/></li>
                             <li t-if="record.department_id.raw_value"><b>Departement:</b> <field name="department_id"/></li>
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index 5bc3915658f..dc1b1bae56c 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -32,7 +32,7 @@
 
                             <templates>
                                 <t t-name="kanban-box">
-                                    <div class="oe_employee_vignette oe_semantic_html_override">
+                                    <div class="oe_employee_vignette">
                                         <div class="oe_employee_image">
                                             <img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/>
                                         </div>
diff --git a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
index 351fd442f20..bbb20cd548b 100644
--- a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
+++ b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
@@ -12,3 +12,8 @@
     width: 65px;
     height: 65px;
 }
+.openerp .oe_employee_vignette ul, .openerp .oe_employee_vignette li {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d359cdbf458..740fe546fbc 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -232,7 +232,7 @@
                     <field name="alias_domain"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click oe_semantic_html_override">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
@@ -533,7 +533,7 @@
                     <field name="categ_ids"/>
                     <templates>
                     <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
+                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
                             <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                 <span class="oe_e">í</span>
                                 <ul class="oe_dropdown_menu">
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 51bb8f45ee9..0776a010a30 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -6,6 +6,12 @@
     width: 250px;
     min-height: 160px;
 }
+
+.oe_kanban_card ul, .oe_kanban_card li {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
 .oe_kanban_project_list {
     margin: 4px 0;
 }
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 5096779545b..a67debdc70b 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -247,7 +247,7 @@
                     <field name="date_deadline"/>
                     <templates>
                         <t t-name="kanban-tooltip">
-                           <ul class="oe_kanban_tooltip oe_semantic_html_override">
+                           <ul class="oe_kanban_tooltip">
                               <li><b>Project:</b> <field name="project_id"/></li>
                               <li><b>Category:</b> <field name="categ_ids"/></li>
                            </ul>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 3142a5a05ef..2e0eef44da9 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -200,7 +200,7 @@
                         <t t-esc="record.delivery_count.value"/> Deliveries
                     </a>
                 </xpath>
-                <ul position="inside" class="oe_semantic_html_override">
+                <ul position="inside">
                     <li t-if="record.type.raw_value != 'service'">On hand: <field name="qty_available"/> <field name="uom_id"/></li>
                     <li t-if="record.type.raw_value != 'service'">Available: <field name="virtual_available"/> <field name="uom_id"/></li>
                 </ul>
diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index c18f584c9ed..f582a082f2b 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -1,3 +1,8 @@
+.oe_kanban_card ul, .oe_kanban_card li {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
 .oe_survey_responsible{
     height: auto;
     width: 200px;
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 776c5e804a6..8b49b89df65 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -298,7 +298,7 @@
                     <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_semantic_html_override">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
diff --git a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
index 63055d9b47a..0b9701f9f1a 100644
--- a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
+++ b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
@@ -3,7 +3,7 @@
 -->
 <templates id="template" xml:space="preserve">
 <t t-name="Systray.Shortcuts">
-    <div class="oe_systray_shortcuts oe_topbar_item oe_dropdown_toggle oe_semantic_html_override">
+    <div class="oe_systray_shortcuts oe_topbar_item oe_dropdown_toggle">
         <span class="oe_e oe_star_off">7</span>
         <ul class="oe_systray_shortcuts_items oe_dropdown_menu"/>
     </div>

From d8f925870faf176c36a859b0c5ef8dae3e9c3861 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 6 Sep 2012 12:50:35 +0200
Subject: [PATCH 891/999] [FIX] Minor fixes

bzr revid: fme@openerp.com-20120906105035-6hfjvk6ngranl1h9
---
 addons/web/static/src/js/chrome.js    | 1 +
 addons/web/static/src/js/view_form.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index bd68f4ad7a8..0c32fdffff9 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1070,6 +1070,7 @@ instance.web.WebClient = instance.web.Client.extend({
         n.warn.apply(n, arguments);
     },
     on_logout: function() {
+        var self = this;
         if (!this.has_uncommitted_changes()) {
             this.session.session_logout().then(function () {
                 $(window).unbind('hashchange', self.on_hashchange);
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 95d367ba75f..bf2bfc4c9fe 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -753,7 +753,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         return def.promise();
     },
     can_be_discarded: function() {
-        return !this.$el.is('.oe_form_dirty') || confirm(_t("Warning, the record has been modified, your changes will be discarded."));
+        return !this.$el.is('.oe_form_dirty') || confirm(_t("Warning, the record has been modified, your changes will be discarded.\n\nAre you sure you want to leave this page ?"));
     },
     /**
      * Triggers saving the form's record. Chooses between creating a new

From cf4209ab9b3c8213763d40cdfaa1024ba676bb83 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 6 Sep 2012 16:47:21 +0530
Subject: [PATCH 892/999] [IMP]improve he employee form view as per mockup

bzr revid: sgo@tinyerp.com-20120906111721-17ev5r0qufc9u4vd
---
 addons/hr/hr_view.xml                         | 53 +++++++++++--------
 addons/hr_attendance/hr_attendance_view.xml   | 17 +++---
 addons/hr_contract/hr_contract_view.xml       | 34 ++++++------
 addons/hr_evaluation/hr_evaluation_view.xml   | 14 +++--
 addons/hr_holidays/hr_holidays_view.xml       | 18 ++++---
 addons/hr_payroll/hr_payroll_view.xml         |  2 +-
 addons/hr_timesheet/hr_timesheet_view.xml     | 16 +++---
 .../hr_timesheet_sheet_view.xml               |  2 +-
 8 files changed, 83 insertions(+), 73 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index d126c455d0b..5ed4be2e333 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -26,10 +26,6 @@
                             <h1>
                                 <field name="name"/>
                             </h1>
-                            <label for="job_id" class="oe_edit_only"/>
-                            <h2>
-                                <field name="job_id" options='{"no_open": true}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
-                            </h2>
                             <label for="category_ids" class="oe_edit_only"/>
                             <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time"/>
                         </div>
@@ -37,44 +33,57 @@
                             <!-- Put here related buttons -->
                         </div>
                         <notebook>
-                            <page string="Information">
+                            <page string="Public Information">
                                 <group>
-                                    <group>
-                                        <field name="department_id" on_change="onchange_department_id(department_id)"/>
-                                        <field name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
-                                        <field name="user_id" on_change="onchange_user(user_id)"/>
+                                    <group string="Contact Information">
+                                        <field name="work_email" widget="email"/>
+                                        <field name="work_phone"/>
+                                        <field name="mobile_phone"/>
+                                    </group>
+                                    <group string="Position">
+                                        <field name="job_id" options='{"no_open": true}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
                                         <field name="parent_id"/>
                                         <field name="coach_id"/>
                                     </group>
                                     <group>
-                                        <field name="work_email" widget="email"/>
-                                        <field name="work_phone"/>
-                                        <field name="address_id" on_change="onchange_address_id(address_id)"/>
-                                        <field name="mobile_phone"/>
-                                        <field name="identification_id" groups="base.group_hr_user"/>
-                                        <field name="passport_id" groups="base.group_hr_user"/>
-                                        <field name="otherid" groups="base.group_hr_user"/>
+                                        <field name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
+                                        <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
+                                        <field name="department_id" on_change="onchange_department_id(department_id)"/>
                                     </group>
-                                    <group name="active_group">
-                                        <field name="active"/>
+                                    <group>
+                                        <field name="user_id" on_change="onchange_user(user_id)" string="Related User"/>
                                     </group>
                                 </group>
                                 <field name="notes" placeholder="Other Information ..." colspan="4"/>
                             </page>
                             <page string="Personal Information" groups="base.group_hr_user">
-                                <group col="4">
-                                    <group>
+                                <group>
+                                    <group string="Citizenship and other info">
                                         <field name="country_id" options='{"no_open": true}'/>
+                                        <field name="identification_id" groups="base.group_hr_user"/>
+                                        <field name="passport_id" groups="base.group_hr_user"/>
                                         <field name="bank_account_id"/>
-                                        <field name="address_home_id"/>
+                                        <field name="otherid" groups="base.group_hr_user"/>
                                     </group>
-                                    <group>
+                                    <group string="Contact Information">
+                                        <field name="address_home_id" context="{'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
+                                    </group>
+                                    <group string="Status">
                                         <field name="gender"/>
                                         <field name="marital"/>
+                                    </group>
+                                    <group string="Birth">
                                         <field name="birthday"/>
                                     </group>
                                 </group>
                             </page>
+                            <page string="HR Settings" groups="base.group_hr_user">
+                                <group>
+                                    <group string="Active" name="active_group">
+                                        <field name="active"/>
+                                    </group>
+                                </group>
+                            </page>
                         </notebook>
                     </sheet>
                 </form>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 1d0122d55fa..5f3841c182b 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -123,14 +123,15 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <field name="active" position="before">
-                    <label for="state"/>
-                    <div>
-                        <field name="state" class="oe_inline"/> - 
-                        <button class="oe_link" name="attendance_action_change" states="present" string="Sign Out" type="object" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
-                        <button class="oe_link" name="attendance_action_change" states="absent" string="Sign In" type="object" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
-                    </div>
-                </field>
+               <xpath expr="//group[@name='active_group']" position="before">
+                    <group string="Attendance">
+                        <div>
+                            <field name="state" class="oe_inline"/> - 
+                            <button class="oe_link" name="attendance_action_change" states="present" string="Sign Out" type="object" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
+                            <button class="oe_link" name="attendance_action_change" states="absent" string="Sign In" type="object" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
+                        </div>
+                    </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 10620cb9a4b..0c48abbebc0 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        
+        
+<!-- Contracts Button on Employee Form -->
 
+        <act_window
+        context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
+        id="act_hr_employee_2_hr_contract"
+        name="Contracts"
+        res_model="hr.contract"
+        src_model="hr.employee"
+        groups="base.group_hr_manager"/>
+        
         <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="30" groups="base.group_no_one"/>
         <record id="hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
@@ -9,19 +20,20 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='parent_id']" position="before">
+                    <xpath expr="//div[@name='button_box']" position="inside">
+                        <button name="%(act_hr_employee_2_hr_contract)d" string="Contracts" type="action" class="oe_inline oe_right"/>
+                    </xpath>
+                    <xpath expr="//field[@name='coach_id']" position="after">
                         <field name="manager"/>
                     </xpath>
                     <xpath expr="//group[@name='active_group']" position="before">
-                        <group>
+                        <group string="Contract">
+                            <field name="medic_exam" string="Medical Exam"/>
                             <field name="vehicle"/>
                             <field name="vehicle_distance"/>
                         </group>
                     </xpath>
-                    <field name="active" position="before">
-                        <field name="medic_exam" string="Medical Exam"/>
-                    </field>
-                    <field name="birthday" position="before">
+                    <field name="marital" position="after">
                         <field name="children"/>
                     </field>
                     <field name="birthday" position="after">
@@ -177,15 +189,5 @@
         <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56" sequence="6" groups="base.group_no_one"/>
         <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager"/>
 
-        <!-- Contracts Button on Employee Form -->
-
-        <act_window
-        context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
-        id="act_hr_employee_2_hr_contract"
-        name="Contracts"
-        res_model="hr.contract"
-        src_model="hr.employee"
-        groups="base.group_hr_manager"/>
-
     </data>
 </openerp>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 12c5dc0af6d..f83886f6ef9 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -128,14 +128,12 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Personal Information" position="after">
-                    <page string="Appraisal" groups="base.group_hr_user">
-                        <group col="4">
-                            <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
-                            <field name="evaluation_date"/>
-                        </group>
-                    </page>
-                </page>
+            <xpath expr="//group[@name='active_group']" position="before">
+                <group string="Appraisals">
+                    <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
+                    <field name="evaluation_date"/>
+                </group>
+            </xpath>
             </field>
         </record>
 
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 650445b2ade..3cfd784b20d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -517,13 +517,17 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <field name="active" position="before">
-                    <label for="remaining_leaves"/>
-                    <div>
-                        <field name="remaining_leaves" class="oe_inline"/>
-                        <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline oe_right"/>
-                    </div>
-                </field>
+                <xpath expr="//group[@name='active_group']" position="before">
+                    <group string="Leaves">
+                        <label for="remaining_leaves"/>
+                        <div>
+                            <field name="remaining_leaves" class="oe_inline"/>
+                        </div>
+                    </group>
+                </xpath>
+                <xpath expr="//div[@name='button_box']" position="inside">
+                    <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline oe_right"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 58484a91567..f485943d2e4 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -386,7 +386,7 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//div[@name='button_box']" position="inside">
-                        <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
+                        <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action" class="oe_inline oe_right"/>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index f4b3e437b27..43b677d7978 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -131,16 +131,12 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Personal Information" position="after">
-                    <page string="Timesheets" groups="base.group_hr_user">
-                        <group>
-                            <group col="2">
-                                <field name="product_id" domain="[('type','=','service')]"/>
-                                <field name="journal_id"/>
-                            </group>
-                        </group>
-                    </page>
-                </page>
+                <xpath expr="//group[@name='active_group']" position="before">
+                    <group string="Timesheets">
+                        <field name="product_id" domain="[('type','=','service')]"/>
+                        <field name="journal_id"/>
+                    </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 6c4ee63cbe6..31f9e073d23 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -350,7 +350,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_employee_extd_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='button_box']" position="inside">
-                    <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
+                    <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action" class="oe_inline oe_right"/>
                 </xpath>
             </field>
         </record>

From 9fd2332f552867b9b26b798910cfeca505f660ea Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 9 Sep 2012 01:12:08 +0200
Subject: [PATCH 893/999] [FIX] viewmanager css for inline view

bzr revid: al@openerp.com-20120908231208-9s1bk5ked84vn018
---
 addons/web/static/src/css/base.css  | 4 ++--
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 8698fdb9f94..73457e2bc19 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1503,10 +1503,10 @@
 .openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row:first-child td {
   padding-top: 8px;
 }
-.openerp .oe_view_manager_inline {
+.openerp .oe_view_manager_inline, .openerp .oe_view_manager_inlineview {
   height: 100%;
 }
-.openerp .oe_view_manager_inline > .oe_view_manager_header {
+.openerp .oe_view_manager_inline > .oe_view_manager_header, .openerp .oe_view_manager_inlineview > .oe_view_manager_header {
   display: none;
 }
 .openerp .oe_popup_form > .oe_formview > .oe_form_pager {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 374f3a6fc4e..5e346b32df2 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1155,7 +1155,7 @@ $sheet-max-width: 860px
                     padding-top: 8px
     // }}}
     // ViewManager inline {{{
-    .oe_view_manager_inline
+    .oe_view_manager_inline, .oe_view_manager_inlineview
         height: 100%
         > .oe_view_manager_header
             display: none

From b7c735f84e205bc34f502042336da422437828b5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Sep 2012 14:12:27 +0200
Subject: [PATCH 894/999] [REM] broken styles

bzr revid: xmo@openerp.com-20120906121227-pt83g8q7c92wedn2
---
 addons/web_graph/static/src/css/graph.css | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/addons/web_graph/static/src/css/graph.css b/addons/web_graph/static/src/css/graph.css
index 367d1de5ef5..f3e69c4687a 100644
--- a/addons/web_graph/static/src/css/graph.css
+++ b/addons/web_graph/static/src/css/graph.css
@@ -72,14 +72,7 @@
     left: 4px;
     top: -2px;
 }
-li {
+.graph-menu li {
     padding: 2px;
     margin-left: 10px;
 }
-a .graph-menu-options {
-    color: white;
-}
-div .graph-menu-options {
-    float: right;
-    top: 0px;
-}

From 276e081490430a62872febef6529fff6bf8edeea Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 6 Sep 2012 15:26:02 +0200
Subject: [PATCH 895/999] [FIX] Fixed muliple calls to
 FormView#can_be_discarded() [REM] Removed trigger_children

bzr revid: fme@openerp.com-20120906132602-whcst4g0c16a6s5v
---
 addons/web/static/src/js/chrome.js    | 16 +---------------
 addons/web/static/src/js/view_form.js | 10 ++++++++--
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 0c32fdffff9..3114aaf315f 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -958,20 +958,6 @@ instance.web.Client = instance.web.Widget.extend({
     has_uncommitted_changes: function() {
         return false;
     },
-    trigger_children: function(events) {
-        // TODO: In the future, if we have more valid use cases in other objects, let's
-        //       put this back in the EventDispatcherMixin as an option of trigger()
-        var children = this.getChildren();
-        for (var i = 0; i < children.length; i++) {
-            var child = children[i];
-            if (child.__eventDispatcherMixin) {
-                child.__edispatcherEvents.trigger.apply(child.__edispatcherEvents, arguments);
-                instance.webclient // Yuck!
-                    .trigger_children.apply(child, arguments);
-            }
-        }
-        return this;
-    },
 });
 
 instance.web.WebClient = instance.web.Client.extend({
@@ -1151,7 +1137,7 @@ instance.web.WebClient = instance.web.Client.extend({
     },
     has_uncommitted_changes: function() {
         var $e = $.Event('clear_uncommitted_changes');
-        this.trigger_children('clear_uncommitted_changes', $e);
+        instance.web.bus.trigger('clear_uncommitted_changes', $e);
         if ($e.isDefaultPrevented()) {
             return true;
         } else {
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index bf2bfc4c9fe..744aa8d000d 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -92,7 +92,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             self.on("change:actual_mode", self, self.init_pager);
             self.init_pager();
         });
-        this.on('clear_uncommitted_changes', this, function(e) {
+        instance.web.bus.on('clear_uncommitted_changes', this, function(e) {
             if (!this.can_be_discarded()) {
                 e.preventDefault();
             }
@@ -753,7 +753,13 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         return def.promise();
     },
     can_be_discarded: function() {
-        return !this.$el.is('.oe_form_dirty') || confirm(_t("Warning, the record has been modified, your changes will be discarded.\n\nAre you sure you want to leave this page ?"));
+        if (this.$el.is('.oe_form_dirty')) {
+            if (!confirm(_t("Warning, the record has been modified, your changes will be discarded.\n\nAre you sure you want to leave this page ?"))) {
+                return false;
+            }
+            this.$el.removeClass('oe_form_dirty');
+        }
+        return true;
     },
     /**
      * Triggers saving the form's record. Chooses between creating a new

From d466f4dcad035a3f4f8948a1f2d86475998aeecf Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 6 Sep 2012 15:55:10 +0200
Subject: [PATCH 896/999] [IMP] res_company: reimplement the onchange method to
 define the company footer

bzr revid: rco@openerp.com-20120906135510-rpj9mres4hbbu4h6
---
 openerp/addons/base/res/res_company.py       | 104 ++++++-------------
 openerp/addons/base/res/res_company_view.xml |  24 ++---
 2 files changed, 40 insertions(+), 88 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index dcd6d378dc2..11c09adab9b 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -102,76 +102,17 @@ class res_company(osv.osv):
                 part_obj.create(cr, uid, {name: value or False, 'parent_id': company.partner_id.id}, context=context)
         return True
 
-    def _format_company_footer(self, cr, uid, company, context=None):
-        """
-        Format the company's RML footer the right way
-
-        @param company: compny's browse record OR dict with the required data
-
-        @return: string containing the formated footer
-        """
-
-        # list of values required to compose the footer
-        val = []
-
-        if company['phone']: val.append(_('Phone: ')+company['phone'])
-        if company['fax']: val.append(_('Fax: ')+company['fax'])
-        if company['email']: val.append(_('Email: ')+company['email'])
-        if company['website']: val.append(_('Website: ')+company['website'])
-        if company['vat']: val.append(_('TIN: ')+company['vat'])
-        if company['company_registry']: val.append(_('Reg: ')+company['company_registry'])
-
-        # fetch the company's bank accounts
-        # todo #TODO: make it work with the onchange
-        bank_accounts = self.browse(cr, uid, company['id'], context=context).bank_ids
-        bank_accounts_names = [bank_account.name_get()[0][1] for bank_account in bank_accounts if bank_account.footer]
-
-        res = ' | '.join(val)
-        # append the account(s) in the footer and manage plural form of "account" if necessary
-        if len(bank_accounts_names) == 1:
-            res += _('\nBank Account: ') + ', '.join(bank_accounts_names)
-        elif len(bank_accounts_names) > 1:
-            res += _('\nBank Accounts: ') + ', '.join(bank_accounts_names)
-
-        return res
-
-    def _get_rml_footer(self, cr, uid, ids, field_names, arg, context=None):
-        result = {}
-        for company in self.browse(cr, uid, ids, context=context):
-            if company.customize_footer:
-                result[company.id] = company.rml_footer
-            else:
-                result[company.id] = self._format_company_footer(cr, uid, company, context)
-
-        return result
-
-    def _set_rml_footer(self, cr, uid, company_id, name, value, arg, context=None):
-        company = self.browse(cr, uid, [company_id], context=context)[0]
-
-        if company.customize_footer:
-            rml_footer = value
-        else:
-            rml_footer = self._format_company_footer(cr, uid, company, context)
-
-        return cr.execute('UPDATE res_company SET rml_footer = %s WHERE id = %s', (rml_footer, company_id))
-
-    def _get_rml_footer_by_line(self, cr, uid, ids, rml_footer, line=0, context=None):
-        rml_split = rml_footer.split('\n')
-        if len(rml_split) < line + 1:
-            return False
-        return rml_split[line]
-
     _columns = {
         'name': fields.related('partner_id', 'name', string='Company Name', size=128, required=True, store=True, type='char'),
-        'customize_footer': fields.boolean('Customize Footer', help="If it is true then general information footer will not update automatically."),
         'parent_id': fields.many2one('res.company', 'Parent Company', select=True),
         'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
-        'rml_footer': fields.function(_get_rml_footer, fnct_inv=_set_rml_footer, type='text', string='General Information Footer', store=True),
         'rml_header': fields.text('RML Header', required=True),
         'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
         'rml_header2': fields.text('RML Internal Header', required=True),
         'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True),
+        'rml_footer': fields.text('Report Footer'),
+        'custom_footer': fields.boolean('Custom Footer', help="Check this to define the report footer manually.  Otherwise it will be filled in automatically."),
         'logo': fields.related('partner_id', 'image', string="Logo", type="binary"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'),
@@ -196,20 +137,33 @@ class res_company(osv.osv):
         ('name_uniq', 'unique (name)', 'The company name must be unique !')
     ]
 
-    def on_change_footer(self, cr, uid, ids, customize_footer=None, phone=None, email=None, fax=None, website=None, vat=None, company_registry=None, bank_ids=None, context=None):
-        if not customize_footer:
-            company_values = {
-                'id': ids[0],
-                'customize_footer': customize_footer,
-                'phone': phone,
-                'email': email,
-                'fax': fax,
-                'website': website,
-                'vat': vat,
-                'company_registry': company_registry,
-                'bank_ids': bank_ids,
-            }
-            return {'value': {'rml_footer': self._format_company_footer(cr, uid, company_values, context)}}
+    def on_change_footer(self, cr, uid, ids, custom_footer, phone, email, fax,
+                         website, vat, company_registry, bank_ids, context=None):
+        if custom_footer:
+            return {}
+
+        # first line (notice that missing elements are filtered out before the join)
+        res = ' | '.join(filter(bool, [
+            phone            and '%s: %s' % (_('Phone'), phone),
+            fax              and '%s: %s' % (_('Fax'), fax),
+            email            and '%s: %s' % (_('Email'), email),
+            website          and '%s: %s' % (_('Website'), website),
+            vat              and '%s: %s' % (_('TIN'), vat),
+            company_registry and '%s: %s' % (_('Reg'), company_registry),
+        ]))
+
+        # second line: bank accounts
+        accounts = self.resolve_o2m_commands_to_record_dicts(cr, uid, 'bank_ids', bank_ids, context=context)
+        accounts_names = [('%(bank_name)s %(acc_number)s' % acc) for acc in accounts if acc['footer']]
+        if accounts_names:
+            title = _('Bank Accounts') if len(accounts_names) > 1 else _('Bank Account')
+            res += '\n%s: %s' % (title, ', '.join(accounts_names))
+
+        return {'value': {'rml_footer': res}}
+
+    def _get_rml_footer_by_line(self, cr, uid, ids, rml_footer, line, context=None):
+        rml_footer_lines = rml_footer.split('\n')
+        return rml_footer_lines[line] if line < len(rml_footer_lines) else ""
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False, access_rights_uid=None):
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 875127ad12f..31ff7ff5285 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -55,26 +55,24 @@
                                     <div>
                                         <field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
                                     </div>
-                                    <field name="website" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)" widget="url" placeholder="e.g. www.openerp.com"/>
+                                    <field name="website" on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)" widget="url" placeholder="e.g. www.openerp.com"/>
                                 </group>
                                 <group>
-                                    <field name="phone" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
-                                    <field name="fax" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
-                                    <field name="email" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
-                                    <field name="vat" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
-                                    <field name="company_registry" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    <field name="phone" on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    <field name="fax" on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    <field name="email" on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    <field name="vat" on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    <field name="company_registry" on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
                                 </group>
                             </group>
                             <group string="Bank Accounts">
-                                <field name="bank_ids" colspan="4" nolabel="1" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                <field name="bank_ids" nolabel="1" context="{'default_company_id': active_id}"
+                                    on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
                             </group>
-                            <group string="Footer Configuration">
-                                <field name="customize_footer" on_change="on_change_footer(customize_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                            <group string="Report Footer Configuration">
                                 <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
-                                <label for="rml_footer"/>
-                                <div name="bank_acc">
-                                    <field name="rml_footer" attrs="{'readonly': [('customize_footer','=', False)]}"/>
-                                </div>
+                                <field name="custom_footer" on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                <field name="rml_footer"/>
                             </group>
                         </page>
                         <page string="Header/Footer" groups="base.group_no_one">

From bebed683730c2ae53792655d2c48fdb5a0bdb276 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 6 Sep 2012 15:57:45 +0200
Subject: [PATCH 897/999] changed most style

bzr revid: nicolas.vanhoren@openerp.com-20120906135745-pgmzrv94jvv3imuq
---
 .../hr_attendance/static/src/css/slider.css   |  49 ++++++++---------
 .../static/src/img/emp-absent.png             | Bin 756 -> 0 bytes
 .../static/src/img/emp-in-disable32.png       | Bin 0 -> 1135 bytes
 .../hr_attendance/static/src/img/emp-in32.png | Bin 0 -> 2153 bytes
 .../static/src/img/emp-out-disable32.png      | Bin 0 -> 1110 bytes
 .../static/src/img/emp-out32.png              | Bin 0 -> 2062 bytes
 .../static/src/img/emp-present.png            | Bin 930 -> 0 bytes
 .../hr_attendance/static/src/js/attendance.js |  52 ++++++------------
 .../static/src/xml/attendance.xml             |  14 ++---
 9 files changed, 44 insertions(+), 71 deletions(-)
 delete mode 100644 addons/hr_attendance/static/src/img/emp-absent.png
 create mode 100644 addons/hr_attendance/static/src/img/emp-in-disable32.png
 create mode 100644 addons/hr_attendance/static/src/img/emp-in32.png
 create mode 100644 addons/hr_attendance/static/src/img/emp-out-disable32.png
 create mode 100644 addons/hr_attendance/static/src/img/emp-out32.png
 delete mode 100644 addons/hr_attendance/static/src/img/emp-present.png

diff --git a/addons/hr_attendance/static/src/css/slider.css b/addons/hr_attendance/static/src/css/slider.css
index 31c0753e7ba..9e0252156b2 100644
--- a/addons/hr_attendance/static/src/css/slider.css
+++ b/addons/hr_attendance/static/src/css/slider.css
@@ -1,32 +1,27 @@
-.oe_attendance_status{
-    height:14px;
-    width:100px;
-    background-color:white;
-    padding: 5px 10px 7px;
-    margin:3px;
-    -webkit-border-radius:4px;
+
+.openerp .oe_attendance_status {
+    height: 32px;
+    width: 32px;
+    display: inline-block;
 }
-.oe_attendance_present{
+.openerp .oe_attendance_signin {
     float:left;
-    text-shadow: grey 0px 1px 0px;
-    color:green;
+    height: 32px;
+    width: 32px;
+    background: url(/hr_attendance/static/src/img/emp-in32.png);
+    cursor: pointer;
 }
-.oe_attendance_absent{
-    float:right;
-    text-shadow: grey 0px 1px 0px;
-    color:red;
-}
-.oe_attendance_slider{
-    cursor:pointer;
-    width: 60px;
-    background-color: gray;
-    position: relative;
-    top: -4px;
-    left: -8px;
-    height: 24px;
-    -webkit-border-radius:4px;
-}
-.oe_attendance_text{
-    visibility:hidden;
+.openerp .oe_attendance_status.oe_attendance_signed .oe_attendance_signin {
+    display: none;
 }
 
+.openerp .oe_attendance_signout {
+    float:right;
+    height: 32px;
+    width: 32px;
+    background: url(/hr_attendance/static/src/img/emp-out32.png);
+    cursor: pointer;
+}
+.openerp .oe_attendance_status.oe_attendance_nosigned .oe_attendance_signout {
+    display: none;
+}
diff --git a/addons/hr_attendance/static/src/img/emp-absent.png b/addons/hr_attendance/static/src/img/emp-absent.png
deleted file mode 100644
index 89dad31c60aeca478b10cd0131033cc04b3e73ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 756
zcmV<Q0t@|#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80008JNkl<Zc-rli
zOGq106ozkz!4xDb*BW0@6Lpg4B0drXQK^D1l%llKS_EAxqONq|t|+>aR>XzSu6!UC
zS|~yh>H}MATcotKvGvtdr)uhR(m40;nMuJ#X*U^n^TP+Tnfd>7?zv|e)1^z7E?v5G
z>C#xwCMK}f*N5-T%{VA4<p(|=UvxP)S1p!`t2LgT#jE~)gnD{_rY4}c7(6){++@NJ
z#`u?*82HWR&&!NCuOz_w@Gvkn1x_K*(gKv00yZ09Hsg>nd?H>_kQI~ZV$o>4uBrLv
z=qNBW1dNOTy}dwVBT!xrUR@0y8;b)n|46J5PbtKL!4P`RSd1p-yM8}Hbl$wP6X@!S
zR9{sE3=9CGh_kUV1PlheC-db<06ZdIGd8J7fSut7KxHLRTN|OG0z5w-C@26A1b}cD
zhcuY)D8xJ&&-@AS#At*j0ru|P2JCk5+}sFdWq{8I+3ki@Q=<k@B#w_`mO@b3ct`|k
zKKyojNz?&?MMdBi3lJX<xw~66<hT@<Wk7-C9~{IqnV%;m0WKFrL1>7|Ts-;-k=lJq
z9}N-5g@uromQ>D&leszY^K<Zv3qX<}Qb**}RB(p_$jd`O5N<>l;BX&Xw{Bvc%r}Tl
zLV5l`yd}0eIwD;lb6!^mq@;jnW&+vS;1qV%YK?9u?Cu8eb#feGs!B>s#A!l;ie$AS
z+}{3|InvWrb6F7hiPyWQ$q;UAZ6H`qgGV7$17-Qpv)tMWzP}H-zW&lYD+_Qs)f=)c
z2yL1zqBk?s2-BI$Rx4NAtUw)sf)Xqv<I>#Y!I8)Ff?hLdx()9MIrpWUoL_3SifLL}
zq-tg0l(sva9CYqMk7s^?v1?cIKe!tgm-WrzcpOqHr9GflOr7D>@?)=8+;+R$G_U+$
m^4n}BqRZ8wT(!0TO#5$`5(dVVotKvY0000<MNUMnLSTYCe^jCX

diff --git a/addons/hr_attendance/static/src/img/emp-in-disable32.png b/addons/hr_attendance/static/src/img/emp-in-disable32.png
new file mode 100644
index 0000000000000000000000000000000000000000..1968e0de46434949ddb12393f4f21895270a334c
GIT binary patch
literal 1135
zcmV-#1d#iQP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb&2sa_Q
z3&GR?00Z+$L_t(Y$BmR*Y*b|s$A5Fq>Dk@ZQkF#u6eyrrg9t^agh&iZ;K55`)F3_(
zUwsf`AjlK77^_l~#=GH35^rGS#XuiSj3(Zt2oDqqAxgypEiK({yW8Ef=ljNoJ-yh{
zmYJO7<jc%|{@=`hKA6JZ0^s1%*Veze4B(9^;=HK<Z1t<}taxTF3Gy7_!dLPVUEI1I
zc;TpC*Fl@ntPW|;_Ukb{u=keJn_m7wZ)l%pG^csZYgPv|V}H{FO_O6~;z0{$&An$D
z6!GyW!$S!P2|(NB^v1zon`f&3_UUW-ulDE-&1g;o4K$}2?bB}U)%VU%jCLj-yuSR-
z`htRuJfw)hq9}Q-t7~30EkG0Yu^Nn&k_{n6LP87%i;)`aqcZ@Q`3aqvJ_eCcyJ!X-
zNEnJBfa2gpe<eVJh2a@`;GRoI!Qmt~^ox7Gb$SNo*k$HvD5d%(e2qAuof12;dwK?q
z#g31yXvCm6t_vX|=RVt;o4|Oo4r+(<J6BOeu~B7<MJeYSKHbutn?Z?<&uutdspn)X
z0TvJxaPaw-1=`VZ`<h<6Z|W;F?t1F*Cg#X8zNV8H349X7xXf{ub2rc5Gt{|{mZ=!L
z^2p;S?ocB|dg$jey?FQpgv?_xb4g+pj-K7K8g|qAe}E>!vitH6I{_{Z0XG;RM}XoG
zqXLHvedJKJl0I2zEPl7Y@GM`9HSv44eXyfpI1-OfCFPV;Nfk+wWVuK;Llg)kz^(C~
zh*hsXc_>#l{t9inUX8dojC`Pga*1|=(l%fL2gR}G^Q*fKrXvPlvhwLI+Ytw_xCkH!
z4nmrCvXMGd)MFUHQ5<KbpIP@yG==ThwR04NZoFvjrFxdX7>sry#e=M40ftZv)^m57
zg`-lA&k<3s<70493?LW+x+C&Q9$+!;v@wK>i=*CM+&>DC@3lDm!&(%J0~iD$OBThD
zU=vFTFl@#nPX~R1<JFA<WY6}JA%$W`H6}oSQs8e^u>_@z^*C4p0tz@1%o+jkT7TL|
zEh!9cB;gVRmpm7^M#%4Mz;cRS;)D#4#A>F0L<c?#J=xq)p(+v$ue8X*DgLAk!xfUu
zCr<}G6!0m>4f@}AN4GM0_FCn#`XyC_=%|A*$OVKrAy=tl5y~*LsnmoN{<zrcj(b{W
z{oLM_HY+r4@hB1!P@qVH9tQB$myka4q=_+`B$B_<-16g?664IHnsS2L>Xo(e+r}0}
zNYuoibgE;TkP5AmBq>cvMR4ieLro{L<F~Pl1U@qPjes2+=I-$tV&xUgVm3(=?@E94
z$%n@?+${L!_F~H4=06l$T;U}K<V;`N{?nyC{|5!z>#RZAZ;Jo`002ovPDHLkV1o9X
B3oQTu

literal 0
HcmV?d00001

diff --git a/addons/hr_attendance/static/src/img/emp-in32.png b/addons/hr_attendance/static/src/img/emp-in32.png
new file mode 100644
index 0000000000000000000000000000000000000000..26e3c01556b290949b104240e73fe43dc27b1229
GIT binary patch
literal 2153
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

literal 0
HcmV?d00001

diff --git a/addons/hr_attendance/static/src/img/emp-out-disable32.png b/addons/hr_attendance/static/src/img/emp-out-disable32.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7099e44529f554318fb555aac6abc1718fc5e20
GIT binary patch
literal 1110
zcmV-c1gZOpP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb&2sjvF
zmQ@n~00Y`dL_t(Y$BmWSPh3?L#((>qGs6rmVyHlY77$yT-l%P$MxPq7@z%anf{BSS
zQ4@WriI<>n2q>jW($x9~s0l_SHYO&LXrhf82ojP~Q?Qb>USNbN!vKTK<;*#I`7mcF
z9USQ1ImyY+THpTG+TXV~<QY8xykGlX!`XWQy7R<Y`2ciz=ZCwWxrZQ0`k4Guy+(*T
zA04N^kU3e_F<Fs+C9W6bqI9(0aeDh(KTA~RB_?r6N>Wy2Nn-jJ>1bact8y1Uz&&(u
ztWi*YEPPl94h}ZRsJi^n@^IH?`=7r&E7NjQq7sw1*kVguVlppbiO5ISa-)shg)?=#
z9!LpjZ#txL(Fj6P_U!38upvM@`a~73$|Souq;YU?anZP{3jNe30Pgmn<fh+(2#VgZ
zi4K(GD1`z91H=2v0J>;MY|;aBV$lnB)=ifMWnMeCF$4GF6lLP5%>EgC@i-uVse-;Y
zHfGS49{*S?@ff7nbiqNXiO*W&IgHoqpeB)g?f_{7?d`152!(t{Z&NtFi4xnMfAEtc
znNY{E(SSk#13%wWA>-qvha&pz`~YpQK7FB<DMC!Jmt7cW3^X_Rjf2!mDW8T;@65~K
zohMIzbDy{>%}o}VB7%h<8;5d&M3`Y#Y@*Y%uM7>W18B$b9Z5c7*q9jDL|Gz^jbLDM
z1D7b%%n~LcO8KrQntvU;?G)MxTxc?~DhX0aHPzHmLlqJ3rw9`Z6BDIemg|hs`X_Qq
z7?1{Wm5D+213@tWSVWj%4nM=hNux=NKV49*!`?CWv#+_S1!Vvl69p&~24Q~0W|>76
zXygTIxRmjxvQ4AzO21b^3;J-0fFg|Lox8>bMu-q1#4HQ^fWzaQC1ZAQP8}^??LnYK
zDPayjE+F0=pt(wj8A7<2r04;T)8naQFFP7my^xG(4F2XYg2n(`6pDYC!{QV#d7{;5
z9;1~m_Ok`2aus0ZYJ?cu5cH}|6fO=+C`Nb~fE4wZ*o;$;9|Ka^60CEBSI}(3_4F^E
z|0_sgGfE51oa86`xO8$I3j-g~$*h_DR9fm-;}#K>sZTt@0sf?jVoE6GSzgDclL;&=
zOz}th-^?-)^ygpq4%%v~*TU@FPX&Gg1n{9*;$1J@AgE&9Ywc`t*U)Ha(cLWpjYS#<
zn-mUZOp*{3{J~eu<HN!rfIHaxa@86o1}LMPLhPFIeKmotw`6KcbZ7aCNgt@JN+qDu
zL%%;NiQ(Ja=p%?9wf>Gk*KI%2U2wtx41B1_@|nK#M`h&yE|mP^?&4z&g_V+uPJTNE
cRo-L$A96_I2bkv;asU7T07*qoM6N<$f|Dll%>V!Z

literal 0
HcmV?d00001

diff --git a/addons/hr_attendance/static/src/img/emp-out32.png b/addons/hr_attendance/static/src/img/emp-out32.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2a6cbb50137c404d3f188151bb64024c082b75a
GIT binary patch
literal 2062
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

literal 0
HcmV?d00001

diff --git a/addons/hr_attendance/static/src/img/emp-present.png b/addons/hr_attendance/static/src/img/emp-present.png
deleted file mode 100644
index a00718fa7f88ef1a833e324374c995378b4881c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 930
zcmV;T16}-yP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000ANNkl<Zc-rli
zYe<t(9EV?{C`fXwENX^YmST}2DI=3^cGKFNMOxFeoNcDd3+ZN>S$Vg+c2m@7ZSUr0
zsjFNB)uvQRnVNHjE0VN~z64R0+umQV^{ubI^=S_r&iQiqJ?DRJ1mVPq6DLlbIB~)-
z?Isf}17-}5zQ>ypD`g!Sq>9fL_5C-2j@}NaI@Kt<SBcz~LgX~(Q}SDR5H*OqHaA3U
z@wwnL{htI|-&oPsW59_!rO49eLaIKD6fzSB$U_j3X%MN>5U&({-K7*((-Q8C3m6AY
zkT(|~LnA{f9V{l(u}_(TI7Kpc-$;Uxq<d0?SoMB~Koz41JR8VjZuOt6C~7N1Ivsvc
zorPqT6!AC2$h}>N);<FY@0TG;Erg&kjuL3&5T)B=3s*$Sh-1VQMg%m^v~=0!NSz2L
z>2PH-<aD_C!z)k}g@zs_)@gWHr{!b4j*sx0(b%Bj_4|~s@L)us>|O<=n(W{EouCpU
zM_+*6;eG%Vng&|nSsQ@q)$=j)vIpF*dVyWDnBvs=k9%J5i=K4&>k$im+6$0EuRf99
zb7@mHdfxY8g0b;2ko`KG>Z-!|=T}ht^bEL~aIovW;9l=z_p0&BowPvjyI%UL<sm^K
zfq!`jEpQk%yX|-BCz{RiXKc4S@OA75WE}-qq+X7t>OhBoeL(4?1qO!9NNvo7@5vw#
zS+3wz_(9dDg~Q>%Pun<1b0Z2nOHkQ;4n@x^u;W22R<*6gs@rSrLDxfa7&!y64GC~b
zp9Mljw-c^dcy$?cmS&9G>}VhA0^bmWP{SH*HEu)n<7n)7yc3ZRd1EVUS4J=*P;RKi
z44FHKBeXy%3&c4Ve6I)NrsXb1zkI{xm)8*0AwW`3B2vv_D$OE6j47tmyV!dkBLb!u
zMub&w1aZ_2L^+F^Ry7x{H5_nt8*sey6eLfi*xM~cjx__tAM>fBZ?nG(TKOV+stY3m
z0s%jdD+#^ic9Jvda+-~)RqoX6I&XNX{Hb95YHV-kA^Bwzb$nQk^Pfw8W^_p^iFjfr
z)35Q|dC~>jS!X;RxnA=4Hm7b87Lx%8(T5?@$ix2bM0=+B;E=?aC}#`Vv;Ns{$SL8>
zUU+fIZqHi38ec^~TX0k8{Z0DKx(IzlKDVA5^mo~R0Zb|UL6Op$cK`qY07*qoM6N<$
Ef+fPYZ~y=R

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 2499b42f054..5b2f4124423 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -7,61 +7,44 @@ openerp.hr_attendance = function (instance) {
     instance.hr_attendance.AttendanceSlider = instance.web.Widget.extend({
         template: 'AttendanceSlider',
         init: function (parent) {
-            this.titles = {
-                'present': _t("Present"),
-                'absent': _t("Absent")
-            }
             this._super(parent);
-            this.session = parent.session;
-            this.parent_element = parent.$el;
         },
-        start: function () {
-            this.$oe_attendance_slider = this.$el.find(".oe_attendance_slider");
-            this.$oe_attendance_slider.click(this.do_update_attendance);
+        start: function() {
+            var self = this;
+            this.on("change:signed_in", this, function() {
+                this.$el.toggleClass("oe_attendance_nosigned", ! this.get("signed_in"));
+                this.$el.toggleClass("oe_attendance_signed", this.get("signed_in"));
+            });
+            this.$(".oe_attendance_signin").click(function() {
+                self.do_update_attendance();
+            });
+            this.$(".oe_attendance_signout").click(function() {
+                self.do_update_attendance();
+            });
+            return this.check_attendance();
         },
         do_update_attendance: function () {
             var self = this;
-            if (!self.employee)
-                return;
             var hr_employee = new instance.web.DataSet(self, 'hr.employee');
             hr_employee.call('attendance_action_change', [
                 [self.employee.id]
             ]).done(function (result) {
-                if (!result) return;
-                if (self.employee.state == 'present')
-                    self.employee.state = 'absent';
-                else
-                    self.employee.state = 'present';
-                self.do_slide(self.employee.state);
+                self.set({"signed_in": ! self.get("signed_in")});
             });
         },
-        do_slide: function (attendance_state) {
-            if (attendance_state == 'present') {
-                this.$oe_attendance_slider.attr("title", _t("Sign Out"));
-                this.$oe_attendance_slider.animate({
-                    "left": "48px"
-                }, "slow");
-            } else {
-                this.$oe_attendance_slider.attr("title", _t("Sign In"));
-                this.$oe_attendance_slider.animate({
-                    "left": "-8px"
-                }, "slow");
-            }
-
-        },
         check_attendance: function () {
             var self = this;
             self.employee = false;
-            this.$el.find(".oe_attendance_status").hide();
+            this.$el.hide();
             var employee = new instance.web.DataSetSearch(self, 'hr.employee', self.session.user_context, [
                 ['user_id', '=', self.session.uid]
             ]);
             return employee.read_slice(['id', 'name', 'state']).pipe(function (res) {
                 if (_.isEmpty(res))
                     return;
-                self.$el.find(".oe_attendance_status").show();
+                self.$el.show();
                 self.employee = res[0];
-                self.do_slide(self.employee.state);
+                self.set({"signed_in": self.employee.state !== "absent"});
             });
         },
     });
@@ -76,7 +59,6 @@ openerp.hr_attendance = function (instance) {
                 self.attendanceslider = new instance.hr_attendance.AttendanceSlider(self);
 
                 self.attendanceslider.prependTo(instance.webclient.$('.oe_systray'));
-                self.attendanceslider.check_attendance();
             });
         },
     });
diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml
index aadfe0155e0..e4287b35910 100644
--- a/addons/hr_attendance/static/src/xml/attendance.xml
+++ b/addons/hr_attendance/static/src/xml/attendance.xml
@@ -1,14 +1,10 @@
 <template>
-    
     <t t-name="AttendanceSlider">
-         <li>
-               <div class="oe_attendance_status">
-                    <div class="oe_attendance_present"><t t-esc="widget.titles.present"/></div>
-                    <div class="oe_attendance_absent"><t t-esc="widget.titles.absent"/></div>
-                    <div class="oe_attendance_slider"><span  class="oe_attendance_text">slider</span></div>
-               </div>
-         </li>
-    </t>   
+        <div class="oe_attendance_status oe_attendance_nosigned">
+             <div class="oe_attendance_signin"></div>
+             <div class="oe_attendance_signout"></div>
+        </div>
+    </t>
 </template>
 
 

From 56e2d8984ddcec5dbffe5bf96b27d8d650ef8b6f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 6 Sep 2012 16:10:51 +0200
Subject: [PATCH 898/999] added tipsy

bzr revid: nicolas.vanhoren@openerp.com-20120906141051-mhgqkoycwxf8flp5
---
 addons/hr_attendance/static/src/js/attendance.js   | 4 ++--
 addons/hr_attendance/static/src/xml/attendance.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 5b2f4124423..d3f620a88c3 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -17,10 +17,10 @@ openerp.hr_attendance = function (instance) {
             });
             this.$(".oe_attendance_signin").click(function() {
                 self.do_update_attendance();
-            });
+            }).tipsy();
             this.$(".oe_attendance_signout").click(function() {
                 self.do_update_attendance();
-            });
+            }).tipsy();
             return this.check_attendance();
         },
         do_update_attendance: function () {
diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml
index e4287b35910..9f13b5c2fe2 100644
--- a/addons/hr_attendance/static/src/xml/attendance.xml
+++ b/addons/hr_attendance/static/src/xml/attendance.xml
@@ -1,8 +1,8 @@
 <template>
     <t t-name="AttendanceSlider">
         <div class="oe_attendance_status oe_attendance_nosigned">
-             <div class="oe_attendance_signin"></div>
-             <div class="oe_attendance_signout"></div>
+             <div class="oe_attendance_signin" t-att-title="_t('You are currently signed out. Click here to sign in.')"></div>
+             <div class="oe_attendance_signout" t-att-title="_t('You are currently signed in. Click here to sign out.')"></div>
         </div>
     </t>
 </template>

From 6eec6cf69105dd565c3197be6f483aede86f45a9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 6 Sep 2012 16:16:46 +0200
Subject: [PATCH 899/999] Changed tipsy

bzr revid: nicolas.vanhoren@openerp.com-20120906141646-r9wgdi9uhjdd5124
---
 addons/hr_attendance/static/src/js/attendance.js   | 12 ++++++++++--
 addons/hr_attendance/static/src/xml/attendance.xml |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index d3f620a88c3..e5cb3ee2bc6 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -3,24 +3,32 @@ openerp.hr_attendance = function (instance) {
     
     var QWeb = instance.web.qweb;
     var _t = instance.web._t;
+    var _lt = instance.web._lt;
+    
+    var tips = {
+        "true": _lt("You are currently signed in. Click here to sign out."),
+        "false": _lt("You are currently signed out. Click here to sign in."),
+    }
 
     instance.hr_attendance.AttendanceSlider = instance.web.Widget.extend({
         template: 'AttendanceSlider',
         init: function (parent) {
             this._super(parent);
+            this.set({"signed_in": false});
         },
         start: function() {
             var self = this;
             this.on("change:signed_in", this, function() {
                 this.$el.toggleClass("oe_attendance_nosigned", ! this.get("signed_in"));
                 this.$el.toggleClass("oe_attendance_signed", this.get("signed_in"));
+                this.$el.attr("title", tips["" + this.get("signed_in")].toString());
             });
             this.$(".oe_attendance_signin").click(function() {
                 self.do_update_attendance();
-            }).tipsy();
+            });
             this.$(".oe_attendance_signout").click(function() {
                 self.do_update_attendance();
-            }).tipsy();
+            });
             return this.check_attendance();
         },
         do_update_attendance: function () {
diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml
index 9f13b5c2fe2..e4287b35910 100644
--- a/addons/hr_attendance/static/src/xml/attendance.xml
+++ b/addons/hr_attendance/static/src/xml/attendance.xml
@@ -1,8 +1,8 @@
 <template>
     <t t-name="AttendanceSlider">
         <div class="oe_attendance_status oe_attendance_nosigned">
-             <div class="oe_attendance_signin" t-att-title="_t('You are currently signed out. Click here to sign in.')"></div>
-             <div class="oe_attendance_signout" t-att-title="_t('You are currently signed in. Click here to sign out.')"></div>
+             <div class="oe_attendance_signin"></div>
+             <div class="oe_attendance_signout"></div>
         </div>
     </t>
 </template>

From 69c3ac117d7e29d71ec157c0217602009fca6c11 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 6 Sep 2012 16:21:43 +0200
Subject: [PATCH 900/999] fixed small bug with tipsy

bzr revid: nicolas.vanhoren@openerp.com-20120906142143-wxo087d2r6y6pln8
---
 addons/hr_attendance/static/src/js/attendance.js   | 6 ++++--
 addons/hr_attendance/static/src/xml/attendance.xml | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index e5cb3ee2bc6..f6a4c15268a 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -18,11 +18,13 @@ openerp.hr_attendance = function (instance) {
         },
         start: function() {
             var self = this;
-            this.on("change:signed_in", this, function() {
+            var tmp = function() {
                 this.$el.toggleClass("oe_attendance_nosigned", ! this.get("signed_in"));
                 this.$el.toggleClass("oe_attendance_signed", this.get("signed_in"));
                 this.$el.attr("title", tips["" + this.get("signed_in")].toString());
-            });
+            };
+            this.on("change:signed_in", this, tmp);
+            _.bind(tmp, this)();
             this.$(".oe_attendance_signin").click(function() {
                 self.do_update_attendance();
             });
diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml
index e4287b35910..6896086440f 100644
--- a/addons/hr_attendance/static/src/xml/attendance.xml
+++ b/addons/hr_attendance/static/src/xml/attendance.xml
@@ -1,6 +1,6 @@
 <template>
     <t t-name="AttendanceSlider">
-        <div class="oe_attendance_status oe_attendance_nosigned">
+        <div class="oe_attendance_status oe_attendance_nosigned" title=" ">
              <div class="oe_attendance_signin"></div>
              <div class="oe_attendance_signout"></div>
         </div>

From 690113ffe208d07f2a474f2565265fba73177fdb Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 6 Sep 2012 16:32:27 +0200
Subject: [PATCH 901/999] [IMP] res_company: make the field 'rml_footer'
 readonly when changed automatically (with secondary field to make it work)

bzr revid: rco@openerp.com-20120906143227-ktfmuhu9em7xrwmy
---
 openerp/addons/base/res/res_company.py       | 8 +++++++-
 openerp/addons/base/res/res_company_view.xml | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 11c09adab9b..f56d33444b3 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -102,6 +102,11 @@ class res_company(osv.osv):
                 part_obj.create(cr, uid, {name: value or False, 'parent_id': company.partner_id.id}, context=context)
         return True
 
+    def _get_rml_footer(self, cr, uid, ids, field_name, arg, context=None):
+        """ simply return the field 'rml_footer'; useful for the client """
+        companies = self.browse(cr, uid, ids, context=context)
+        return dict((company.id, company.rml_footer) for company in companies)
+
     _columns = {
         'name': fields.related('partner_id', 'name', string='Company Name', size=128, required=True, store=True, type='char'),
         'parent_id': fields.many2one('res.company', 'Parent Company', select=True),
@@ -112,6 +117,7 @@ class res_company(osv.osv):
         'rml_header2': fields.text('RML Internal Header', required=True),
         'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True),
         'rml_footer': fields.text('Report Footer'),
+        'rml_footer_readonly': fields.function(_get_rml_footer, type='text', string='Report Footer'),
         'custom_footer': fields.boolean('Custom Footer', help="Check this to define the report footer manually.  Otherwise it will be filled in automatically."),
         'logo': fields.related('partner_id', 'image', string="Logo", type="binary"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
@@ -159,7 +165,7 @@ class res_company(osv.osv):
             title = _('Bank Accounts') if len(accounts_names) > 1 else _('Bank Account')
             res += '\n%s: %s' % (title, ', '.join(accounts_names))
 
-        return {'value': {'rml_footer': res}}
+        return {'value': {'rml_footer': res, 'rml_footer_readonly': res}}
 
     def _get_rml_footer_by_line(self, cr, uid, ids, rml_footer, line, context=None):
         rml_footer_lines = rml_footer.split('\n')
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 31ff7ff5285..556ab4511f3 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -72,7 +72,8 @@
                             <group string="Report Footer Configuration">
                                 <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
                                 <field name="custom_footer" on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
-                                <field name="rml_footer"/>
+                                <field name="rml_footer" attrs="{'invisible': [('custom_footer','=',False)]}"/>
+                                <field name="rml_footer_readonly" attrs="{'invisible': [('custom_footer','=',True)]}"/>
                             </group>
                         </page>
                         <page string="Header/Footer" groups="base.group_no_one">

From 8562bb1ef722512dab46e47079773fa037145a5e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 6 Sep 2012 16:41:40 +0200
Subject: [PATCH 902/999] [IMP] perfected loading messages

bzr revid: nicolas.vanhoren@openerp.com-20120906144140-7ih93r7b61b6vojd
---
 addons/web/static/src/js/coresetup.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index ab3e355e818..60e59ad0b2c 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -597,7 +597,8 @@ var messages_by_seconds = function() {
         [60, _t("Still loading...<br />Please be patient.")],
         [120, _t("Don't leave yet,<br />it's still loading...")],
         [300, _t("You may not believe it,<br />but the application is actually loading...")],
-        [600, _t("Take a minute to get a coffee,<br />because it's loading...")],
+        [420, _t("Take a minute to get a coffee,<br />because it's loading...")],
+        [600, _t("It's loading...<br />By the way, did you tried the kitten mode?")],
         [3600, _t("Maybe you should consider pressing F5...")],
     ];
 };

From f4945c2fc7e341efa769e3790bce420387d162a3 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 6 Sep 2012 16:48:36 +0200
Subject: [PATCH 903/999] [IMP] orm: fix and generalize method
 resolve_o2m_commands_to_record_dicts (now named resolve_2many_commands)

bzr revid: rco@openerp.com-20120906144836-v2ye3o8n12iir84b
---
 openerp/addons/base/res/res_bank.py    |  2 +-
 openerp/addons/base/res/res_company.py |  2 +-
 openerp/osv/orm.py                     | 99 ++++++++++++--------------
 openerp/tests/test_orm.py              | 24 +++----
 4 files changed, 59 insertions(+), 68 deletions(-)

diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index c5c05c1807c..a839afc10e4 100644
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -109,7 +109,7 @@ class res_partner_bank(osv.osv):
         if not context.get('address'):
             return value
 
-        for address in self.pool.get('res.partner').resolve_o2m_commands_to_record_dicts(
+        for address in self.pool.get('res.partner').resolve_2many_commands(
             cursor, user, 'address', context['address'], ['type', field], context=context):
 
             if address.get('type') == 'default':
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index f56d33444b3..a51f37af1f4 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -159,7 +159,7 @@ class res_company(osv.osv):
         ]))
 
         # second line: bank accounts
-        accounts = self.resolve_o2m_commands_to_record_dicts(cr, uid, 'bank_ids', bank_ids, context=context)
+        accounts = self.resolve_2many_commands(cr, uid, 'bank_ids', bank_ids, context=context)
         accounts_names = [('%(bank_name)s %(acc_number)s' % acc) for acc in accounts if acc['footer']]
         if accounts_names:
             title = _('Bank Accounts') if len(accounts_names) > 1 else _('Bank Account')
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 2ba8afd8e72..a6233a8bb46 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -5009,66 +5009,57 @@ class BaseModel(object):
 
         return True
 
-    def resolve_o2m_commands_to_record_dicts(self, cr, uid, field_name, o2m_commands, fields=None, context=None):
-        """ Serializes o2m commands into record dictionaries (as if
-        all the o2m records came from the database via a read()), and
-        returns an iterable over these dictionaries.
+    def resolve_2many_commands(self, cr, uid, field_name, commands, fields=None, context=None):
+        """ Serializes one2many and many2many commands into record dictionaries
+            (as if all the records came from the database via a read()).  This
+            method is aimed at onchange methods on one2many and many2many fields.
 
-        Because o2m commands might be creation commands, not all
-        record ids will contain an ``id`` field. Commands matching an
-        existing record (``UPDATE`` and ``LINK_TO``) will have an id.
+            Because commands might be creation commands, not all record dicts
+            will contain an ``id`` field.  Commands matching an existing record
+            will have an ``id``.
 
-        .. note:: ``CREATE``, ``UPDATE`` and ``LINK_TO`` stand for the
-                  o2m command codes ``0``, ``1`` and ``4``
-                  respectively
-
-        :param field_name: name of the o2m field matching the commands
-        :type field_name: str
-        :param o2m_commands: one2many commands to execute on ``field_name``
-        :type o2m_commands: list((int|False, int|False, dict|False))
-        :param fields: list of fields to read from the database, when applicable
-        :type fields: list(str)
-        :raises AssertionError: if a command is not ``CREATE``, ``UPDATE`` or ``LINK_TO``
-        :returns: o2m records in a shape similar to that returned by
-                  ``read()`` (except records may be missing the ``id``
-                  field if they don't exist in db)
-        :rtype: ``list(dict)``
+            :param field_name: name of the one2many or many2many field matching the commands
+            :type field_name: str
+            :param commands: one2many or many2many commands to execute on ``field_name``
+            :type commands: list((int|False, int|False, dict|False))
+            :param fields: list of fields to read from the database, when applicable
+            :type fields: list(str)
+            :returns: records in a shape similar to that returned by ``read()``
+                (except records may be missing the ``id`` field if they don't exist in db)
+            :rtype: list(dict)
         """
-        o2m_model = self._all_columns[field_name].column._obj
+        result = []             # result (list of dict)
+        record_ids = set()      # ids of records to read
+        updates = {}            # {id: dict} of updates on particular records
 
-        # convert single ids and pairs to tripled commands
-        commands = []
-        for o2m_command in o2m_commands:
-            if not isinstance(o2m_command, (list, tuple)):
-                command = 4
-                commands.append((command, o2m_command, False))
-            elif len(o2m_command) == 1:
-                (command,) = o2m_command
-                commands.append((command, False, False))
-            elif len(o2m_command) == 2:
-                command, id = o2m_command
-                commands.append((command, id, False))
-            else:
-                command = o2m_command[0]
-                commands.append(o2m_command)
-            assert command in (0, 1, 4), \
-                "Only CREATE, UPDATE and LINK_TO commands are supported in resolver"
+        for command in commands:
+            if not isinstance(command, (list, tuple)):
+                record_ids.add(command)
+            elif command[0] == 0:
+                result.append(command[2])
+            elif command[0] == 1:
+                record_ids.add(command[1])
+                updates.setdefault(command[1], {}).update(command[2])
+            elif command[0] in (2, 3):
+                record_ids.discard(command[1])
+            elif command[0] == 4:
+                record_ids.add(command[1])
+            elif command[0] == 5:
+                result, record_ids = [], []
+            elif command[0] == 6:
+                result, record_ids = [], list(command[2])
 
-        # extract records to read, by id, in a mapping dict
-        ids_to_read = [id for (command, id, _) in commands if command in (1, 4)]
-        records_by_id = dict(
-            (record['id'], record)
-            for record in self.pool.get(o2m_model).read(
-                cr, uid, ids_to_read, fields=fields, context=context))
+        # read the records and apply the updates
+        other_model = self.pool.get(self._all_columns[field_name].column._obj)
+        for record in other_model.read(cr, uid, list(record_ids), fields=fields, context=context):
+            record.update(updates.get(record['id'], {}))
+            result.append(record)
 
-        record_dicts = []
-        # merge record from db with record provided by command
-        for command, id, record in commands:
-            item = {}
-            if command in (1, 4): item.update(records_by_id[id])
-            if command in (0, 1): item.update(record)
-            record_dicts.append(item)
-        return record_dicts
+        return result
+
+    # for backward compatibility
+    def resolve_2many_commands(self, cr, uid, field_name, o2m_commands, fields=None, context=None):
+        return self.resolve_2many_commands(cr, uid, field_name, o2m_commands, fields, context)
 
 # keep this import here, at top it will cause dependency cycle errors
 import expression
diff --git a/openerp/tests/test_orm.py b/openerp/tests/test_orm.py
index ea9b37e5f3b..8c7043a5ff0 100644
--- a/openerp/tests/test_orm.py
+++ b/openerp/tests/test_orm.py
@@ -23,14 +23,14 @@ class TestO2MSerialization(common.TransactionCase):
 
     def test_no_command(self):
         " empty list of commands yields an empty list of records "
-        results = self.partner.resolve_o2m_commands_to_record_dicts(
+        results = self.partner.resolve_2many_commands(
             self.cr, UID, 'address', [])
 
         self.assertEqual(results, [])
 
     def test_CREATE_commands(self):
         " returns the VALUES dict as-is "
-        results = self.partner.resolve_o2m_commands_to_record_dicts(
+        results = self.partner.resolve_2many_commands(
             self.cr, UID, 'address',
             map(CREATE, [{'foo': 'bar'}, {'foo': 'baz'}, {'foo': 'baq'}]))
         self.assertEqual(results, [
@@ -48,7 +48,7 @@ class TestO2MSerialization(common.TransactionCase):
         ]
         commands = map(LINK_TO, ids)
 
-        results = self.partner.resolve_o2m_commands_to_record_dicts(
+        results = self.partner.resolve_2many_commands(
             self.cr, UID, 'address', commands, ['name'])
 
         self.assertEqual(results, [
@@ -65,7 +65,7 @@ class TestO2MSerialization(common.TransactionCase):
             self.partner.create(self.cr, UID, {'name': 'baz'})
         ]
 
-        results = self.partner.resolve_o2m_commands_to_record_dicts(
+        results = self.partner.resolve_2many_commands(
             self.cr, UID, 'address', ids, ['name'])
 
         self.assertEqual(results, [
@@ -80,7 +80,7 @@ class TestO2MSerialization(common.TransactionCase):
         id_bar = self.partner.create(self.cr, UID, {'name': 'bar'})
         id_baz = self.partner.create(self.cr, UID, {'name': 'baz', 'city': 'tag'})
 
-        results = self.partner.resolve_o2m_commands_to_record_dicts(
+        results = self.partner.resolve_2many_commands(
             self.cr, UID, 'address', [
                 LINK_TO(id_foo),
                 UPDATE(id_bar, {'name': 'qux', 'city': 'tagtag'}),
@@ -99,7 +99,7 @@ class TestO2MSerialization(common.TransactionCase):
             for name in ['NObar', 'baz', 'qux', 'NOquux', 'NOcorge', 'garply']
         ]
 
-        results = self.partner.resolve_o2m_commands_to_record_dicts(
+        results = self.partner.resolve_2many_commands(
             self.cr, UID, 'address', [
                 CREATE({'name': 'foo'}),
                 UPDATE(ids[0], {'name': 'bar'}),
@@ -131,7 +131,7 @@ class TestO2MSerialization(common.TransactionCase):
         ]
         commands = map(lambda id: (4, id), ids)
 
-        results = self.partner.resolve_o2m_commands_to_record_dicts(
+        results = self.partner.resolve_2many_commands(
             self.cr, UID, 'address', commands, ['name'])
 
         self.assertEqual(results, [
@@ -144,7 +144,7 @@ class TestO2MSerialization(common.TransactionCase):
         "DELETE_ALL can appear as a singleton"
 
         try:
-            self.partner.resolve_o2m_commands_to_record_dicts(
+            self.partner.resolve_2many_commands(
                 self.cr, UID, 'address', [(5,)], ['name'])
         except AssertionError:
             # 5 should fail with an assert error, but not e.g. a ValueError
@@ -154,19 +154,19 @@ class TestO2MSerialization(common.TransactionCase):
         "Commands with uncertain semantics in this context should be forbidden"
 
         with self.assertRaises(AssertionError):
-            self.partner.resolve_o2m_commands_to_record_dicts(
+            self.partner.resolve_2many_commands(
                 self.cr, UID, 'address', [DELETE(42)], ['name'])
 
         with self.assertRaises(AssertionError):
-            self.partner.resolve_o2m_commands_to_record_dicts(
+            self.partner.resolve_2many_commands(
                 self.cr, UID, 'address', [FORGET(42)], ['name'])
 
         with self.assertRaises(AssertionError):
-            self.partner.resolve_o2m_commands_to_record_dicts(
+            self.partner.resolve_2many_commands(
                 self.cr, UID, 'address', [DELETE_ALL()], ['name'])
 
         with self.assertRaises(AssertionError):
-            self.partner.resolve_o2m_commands_to_record_dicts(
+            self.partner.resolve_2many_commands(
                 self.cr, UID, 'address', [REPLACE_WITH([42])], ['name'])
 
 

From 04033a328f483fad98226921664d2c10500a0996 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 6 Sep 2012 17:28:30 +0200
Subject: [PATCH 904/999] [FIX] stock: revert overzealous insertion of ul css
 class in recent refactoring by niv

bzr revid: odo@openerp.com-20120906152830-mt8i36zh5b211rg9
---
 addons/stock/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 3142a5a05ef..2e0eef44da9 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -200,7 +200,7 @@
                         <t t-esc="record.delivery_count.value"/> Deliveries
                     </a>
                 </xpath>
-                <ul position="inside" class="oe_semantic_html_override">
+                <ul position="inside">
                     <li t-if="record.type.raw_value != 'service'">On hand: <field name="qty_available"/> <field name="uom_id"/></li>
                     <li t-if="record.type.raw_value != 'service'">Available: <field name="virtual_available"/> <field name="uom_id"/></li>
                 </ul>

From b2136d31109eb36d244755851590b9a4de2f0512 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 7 Sep 2012 18:07:25 +0200
Subject: [PATCH 905/999] [FIX] debian/control: missing dependency on docutils

Was added to setup.py but not in deb packaging.

bzr revid: odo@openerp.com-20120907160725-gb4to44oc0wzccwq
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index ce0d3df55e1..f5d425c5586 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Depends:
  python,
  postgresql-client,
  python-dateutil,
+ python-docutils,
  python-feedparser,
  python-gdata,
  python-ldap,

From 54532438cddcd5914d23031fb50f1022799fd78f Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 7 Sep 2012 19:31:02 +0200
Subject: [PATCH 906/999] restyling of kanban quick create

bzr revid: mit@openerp.com-20120907173102-628l5xpnpimmlnj6
---
 addons/web_kanban/static/src/css/kanban.css   | 24 ++++++++++---------
 addons/web_kanban/static/src/css/kanban.sass  |  9 +++----
 .../web_kanban/static/src/xml/web_kanban.xml  |  2 +-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 1b9530b0845..0c1031e7607 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -140,9 +140,6 @@
 .openerp .oe_kanban_view .oe_kanban_add {
   float: right;
 }
-.openerp .oe_kanban_view .oe_kanban_quick_create {
-  margin-bottom: 4px;
-}
 .openerp .oe_kanban_view .oe_kanban_quick_create_buttons {
   margin: 4px 0;
 }
@@ -151,10 +148,14 @@
   padding: 10px;
 }
 .openerp .oe_kanban_view .oe_kanban_quick_create input {
+  outline: none;
+  border: none;
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+  -box-shadow: none;
   display: block;
   margin: 0 0 8px 0;
   font-size: 13px;
-  box-sizing: border-box;
   width: 100%;
 }
 .openerp .oe_kanban_view .oe_kanban_vignette {
@@ -334,7 +335,8 @@
   display: inline-block;
   line-height: 1em;
 }
-.openerp .oe_kanban_view .oe_kanban_card {
+.openerp .oe_kanban_view .oe_kanban_card, .openerp .oe_kanban_view .oe_kanban_quick_create {
+  margin-bottom: 4px;
   position: relative;
   display: block;
   background: white;
@@ -346,27 +348,27 @@
   -webkit-border-radius: 4px;
   border-radius: 4px;
 }
-.openerp .oe_kanban_view .oe_kanban_card:hover {
+.openerp .oe_kanban_view .oe_kanban_card:hover, .openerp .oe_kanban_view .oe_kanban_quick_create:hover {
   border: 1px solid #7c7bad;
   -moz-box-shadow: 0 0 4px #7c7bad;
   -webkit-box-shadow: 0 0 4px #7c7bad;
   -box-shadow: 0 0 4px #7c7bad;
 }
-.openerp .oe_kanban_view .oe_kanban_card:hover .oe_dropdown_kanban > span {
+.openerp .oe_kanban_view .oe_kanban_card:hover .oe_dropdown_kanban > span, .openerp .oe_kanban_view .oe_kanban_quick_create:hover .oe_dropdown_kanban > span {
   visibility: visible;
 }
-.openerp .oe_kanban_view .oe_kanban_card h3 {
+.openerp .oe_kanban_view .oe_kanban_card h3, .openerp .oe_kanban_view .oe_kanban_quick_create h3 {
   margin: 0 16px 0 0;
   color: #4c4c4c;
   text-decoration: none;
 }
-.openerp .oe_kanban_view .oe_kanban_card h3:hover {
+.openerp .oe_kanban_view .oe_kanban_card h3:hover, .openerp .oe_kanban_view .oe_kanban_quick_create h3:hover {
   text-decoration: none;
 }
-.openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban {
+.openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban, .openerp .oe_kanban_view .oe_kanban_quick_create .oe_dropdown_kanban {
   margin-top: 4px;
 }
-.openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban .oe_kanban_project_times li {
+.openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban .oe_kanban_project_times li, .openerp .oe_kanban_view .oe_kanban_quick_create .oe_dropdown_kanban .oe_kanban_project_times li {
   float: left;
 }
 .openerp .oe_kanban_view .oe_kanban_star {
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index cd2b210a733..8678bc90254 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -153,18 +153,18 @@
     .oe_kanban_add
         float: right
 
-    .oe_kanban_quick_create
-        margin-bottom: 4px
     .oe_kanban_quick_create_buttons
         margin: 4px 0
     .oe_kanban_no_group .oe_kanban_quick_create
         width: 200px
         padding: 10px
     .oe_kanban_quick_create input
+        outline: none
+        border: none
+        @include box-shadow(none)
         display: block
         margin: 0 0 8px 0
         font-size: 13px
-        box-sizing: border-box
         width: 100%
     // }}}
     // KanbanRecords {{{
@@ -302,7 +302,8 @@
         white-space: nowrap
         display: inline-block
         line-height: 1em
-    .oe_kanban_card
+    .oe_kanban_card, .oe_kanban_quick_create
+        margin-bottom: 4px
         position: relative
         display: block
         background: white
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 0f0ab52b77b..8a1b27c9726 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -83,7 +83,7 @@
     </li>
 </t>
 <div t-name="KanbanView.quick_create" class="oe_kanban_quick_create">
-    <input t-att-placeholder="_t('Create a new record')"/>
+    <input/>
     <t t-if="widget._buttons">
         <div class="oe_kanban_quick_create_buttons">
             <button class="oe_kanban_quick_create_add">Add</button>

From 8a48914a5c4bb290c30cd4d65ec98af9fa05f427 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 8 Sep 2012 04:54:18 +0000
Subject: [PATCH 907/999] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120908045418-c9hj53ekfup0z9n8
---
 openerp/addons/base/i18n/es_MX.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po
index dbc674d754a..cc9d519e705 100644
--- a/openerp/addons/base/i18n/es_MX.po
+++ b/openerp/addons/base/i18n/es_MX.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: 2012-09-07 04:55+0000\n"
+"X-Launchpad-Export-Date: 2012-09-08 04:54+0000\n"
 "X-Generator: Launchpad (build 15914)\n"
 
 #. module: base

From 1e834fb029c3c0b4db29e346be47b410aa5b43ad Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Sep 2012 17:39:41 +0200
Subject: [PATCH 908/999] [ADD] test for retarded behavior when importing o2m
 _rec_name

bzr revid: xmo@openerp.com-20120906153941-qynzx3minrxpz82t
---
 openerp/tests/addons/test_impex/tests/test_import.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/openerp/tests/addons/test_impex/tests/test_import.py b/openerp/tests/addons/test_impex/tests/test_import.py
index 4712d53feff..03507ee7012 100644
--- a/openerp/tests/addons/test_impex/tests/test_import.py
+++ b/openerp/tests/addons/test_impex/tests/test_import.py
@@ -716,6 +716,15 @@ class test_m2m(ImporterCase):
 class test_o2m(ImporterCase):
     model_name = 'export.one2many'
 
+    def test_name_get(self):
+        # FIXME: bloody hell why can't this just name_create the record?
+        self.assertRaises(
+            IndexError,
+            self.import_,
+            ['const', 'value'],
+            [['5', u'Java is a DSL for taking large XML files'
+                   u' and converting them to stack traces']])
+
     def test_single(self):
         self.assertEqual(
             self.import_(['const', 'value/value'], [

From 5c6b8431aac58b22add81b47bca46beeedf55c57 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 6 Sep 2012 18:10:16 +0200
Subject: [PATCH 909/999] [IMP] improved style of blockUI

bzr revid: nicolas.vanhoren@openerp.com-20120906161016-d6u8bmtzg8b2d58v
---
 addons/web/static/src/js/coresetup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 60e59ad0b2c..5f0ecc80827 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -585,7 +585,7 @@ instance.session.on('module_loaded', this, function () {
 /** Setup blockui */
 if ($.blockUI) {
     $.blockUI.defaults.baseZ = 1100;
-    $.blockUI.defaults.message = '<div class="oe_blockui_spin_container">';
+    $.blockUI.defaults.message = '<div class="openerp oe_blockui_spin_container" style="background-color: transparent;">';
     $.blockUI.defaults.css.border = '0';
     $.blockUI.defaults.css["background-color"] = '';
 }

From a43f4e1419df54f6ce205b17db293b56629aed77 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Sep 2012 18:17:19 +0200
Subject: [PATCH 910/999] [IMP] folded columns in read_group

bzr revid: fp@tinyerp.com-20120906161719-k4r56bgbso6rprtu
---
 openerp/osv/orm.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 2ba8afd8e72..7d8bb84fc25 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -670,7 +670,7 @@ class BaseModel(object):
     _description = None
     _needaction = False
 
-    # dict of {field:method}, with method returning the name_get of records
+    # dict of {field:method}, with method returning the (name_get of records, {id: fold})
     # to include in the _read_group, if grouped on this field
     _group_by_full = {}
 
@@ -2447,7 +2447,7 @@ class BaseModel(object):
 
         # Grab the list of all groups that should be displayed, including all present groups 
         present_group_ids = [x[groupby][0] for x in read_group_result if x[groupby]]
-        all_groups = self._group_by_full[groupby](self, cr, uid, present_group_ids, domain,
+        all_groups,folded = self._group_by_full[groupby](self, cr, uid, present_group_ids, domain,
                                                   read_group_order=read_group_order,
                                                   access_rights_uid=openerp.SUPERUSER_ID,
                                                   context=context)
@@ -2498,6 +2498,9 @@ class BaseModel(object):
                 append_left(read_group_result.pop(0))
             else:
                 append_right(all_groups.pop(0))
+        if folded:
+            for r in result:
+                r['__fold'] = folded.get(r[groupby], False)
         return result
 
     def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):

From c07aa9b5da08dfcc6f7ce5cf67ab002ae89b7279 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Sep 2012 18:18:12 +0200
Subject: [PATCH 911/999] read_grouop_fold

bzr revid: fp@tinyerp.com-20120906161812-5yop3buxhpbuylmm
---
 addons/crm/crm_lead.py                  | 4 ++--
 addons/hr_recruitment/hr_recruitment.py | 4 ++--
 addons/note/note.py                     | 2 +-
 addons/project/project.py               | 4 ++--
 addons/project_issue/project_issue.py   | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 808b66557ec..ddfdb05ca66 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -87,8 +87,8 @@ class crm_lead(base_stage, osv.osv):
         search_domain = []
         section_id = self._resolve_section_id_from_context(cr, uid, context=context)
         if section_id:
-            search_domain += ['|', '&', ('section_ids', '=', section_id), ('fold', '=', False)]
-        search_domain += ['|', ('id', 'in', ids), '&', ('case_default', '=', True), ('fold', '=', False)]
+            search_domain += ['|', ('section_ids', '=', section_id)]
+        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
         # retrieve type from the context (if set: choose 'type' or 'both')
         type = self._resolve_type_from_context(cr, uid, context=context)
         if type:
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 3401670d6eb..2748834ae9a 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -131,8 +131,8 @@ class hr_applicant(base_stage, osv.Model):
         department_id = self._resolve_department_id_from_context(cr, uid, context=context)
         search_domain = []
         if department_id:
-            search_domain += ['|', '&', ('department_id', '=', department_id), ('fold', '=', False)]
-        search_domain += ['|', ('id', 'in', ids), '&', ('department_id', '=', False), ('fold', '=', False)]
+            search_domain += ['|', ('department_id', '=', department_id)]
+        search_domain += ['|', ('id', 'in', ids), ('department_id', '=', False)]
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
diff --git a/addons/note/note.py b/addons/note/note.py
index 61b5caeff8d..abc7dca297e 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -64,7 +64,7 @@ class note_note(osv.osv):
         stage_obj = self.pool.get('note.stage')
 
         # only show stage groups not folded and owned by user
-        search_domain = [('fold', '=', False),('user_id', '=', uid)]
+        search_domain = [('user_id', '=', uid)]
 
         stage_ids = stage_obj._search(cr, uid, search_domain, order=self._order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
diff --git a/addons/project/project.py b/addons/project/project.py
index 8e624c42595..9bd939dd4fe 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -582,8 +582,8 @@ class task(base_stage, osv.osv):
         search_domain = []
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
-            search_domain += ['|', '&', ('project_ids', '=', project_id), ('fold', '=', False)]
-        search_domain += ['|', ('id', 'in', ids), '&', ('case_default', '=', True), ('fold', '=', False)]
+            search_domain += ['|', ('project_ids', '=', project_id)]
+        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 8031a9dc88d..6121acbd607 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -87,8 +87,8 @@ class project_issue(base_stage, osv.osv):
         search_domain = []
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
-            search_domain += ['|', '&', ('project_ids', '=', project_id), ('fold', '=', False)]
-        search_domain += ['|', ('id', 'in', ids), '&', ('case_default', '=', True), ('fold', '=', False)]
+            search_domain += ['|', ('project_ids', '=', project_id)]
+        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
         # perform search
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)

From 2c63d43c36a8dc7d414841923d1afc7366d69726 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Sep 2012 18:25:28 +0200
Subject: [PATCH 912/999] fix

bzr revid: fp@tinyerp.com-20120906162528-553xac78vjg9h850
---
 openerp/osv/orm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 7d8bb84fc25..5cb006923c7 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2498,9 +2498,10 @@ class BaseModel(object):
                 append_left(read_group_result.pop(0))
             else:
                 append_right(all_groups.pop(0))
+
         if folded:
             for r in result:
-                r['__fold'] = folded.get(r[groupby], False)
+                r['__fold'] = folded.get(r[groupby] and r[groupby][0], False)
         return result
 
     def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):

From 26fc26642920b6151537d095cf3f36ab4d657838 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 6 Sep 2012 18:53:54 +0200
Subject: [PATCH 913/999] [ADD] Kanban: Added support for read_group's __fold

bzr revid: fme@openerp.com-20120906165354-my4nps0822vbrn9d
---
 addons/web/static/src/js/data.js          | 2 ++
 addons/web_kanban/static/src/js/kanban.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 10fd727e57a..29e799e54c3 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -417,6 +417,7 @@ instance.web.data = {
             var group_size = fixed_group[grouping_field + '_count'] || fixed_group.__count || 0;
             var leaf_group = fixed_group.__context.group_by.length === 0;
             this.attributes = {
+                folded: !!(fixed_group.__fold),
                 grouped_on: grouping_field,
                 // if terminal group (or no group) and group_by_no_leaf => use group.__count
                 length: group_size,
@@ -494,6 +495,7 @@ instance.web.DataGroup =  instance.web.CallbackEnabled.extend( /** @lends opener
                     {
                         __context: child_context,
                         __domain: group.model.domain(),
+                        folded: group.get('folded'),
                         grouped_on: group.get('grouped_on'),
                         length: group.get('length'),
                         value: group.get('value'),
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 0cef134d95b..a93fdec2344 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -471,7 +471,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         var key = this.view.group_by + '-' + this.value;
         if (!this.view.state.groups[key]) {
             this.view.state.groups[key] = {
-                folded: false
+                folded: group.folded
             };
         }
         this.state = this.view.state.groups[key];

From 4130f861b23313ffcf66ee57f0e40b019ef0bcfb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Sep 2012 19:42:05 +0200
Subject: [PATCH 914/999] [FIX] kanban

bzr revid: fp@tinyerp.com-20120906174205-86xhb29sat7eg07e
---
 addons/web_kanban/static/src/js/kanban.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index a93fdec2344..a4dbae559b7 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -471,7 +471,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         var key = this.view.group_by + '-' + this.value;
         if (!this.view.state.groups[key]) {
             this.view.state.groups[key] = {
-                folded: group.folded
+                folded: group?group.folded:false
             };
         }
         this.state = this.view.state.groups[key];

From 1bd76b27fa5f0f14e3e67b4d4c1dbfcb53a0e11a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 6 Sep 2012 23:54:48 +0200
Subject: [PATCH 915/999] [REM] process view (moved to module process)

bzr revid: al@openerp.com-20120906215448-klli6wpvce97vcb1
---
 addons/web_process/__init__.py                |   0
 addons/web_process/__openerp__.py             |  21 -
 addons/web_process/i18n/ar.po                 | 118 ----
 addons/web_process/i18n/bg.po                 | 118 ----
 addons/web_process/i18n/bn.po                 | 118 ----
 addons/web_process/i18n/bs.po                 | 118 ----
 addons/web_process/i18n/ca.po                 | 118 ----
 addons/web_process/i18n/cs.po                 | 119 ----
 addons/web_process/i18n/da.po                 | 118 ----
 addons/web_process/i18n/de.po                 | 118 ----
 addons/web_process/i18n/en_GB.po              | 118 ----
 addons/web_process/i18n/es.po                 | 118 ----
 addons/web_process/i18n/es_CL.po              | 118 ----
 addons/web_process/i18n/es_CR.po              | 118 ----
 addons/web_process/i18n/es_EC.po              | 118 ----
 addons/web_process/i18n/fi.po                 | 118 ----
 addons/web_process/i18n/fr.po                 | 118 ----
 addons/web_process/i18n/gl.po                 | 118 ----
 addons/web_process/i18n/hr.po                 | 118 ----
 addons/web_process/i18n/hu.po                 | 118 ----
 addons/web_process/i18n/it.po                 | 118 ----
 addons/web_process/i18n/ja.po                 | 118 ----
 addons/web_process/i18n/ka.po                 | 118 ----
 addons/web_process/i18n/mk.po                 | 118 ----
 addons/web_process/i18n/mn.po                 | 118 ----
 addons/web_process/i18n/nb.po                 | 118 ----
 addons/web_process/i18n/nl.po                 | 118 ----
 addons/web_process/i18n/nl_BE.po              | 118 ----
 addons/web_process/i18n/pl.po                 | 118 ----
 addons/web_process/i18n/pt.po                 | 118 ----
 addons/web_process/i18n/pt_BR.po              | 118 ----
 addons/web_process/i18n/ro.po                 | 118 ----
 addons/web_process/i18n/ru.po                 | 118 ----
 addons/web_process/i18n/sl.po                 | 118 ----
 addons/web_process/i18n/sr@latin.po           | 118 ----
 addons/web_process/i18n/sv.po                 | 118 ----
 addons/web_process/i18n/tr.po                 | 118 ----
 addons/web_process/i18n/web_process.pot       | 119 ----
 addons/web_process/i18n/zh_CN.po              | 118 ----
 .../static/lib/dracula/dracula_algorithms.js  | 599 ------------------
 .../static/lib/dracula/dracula_graffle.js     | 107 ----
 .../static/lib/dracula/dracula_graph.coffee   | 524 ---------------
 .../static/lib/dracula/dracula_graph.js       | 527 ---------------
 addons/web_process/static/src/css/process.css |  73 ---
 .../web_process/static/src/img/ToolOval.jpg   | Bin 650 -> 0 bytes
 .../static/src/img/ToolShowGrid.jpg           | Bin 635 -> 0 bytes
 .../static/src/img/ToolShowGrid.png           | Bin 810 -> 0 bytes
 .../web_process/static/src/img/button-a-a.png | Bin 6595 -> 0 bytes
 addons/web_process/static/src/img/cta-a.gif   | Bin 108 -> 0 bytes
 addons/web_process/static/src/img/grid_10.jpg | Bin 4530 -> 0 bytes
 .../static/src/img/iconset-a-help.gif         | Bin 379 -> 0 bytes
 .../static/src/img/node-current.png           | Bin 3143 -> 0 bytes
 .../web_process/static/src/img/node-gray.png  | Bin 3128 -> 0 bytes
 .../static/src/img/node-subflow-gray.png      | Bin 6837 -> 0 bytes
 .../static/src/img/node-subflow.png           | Bin 6851 -> 0 bytes
 addons/web_process/static/src/img/node.png    | Bin 3205 -> 0 bytes
 addons/web_process/static/src/img/port.gif    | Bin 166 -> 0 bytes
 addons/web_process/static/src/img/sep-a.gif   | Bin 43 -> 0 bytes
 .../web_process/static/src/img/window_bg.png  | Bin 128 -> 0 bytes
 .../static/src/img/window_toolbar.png         | Bin 200 -> 0 bytes
 addons/web_process/static/src/js/process.js   | 291 ---------
 .../static/src/xml/web_process.xml            | 114 ----
 62 files changed, 6624 deletions(-)
 delete mode 100644 addons/web_process/__init__.py
 delete mode 100644 addons/web_process/__openerp__.py
 delete mode 100644 addons/web_process/i18n/ar.po
 delete mode 100644 addons/web_process/i18n/bg.po
 delete mode 100644 addons/web_process/i18n/bn.po
 delete mode 100644 addons/web_process/i18n/bs.po
 delete mode 100644 addons/web_process/i18n/ca.po
 delete mode 100644 addons/web_process/i18n/cs.po
 delete mode 100644 addons/web_process/i18n/da.po
 delete mode 100644 addons/web_process/i18n/de.po
 delete mode 100644 addons/web_process/i18n/en_GB.po
 delete mode 100644 addons/web_process/i18n/es.po
 delete mode 100644 addons/web_process/i18n/es_CL.po
 delete mode 100644 addons/web_process/i18n/es_CR.po
 delete mode 100644 addons/web_process/i18n/es_EC.po
 delete mode 100644 addons/web_process/i18n/fi.po
 delete mode 100644 addons/web_process/i18n/fr.po
 delete mode 100644 addons/web_process/i18n/gl.po
 delete mode 100644 addons/web_process/i18n/hr.po
 delete mode 100644 addons/web_process/i18n/hu.po
 delete mode 100644 addons/web_process/i18n/it.po
 delete mode 100644 addons/web_process/i18n/ja.po
 delete mode 100644 addons/web_process/i18n/ka.po
 delete mode 100644 addons/web_process/i18n/mk.po
 delete mode 100644 addons/web_process/i18n/mn.po
 delete mode 100644 addons/web_process/i18n/nb.po
 delete mode 100644 addons/web_process/i18n/nl.po
 delete mode 100644 addons/web_process/i18n/nl_BE.po
 delete mode 100644 addons/web_process/i18n/pl.po
 delete mode 100644 addons/web_process/i18n/pt.po
 delete mode 100644 addons/web_process/i18n/pt_BR.po
 delete mode 100644 addons/web_process/i18n/ro.po
 delete mode 100644 addons/web_process/i18n/ru.po
 delete mode 100644 addons/web_process/i18n/sl.po
 delete mode 100644 addons/web_process/i18n/sr@latin.po
 delete mode 100644 addons/web_process/i18n/sv.po
 delete mode 100644 addons/web_process/i18n/tr.po
 delete mode 100644 addons/web_process/i18n/web_process.pot
 delete mode 100644 addons/web_process/i18n/zh_CN.po
 delete mode 100644 addons/web_process/static/lib/dracula/dracula_algorithms.js
 delete mode 100644 addons/web_process/static/lib/dracula/dracula_graffle.js
 delete mode 100644 addons/web_process/static/lib/dracula/dracula_graph.coffee
 delete mode 100644 addons/web_process/static/lib/dracula/dracula_graph.js
 delete mode 100644 addons/web_process/static/src/css/process.css
 delete mode 100644 addons/web_process/static/src/img/ToolOval.jpg
 delete mode 100644 addons/web_process/static/src/img/ToolShowGrid.jpg
 delete mode 100644 addons/web_process/static/src/img/ToolShowGrid.png
 delete mode 100644 addons/web_process/static/src/img/button-a-a.png
 delete mode 100644 addons/web_process/static/src/img/cta-a.gif
 delete mode 100644 addons/web_process/static/src/img/grid_10.jpg
 delete mode 100644 addons/web_process/static/src/img/iconset-a-help.gif
 delete mode 100644 addons/web_process/static/src/img/node-current.png
 delete mode 100644 addons/web_process/static/src/img/node-gray.png
 delete mode 100644 addons/web_process/static/src/img/node-subflow-gray.png
 delete mode 100644 addons/web_process/static/src/img/node-subflow.png
 delete mode 100644 addons/web_process/static/src/img/node.png
 delete mode 100644 addons/web_process/static/src/img/port.gif
 delete mode 100644 addons/web_process/static/src/img/sep-a.gif
 delete mode 100644 addons/web_process/static/src/img/window_bg.png
 delete mode 100644 addons/web_process/static/src/img/window_toolbar.png
 delete mode 100644 addons/web_process/static/src/js/process.js
 delete mode 100644 addons/web_process/static/src/xml/web_process.xml

diff --git a/addons/web_process/__init__.py b/addons/web_process/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/addons/web_process/__openerp__.py b/addons/web_process/__openerp__.py
deleted file mode 100644
index 7192e83fda7..00000000000
--- a/addons/web_process/__openerp__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    'name': 'Process',
-    'version': '2.0',
-     'description': """
-OpenERP Web process view.
-=========================
-
-""",
-    'depends': ['web_diagram'],
-    'js': [
-        'static/lib/dracula/*.js',
-        'static/src/js/process.js'
-    ],
-    'css': [
-        'static/src/css/process.css'
-    ],
-    'qweb': [
-        'static/src/xml/*.xml'
-    ],
-    'auto_install': True
-}
diff --git a/addons/web_process/i18n/ar.po b/addons/web_process/i18n/ar.po
deleted file mode 100644
index 3e1df341eca..00000000000
--- a/addons/web_process/i18n/ar.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Arabic translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-08 00:38+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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "إلغاء"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "حفظ"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "مستعرض العمليات"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "التوثيق"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "اقرأ الوثائق من علي الإنترنت"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "المنتدى"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "نقاش المجتمع"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "كتب"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "احصل علي الكتاب"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "أوبنيرب للمنشآت"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "قم بشراء أوبنيرب"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "عمليّة"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "ملاحظات:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "آخر تعديل بواسطة:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "غ/م"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "تدفقات بيانية:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "متعلق:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "اختر العملية"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "تحديد"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "تحرير العملية"
diff --git a/addons/web_process/i18n/bg.po b/addons/web_process/i18n/bg.po
deleted file mode 100644
index 9aa1fe53d69..00000000000
--- a/addons/web_process/i18n/bg.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Bulgarian translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-07-09 12:29+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian <bg@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Отказ"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Запис"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Изглед на процеса"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Документация"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Прочети документацията онлайн"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Форум"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Обща дискусия"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Книги"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Вземи книгите"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Купи OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Процес"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Бележки"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Последно модифицирано от:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Междинен поток"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Свързани"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Избор Процес"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Избор"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Редакция Процес"
diff --git a/addons/web_process/i18n/bn.po b/addons/web_process/i18n/bn.po
deleted file mode 100644
index a5a10d017da..00000000000
--- a/addons/web_process/i18n/bn.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Bengali translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-04-12 22:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bengali <bn@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "বাতিল করুন"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "সংরক্ষণ করুন"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "প্রক্রিয়াদর্শন"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "নথিকরন"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "অনলাইনে নথিপত্র পরুন"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "মুক্ত আলোচনাস্থল"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "সাম্প্রদায়িক আলোচনা"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "বইগুলি"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "বইগুলি নাও"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "ওপেন-ই-আর-পি শিল্পোদ্যোগ"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "ওপেন-ই-আর-পি শিল্পোদ্যোগ কিনুন"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "প্রক্রিয়া"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "টীকাগুলি"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "সর্বশেষ পরিবর্তন"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "প্রযোজ্য নয়"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "উপপ্রবাহগুলি:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "সম্পর্কিত:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "প্রক্রিয়া নির্বাচন করুন"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "নির্বাচন করুন"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "প্রক্রিয়া সম্পাদনা করুন"
diff --git a/addons/web_process/i18n/bs.po b/addons/web_process/i18n/bs.po
deleted file mode 100644
index ca18ca5c8ba..00000000000
--- a/addons/web_process/i18n/bs.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Bosnian translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-04-17 17:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bosnian <bs@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Otkaži"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Spasi"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Pregled Procesa"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Dokumentacija"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Čitaj Dokumentaciju Online"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Zajednička Diskusija"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Knjige"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Nabavite knjige"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "Pokreni OpenERP"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Kupi OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Proces"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Bilješke:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Posljednje modifikovano od:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N/A"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Srodnost:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Odabrani Proces"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Izaberi"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Edituj proces"
diff --git a/addons/web_process/i18n/ca.po b/addons/web_process/i18n/ca.po
deleted file mode 100644
index 49ae4877ad8..00000000000
--- a/addons/web_process/i18n/ca.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Catalan translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-06-16 18:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan <ca@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr ""
diff --git a/addons/web_process/i18n/cs.po b/addons/web_process/i18n/cs.po
deleted file mode 100644
index 64c1efebe9d..00000000000
--- a/addons/web_process/i18n/cs.po
+++ /dev/null
@@ -1,119 +0,0 @@
-# Czech translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-03-22 09:43+0000\n"
-"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
-"Language-Team: opener-i18n-czech <openerp-i18n-czech@lists.launchpad.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-"X-Poedit-Language: Czech\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Zrušit"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Uložit"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Pohled procesu"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Dokumentace"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Číst dokumentaci online"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Fórum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Komunitní diskuse"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Knihy"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Získat knihy"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Zakoupit OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Proces"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Poznámky:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Naposledy změněno:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N/A"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Podtoky:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Vztažené:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Vybrat proces"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Vybrat"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Upravit proces"
diff --git a/addons/web_process/i18n/da.po b/addons/web_process/i18n/da.po
deleted file mode 100644
index eebabf25d23..00000000000
--- a/addons/web_process/i18n/da.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Danish translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-07-01 09:08+0000\n"
-"Last-Translator: Aputsiaq Niels Janussen <aj@isit.gl>\n"
-"Language-Team: Danish <da@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Annullér"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Gem"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Dokumentation"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Læs dokumentation online"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Bøger"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Noter:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Senest ændret af:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "Ikke tilgængelig"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Relateret:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Markér"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr ""
diff --git a/addons/web_process/i18n/de.po b/addons/web_process/i18n/de.po
deleted file mode 100644
index 9ad55a18bcc..00000000000
--- a/addons/web_process/i18n/de.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# German translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-07 19:13+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
-"Language-Team: German <de@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Speichern"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Prozess Ansicht"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Dokumentation"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Lese Online Dokumentation"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Community Diskussion"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Bücher"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Kaufe Bücher"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Kaufe OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Prozess"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Anmerkungen:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Zuletzt bearbeitet von:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "n. v."
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Unterprozesse:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Zugehörig:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Prozess auswählen"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Auswählen"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Prozess bearbeiten"
diff --git a/addons/web_process/i18n/en_GB.po b/addons/web_process/i18n/en_GB.po
deleted file mode 100644
index c4317088faf..00000000000
--- a/addons/web_process/i18n/en_GB.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# English (United Kingdom) translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-09 11:44+0000\n"
-"Last-Translator: John Bradshaw <Unknown>\n"
-"Language-Team: English (United Kingdom) <en_GB@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Cancel"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Save"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Process View"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Documentation"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Read Documentation Online"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Community Discussion"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Books"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Get the books"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Purchase OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Process"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Notes:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Last modified by:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N/A"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Subflows :"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Related:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Select Process"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Select"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Edit Process"
diff --git a/addons/web_process/i18n/es.po b/addons/web_process/i18n/es.po
deleted file mode 100644
index 88a9f16ed1d..00000000000
--- a/addons/web_process/i18n/es.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Spanish translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-13 12:36+0000\n"
-"Last-Translator: Daniel Campos (Avanzosc) <Unknown>\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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Guardar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Vista del proceso"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Documentación"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Leer Documentación Online"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Foro"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Debate de la comunidad"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Libros"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Obtener los libros"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Comprar OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Proceso"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Observaciones:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Última modificación por:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N/D"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Subflujos:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Relacionado:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Seleccionar Proceso"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Seleccionar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Editar Proceso"
diff --git a/addons/web_process/i18n/es_CL.po b/addons/web_process/i18n/es_CL.po
deleted file mode 100644
index 636612638df..00000000000
--- a/addons/web_process/i18n/es_CL.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Spanish (Chile) translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-04-14 15:22+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Chile) <es_CL@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Guardar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Vista del proceso"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Documentación"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Leer documentación online"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Foro"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Debate de la comunidad"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Libros"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Obtener los libros"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Comprar OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Proceso"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Observaciones:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Última modificación por:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N/D"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Subflujos:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Relacionado:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Seleccionar proceso"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Seleccionar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Editar Proceso"
diff --git a/addons/web_process/i18n/es_CR.po b/addons/web_process/i18n/es_CR.po
deleted file mode 100644
index b102f2838cd..00000000000
--- a/addons/web_process/i18n/es_CR.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Spanish (Costa Rica) translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-17 14:28+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
-"Language-Team: Spanish (Costa Rica) <es_CR@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Guardar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Vista de Proceso"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Documentación"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Leer documentación en línea"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Foro"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Discusión de la comunidad"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Libros"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Obtener los libros"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Comprar OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Proceso"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Notas:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Última modificación por:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N/A"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Sub-flujos:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Relacionado:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Seleccionar proceso"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Seleccionar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Editar proceso"
diff --git a/addons/web_process/i18n/es_EC.po b/addons/web_process/i18n/es_EC.po
deleted file mode 100644
index c2003008290..00000000000
--- a/addons/web_process/i18n/es_EC.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Spanish (Ecuador) translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-03-22 20:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Ecuador) <es_EC@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Guardar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Vista del proceso"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Documentación"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Leer Documentación Online"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Foro"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Debate de la comunidad"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Libros"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Obtener los libros"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Comprar OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Proceso"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Observaciones:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Última modificación por:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N/D"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Subflujos:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Relacionado:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Seleccionar Proceso"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Seleccionar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Editar Proceso"
diff --git a/addons/web_process/i18n/fi.po b/addons/web_process/i18n/fi.po
deleted file mode 100644
index b853bff6426..00000000000
--- a/addons/web_process/i18n/fi.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Finnish translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-03-19 11:50+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Peruuta"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Talleta"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Prosessinäkymä"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Dokumentointi"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Lue dokumentaatio verkosta"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Foorumi"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Yhteisön keskustelut"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Kirjat"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Hanki kirjat"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Osta OpenERP enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Prosessi"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Muistiinpanot:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Viimeksi muokkasi:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "Ei saatavilla"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Työnkulku (alataso):"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Liittyy:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Valitse Prosessi"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Valitse"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Muokkaa prosessia"
diff --git a/addons/web_process/i18n/fr.po b/addons/web_process/i18n/fr.po
deleted file mode 100644
index 325252c2f09..00000000000
--- a/addons/web_process/i18n/fr.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# French translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-15 09:56+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Annuler"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Enregistrer"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Vue processus"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Documentation"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Lire la documentation en ligne"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Discussion communautaire"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Livres"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Obtenir les livres"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Souscrire à OpeneRP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Processus métier"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Notes :"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Dernière modification par :"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N/D"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Sous-flux :"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Processus métier connexes :"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Sélectionner un processus métier"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Sélectionner"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Modifier processus métier"
diff --git a/addons/web_process/i18n/gl.po b/addons/web_process/i18n/gl.po
deleted file mode 100644
index a06a31db591..00000000000
--- a/addons/web_process/i18n/gl.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Galician translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-13 23:07+0000\n"
-"Last-Translator: Amós Oviedo <Unknown>\n"
-"Language-Team: Galician <gl@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Gardar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Vista de Proceso"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Documentación"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Lea a Documentación En liña"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Foro"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Discusión na Comunidade"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Libros"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Conseguir os libros"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Comprar OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Proceso"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Observacións"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Última modificación feita por:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N/D"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Subfluxos:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Relacionado:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Escolla un Proceso"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Seleccionar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Editar Proceso"
diff --git a/addons/web_process/i18n/hr.po b/addons/web_process/i18n/hr.po
deleted file mode 100644
index 7963cc01288..00000000000
--- a/addons/web_process/i18n/hr.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Croatian translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-08 08:44+0000\n"
-"Last-Translator: Marijan Rajic <Unknown>\n"
-"Language-Team: Croatian <hr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Odustani"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Snimi"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Pregled procesa"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Dokumentacija"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Pogledajte dokumentaciju na internetu"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Rasprave"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Knjige"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Nabavi knjige"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Nabavite OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Proces"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Bilješke:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Promijenio:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N/A"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Podtokovi:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Povezani:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Odaberi proces"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Odaberi"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Uredi proces"
diff --git a/addons/web_process/i18n/hu.po b/addons/web_process/i18n/hu.po
deleted file mode 100644
index c34533d9874..00000000000
--- a/addons/web_process/i18n/hu.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Hungarian translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-07-19 06:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hungarian <hu@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Mégsem"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Mentés"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Dokumentáció"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Olvassa a dokumentációt online"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Fórum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Közösségi vitafórum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Könyvek"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Megjegyzések:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Utoljára módosította:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Alfolyamatok:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Kapcsolódó:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Folyamat kiválasztása"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Kiválaszt"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr ""
diff --git a/addons/web_process/i18n/it.po b/addons/web_process/i18n/it.po
deleted file mode 100644
index ed09b1d03a2..00000000000
--- a/addons/web_process/i18n/it.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Italian translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-16 22:02+0000\n"
-"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Annulla"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Salva"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Vista Processo"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Documentazione"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Leggi la Documentazione Online"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Discussioni Community"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Libri"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Ottieni i libri"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Acquista OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Processo"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Note:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Ultima modifica di:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N/A"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Sottoflussi:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Correlati:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Seleziona Processo"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Seleziona"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Modifica Processo"
diff --git a/addons/web_process/i18n/ja.po b/addons/web_process/i18n/ja.po
deleted file mode 100644
index 4c6292af40d..00000000000
--- a/addons/web_process/i18n/ja.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Japanese translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-07-19 04:29+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "キャンセル"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "保存"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "プロセスビュー"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "ドキュメンテーション"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "オンラインのドキュメントを読んで下さい"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "フォーラム"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "コミュニティの議論"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "本"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "本を手に入れる"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERPエンタープライズ"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "OpenERPエンタープライズを購入"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "プロセス"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "注記"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "最終更新者："
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "該当なし"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "サブフロー："
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "関係："
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "プロセスの選択"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "選択"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "プロセスの編集"
diff --git a/addons/web_process/i18n/ka.po b/addons/web_process/i18n/ka.po
deleted file mode 100644
index 4c403c4efd2..00000000000
--- a/addons/web_process/i18n/ka.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Georgian translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-03-15 19:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Georgian <ka@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "შეწყვეტა"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "შენახვა"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "პროცესის ხედი"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "დოკუმენტაცია"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "წაიკითხეთ დოკუმენტაცია ონლაინ რეჟიმში"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "ფორუმი"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "საზოგადო დისკუსია"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "წიგნები"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "წიგნების მოძიება"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "OpenERP Enterprise-ს შეძენა"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "პროცესი"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "შენიშვნები:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "ბოლოს შეცვალა:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "არ არის მოცემული"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "ქვენაკადები:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "დაკავშირებული:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "აირჩიე პროცესი"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "აირჩიე"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "შეცვალე პროცესი"
diff --git a/addons/web_process/i18n/mk.po b/addons/web_process/i18n/mk.po
deleted file mode 100644
index 463fc07210d..00000000000
--- a/addons/web_process/i18n/mk.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Macedonian translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-08 10:30+0000\n"
-"Last-Translator: Nikola Stojanoski <nstojanoski@vion.mk>\n"
-"Language-Team: Macedonian <mk@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Откажи"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Сочувај"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Документација"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Форум"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Книги"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Процес"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Забелешки:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Поврзано:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Одбери"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr ""
diff --git a/addons/web_process/i18n/mn.po b/addons/web_process/i18n/mn.po
deleted file mode 100644
index 0faf71e1951..00000000000
--- a/addons/web_process/i18n/mn.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Mongolian translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-06-13 17:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Цуцлах"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Хадгалах"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Процесс Харагдац"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Баримт"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Баримтыг Онлайн Унших"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Хэлэлцүүлэг"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Холбооны Хэлэлцүүлэг"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Ном"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Ном авах"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "OpenERP Enterprise-г худалдаж авах"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Процесс"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Тэмдэглэл:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Хамгийн сүүлд зассан:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "Алга"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Дэд урсгал:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Холбоотой:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Процесс Сонгох"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Сонгох"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Процесс Засварлах"
diff --git a/addons/web_process/i18n/nb.po b/addons/web_process/i18n/nb.po
deleted file mode 100644
index 9a15b148381..00000000000
--- a/addons/web_process/i18n/nb.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Norwegian Bokmal translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-07-24 06:25+0000\n"
-"Last-Translator: Tor Syversen <sol-moe@online.no>\n"
-"Language-Team: Norwegian Bokmal <nb@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Avbryt"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Lagre"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Dokumentasjon"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Les dokumentasjon online"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Bøker"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Få tak i bøkene"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Prosess"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Notater:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Sist revidert av:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N/A"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Velg prosess"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Velg"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Rediger prosess"
diff --git a/addons/web_process/i18n/nl.po b/addons/web_process/i18n/nl.po
deleted file mode 100644
index 3004298b899..00000000000
--- a/addons/web_process/i18n/nl.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Dutch translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-07-05 08:01+0000\n"
-"Last-Translator: Erwin <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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Opslaan"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Laat proces zien"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Documentatie"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Lees documentatie online"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Community discussie"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Boeken"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Verkrijg de boeken"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Koop OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Verwerken"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Opmerkingen:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Laatst gewijzigd door:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N.v.t."
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Subschemas:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Gerelateerd:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Proces selecteren"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Selecteer"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Proces bewerken"
diff --git a/addons/web_process/i18n/nl_BE.po b/addons/web_process/i18n/nl_BE.po
deleted file mode 100644
index 336f3823a57..00000000000
--- a/addons/web_process/i18n/nl_BE.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Dutch (Belgium) translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-08 16:58+0000\n"
-"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
-"Language-Team: Dutch (Belgium) <nl_BE@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Opslaan"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Procesweergave"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Documentatie"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Documentatie on line lezen"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Communitygesprekken"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Boeken"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Koop de boeken"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Entreprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Koop OpenERP Entreprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Proces"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Opmerkingen:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Laatst gewijzigd door:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "Nvt"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Subflows:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Gekoppeld:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Selecteer een proces"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Selecteren"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Proces bewerken"
diff --git a/addons/web_process/i18n/pl.po b/addons/web_process/i18n/pl.po
deleted file mode 100644
index bfa4691499f..00000000000
--- a/addons/web_process/i18n/pl.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Polish translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-28 11:14+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish <pl@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Anuluj"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Zapisz"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Widok procesu"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Dokumentacja"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Czytaj dokumentację online"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Dyskusja w społeczności"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Książki"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Pobierz książki"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Notatki:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Ostatnio modyfikowane przez:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Podobiegi:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Związane:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Wybierz proces"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Wybierz"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Edytuj proces"
diff --git a/addons/web_process/i18n/pt.po b/addons/web_process/i18n/pt.po
deleted file mode 100644
index fe9d449b15d..00000000000
--- a/addons/web_process/i18n/pt.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Portuguese translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-16 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese <pt@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Gravar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Vista de Processo"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Documentação"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Ler documentação online"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Discussão da comunidade"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Livros"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Compre os Livros"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Adquira o OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Processar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Notas:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Última alteração por:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "Indisponível"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Subfluxos"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Relacionado:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Selecionar Processo"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Selecionar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Editar Processo"
diff --git a/addons/web_process/i18n/pt_BR.po b/addons/web_process/i18n/pt_BR.po
deleted file mode 100644
index fd1d766dbe2..00000000000
--- a/addons/web_process/i18n/pt_BR.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Brazilian Portuguese translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-08 02:43+0000\n"
-"Last-Translator: Marcelo Sa - www.jambu.com.br <marcelo@jambu.com.br>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Salvar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Visão de Processo"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Documentação"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Ler Documentação Online"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Fórum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Discussão da Comunidade"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Livros"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Obter os livros"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Comprar OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Processo"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Notas:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Última atualização por:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N/D"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Sub fluxos:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Relacionado:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Selecionar processo"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Selecionar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Editar Processo"
diff --git a/addons/web_process/i18n/ro.po b/addons/web_process/i18n/ro.po
deleted file mode 100644
index d9445d19146..00000000000
--- a/addons/web_process/i18n/ro.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Romanian translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-03-10 13:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <ro@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Anulati"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Salvati"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Vizualizare Proces"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Documentatie"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Cititi Documentatia Online"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Discutii"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Carti"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Obtineti cartile"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Cumparati OpenErp Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Proces"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Note:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Modificat ultima data de :"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "Nu este disponibil (a)"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Subfluxuri:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Referitor la:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Selectati Procesul"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Selectati"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Editati Procesul"
diff --git a/addons/web_process/i18n/ru.po b/addons/web_process/i18n/ru.po
deleted file mode 100644
index 01701676b0d..00000000000
--- a/addons/web_process/i18n/ru.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Russian translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-17 07:49+0000\n"
-"Last-Translator: Aleksei Motsik <Unknown>\n"
-"Language-Team: Russian <ru@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Отменить"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Сохранить"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Просмотр Процесса"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Документация"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Читать Документацию Онлайн"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Форум"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Обсуждения Сообществом"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Книги"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Получить книги"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Приобрести OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Процесс"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Заметки:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Изменялся:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "Н/Д"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "СубПотоки:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Связанный:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Выбрерите Процесс"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Выбрать"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Изменить Процесс"
diff --git a/addons/web_process/i18n/sl.po b/addons/web_process/i18n/sl.po
deleted file mode 100644
index 0f426def60f..00000000000
--- a/addons/web_process/i18n/sl.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Slovenian translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-05-23 20:57+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovenian <sl@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Prekliči"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Shrani"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Dokumentacija"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Preberi spletno dokumentacijo"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Razprava skupnosti"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Knjige"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Proces"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Zapiski:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Zadnja sprememba:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N/A"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Izberi postopek"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Izberi"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Urejanje procesa"
diff --git a/addons/web_process/i18n/sr@latin.po b/addons/web_process/i18n/sr@latin.po
deleted file mode 100644
index 02dfe01f1f1..00000000000
--- a/addons/web_process/i18n/sr@latin.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Serbian Latin translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-09 21:14+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
-"Language-Team: Serbian Latin <sr@latin@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Otkaži"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Sačuvaj"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Pregled Procesa"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Dokumentacija"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Čitaj dokumentaciju na mreži"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Diskusija u okviru zajednice"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Knjige"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Uzmi knjige"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Kupi OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Proces"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Beleške:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Poslednji izmenio :"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "N/V"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Podtokovi:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Vezano za:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Izaberi Proces"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Izaberi"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Uredi Proces"
diff --git a/addons/web_process/i18n/sv.po b/addons/web_process/i18n/sv.po
deleted file mode 100644
index 55467b65c2b..00000000000
--- a/addons/web_process/i18n/sv.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Swedish translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-04-17 12:42+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "Avbryt"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Spara"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "Processvy"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Dokumentation"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Läs online-dokumentationen"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Diskussion i användarföreningen"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Böcker"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Komma över böckerna"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "Köp OpenERP Enterprise"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "Process"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Anteckningar:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "Senast ändrad av:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "Ej tillgänglig"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Underflöde"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "Relaterad:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "Välj process"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Välj"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "Ändra processen"
diff --git a/addons/web_process/i18n/tr.po b/addons/web_process/i18n/tr.po
deleted file mode 100644
index 79fa1e0c208..00000000000
--- a/addons/web_process/i18n/tr.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Turkish translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-09 20:20+0000\n"
-"Last-Translator: Ahmet Altınışık <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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "İptal"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "Kaydet"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "İşlem Görünümü"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "Dokümantasyon"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "Online Dökümantasyonu Oku"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "Forum"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "Topluluk Tartışması"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "Kitaplar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "Kitapları al"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP Kurumsal"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "OpenERP Kurumsalı Satınal"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "İşlem"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "Notlar:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "En son değiştiren:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "YOK"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "Alt akışlar"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "İlgili:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "İşlemi Seç"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "Seç"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "İşlemi Düzenle"
diff --git a/addons/web_process/i18n/web_process.pot b/addons/web_process/i18n/web_process.pot
deleted file mode 100644
index 4efbba4961f..00000000000
--- a/addons/web_process/i18n/web_process.pot
+++ /dev/null
@@ -1,119 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2012 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr ""
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr ""
-
diff --git a/addons/web_process/i18n/zh_CN.po b/addons/web_process/i18n/zh_CN.po
deleted file mode 100644
index 0acc66b8584..00000000000
--- a/addons/web_process/i18n/zh_CN.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Chinese (Simplified) translation for openerp-web
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-08 02:13+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@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: 2012-09-05 04:56+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:261
-msgid "Cancel"
-msgstr "取消"
-
-#. openerp-web
-#: addons/web_process/static/src/js/process.js:262
-msgid "Save"
-msgstr "保存"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:6
-msgid "Process View"
-msgstr "业务流程视图"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Documentation"
-msgstr "文档"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:19
-msgid "Read Documentation Online"
-msgstr "在线阅读文档"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Forum"
-msgstr "论坛"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:25
-msgid "Community Discussion"
-msgstr "社区讨论"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Books"
-msgstr "图书"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:31
-msgid "Get the books"
-msgstr "获得相关图书"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "OpenERP Enterprise"
-msgstr "OpenERP 企业"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:37
-msgid "Purchase OpenERP Enterprise"
-msgstr "购买 OpenERP 企业版"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:52
-msgid "Process"
-msgstr "业务流程"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:56
-msgid "Notes:"
-msgstr "备注："
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "Last modified by:"
-msgstr "最后修改者:"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:59
-msgid "N/A"
-msgstr "不可用"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:62
-msgid "Subflows:"
-msgstr "子工作流："
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:75
-msgid "Related:"
-msgstr "相关的："
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:88
-msgid "Select Process"
-msgstr "选择业务流程"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:98
-msgid "Select"
-msgstr "选择"
-
-#. openerp-web
-#: addons/web_process/static/src/xml/web_process.xml:109
-msgid "Edit Process"
-msgstr "编辑业务流程"
diff --git a/addons/web_process/static/lib/dracula/dracula_algorithms.js b/addons/web_process/static/lib/dracula/dracula_algorithms.js
deleted file mode 100644
index 0fbb0857fc8..00000000000
--- a/addons/web_process/static/lib/dracula/dracula_algorithms.js
+++ /dev/null
@@ -1,599 +0,0 @@
-/*
- * Various algorithms and data structures, licensed under the MIT-license.
- * (c) 2010 by Johann Philipp Strathausen <strathausen@gmail.com>
- * http://strathausen.eu
- *
- */
-
-
-
-/*
-        Bellman-Ford
-    
-    Path-finding algorithm, finds the shortest paths from one node to all nodes.
-    
-    
-        Complexity
-        
-    O( |E| · |V| ), where E = edges and V = vertices (nodes)
-    
-    
-        Constraints
-    
-    Can run on graphs with negative edge weights as long as they do not have
-    any negative weight cycles.
-    
- */
-function bellman_ford(g, source) {
-
-    /* STEP 1: initialisation */
-    for(var n in g.nodes)
-        g.nodes[n].distance = Infinity;
-        /* predecessors are implicitly null */
-    source.distance = 0;
-    
-    step("Initially, all distances are infinite and all predecessors are null.");
-    
-    /* STEP 2: relax each edge (this is at the heart of Bellman-Ford) */
-    /* repeat this for the number of nodes minus one */
-    for(var i = 1; i < g.nodes.length; i++)
-        /* for each edge */
-        for(var e in g.edges) {
-            var edge = g.edges[e];
-            if(edge.source.distance + edge.weight < edge.target.distance) {
-                step("Relax edge between " + edge.source.id + " and " + edge.target.id + ".");
-                edge.target.distance = edge.source.distance + edge.weight;
-                edge.target.predecessor = edge.source;
-            }
-	    //Added by Jake Stothard (Needs to be tested)
-	    if(!edge.style.directed) {
-		if(edge.target.distance + edge.weight < edge.source.distance) {
-                    g.snapShot("Relax edge between "+edge.target.id+" and "+edge.source.id+".");
-                    edge.source.distance = edge.target.distance + edge.weight;
-                    edge.source.predecessor = edge.target;
-		}
-	    }
-        }
-    step("Ready.");
-    
-    /* STEP 3: TODO Check for negative cycles */
-    /* For now we assume here that the graph does not contain any negative
-       weights cycles. (this is left as an excercise to the reader[tm]) */
-}
-
-
-
-/*
-   Path-finding algorithm Dijkstra
-   
-   - worst-case running time is O((|E| + |V|) · log |V| ) thus better than
-     Bellman-Ford for sparse graphs (with less edges), but cannot handle
-     negative edge weights
- */
-function dijkstra(g, source) {
-
-    /* initially, all distances are infinite and all predecessors are null */
-    for(var n in g.nodes)
-        g.nodes[n].distance = Infinity;
-        /* predecessors are implicitly null */
-
-    g.snapShot("Initially, all distances are infinite and all predecessors are null.");
-
-    source.distance = 0;
-    /* set of unoptimized nodes, sorted by their distance (but a Fibonacci heap
-       would be better) */
-    var q = new BinaryMinHeap(g.nodes, "distance");
-
-    /* pointer to the node in focus */
-    var node;
-
-    /* get the node with the smallest distance
-       as long as we have unoptimized nodes. q.min() can have O(log n). */
-    while(q.min() != undefined) {
-        /* remove the latest */
-        node = q.extractMin();
-        node.optimized = true;
-
-        /* no nodes accessible from this one, should not happen */
-        if(node.distance == Infinity)
-            throw "Orphaned node!";
-
-        /* for each neighbour of node */
-        for(e in node.edges) {
-	    var other = (node == node.edges[e].target) ? node.edges[e].source : node.edges[e].target;
-		
-            if(other.optimized)
-                continue;
-
-            /* look for an alternative route */
-            var alt = node.distance + node.edges[e].weight;
-            
-            /* update distance and route if a better one has been found */
-            if (alt < other.distance) {
-            
-                /* update distance of neighbour */
-                other.distance = alt;
-
-                /* update priority queue */
-                q.heapify();
-
-                /* update path */
-                other.predecessor = node;
-                g.snapShot("Enhancing node.")
-            }
-        }
-    }
-}
-
-
-/* All-Pairs-Shortest-Paths */
-/* Runs at worst in O(|V|³) and at best in Omega(|V|³) :-)
-   complexity Sigma(|V|²) */
-/* This implementation is not yet ready for general use, but works with the
-   Dracula graph library. */
-function floyd_warshall(g, source) {
-
-    /* Step 1: initialising empty path matrix (second dimension is implicit) */
-    var path = [];
-    var next = [];
-    var n = g.nodes.length;
-
-    /* construct path matrix, initialize with Infinity */
-    for(j in g.nodes) {
-        path[j] = [];
-        next[j] = [];
-        for(i in g.nodes)
-            path[j][i] = j == i ? 0 : Infinity;
-    }   
-    
-    /* initialize path with edge weights */
-    for(e in g.edges)
-        path[g.edges[e].source.id][g.edges[e].target.id] = g.edges[e].weight;
-    
-    /* Note: Usually, the initialisation is done by getting the edge weights
-       from a node matrix representation of the graph, not by iterating through
-       a list of edges as done here. */
-    
-    /* Step 2: find best distances (the heart of Floyd-Warshall) */
-    for(k in g.nodes){
-        for(i in g.nodes) {
-            for(j in g.nodes)
-                if(path[i][j] > path[i][k] + path[k][j]) {
-                    path[i][j] = path[i][k] + path[k][j];
-                    /* Step 2.b: remember the path */
-                    next[i][j] = k;
-                }
-        }
-    }
-
-    /* Step 3: Path reconstruction, get shortest path */
-    function getPath(i, j) {
-        if(path[i][j] == Infinity)
-            throw "There is no path.";
-        var intermediate = next[i][j];
-        if(intermediate == undefined)
-            return null;
-        else
-            return getPath(i, intermediate)
-                .concat([intermediate])
-                .concat(getPath(intermediate, j));
-    }
-
-    /* TODO use the knowledge, e.g. mark path in graph */
-}
-
-/*
-        Ford-Fulkerson
-    
-    Max-Flow-Min-Cut Algorithm finding the maximum flow through a directed
-    graph from source to sink.
-    
-    
-        Complexity
-
-    O(E * max(f)), max(f) being the maximum flow
-    
-    
-        Description
-
-    As long as there is an open path through the residual graph, send the
-    minimum of the residual capacities on the path.
-    
-    
-        Constraints
-    
-    The algorithm works only if all weights are integers. Otherwise it is
-    possible that the Ford–Fulkerson algorithm will not converge to the maximum
-    value.
-    
-    
-        Input
-    
-    g - Graph object
-    s - Source ID
-    t - Target (sink) ID
-    
-    
-        Output
-    
-    Maximum flow from Source s to Target t
-
- */
-/*
-        Edmonds-Karp
-    
-    Max-Flow-Min-Cut Algorithm finding the maximum flow through a directed
-    graph from source to sink. An implementation of the Ford-Fulkerson
-    algorithm.
-    
-    
-        Complexity
-    
-    O(|V|*|E|²)
-    
-    
-        Input
-        
-    g - Graph object (with node and edge lists, capacity is a property of edge)
-    s - source ID
-    t - sink ID
-    
- */
-function edmonds_karp(g, s, t) {
-
-}
-
-/*
-   A simple binary min-heap serving as a priority queue
-   - takes an array as the input, with elements having a key property
-   - elements will look like this:
-        {
-            key: "... key property ...", 
-            value: "... element content ..."
-        }
-    - provides insert(), min(), extractMin() and heapify()
-    - example usage (e.g. via the Firebug or Chromium console):
-        var x = {foo: 20, hui: "bla"};
-        var a = new BinaryMinHeap([x,{foo:3},{foo:10},{foo:20},{foo:30},{foo:6},{foo:1},{foo:3}],"foo");
-        console.log(a.extractMin());
-        console.log(a.extractMin());
-        x.foo = 0; // update key
-        a.heapify(); // call this always after having a key updated
-        console.log(a.extractMin());
-        console.log(a.extractMin());
-    - can also be used on a simple array, like [9,7,8,5]
- */
-function BinaryMinHeap(array, key) {
-    
-    /* Binary tree stored in an array, no need for a complicated data structure */
-    var tree = [];
-    
-    var key = key || 'key';
-    
-    /* Calculate the index of the parent or a child */
-    var parent = function(index) { return Math.floor((index - 1)/2); };
-    var right = function(index) { return 2 * index + 2; };
-    var left = function(index) { return 2 * index + 1; };
-
-    /* Helper function to swap elements with their parent 
-       as long as the parent is bigger */
-    function bubble_up(i) {
-        var p = parent(i);
-        while((p >= 0) && (tree[i][key] < tree[p][key])) {
-            /* swap with parent */
-            tree[i] = tree.splice(p, 1, tree[i])[0];
-            /* go up one level */
-            i = p;
-            p = parent(i);
-        }
-    }
-
-    /* Helper function to swap elements with the smaller of their children
-       as long as there is one */
-    function bubble_down(i) {
-        var l = left(i);
-        var r = right(i);
-        
-        /* as long as there are smaller children */
-        while(tree[l] && (tree[i][key] > tree[l][key]) || tree[r] && (tree[i][key] > tree[r][key])) {
-            
-            /* find smaller child */
-            var child = tree[l] ? tree[r] ? tree[l][key] > tree[r][key] ? r : l : l : l;
-            
-            /* swap with smaller child with current element */
-            tree[i] = tree.splice(child, 1, tree[i])[0];
-            
-            /* go up one level */
-            i = child;
-            l = left(i);
-            r = right(i);
-        }
-    }
-    
-    /* Insert a new element with respect to the heap property
-       1. Insert the element at the end
-       2. Bubble it up until it is smaller than its parent */
-    this.insert = function(element) {
-    
-        /* make sure there's a key property */
-        (element[key] == undefined) && (element = {key:element});
-        
-        /* insert element at the end */
-        tree.push(element);
-
-        /* bubble up the element */
-        bubble_up(tree.length - 1);
-    }
-    
-    /* Only show us the minimum */
-    this.min = function() {
-        return tree.length == 1 ? undefined : tree[0];
-    }
-    
-    /* Return and remove the minimum
-       1. Take the root as the minimum that we are looking for
-       2. Move the last element to the root (thereby deleting the root) 
-       3. Compare the new root with both of its children, swap it with the
-          smaller child and then check again from there (bubble down)
-    */
-    this.extractMin = function() {
-        var result = this.min();
-        
-        /* move the last element to the root or empty the tree completely */
-        /* bubble down the new root if necessary */
-        (tree.length == 1) && (tree = []) || (tree[0] = tree.pop()) && bubble_down(0);
-        
-        return result;        
-    }
-    
-    /* currently unused, TODO implement */
-    this.changeKey = function(index, key) {
-        throw "function not implemented";
-    }
-
-    this.heapify = function() {
-        for(var start = Math.floor((tree.length - 2) / 2); start >= 0; start--) {
-            bubble_down(start);
-        }
-    }
-    
-    /* insert the input elements one by one only when we don't have a key property (TODO can be done more elegant) */
-    for(i in (array || []))
-        this.insert(array[i]);
-}
-
-
-
-/*
-    Quick Sort:
-        1. Select some random value from the array, the median.
-        2. Divide the array in three smaller arrays according to the elements
-           being less, equal or greater than the median.
-        3. Recursively sort the array containg the elements less than the
-           median and the one containing elements greater than the median.
-        4. Concatenate the three arrays (less, equal and greater).
-        5. One or no element is always sorted.
-    TODO: This could be implemented more efficiently by using only one array object and several pointers.
-*/
-function quickSort(arr) {
-    /* recursion anchor: one element is always sorted */
-    if(arr.length <= 1) return arr;
-    /* randomly selecting some value */
-    var median = arr[Math.floor(Math.random() * arr.length)];
-    var arr1 = [], arr2 = [], arr3 = [];
-    for(var i in arr) {
-        arr[i] < median && arr1.push(arr[i]);
-        arr[i] == median && arr2.push(arr[i]);
-        arr[i] > median && arr3.push(arr[i]);
-    }
-    /* recursive sorting and assembling final result */
-    return quickSort(arr1).concat(arr2).concat(quickSort(arr3));
-}
-
-/*
-    Selection Sort:
-        1. Select the minimum and remove it from the array
-        2. Sort the rest recursively
-        3. Return the minimum plus the sorted rest
-        4. An array with only one element is already sorted
-*/
-function selectionSort(arr) {
-    /* recursion anchor: one element is always sorted */
-    if(arr.length == 1) return arr;
-    var minimum = Infinity;
-    var index;
-    for(var i in arr) {
-        if(arr[i] < minimum) {
-            minimum = arr[i];
-            index = i; /* remember the minimum index for later removal */
-        }
-    }
-    /* remove the minimum */
-    arr.splice(index, 1);
-    /* assemble result and sort recursively (could be easily done iteratively as well)*/
-    return [minimum].concat(selectionSort(arr));
-}
-
-/*
-    Merge Sort:
-        1. Cut the array in half
-        2. Sort each of them recursively
-        3. Merge the two sorted arrays
-        4. An array with only one element is considered sorted
-
-*/
-function mergeSort(arr) {
-    /* merges two sorted arrays into one sorted array */
-    function merge(a, b) {
-        /* result set */
-        var c = [];
-        /* as long as there are elements in the arrays to be merged */
-        while(a.length > 0 || b.length > 0){
-            /* are there elements to be merged, if yes, compare them and merge */
-            var n = a.length > 0 && b.length > 0 ? a[0] < b[0] ? a.shift() : b.shift() : b.length > 0 ? b.shift() : a.length > 0 ? a.shift() : null;
-            /* always push the smaller one onto the result set */
-            n != null && c.push(n);
-        }
-        return c;
-    }
-    /* this mergeSort implementation cuts the array in half, wich should be fine with randomized arrays, but introduces the risk of a worst-case scenario */
-    median = Math.floor(arr.length / 2);
-    var part1 = arr.slice(0, median); /* for some reason it doesn't work if inserted directly in the return statement (tried so with firefox) */
-    var part2 = arr.slice(median - arr.length);
-    return arr.length <= 1 ? arr : merge(
-        mergeSort(part1), /* first half */
-        mergeSort(part2) /* second half */
-    );
-}
-
-/* Balanced Red-Black-Tree */
-function RedBlackTree(arr) {
-    
-}
-
-function BTree(arr) {
-    
-}
-
-function NaryTree(n, arr) {
-    
-}
-
-/**
- * Knuth-Morris-Pratt string matching algorithm - finds a pattern in a text.
- * FIXME: Doesn't work correctly yet.
- */
-function kmp(p, t) {
-
-    /**
-     * PREFIX, OVERLAP or FALIURE function for KMP. Computes how many iterations
-     * the algorithm can skip after a mismatch.
-     *
-     * @input p - pattern (string)
-     * @result array of skippable iterations
-     */
-    function prefix(p) {
-        /* pi contains the computed skip marks */
-        var pi = [0], k = 0;
-        for(q = 1; q < p.length; q++) {
-            while(k > 0 && (p.charAt(k) != p.charAt(q)))
-                k = pi[k-1];
-            
-            (p.charAt(k) == p.charAt(q)) && k++;
-            
-            pi[q] = k;
-        }
-        return pi;
-    }
-    
-    /* The actual KMP algorithm starts here. */
-    
-    var pi = prefix(p), q = 0, result = [];
-    
-    for(var i = 0; i < t.length; i++) {
-        /* jump forward as long as the character doesn't match */
-        while((q > 0) && (p.charAt(q) != t.charAt(i)))
-            q = pi[q];
-        
-        (p.charAt(q) == t.charAt(i)) && q++;
-        
-        (q == p.length) && result.push(i - p.length) && (q = pi[q]);
-    }
-    
-    return result;
-}
-
-/* step for algorithm visualisation */
-function step(comment, funct) {
-    //wait for input
-    //display comment (before or after waiting)
-//    next.wait();
-    /* execute callback function */
-    funct();
-}
-
-/**
- * Curry - Function currying
- * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
- * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php)
- * Date: 10/4/2008
- *
- * @author Ariel Flesler
- * @version 1.0.1
- */
-function curry( fn ){
-	return function(){
-		var args = curry.args(arguments),
-			master = arguments.callee,
-			self = this;
-
-		return args.length >= fn.length ? fn.apply(self,args) :	function(){
-			return master.apply( self, args.concat(curry.args(arguments)) );
-		};
-	};
-};
-
-curry.args = function( args ){
-	return Array.prototype.slice.call(args);
-};
-
-Function.prototype.curry = function(){
-	return curry(this);
-};
-
-/**
- * Topological Sort
- *
- * Sort a directed graph based on incoming edges
- *
- * Coded by Jake Stothard
- */
-function topological_sort(g) {
-    //Mark nodes as "deleted" instead of actually deleting them
-    //That way we don't have to copy g
-
-    for(i in g.nodes)
-	g.nodes[i].deleted = false;
-    
-    var ret = topological_sort_helper(g);
-
-    //Cleanup: Remove the deleted property
-    for(i in g.nodes)
-	delete g.nodes[i].deleted
-
-    return ret;
-}
-function topological_sort_helper(g) {
-    //Find node with no incoming edges
-    var node;
-    for(i in g.nodes) {
-	if(g.nodes[i].deleted)
-	    continue; //Bad style, meh
-	
-	var incoming = false;
-	for(j in g.nodes[i].edges) {
-	    if(g.nodes[i].edges[j].target == g.nodes[i]
-	      && g.nodes[i].edges[j].source.deleted == false) {
-		incoming = true;
-		break;
-	    }
-	}
-	if(!incoming) {
-	    node = g.nodes[i];
-	    break;
-	}
-    }
-
-    // Either unsortable or done. Either way, GTFO
-    if(node == undefined)
-	return [];
-
-    //"Delete" node from g
-    node.deleted = true;
-    
-    var tail = topological_sort_helper(g);
-
-    tail.unshift(node);
-
-    return tail;
-}
diff --git a/addons/web_process/static/lib/dracula/dracula_graffle.js b/addons/web_process/static/lib/dracula/dracula_graffle.js
deleted file mode 100644
index 2b03ad16c79..00000000000
--- a/addons/web_process/static/lib/dracula/dracula_graffle.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Originally grabbed from the official RaphaelJS Documentation
- * http://raphaeljs.com/graffle.html
- * Adopted (arrows) and commented by Philipp Strathausen http://blog.ameisenbar.de
- * Licenced under the MIT licence.
- */
-
-/**
- * Usage:
- * connect two shapes
- * parameters: 
- *      source shape [or connection for redrawing], 
- *      target shape,
- *      style with { fg : linecolor, bg : background color, directed: boolean }
- * returns:
- *      connection { draw = function() }
- */
-Raphael.fn.connection = function (obj1, obj2, style) {
-    var selfRef = this;
-    /* create and return new connection */
-    var edge = {/*
-        from : obj1,
-        to : obj2,
-        style : style,*/
-        draw : function() {
-            /* get bounding boxes of target and source */
-            var bb1 = obj1.getBBox();
-            var bb2 = obj2.getBBox();
-            var off1 = 0;
-            var off2 = 0;
-            /* coordinates for potential connection coordinates from/to the objects */
-            var p = [
-                {x: bb1.x + bb1.width / 2, y: bb1.y - off1},              /* NORTH 1 */
-                {x: bb1.x + bb1.width / 2, y: bb1.y + bb1.height + off1}, /* SOUTH 1 */
-                {x: bb1.x - off1, y: bb1.y + bb1.height / 2},             /* WEST  1 */
-                {x: bb1.x + bb1.width + off1, y: bb1.y + bb1.height / 2}, /* EAST  1 */
-                {x: bb2.x + bb2.width / 2, y: bb2.y - off2},              /* NORTH 2 */
-                {x: bb2.x + bb2.width / 2, y: bb2.y + bb2.height + off2}, /* SOUTH 2 */
-                {x: bb2.x - off2, y: bb2.y + bb2.height / 2},             /* WEST  2 */
-                {x: bb2.x + bb2.width + off2, y: bb2.y + bb2.height / 2}  /* EAST  2 */
-            ];
-            
-            /* distances between objects and according coordinates connection */
-            var d = {}, dis = [];
-
-            /*
-             * find out the best connection coordinates by trying all possible ways
-             */
-            /* loop the first object's connection coordinates */
-            for (var i = 0; i < 4; i++) {
-                /* loop the seond object's connection coordinates */
-                for (var j = 4; j < 8; j++) {
-                    var dx = Math.abs(p[i].x - p[j].x),
-                        dy = Math.abs(p[i].y - p[j].y);
-                    if ((i == j - 4) || (((i != 3 && j != 6) || p[i].x < p[j].x) && ((i != 2 && j != 7) || p[i].x > p[j].x) && ((i != 0 && j != 5) || p[i].y > p[j].y) && ((i != 1 && j != 4) || p[i].y < p[j].y))) {
-                        dis.push(dx + dy);
-                        d[dis[dis.length - 1].toFixed(3)] = [i, j];
-                    }
-                }
-            }
-            var res = dis.length == 0 ? [0, 4] : d[Math.min.apply(Math, dis).toFixed(3)];
-            /* bezier path */
-            var x1 = p[res[0]].x,
-                y1 = p[res[0]].y,
-                x4 = p[res[1]].x,
-                y4 = p[res[1]].y,
-                dx = Math.max(Math.abs(x1 - x4) / 2, 10),
-                dy = Math.max(Math.abs(y1 - y4) / 2, 10),
-                x2 = [x1, x1, x1 - dx, x1 + dx][res[0]].toFixed(3),
-                y2 = [y1 - dy, y1 + dy, y1, y1][res[0]].toFixed(3),
-                x3 = [0, 0, 0, 0, x4, x4, x4 - dx, x4 + dx][res[1]].toFixed(3),
-                y3 = [0, 0, 0, 0, y1 + dy, y1 - dy, y4, y4][res[1]].toFixed(3);
-            /* assemble path and arrow */
-            var path = ["M", x1.toFixed(3), y1.toFixed(3), "C", x2, y2, x3, y3, x4.toFixed(3), y4.toFixed(3)];
-            /* arrow */
-            if(style && style.directed) {
-                /* magnitude, length of the last path vector */
-                var mag = Math.sqrt((y4 - y3) * (y4 - y3) + (x4 - x3) * (x4 - x3));
-                /* vector normalisation to specified length  */
-                var norm = function(x,l){return (-x*(l||5)/mag);};
-                /* calculate array coordinates (two lines orthogonal to the path vector) */
-                var arr = [
-                    {x:(norm(x4-x3)+norm(y4-y3)+x4).toFixed(3), y:(norm(y4-y3)+norm(x4-x3)+y4).toFixed(3)},
-                    {x:(norm(x4-x3)-norm(y4-y3)+x4).toFixed(3), y:(norm(y4-y3)-norm(x4-x3)+y4).toFixed(3)}
-                ];
-                path.push("M", arr[0].x, arr[0].y, "L", x4, y4, "L", arr[1].x, arr[1].y, "L", arr[0].x, arr[0].y);
-            }
-            var svgpath = path.join(' ');
-            /* function to be used for moving existent path(s), e.g. animate() or attr() */
-            var move = "attr";
-            /* applying path(s) */
-            edge.fg && edge.fg[move]({path:svgpath})
-                || (edge.fg = selfRef.path(svgpath).attr({stroke: style && style.stroke || "#000", fill: "none"}).toBack());
-            edge.bg && edge.bg[move]({path:svgpath})
-                || style && style.fill && (edge.bg = style.fill.split && selfRef.path(svgpath).attr({stroke: style.fill.split("|")[0], fill: "none", "stroke-width": style.fill.split("|")[1] || 3}).toBack());
-            /* setting label */
-            style && style.label 
-                && (edge.label && edge.label.attr({x:(x1+x4)/2, y:(y1+y4)/2}) 
-                    || (edge.label = selfRef.text((x1+x4)/2, (y1+y4)/2, style.label).attr({fill: "#000", "font-size": style["font-size"] || "12px"})));
-//                && selfRef.text(x4, y4, style.label).attr({stroke: style && style.stroke || "#fff", "font-weight":"bold", "font-size":"20px"})
-//            style && style.callback && style.callback(edge);
-        }
-    }
-    edge.draw();
-    return edge;
-};
-//Raphael.prototype.set.prototype.dodo=function(){console.log("works");};
diff --git a/addons/web_process/static/lib/dracula/dracula_graph.coffee b/addons/web_process/static/lib/dracula/dracula_graph.coffee
deleted file mode 100644
index bb91945098d..00000000000
--- a/addons/web_process/static/lib/dracula/dracula_graph.coffee
+++ /dev/null
@@ -1,524 +0,0 @@
-###
- *  Dracula Graph Layout and Drawing Framework 0.0.3alpha
- *  (c) 2010 Philipp Strathausen <strathausen@gmail.com>, http://strathausen.eu
- *  
- *  Contributions by:
- *  Branched by Jake Stothard <stothardj@gmail.com>.
- *
- *  based on the Graph JavaScript framework, version 0.0.1
- *  (c) 2006 Aslak Hellesoy <aslak.hellesoy@gmail.com>
- *  (c) 2006 Dave Hoover <dave.hoover@gmail.com>
- *
- *  Ported from Graph::Layouter::Spring in
- *    http://search.cpan.org/~pasky/Graph-Layderer-0.02/
- *  The algorithm is based on a spring-style layouter of a Java-based social
- *  network tracker PieSpy written by Paul Mutton E<lt>paul@jibble.orgE<gt>.
- *
- *  This code is freely distributable under the terms of an MIT-style license.
- *  For details, see the Graph web site: http://dev.buildpatternd.com/trac
- *
- *  Links:
- *
- *  Graph Dracula JavaScript Framework:
- *      http://graphdracula.net
- *
- *  Demo of the original applet:
- *      http://redsquirrel.com/dave/work/webdep/
- *
- *  Mirrored original source code at snipplr:
- *      http://snipplr.com/view/1950/graph-javascript-framework-version-001/
- *
- *  Original usage example:
- *      http://ajaxian.com/archives/new-javascriptcanvas-graph-library
- *
-###
-
-
-###
-    Edge Factory
-###
-AbstractEdge = ->
-
-AbstractEdge.prototype =
-    hide: ->
-        @connection.fg.hide()
-        @connection.bg && @bg.connection.hide()
-
-EdgeFactory = ->
-    @template = new AbstractEdge()
-    @template.style = new Object()
-    @template.style.directed = false
-    @template.weight = 1
-
-EdgeFactory.prototype =
-    build: (source, target) ->
-        e = jQuery.extend true, {}, @template
-        e.source = source
-        e.target = target
-        e
-
-###
-    Graph
-###
-Graph = ->
-    @nodes = {}
-    @edges = []
-    @snapshots = [] # previous graph states TODO to be implemented
-    @edgeFactory = new EdgeFactory()
-
-Graph.prototype =
-###
-    add a node
-    @id          the node's ID (string or number)
-    @content     (optional, dictionary) can contain any information that is
-                 being interpreted by the layout algorithm or the graph
-                 representation
-###
-    addNode: (id, content) ->
-        # testing if node is already existing in the graph
-        if @nodes[id] == undefined
-            @nodes[id] = new Graph.Node id, content
-        @nodes[id]
-
-    addEdge: (source, target, style) ->
-        s = @addNode source
-        t = @addNode target
-        var edge = @edgeFactory.build s, t
-        jQuery.extend edge.style, style
-        s.edges.push edge
-        @edges.push edge
-        # NOTE: Even directed edges are added to both nodes.
-        t.edges.push edge
-
-    # TODO to be implemented
-    # Preserve a copy of the graph state (nodes, positions, ...)
-    # @comment     a comment describing the state
-    snapShot: (comment) ->
-        ###/* FIXME
-        var graph = new Graph()
-        graph.nodes = jQuery.extend(true, {}, @nodes)
-        graph.edges = jQuery.extend(true, {}, @edges)
-        @snapshots.push({comment: comment, graph: graph})
-        */
-        ###
-
-    removeNode: (id) ->
-        delete @nodes[id]
-        for i = 0; i < @edges.length; i++
-            if @edges[i].source.id == id || @edges[i].target.id == id
-                @edges.splice(i, 1)
-                i--
-
-/*
- * Node
- */
-Graph.Node = (id, node) ->
-    node = node || {}
-    node.id = id
-    node.edges = []
-    node.hide = ->
-        @hidden = true
-        @shape && @shape.hide() # FIXME this is representation specific code and should be elsewhere */
-        for(i in @edges)
-            (@edges[i].source.id == id || @edges[i].target == id) && @edges[i].hide && @edges[i].hide()
-
-    node.show = ->
-        @hidden = false
-        @shape && @shape.show()
-        for(i in @edges)
-            (@edges[i].source.id == id || @edges[i].target == id) && @edges[i].show && @edges[i].show()
-
-    node
-
-Graph.Node.prototype = { }
-
-###
-    Renderer base class
-###
-Graph.Renderer = { }
-
-###
-    Renderer implementation using RaphaelJS
-###
-Graph.Renderer.Raphael = (element, graph, width, height) ->
-    @width = width || 400
-    @height = height || 400
-    var selfRef = this
-    @r = Raphael element, @width, @height
-    @radius = 40 # max dimension of a node
-    @graph = graph
-    @mouse_in = false
-
-    # TODO default node rendering
-    if(!@graph.render) {
-        @graph.render = ->
-            return
-        }
-    }
-    
-    /*
-     * Dragging
-     */
-    @isDrag = false
-    @dragger = (e) ->
-        @dx = e.clientX
-        @dy = e.clientY
-        selfRef.isDrag = this
-        @set && @set.animate "fill-opacity": .1, 200 && @set.toFront()
-        e.preventDefault && e.preventDefault()
-
-    document.onmousemove =  (e) {
-        e = e || window.event
-        if (selfRef.isDrag) {
-            var bBox = selfRef.isDrag.set.getBBox()
-            // TODO round the coordinates here (eg. for proper image representation)
-            var newX = e.clientX - selfRef.isDrag.dx + (bBox.x + bBox.width / 2)
-            var newY = e.clientY - selfRef.isDrag.dy + (bBox.y + bBox.height / 2)
-            /* prevent shapes from being dragged out of the canvas */
-            var clientX = e.clientX - (newX < 20 ? newX - 20 : newX > selfRef.width - 20 ? newX - selfRef.width + 20 : 0)
-            var clientY = e.clientY - (newY < 20 ? newY - 20 : newY > selfRef.height - 20 ? newY - selfRef.height + 20 : 0)
-            selfRef.isDrag.set.translate(clientX - Math.round(selfRef.isDrag.dx), clientY - Math.round(selfRef.isDrag.dy))
-            //            console.log(clientX - Math.round(selfRef.isDrag.dx), clientY - Math.round(selfRef.isDrag.dy))
-            for (var i in selfRef.graph.edges) {
-                selfRef.graph.edges[i].connection && selfRef.graph.edges[i].connection.draw()
-            }
-            //selfRef.r.safari()
-            selfRef.isDrag.dx = clientX
-            selfRef.isDrag.dy = clientY
-        }
-    }
-    document.onmouseup =  ->
-        selfRef.isDrag && selfRef.isDrag.set.animate({"fill-opacity": .6}, 500)
-        selfRef.isDrag = false
-    }
-    @draw()
-}
-Graph.Renderer.Raphael.prototype = {
-    translate: (point) {
-        return [
-            (point[0] - @graph.layoutMinX) * @factorX + @radius,
-            (point[1] - @graph.layoutMinY) * @factorY + @radius
-        ]
-    },
-
-    rotate: (point, length, angle) {
-        var dx = length * Math.cos(angle)
-        var dy = length * Math.sin(angle)
-        return [point[0]+dx, point[1]+dy]
-    },
-
-    draw: ->
-        @factorX = (@width - 2 * @radius) / (@graph.layoutMaxX - @graph.layoutMinX)
-        @factorY = (@height - 2 * @radius) / (@graph.layoutMaxY - @graph.layoutMinY)
-        for (i in @graph.nodes) {
-            @drawNode(@graph.nodes[i])
-        }
-        for (var i = 0; i < @graph.edges.length; i++) {
-            @drawEdge(@graph.edges[i])
-        }
-    },
-
-    drawNode: (node) {
-        var point = @translate([node.layoutPosX, node.layoutPosY])
-        node.point = point
-
-        /* if node has already been drawn, move the nodes */
-        if(node.shape) {
-            var oBBox = node.shape.getBBox()
-            var opoint = { x: oBBox.x + oBBox.width / 2, y: oBBox.y + oBBox.height / 2}
-            node.shape.translate(Math.round(point[0] - opoint.x), Math.round(point[1] - opoint.y))
-            @r.safari()
-            return node
-        }/* else, draw new nodes */
-
-        var shape
-
-        /* if a node renderer  is provided by the user, then use it 
-           or the default render  instead */
-        if(!node.render) {
-            node.render = (r, node) {
-                /* the default node drawing */
-                var color = Raphael.getColor()
-                var ellipse = r.ellipse(0, 0, 30, 20).attr({fill: color, stroke: color, "stroke-width": 2})
-                /* set DOM node ID */
-                ellipse.node.id = node.label || node.id
-                shape = r.set().
-                    push(ellipse).
-                    push(r.text(0, 30, node.label || node.id))
-                return shape
-            }
-        }
-        /* or check for an ajax representation of the nodes */
-        if(node.shapes) {
-            // TODO ajax representation evaluation
-        }
-
-        shape = node.render(@r, node).hide()
-
-        shape.attr({"fill-opacity": .6})
-        /* re-reference to the node an element belongs to, needed for dragging all elements of a node */
-        shape.items.forEach((item){ item.set = shape; item.node.style.cursor = "move"; })
-        shape.mousedown(@dragger)
-
-        var box = shape.getBBox()
-        shape.translate(Math.round(point[0]-(box.x+box.width/2)),Math.round(point[1]-(box.y+box.height/2)))
-        //console.log(box,point)
-        node.hidden || shape.show()
-        node.shape = shape
-    },
-    drawEdge: (edge) {
-        /* if this edge already exists the other way around and is undirected */
-        if(edge.backedge)
-            return
-        if(edge.source.hidden || edge.target.hidden) {
-            edge.connection && edge.connection.fg.hide() | edge.connection.bg && edge.connection.bg.hide()
-            return
-        }
-        /* if edge already has been drawn, only refresh the edge */
-        if(!edge.connection) {
-            edge.style && edge.style.callback && edge.style.callback(edge); // TODO move this somewhere else
-            edge.connection = @r.connection(edge.source.shape, edge.target.shape, edge.style)
-            return
-        }
-        //FIXME showing doesn't work well
-        edge.connection.fg.show()
-        edge.connection.bg && edge.connection.bg.show()
-        edge.connection.draw()
-    }
-}
-Graph.Layout = {}
-Graph.Layout.Spring = (graph) {
-    @graph = graph
-    @iterations = 500
-    @maxRepulsiveForceDistance = 6
-    @k = 2
-    @c = 0.01
-    @maxVertexMovement = 0.5
-    @layout()
-}
-Graph.Layout.Spring.prototype = {
-    layout: ->
-        @layoutPrepare()
-        for (var i = 0; i < @iterations; i++) {
-            @layoutIteration()
-        }
-        @layoutCalcBounds()
-    },
-    
-    layoutPrepare: ->
-        for (i in @graph.nodes) {
-            var node = @graph.nodes[i]
-            node.layoutPosX = 0
-            node.layoutPosY = 0
-            node.layoutForceX = 0
-            node.layoutForceY = 0
-        }
-        
-    },
-    
-    layoutCalcBounds: ->
-        var minx = Infinity, maxx = -Infinity, miny = Infinity, maxy = -Infinity
-
-        for (i in @graph.nodes) {
-            var x = @graph.nodes[i].layoutPosX
-            var y = @graph.nodes[i].layoutPosY
-            
-            if(x > maxx) maxx = x
-            if(x < minx) minx = x
-            if(y > maxy) maxy = y
-            if(y < miny) miny = y
-        }
-
-        @graph.layoutMinX = minx
-        @graph.layoutMaxX = maxx
-        @graph.layoutMinY = miny
-        @graph.layoutMaxY = maxy
-    },
-    
-    layoutIteration: ->
-        // Forces on nodes due to node-node repulsions
-
-        var prev = new Array()
-        for(var c in @graph.nodes) {
-            var node1 = @graph.nodes[c]
-            for (var d in prev) {
-                var node2 = @graph.nodes[prev[d]]
-                @layoutRepulsive(node1, node2)
-                
-            }
-            prev.push(c)
-        }
-        
-        // Forces on nodes due to edge attractions
-        for (var i = 0; i < @graph.edges.length; i++) {
-            var edge = @graph.edges[i]
-            @layoutAttractive(edge);             
-        }
-        
-        // Move by the given force
-        for (i in @graph.nodes) {
-            var node = @graph.nodes[i]
-            var xmove = @c * node.layoutForceX
-            var ymove = @c * node.layoutForceY
-
-            var max = @maxVertexMovement
-            if(xmove > max) xmove = max
-            if(xmove < -max) xmove = -max
-            if(ymove > max) ymove = max
-            if(ymove < -max) ymove = -max
-            
-            node.layoutPosX += xmove
-            node.layoutPosY += ymove
-            node.layoutForceX = 0
-            node.layoutForceY = 0
-        }
-    },
-
-    layoutRepulsive: (node1, node2) {
-        var dx = node2.layoutPosX - node1.layoutPosX
-        var dy = node2.layoutPosY - node1.layoutPosY
-        var d2 = dx * dx + dy * dy
-        if(d2 < 0.01) {
-            dx = 0.1 * Math.random() + 0.1
-            dy = 0.1 * Math.random() + 0.1
-            var d2 = dx * dx + dy * dy
-        }
-        var d = Math.sqrt(d2)
-        if(d < @maxRepulsiveForceDistance) {
-            var repulsiveForce = @k * @k / d
-            node2.layoutForceX += repulsiveForce * dx / d
-            node2.layoutForceY += repulsiveForce * dy / d
-            node1.layoutForceX -= repulsiveForce * dx / d
-            node1.layoutForceY -= repulsiveForce * dy / d
-        }
-    },
-
-    layoutAttractive: (edge) {
-        var node1 = edge.source
-        var node2 = edge.target
-        
-        var dx = node2.layoutPosX - node1.layoutPosX
-        var dy = node2.layoutPosY - node1.layoutPosY
-        var d2 = dx * dx + dy * dy
-        if(d2 < 0.01) {
-            dx = 0.1 * Math.random() + 0.1
-            dy = 0.1 * Math.random() + 0.1
-            var d2 = dx * dx + dy * dy
-        }
-        var d = Math.sqrt(d2)
-        if(d > @maxRepulsiveForceDistance) {
-            d = @maxRepulsiveForceDistance
-            d2 = d * d
-        }
-        var attractiveForce = (d2 - @k * @k) / @k
-        if(edge.attraction == undefined) edge.attraction = 1
-        attractiveForce *= Math.log(edge.attraction) * 0.5 + 1
-        
-        node2.layoutForceX -= attractiveForce * dx / d
-        node2.layoutForceY -= attractiveForce * dy / d
-        node1.layoutForceX += attractiveForce * dx / d
-        node1.layoutForceY += attractiveForce * dy / d
-    }
-}
-
-Graph.Layout.Ordered = (graph, order) {
-    @graph = graph
-    @order = order
-    @layout()
-}
-Graph.Layout.Ordered.prototype = {
-    layout: ->
-        @layoutPrepare()
-        @layoutCalcBounds()
-    },
-    
-    layoutPrepare: (order) {
-        for (i in @graph.nodes) {
-            var node = @graph.nodes[i]
-            node.layoutPosX = 0
-            node.layoutPosY = 0
-        }
-            var counter = 0
-            for (i in @order) {
-                var node = @order[i]
-                node.layoutPosX = counter
-                node.layoutPosY = Math.random()
-                counter++
-            }
-    },
-    
-    layoutCalcBounds: ->
-        var minx = Infinity, maxx = -Infinity, miny = Infinity, maxy = -Infinity
-
-        for (i in @graph.nodes) {
-            var x = @graph.nodes[i].layoutPosX
-            var y = @graph.nodes[i].layoutPosY
-            
-            if(x > maxx) maxx = x
-            if(x < minx) minx = x
-            if(y > maxy) maxy = y
-            if(y < miny) miny = y
-        }
-
-        @graph.layoutMinX = minx
-        @graph.layoutMaxX = maxx
-
-        @graph.layoutMinY = miny
-        @graph.layoutMaxY = maxy
-    }
-}
-
-/*
- * usefull JavaScript extensions, 
- */
-
- log(a) {console.log&&console.log(a);}
-
-/*
- * Raphael Tooltip Plugin
- * - attaches an element as a tooltip to another element
- *
- * Usage example, adding a rectangle as a tooltip to a circle:
- *
- *      paper.circle(100,100,10).tooltip(paper.rect(0,0,20,30))
- *
- * If you want to use more shapes, you'll have to put them into a set.
- *
- */
-Raphael.el.tooltip =  (tp) {
-    @tp = tp
-    @tp.o = {x: 0, y: 0}
-    @tp.hide()
-    @hover(
-        (event){ 
-            @mousemove((event){ 
-                @tp.translate(event.clientX - 
-                                  @tp.o.x,event.clientY - @tp.o.y)
-                @tp.o = {x: event.clientX, y: event.clientY}
-            })
-            @tp.show().toFront()
-        }, 
-        (event){
-            @tp.hide()
-            @unmousemove()
-        })
-    return this
-}
-
-/* For IE */
-if (!Array.prototype.forEach)
-{
-  Array.prototype.forEach = (fun /*, thisp*/)
-  {
-    var len = @length
-    if (typeof fun != "")
-      throw new TypeError()
-
-    var thisp = arguments[1]
-    for (var i = 0; i < len; i++)
-    {
-      if (i in this)
-        fun.call(thisp, this[i], i, this)
-    }
-  }
-}
diff --git a/addons/web_process/static/lib/dracula/dracula_graph.js b/addons/web_process/static/lib/dracula/dracula_graph.js
deleted file mode 100644
index 28269986e78..00000000000
--- a/addons/web_process/static/lib/dracula/dracula_graph.js
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- *  Dracula Graph Layout and Drawing Framework 0.0.3alpha
- *  (c) 2010 Philipp Strathausen <strathausen@gmail.com>, http://strathausen.eu
- *  Contributions by Jake Stothard <stothardj@gmail.com>.
- *
- *  based on the Graph JavaScript framework, version 0.0.1
- *  (c) 2006 Aslak Hellesoy <aslak.hellesoy@gmail.com>
- *  (c) 2006 Dave Hoover <dave.hoover@gmail.com>
- *
- *  Ported from Graph::Layouter::Spring in
- *    http://search.cpan.org/~pasky/Graph-Layderer-0.02/
- *  The algorithm is based on a spring-style layouter of a Java-based social
- *  network tracker PieSpy written by Paul Mutton <paul@jibble.org>.
- *
- *  This code is freely distributable under the MIT license. Commercial use is
- *  hereby granted without any cost or restriction.
- *
- *  Links:
- *
- *  Graph Dracula JavaScript Framework:
- *      http://graphdracula.net
- *
- /*--------------------------------------------------------------------------*/
-
-/*
- * Edge Factory
- */
-var AbstractEdge = function() {
-}
-AbstractEdge.prototype = {
-    hide: function() {
-        this.connection.fg.hide();
-        this.connection.bg && this.bg.connection.hide();
-    }
-};
-var EdgeFactory = function() {
-    this.template = new AbstractEdge();
-    this.template.style = new Object();
-    this.template.style.directed = false;
-    this.template.weight = 1;
-};
-EdgeFactory.prototype = {
-    build: function(source, target) {
-        var e = jQuery.extend(true, {}, this.template);
-        e.source = source;
-        e.target = target;
-        return e;
-    }
-};
-
-/*
- * Graph
- */
-var Graph = function() {
-    this.nodes = {};
-    this.edges = [];
-    this.snapshots = []; // previous graph states TODO to be implemented
-    this.edgeFactory = new EdgeFactory();
-};
-Graph.prototype = {
-    /*
-     * add a node
-     * @id          the node's ID (string or number)
-     * @content     (optional, dictionary) can contain any information that is
-     *              being interpreted by the layout algorithm or the graph
-     *              representation
-     */
-    addNode: function(id, content) {
-        /* testing if node is already existing in the graph */
-        if(this.nodes[id] == undefined) {
-            this.nodes[id] = new Graph.Node(id, content);
-        }
-        return this.nodes[id];
-    },
-
-    addEdge: function(source, target, style) {
-        var s = this.addNode(source);
-        var t = this.addNode(target);
-        var edge = this.edgeFactory.build(s, t);
-        jQuery.extend(edge.style,style);
-        s.edges.push(edge);
-        this.edges.push(edge);
-        // NOTE: Even directed edges are added to both nodes.
-        t.edges.push(edge);
-    },
-
-    /* TODO to be implemented
-     * Preserve a copy of the graph state (nodes, positions, ...)
-     * @comment     a comment describing the state
-     */
-    snapShot: function(comment) {
-        /* FIXME
-        var graph = new Graph();
-        graph.nodes = jQuery.extend(true, {}, this.nodes);
-        graph.edges = jQuery.extend(true, {}, this.edges);
-        this.snapshots.push({comment: comment, graph: graph});
-        */
-    },
-    removeNode: function(id) {
-        delete this.nodes[id];
-        for(var i = 0; i < this.edges.length; i++) {
-            if (this.edges[i].source.id == id || this.edges[i].target.id == id) {
-                this.edges.splice(i, 1);
-                i--;
-            }
-        }
-    }
-};
-
-/*
- * Node
- */
-Graph.Node = function(id, node){
-    node = node || {};
-    node.id = id;
-    node.edges = [];
-    node.hide = function() {
-        this.hidden = true;
-        this.shape && this.shape.hide(); /* FIXME this is representation specific code and should be elsewhere */
-        for(i in this.edges)
-            (this.edges[i].source.id == id || this.edges[i].target == id) && this.edges[i].hide && this.edges[i].hide();
-    };
-    node.show = function() {
-        this.hidden = false;
-        this.shape && this.shape.show();
-        for(i in this.edges)
-            (this.edges[i].source.id == id || this.edges[i].target == id) && this.edges[i].show && this.edges[i].show();
-    };
-    return node;
-};
-Graph.Node.prototype = {
-};
-
-/*
- * Renderer base class
- */
-Graph.Renderer = {};
-
-/*
- * Renderer implementation using RaphaelJS
- */
-Graph.Renderer.Raphael = function(element, graph, width, height) {
-    this.width = width || 800;
-    this.height = height || 800;
-    var selfRef = this;
-    this.r = Raphael(element, this.width, this.height);
-    this.radius = 40; /* max dimension of a node */
-    this.graph = graph;
-    this.mouse_in = false;
-
-    /* TODO default node rendering function */
-    if(!this.graph.render) {
-        this.graph.render = function() {
-            return;
-        }
-    }
-
-    /*
-     * Dragging
-     */
-    this.isDrag = false;
-    this.dragger = function (e) {
-        this.dx = e.clientX;
-        this.dy = e.clientY;
-        selfRef.isDrag = this;
-        this.set && this.set.animate({"fill-opacity": .1}, 200);
-        e.preventDefault && e.preventDefault();
-    };
-
-    var d = document.getElementById(element);
-    d.onmousemove = function (e) {
-        e = e || window.event;
-        if (selfRef.isDrag) {
-            var bBox = selfRef.isDrag.set.getBBox();
-            // TODO round the coordinates here (eg. for proper image representation)
-            var newX = e.clientX - selfRef.isDrag.dx + (bBox.x + bBox.width / 2);
-            var newY = e.clientY - selfRef.isDrag.dy + (bBox.y + bBox.height / 2);
-            /* prevent shapes from being dragged out of the canvas */
-            var clientX = e.clientX - (newX < 20 ? newX - 20 : newX > selfRef.width - 20 ? newX - selfRef.width + 20 : 0);
-            var clientY = e.clientY - (newY < 20 ? newY - 20 : newY > selfRef.height - 20 ? newY - selfRef.height + 20 : 0);
-            selfRef.isDrag.set.translate(clientX - Math.round(selfRef.isDrag.dx), clientY - Math.round(selfRef.isDrag.dy));
-            //            console.log(clientX - Math.round(selfRef.isDrag.dx), clientY - Math.round(selfRef.isDrag.dy));
-            for (var i in selfRef.graph.edges) {
-                selfRef.graph.edges[i].connection && selfRef.graph.edges[i].connection.draw();
-            }
-            //selfRef.r.safari();
-            selfRef.isDrag.dx = clientX;
-            selfRef.isDrag.dy = clientY;
-        }
-    };
-    d.onmouseup = function () {
-        selfRef.isDrag && selfRef.isDrag.set.animate({"fill-opacity": .6}, 500);
-        selfRef.isDrag = false;
-    };
-    this.draw();
-};
-Graph.Renderer.Raphael.prototype = {
-    translate: function(point) {
-        return [
-            (point[0] - this.graph.layoutMinX) * this.factorX + this.radius,
-            (point[1] - this.graph.layoutMinY) * this.factorY + this.radius
-        ];
-    },
-
-    rotate: function(point, length, angle) {
-        var dx = length * Math.cos(angle);
-        var dy = length * Math.sin(angle);
-        return [point[0]+dx, point[1]+dy];
-    },
-
-    draw: function() {
-        this.factorX = (this.width - 2 * this.radius) / (this.graph.layoutMaxX - this.graph.layoutMinX);
-        this.factorY = (this.height - 2 * this.radius) / (this.graph.layoutMaxY - this.graph.layoutMinY);
-        for (i in this.graph.nodes) {
-            this.drawNode(this.graph.nodes[i]);
-        }
-        for (var i = 0; i < this.graph.edges.length; i++) {
-            this.drawEdge(this.graph.edges[i]);
-        }
-    },
-
-    drawNode: function(node) {
-        var point = this.translate([node.layoutPosX, node.layoutPosY]);
-        node.point = point;
-
-        /* if node has already been drawn, move the nodes */
-        if(node.shape) {
-            var oBBox = node.shape.getBBox();
-            var opoint = { x: oBBox.x + oBBox.width / 2, y: oBBox.y + oBBox.height / 2};
-            node.shape.translate(Math.round(point[0] - opoint.x), Math.round(point[1] - opoint.y));
-            this.r.safari();
-            return node;
-        }/* else, draw new nodes */
-
-        var shape;
-
-        /* if a node renderer function is provided by the user, then use it
-           or the default render function instead */
-        if(!node.render) {
-            node.render = function(r, node) {
-                /* the default node drawing */
-                var color = Raphael.getColor();
-                var ellipse = r.ellipse(0, 0, 30, 20).attr({fill: color, stroke: color, "stroke-width": 2});
-                /* set DOM node ID */
-                ellipse.node.id = node.label || node.id;
-                shape = r.set().
-                    push(ellipse).
-                    push(r.text(0, 30, node.label || node.id));
-                return shape;
-            }
-        }
-        /* or check for an ajax representation of the nodes */
-        if(node.shapes) {
-            // TODO ajax representation evaluation
-        }
-
-        shape = node.render(this.r, node).hide();
-
-        shape.attr({"fill-opacity": .6});
-        /* re-reference to the node an element belongs to, needed for dragging all elements of a node */
-        shape.items.forEach(function(item){ item.set = shape; item.node.style.cursor = "move"; });
-        shape.mousedown(this.dragger);
-
-        var box = shape.getBBox();
-        shape.translate(Math.round(point[0]-(box.x+box.width/2)),Math.round(point[1]-(box.y+box.height/2)))
-        //console.log(box,point);
-        node.hidden || shape.show();
-        node.shape = shape;
-    },
-    drawEdge: function(edge) {
-        /* if this edge already exists the other way around and is undirected */
-        if(edge.backedge)
-            return;
-        if(edge.source.hidden || edge.target.hidden) {
-            edge.connection && edge.connection.fg.hide() | edge.connection.bg && edge.connection.bg.hide();
-            return;
-        }
-        /* if edge already has been drawn, only refresh the edge */
-        if(!edge.connection) {
-            edge.style && edge.style.callback && edge.style.callback(edge); // TODO move this somewhere else
-            edge.connection = this.r.connection(edge.source.shape, edge.target.shape, edge.style);
-            return;
-        }
-        //FIXME showing doesn't work well
-        edge.connection.fg.show();
-        edge.connection.bg && edge.connection.bg.show();
-        edge.connection.draw();
-    }
-};
-Graph.Layout = {};
-Graph.Layout.Spring = function(graph) {
-    this.graph = graph;
-    this.iterations = 500;
-    this.maxRepulsiveForceDistance = 6;
-    this.k = 2;
-    this.c = 0.01;
-    this.maxVertexMovement = 0.5;
-    this.layout();
-};
-Graph.Layout.Spring.prototype = {
-    layout: function() {
-        this.layoutPrepare();
-        for (var i = 0; i < this.iterations; i++) {
-            this.layoutIteration();
-        }
-        this.layoutCalcBounds();
-    },
-
-    layoutPrepare: function() {
-        for (i in this.graph.nodes) {
-            var node = this.graph.nodes[i];
-            node.layoutPosX = 0;
-            node.layoutPosY = 0;
-            node.layoutForceX = 0;
-            node.layoutForceY = 0;
-        }
-
-    },
-
-    layoutCalcBounds: function() {
-        var minx = Infinity, maxx = -Infinity, miny = Infinity, maxy = -Infinity;
-
-        for (i in this.graph.nodes) {
-            var x = this.graph.nodes[i].layoutPosX;
-            var y = this.graph.nodes[i].layoutPosY;
-
-            if(x > maxx) maxx = x;
-            if(x < minx) minx = x;
-            if(y > maxy) maxy = y;
-            if(y < miny) miny = y;
-        }
-
-        this.graph.layoutMinX = minx;
-        this.graph.layoutMaxX = maxx;
-        this.graph.layoutMinY = miny;
-        this.graph.layoutMaxY = maxy;
-    },
-
-    layoutIteration: function() {
-        // Forces on nodes due to node-node repulsions
-
-        var prev = new Array();
-        for(var c in this.graph.nodes) {
-            var node1 = this.graph.nodes[c];
-            for (var d in prev) {
-                var node2 = this.graph.nodes[prev[d]];
-                this.layoutRepulsive(node1, node2);
-
-            }
-            prev.push(c);
-        }
-
-        // Forces on nodes due to edge attractions
-        for (var i = 0; i < this.graph.edges.length; i++) {
-            var edge = this.graph.edges[i];
-            this.layoutAttractive(edge);
-        }
-
-        // Move by the given force
-        for (i in this.graph.nodes) {
-            var node = this.graph.nodes[i];
-            var xmove = this.c * node.layoutForceX;
-            var ymove = this.c * node.layoutForceY;
-
-            var max = this.maxVertexMovement;
-            if(xmove > max) xmove = max;
-            if(xmove < -max) xmove = -max;
-            if(ymove > max) ymove = max;
-            if(ymove < -max) ymove = -max;
-
-            node.layoutPosX += xmove;
-            node.layoutPosY += ymove;
-            node.layoutForceX = 0;
-            node.layoutForceY = 0;
-        }
-    },
-
-    layoutRepulsive: function(node1, node2) {
-        if (typeof node1 == 'undefined' || typeof node2 == 'undefined')
-            return;
-        var dx = node2.layoutPosX - node1.layoutPosX;
-        var dy = node2.layoutPosY - node1.layoutPosY;
-        var d2 = dx * dx + dy * dy;
-        if(d2 < 0.01) {
-            dx = 0.1 * Math.random() + 0.1;
-            dy = 0.1 * Math.random() + 0.1;
-            var d2 = dx * dx + dy * dy;
-        }
-        var d = Math.sqrt(d2);
-        if(d < this.maxRepulsiveForceDistance) {
-            var repulsiveForce = this.k * this.k / d;
-            node2.layoutForceX += repulsiveForce * dx / d;
-            node2.layoutForceY += repulsiveForce * dy / d;
-            node1.layoutForceX -= repulsiveForce * dx / d;
-            node1.layoutForceY -= repulsiveForce * dy / d;
-        }
-    },
-
-    layoutAttractive: function(edge) {
-        var node1 = edge.source;
-        var node2 = edge.target;
-
-        var dx = node2.layoutPosX - node1.layoutPosX;
-        var dy = node2.layoutPosY - node1.layoutPosY;
-        var d2 = dx * dx + dy * dy;
-        if(d2 < 0.01) {
-            dx = 0.1 * Math.random() + 0.1;
-            dy = 0.1 * Math.random() + 0.1;
-            var d2 = dx * dx + dy * dy;
-        }
-        var d = Math.sqrt(d2);
-        if(d > this.maxRepulsiveForceDistance) {
-            d = this.maxRepulsiveForceDistance;
-            d2 = d * d;
-        }
-        var attractiveForce = (d2 - this.k * this.k) / this.k;
-        if(edge.attraction == undefined) edge.attraction = 1;
-        attractiveForce *= Math.log(edge.attraction) * 0.5 + 1;
-
-        node2.layoutForceX -= attractiveForce * dx / d;
-        node2.layoutForceY -= attractiveForce * dy / d;
-        node1.layoutForceX += attractiveForce * dx / d;
-        node1.layoutForceY += attractiveForce * dy / d;
-    }
-};
-
-Graph.Layout.Ordered = function(graph, order) {
-    this.graph = graph;
-    this.order = order;
-    this.layout();
-};
-Graph.Layout.Ordered.prototype = {
-    layout: function() {
-        this.layoutPrepare();
-        this.layoutCalcBounds();
-    },
-
-    layoutPrepare: function(order) {
-        for (i in this.graph.nodes) {
-            var node = this.graph.nodes[i];
-            node.layoutPosX = 0;
-            node.layoutPosY = 0;
-        }
-            var counter = 0;
-            for (i in this.order) {
-                var node = this.order[i];
-                node.layoutPosX = counter;
-                node.layoutPosY = Math.random();
-                counter++;
-            }
-    },
-
-    layoutCalcBounds: function() {
-        var minx = Infinity, maxx = -Infinity, miny = Infinity, maxy = -Infinity;
-
-        for (i in this.graph.nodes) {
-            var x = this.graph.nodes[i].layoutPosX;
-            var y = this.graph.nodes[i].layoutPosY;
-
-            if(x > maxx) maxx = x;
-            if(x < minx) minx = x;
-            if(y > maxy) maxy = y;
-            if(y < miny) miny = y;
-        }
-
-        this.graph.layoutMinX = minx;
-        this.graph.layoutMaxX = maxx;
-
-        this.graph.layoutMinY = miny;
-        this.graph.layoutMaxY = maxy;
-    }
-};
-
-/*
- * usefull JavaScript extensions,
- */
-
-function log(a) {console.log&&console.log(a);}
-
-/*
- * Raphael Tooltip Plugin
- * - attaches an element as a tooltip to another element
- *
- * Usage example, adding a rectangle as a tooltip to a circle:
- *
- *      paper.circle(100,100,10).tooltip(paper.rect(0,0,20,30));
- *
- * If you want to use more shapes, you'll have to put them into a set.
- *
- */
-Raphael.el.tooltip = function (tp) {
-    this.tp = tp;
-    this.tp.o = {x: 0, y: 0};
-    this.tp.hide();
-    this.hover(
-        function(event){
-            this.mousemove(function(event){
-                this.tp.translate(event.clientX -
-                                  this.tp.o.x,event.clientY - this.tp.o.y);
-                this.tp.o = {x: event.clientX, y: event.clientY};
-            });
-            this.tp.show().toFront();
-        },
-        function(event){
-            this.tp.hide();
-            this.unmousemove();
-        });
-    return this;
-};
-
-/* For IE */
-if (!Array.prototype.forEach)
-{
-  Array.prototype.forEach = function(fun /*, thisp*/)
-  {
-    var len = this.length;
-    if (typeof fun != "function")
-      throw new TypeError();
-
-    var thisp = arguments[1];
-    for (var i = 0; i < len; i++)
-    {
-      if (i in this)
-        fun.call(thisp, this[i], i, this);
-    }
-  };
-}
diff --git a/addons/web_process/static/src/css/process.css b/addons/web_process/static/src/css/process.css
deleted file mode 100644
index dde01f26ea5..00000000000
--- a/addons/web_process/static/src/css/process.css
+++ /dev/null
@@ -1,73 +0,0 @@
-
-a.cta-a {
-    float: left;
-    padding: 5px 10px;
-    border: 1px solid #ccc;
-    border-radius: 5px;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    background: #eeeded url(/web_process/static/src/img/cta-a.gif) repeat-x;
-    box-shadow: 0 1px 0 #fff;
-    -moz-box-shadow: 0 1px 0 #fff;
-    -webkit-box-shadow: 0 1px 0 #fff;
-    color: #8c8c8c;
-    font-size: 0.9em;
-    text-transform: uppercase;
-    font-weight: bold;
-    text-shadow: #fff 0 1px 0;
-    margin: 2px;
-}
-
-a.cta-a span {
-    float: left;
-    padding: 7px 0 5px 5px;
-    background-position: 0 50%;
-    background-repeat: no-repeat;
-    cursor: pointer;
-}
-
-a.cta-a strong {
-    display: block;
-    color: #393939;
-}
-
-.process_h1 {
-    background:url("/web_process/static/src/img/sep-a.gif") repeat-x scroll 0 90% transparent;
-    font-size:2em;
-    font-weight:normal;
-    padding:0 0 5px 5px;
-    line-height: 1.2;
-}
-
-.process-links {
-    padding: 5px 10px;
-    text-align: center;
-    display: table;
-    margin: auto;
-}
-
-.process-links a.cta-a {
-    display: table-cell;
-}
-
-.oe_process {
-    height: 20px;
-    margin-top:8px;
-    padding: 0;
-    width: 24px;
-    cursor: pointer;
-    display: block;
-    background: url(/web/static/src/img/iconset-a-help.png) no-repeat  center center;
-    float: left;
-}
-
-.process-help-text {
-    float: left;
-    padding:5px 10px;
-    min-height:56px;
-    font-size: 120%;
-}
-
-td.process_fields,button.toggle_fields span:last-child {
-    display: none;
-}
diff --git a/addons/web_process/static/src/img/ToolOval.jpg b/addons/web_process/static/src/img/ToolOval.jpg
deleted file mode 100644
index c30f15a07d27df0d0e0b9baf91a444f74f00482c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 650
zcmex=<NpH&0WUXCHwH#VMg|WcWcdG(LCm!xGmU}4*Ox(yfq{Voh=Jh$Z3brsR%R9!
z7G_o;!OF_Y#?HgR4g~z%+?+gu{6a#4{DOkQVlv{wB2uD)f)a`nQnIr0^76vsN-9cn
zDl&5Nav(z(fm+$w*!eg(_~b+cMdU~Z{|_(-axh3RNH8-hF)#@-G7B>PKLX?fy#VwC
z5@2KJU<S&l3otM-GP5wUFfl_V8JU<_1cew_*@P9@MGTFU0+k(|Kt?b!z?DE%0`;&0
zWuygxGAO1qGBGd<3b82uzs11A4AdvcEXZKb@X9a$%nOS{YuLor-cji}G3CXpM)4Ej
zQ_o-I=5b`4@h@U^(zUMkYrF@}%$<|e_~=Yob?wbtKKV};RF#C8?QKkD|7KUpc*^$9
zobHOg6+SAlk2ajXJuUrb^s4Wl^ZMr4uQA--oqcN3{Kv<(y#BP@s_ux+7yAfxx5C=r
z`A@2y@~o>Zf(oWdIz%Q+VDQP)%Q^J;!30MZp(R4sLSK9@_^NqH?lZ^D)bA0g*Qb}n
zO5Q#e_FW?W>~7tETP~T0X%{Ur5B|2>gs=S2i=8gsMpr$zzYA3KShdKt;LvfAsr+}D
zW!7+Q_}s1MThX~!=}Ft%#mk@FP7xAJRJbvBqy28F*_q2)_8pPnk(!dc#Csp}p|Uzj
z_fWYzUrkF(H+{Pne$8sHt0T*UHK$fFEwEU%f`NN>?2Ku%vNm~Ir5s>LnE(GK0H}(`
AdH?_b

diff --git a/addons/web_process/static/src/img/ToolShowGrid.jpg b/addons/web_process/static/src/img/ToolShowGrid.jpg
deleted file mode 100644
index 8285acc8aaca324c30f67748dec386d635ff9ba5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 635
zcmex=<NpH&0WUXCHwH#VMg|WcWcdG(LCm!xGmU}4*Ox(yfq{Voh=Jh$Z3brsR%R9!
z7G_o;!OF_Y#?HgR4g~z%+?+gu{6a#4{DOkQVlv{wB2uD)f)a`nQnIr0^76vsN-9cn
zDl&5Nav(z(fm+$w*!eg(_~b+cMdU~Z{|_(-axh3RNH8-hF)#@-G7B>PKLX?fy#VwC
z5@2Cv;{eL&3NSD-0|65YJ5-X15$FdtK?WgVMI}d(M0PR5g`&!;M$UmjAcGhgm{HAP
zVrF3gSs^KiF2xA6Uy=F$Ee0ND5R+Mu!JgsEl`mUwe}3WQ#A03eP{!1Mf7s2LofCIx
zbTlPTdE+mCZ@Fajg@qbV{>JX!wlczn-{YJ6gqFHJ`^;;%&Mw<Nzq@yL*yT{c!(6wl
zPF<Y*Y{|O4TLS~a^KS<;9r&|VddAeK-Ya+3)yc*FeYksf9=GOv+v4X|3)b^_-Y$Lf
zN@r#EtaXp(b?und?YPj5Z{jHh!zb*PMoU^!`)|y(s=OR2&waZ@-+OD>mb;ou6@yJg
zP918fD|dBuIraPH(kjV}`{vmu@4UU@oIYkf?A;k;;ntEVvsBA2p_nbDW%Zu=`<LZR
zjUuOW1sJ+a57iguy4C(NwpvuAe)>(5%dxgOlE%-&H~m(-KB;N?%t@2yN2aUnDC=MP
d&`ogfU*SEQy7%9fxa?~pwmCh*flc`TO#pL)yWao+

diff --git a/addons/web_process/static/src/img/ToolShowGrid.png b/addons/web_process/static/src/img/ToolShowGrid.png
deleted file mode 100644
index ea530671b97bb7e150e4a8cf5097f2bd0d2a073f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 810
zcmbV}?N3s16vuB_p>EoGVK!M0qSJgRUexBAFU)2buFMQ`EjP`WT9#UCYt?2-rI96q
z8f2}qk)};+u$oy$2s%eNpQX$Mf#ULTFZW*H-av$Y{tKP$JnZv5=fydPpO>2*5gro`
zK~MzyNLD_`+txfZ1VmlWxCVmON%M|!4hMt5V<k6F*W9nT`wY}Pp>%X=K{>9w{kV5X
zGYd$)P&%TW4Fm$zUtilR8Af;l0f2+*$p!yvz(aYRxZCd!I0-jNc}FG}fTZ{~?<T!&
z%8TM|*p7KfuR=S&HWLgEj84NSVMPcNj4qjNFhanH>zCPPw4y*QsBEa=N#vh3F4B)+
zl*Nt{<O)HpSR8}{C*?z$%RC8aYwMI_o)sHLn(a8|@%^^rHp~NfRlWG_;27%m!A_6S
zhM{gR;`SjfpV5k2oSy!VV^wux&?Z++EyLKN$)VH31{gQM*iRE8AD#jdFqwKrZ*>{0
zuAgRf-e8+E*kr01z~7I|nH-b}p_X9chZ!|GsPATU$wC0>#)FqK#l*6mT>OLUjEK&(
zw#)UVmvZ&oJLPoWmx(^b1R(!y`Kmp|;BD)!=I5S-4*vOG2I~FntW3^s;kl9*$t7HF
zDGN$qv9=CuNTH|G66th$A}yVs5*HWE;qjj|iUq}W;=;VT=K^u#6Lx5_GBuUK&@dDB
zG8jr`5`!_48qwM!Y;Uy`wzL;;3}SJ6LFuUmb`2I65?K}{xzpP*xJl8~@#sUOqQ9df
zS-yjFNdI+mOrlrM&T60Phqco=`WUo`ekQ&4CXGhRu1%!TS*&tNWOQNLwc5?cnbkXM
zi>otktwNIR^_iJUe{5#w*;xN_XXh5JaG)q^W9z+U{zH>Mz~{3Kf+jwjo6BRzcT2nQ
z?s6`dOO(Ho#_uav4JRk2F`p}TF_~{$GBTKHjXk00qEVFJEE9=DSDL3qrL58LBK$;H
x`|IBRp1wEL6&Ej5oxfD+gdMhoq-SC4Au{Jc{fSR!u7hJj?8CWP{fA0;{{She3Df`p

diff --git a/addons/web_process/static/src/img/button-a-a.png b/addons/web_process/static/src/img/button-a-a.png
deleted file mode 100644
index bd046bbbef7da60895536a7a18323abbbe21e7fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6595
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
AIsgCw

diff --git a/addons/web_process/static/src/img/cta-a.gif b/addons/web_process/static/src/img/cta-a.gif
deleted file mode 100644
index daa561e29f58d52f0806ada27a6ad25c1e30f24a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 108
zcmZ?wbhEHbWMt4`*v!E2_3PJ<A3wf(_wLiDPw(Hq|M20%m(QO+e)#b9%a>0dKfZtW
z?lTa4`t;??mk;mXzkB;u@h1xd2<U(akQodtk^+n^vrH>8j~(|&5Rgd;v{>OR;HAys
JFXPT&4FG9+IZXfn

diff --git a/addons/web_process/static/src/img/grid_10.jpg b/addons/web_process/static/src/img/grid_10.jpg
deleted file mode 100644
index 5254207b96407a79195cd541dfb145417e8bdb30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4530
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
WuGByeNqr^lmQ?MFC%jA)J^T;N+H+X|

diff --git a/addons/web_process/static/src/img/iconset-a-help.gif b/addons/web_process/static/src/img/iconset-a-help.gif
deleted file mode 100644
index 5400acec57bd30ea50c05765808d2d20684a6f90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 379
zcmV->0fhcXNk%w1VGaNe0M$MK@$m5T^Yiuf_4D%b_xJbd=jZF|>)qSi|NsBt-{11_
z@#^X6-rU^r@$u~H>h10A?d$96=;+wj*W%#dt*x!*<mBMq-un9b`T6<T*VpLh=hxNM
z+}zxSg@xYT-S_tP#Kgq5wzl8h-O|$1qN1YP+uN(FtB8n*xw*N`&CS`^*sH3l`1tt3
z!ouw9>*wa??(FRA>FMa^=JxjX{r&y)^z`N9<LT(=>gww5?(XpL@cjJz?Ck9C?d@Dy
zSpWb4A^8LW002G!EC2ui01f~S000J<K%a0(Ec$xA84ZD;&5*+$fVQhzX@K4lw!2_j
zr_Ks<*}-~_20<WDl~N>^fY5NrK7qlY#sZD<0W&f-H9Cem6ev80H8wU1IgvRb9FUO!
zHWe=qJe{7M4=)u3A_h38CKRVQ1|9_v69)@7H#IY~3kMSrJrNce2`{uS2^kg<T0Jo~
Z3=$g~5)3vmT0<}~8Zt5(F)%|x06T~2*E|3K

diff --git a/addons/web_process/static/src/img/node-current.png b/addons/web_process/static/src/img/node-current.png
deleted file mode 100644
index 51f86b04c786e91411168f858503553f1469f4e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3143
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
QFFwFf-&7BK<No9S0af=I>;M1&

diff --git a/addons/web_process/static/src/img/node-gray.png b/addons/web_process/static/src/img/node-gray.png
deleted file mode 100644
index 972013540cf00d5e379f9c9136b11499ab2e93f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3128
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

diff --git a/addons/web_process/static/src/img/node-subflow-gray.png b/addons/web_process/static/src/img/node-subflow-gray.png
deleted file mode 100644
index ffafe1bd681f01d622bcb371dea2488a7d724868..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6837
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

diff --git a/addons/web_process/static/src/img/node-subflow.png b/addons/web_process/static/src/img/node-subflow.png
deleted file mode 100644
index fd2a480204d87d73a476a452746e4962ba5665df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6851
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

diff --git a/addons/web_process/static/src/img/node.png b/addons/web_process/static/src/img/node.png
deleted file mode 100644
index 853ac85cd566516bf18e7e4532ecf28610b25e0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3205
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
E1-$h9vH$=8

diff --git a/addons/web_process/static/src/img/port.gif b/addons/web_process/static/src/img/port.gif
deleted file mode 100644
index 1a3f97815e7f6c7551216db23d9ca8023c91ddb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 166
zcmZ?wbhEHb<Y8cEIKsg2|NsBfmiDhUY&v7>eAdD3R#ExY#MJ8<IT!syUT@j<uxG;8
z>o@=Y`0@VGkuO)SUWrXQ@8SDo`mA#<UJS$m#h)x-g*qS-WG4fwvVyQ6qY6XDDi)pU
fWd|;7;^#S|ljyx8QGIjcVYUnzfmT*S76xko(^52}

diff --git a/addons/web_process/static/src/img/sep-a.gif b/addons/web_process/static/src/img/sep-a.gif
deleted file mode 100644
index 5a064f21e89f03e8e6ffd1b898fa51b2fae272e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
scmZ?wbhEHbWMp7sXkcKtd;9jUpFb6UvM_*v4u}BBFfcK>a4}c|00`s>g#Z8m

diff --git a/addons/web_process/static/src/img/window_bg.png b/addons/web_process/static/src/img/window_bg.png
deleted file mode 100644
index 864aed8a40b6464aac58588184cbc7259a34419c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 128
zcmeAS@N?(olHy`uVBq!ia0vp^IzX(!!3-ofoqnMTq<8{+LR??Je*O0C+m9bVzJLFI
zMc*`#27ON##}JF&w-*c<84P$@9A^Fa9>bd>>2UCW<I7G7LG2>rkgPVV8O7%;pU?U1
a`J7+mD_7u#+WR#?tqh*7elF{r5}E+Ip)ZjD

diff --git a/addons/web_process/static/src/img/window_toolbar.png b/addons/web_process/static/src/img/window_toolbar.png
deleted file mode 100644
index 77c30b79d828448d0d87b6654424e77b19375de7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 200
zcmeAS@N?(olHy`uVBq!ia0vp^F+eQB!2~4x+s^U<Db50q$YKTtZXpn6ymYtj4^Xhm
z)5S3)qV??!L#_h~0xlPGBo6+bAF?6P(O33H-Le_wP5mddq}Oge{%^yzB=Zvo_fEg7
zz+UWE)+{q6=mu}mhVN-WLCf~L3dftxK5k+b`MFHRCRnJhR>*D&i&7I%`2HW3thI00
sEMM&1Ed7LmVYegSF$o|yPFBV4Z=>e6lX{}sKvyt$y85}Sb4q9e0HWbZS^xk5

diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js
deleted file mode 100644
index c2192a9a10a..00000000000
--- a/addons/web_process/static/src/js/process.js
+++ /dev/null
@@ -1,291 +0,0 @@
-openerp.web_process = function (instance) {
-    var QWeb = instance.web.qweb,
-          _t = instance.web._t;
-    instance.web.ViewManager.include({
-        start: function() {
-            var _super = this._super();
-            this.process_check();
-            this.process_help = this.action ? this.action.help : 'Help: Not Defined';
-            this.model = this.dataset.model;
-            if(this.action) this.process_model = this.action.res_model;
-            else this.process_model = this.model;
-            return _super;
-        },
-        process_check: function() {
-            var self = this,
-            grandparent = this.getParent() && this.getParent().getParent(),
-            view = this.views[this.views_src[0].view_type],
-            $process_view = this.$el.find('.oe_process');
-            if (!(grandparent instanceof instance.web.WebClient) ||
-                !(view.view_type === this.views_src[0].view_type
-                    && view.view_id === this.views_src[0].view_id)) {
-                        $process_view.hide();
-                        return;
-            }
-            $process_view.click(function() {
-                self.initialize_process_view();
-            });
-        },
-        initialize_process_view: function() {
-            var self = this;
-            this.record_id = false;
-            if(this.active_view == 'form') {
-                this.record_id = this.views[this.active_view].controller.datarecord.id;
-            }
-
-            $.when(this.help(), this.get_process_object()).pipe(function(help, process) {
-                self.process_help = help;
-                if(process && process.length) {
-                    if(process.length > 1) {
-                        self.process_selection = process;
-                    } else {
-                        self.process_id = process[0][0],
-                        self.process_title = process[0][1];
-                    }
-                }
-                return $.Deferred().resolve();
-            }).pipe(function() {
-                var def = $.Deferred();
-                if(self.process_id) {
-                    self.graph_get().done(function(res) {
-                        self.process_notes = res.notes;
-                        self.process_title = res.name;
-                        self.process_subflows = _(res.nodes).chain()
-                              .filter(function (node) { return node['subflow'] !== false; })
-                              .uniq(false, function (node) { return node['subflow'][0]; }).value();
-                        self.process_related = res.related;
-                        def.resolve(res);
-                    });
-                } else def.resolve();
-                return def.promise();
-            }).done(function(res) {
-                $.when(self.render_process_view()).done(function() {
-                    if(res) self.draw_process_graph(res);
-                });
-            });
-        },
-        graph_get: function() {
-            var self = this;
-            var def = $.Deferred();
-            this.process_id = parseInt(this.process_id, 10);
-
-            this.process_dataset
-            .call("graph_get",[this.process_id, this.model || this.dataset.model, this.record_id, [80,80,150,100]])
-            .done(function(res) {
-                self.process_dataset
-                    .call("search_by_model",[self.model || self.dataset.model,self.session.context])
-                    .done(
-                    function(r) {
-                        res['related'] = r;
-                        def.resolve(res);
-                    });
-            });
-            return def.promise();
-        },
-        help : function() {
-            var def = $.Deferred();
-            if(!this.subflow_model) {
-                def.resolve(this.action ? (this.action.help!=false ? this.action.help : 'Help: Not Defined') : 'Help: Not Defined');
-            } else {
-                 var dataset = new instance.web.DataSetSearch(this, "ir.actions.act_window", this.session.context, []);
-                 dataset
-                    .read_slice(['help'],
-                    {
-                        domain: [
-                            ['res_model', '=', this.subflow_model],
-                            ['name', 'ilike', this.subflow_name]
-                        ]
-                    }
-                    ).done(function(res) {
-                        def.resolve(res.help || 'Help: Not Defined');
-                    });
-            }
-            return def.promise();
-        },
-        get_process_object : function() {
-            var self = this,
-                def = $.Deferred();
-            if(this.process_id)
-                return def.resolve().promise();
-
-            this.process_dataset = new instance.web.DataSet(this, "process.process", this.session.context);
-            this.process_dataset
-            .call("search_by_model", [self.process_model,self.session.context])
-            .done(function(res) {
-                if (!res.length) {
-                    self.process_model = false;
-                    self.get_process_object().done(def.resolve);
-                }
-                else {
-                    def.resolve(res);
-                }
-            })
-            .fail(def.reject);
-            return def.promise();
-        },
-        render_process_view : function() {
-            this.$el.html(QWeb.render("ProcessView", this));
-            var self = this;
-            this.$el.find('#edit_process').click(function() {
-                self.edit_process_view();
-            });
-            var $parent = this.getParent().$el;
-            $parent.find('#change_process').click(function() {
-                self.process_selection = false,
-                self.process_id = $parent.find('#select_process').val(),
-                self.process_title = $.trim($parent.find('#select_process option:selected').text());
-                self.initialize_process_view();
-            });
-
-            this.$el.find(".process_subflow").click(function() {
-                self.process_id = this.id;
-                self.initialize_process_view();
-            });
-        },
-        draw_process_graph : function(res) {
-            var self = this,
-                process_graph = new Graph();
-            var process_renderer = function(r, n) {
-                var clip_rect = "".concat(n.node.x,",",n.node.y,",150,100");
-
-                //Image part
-                var bg = n.node.kind == "subflow" ? "node-subflow" : "node";
-                bg = n.node.gray ? bg + "-gray" : bg;
-                bg = n.node.active ? 'node-current': bg;
-
-                var img_src = '/web_process/static/src/img/'+ bg + '.png';
-
-                r['image'](img_src, n.node.x, n.node.y,150, 100)
-                    .attr({"clip-rect": clip_rect})
-                    .mousedown(function() {
-                        return false;
-                });
-                //Node
-                var process_node = r['rect'](n.node.x, n.node.y, 150, 100).attr({stroke: "none"});
-                // Node text
-                var process_node_text =  r.text(n.node.x, n.node.y, (n.node.name))
-                    .attr({"fill": "#fff", "font-weight": "bold", "cursor": "pointer"});
-                process_node_text.translate((process_node.getBBox().width / 2) + 5, 10);
-                if(n.node.subflow) {
-                    process_node_text.click(function() {
-                        self.process_id = n.node.subflow[0];
-                        self.subflow_model = n.node.model;
-                        self.subflow_name = n.node.name;
-                        self.initialize_process_view();
-                    });
-                }
-                //Node Description
-                var new_notes = n.node.notes;
-                if(n.node.notes.length > 25) {
-                    var to;
-                    var temp_str = new_notes = '';
-                    var from = to = 0;
-                    while (1) {
-                        from = 25;
-                        temp_str = n.node.notes.substr(to ,25);
-                        if (temp_str.lastIndexOf(" ") < 25 && temp_str.length >= 25) {
-                            from  =  temp_str.lastIndexOf(" ");
-                        }
-                        new_notes += "\n" + n.node.notes.substr(to , from);
-                        if(new_notes.length > n.node.notes.length) break;
-                        to += from;
-                    }
-                }
-
-                if(n.node.res)
-                    new_notes = n.node.res.name + '\n' + new_notes;
-
-                r.text(n.node.x+85, n.node.y+50, (new_notes));
-                r['image']('/web/static/src/img/icons/gtk-info.png', n.node.x+20, n.node.y+70, 16, 16)
-                    .attr({"cursor": "pointer", "title": "Help"})
-                    .click(function() {
-                        window.open(n.node.url || "http://doc.openerp.com/v6.0/index.php?model=" + n.node.model);
-                    });
-
-                if(n.node.menu) {
-                    r['image']('/web/static/src/img/icons/gtk-jump-to.png', n.node.x+115, n.node.y+70, 16, 16)
-                    .attr({"cursor": "pointer", "title": n.node.menu.name})
-                    .click(function() {
-                        self.jump_to_view(n.node.res_model, n.node.menu.id);
-                    });
-                }
-
-                var process_set = r.set().push(process_node);
-                process_set.mousedown(function() {
-                    return false;
-                });
-                return process_set;
-            };
-
-            _.each(res['nodes'],function(node, node_id) {
-                node['res_model'] = self.model,
-                node['res_id'] = false,
-                node['id'] = node_id;
-                process_graph.addNode(node.id, {node: node,render: process_renderer});
-            });
-
-            _.each(res['transitions'], function(transitions) {
-                var src = res['nodes'][transitions['source']];
-                var dst = res['nodes'][transitions['target']];
-                // make active
-                transitions['active'] = src.active && !dst.gray;
-                process_graph.addEdge(src.id, dst.id, {directed : true});
-            });
-            var width = $(document).width();
-            var height = $(document).height();
-            var layouter = new Graph.Layout.Ordered(process_graph);
-            var render_process_graph = new Graph.Renderer.Raphael('process_canvas', process_graph, width, height);
-        },
-        jump_to_view: function(model, id) {
-            var self = this;
-            var dataset = new instance.web.DataSet(this, 'ir.values', this.session.context);
-            dataset.call('get',
-                ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context],
-                function(res) {
-                    var action = res[0][res[0].length - 1];
-                    self.rpc("/web/action/load", {
-                        action_id: action.id,
-                        context: dataset.context
-                        }, function(result) {
-                            var action_manager = new instance.web.ActionManager(self);
-                            action_manager.replace(self.$el);
-                            action_manager.do_action(result.result);
-                        });
-                });
-        },
-        edit_process_view: function() {
-            var self = this;
-            var action_manager = new instance.web.ActionManager(this);
-            var dialog = new instance.web.Dialog(this, {
-                width: 800,
-                buttons : [
-                    {text: _t("Cancel"), click: function() { $(this).dialog('destroy'); }},
-                    {text: _t("Save"), click: function() {
-                        var form_view = action_manager.inner_widget.views.form.controller;
-
-                        form_view.do_save(function() {
-                            self.initialize_process_view();
-                        });
-                        $(this).dialog('destroy');
-                    }}
-                ]
-            }).open();
-
-            action_manager.appendTo(dialog.$el);
-            action_manager.do_action({
-                res_model : 'process.process',
-                res_id: self.process_id,
-                views : [[false, 'form']],
-                type : 'ir.actions.act_window',
-                flags : {
-                    search_view: false,
-                    sidebar : false,
-                    views_switcher : false,
-                    action_buttons : false,
-                    pager: false
-                }
-            });
-        }
-    });
-};
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/web_process/static/src/xml/web_process.xml b/addons/web_process/static/src/xml/web_process.xml
deleted file mode 100644
index 7bf2ba1d93b..00000000000
--- a/addons/web_process/static/src/xml/web_process.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<template>
-<!-- vim:fdl=1:
--->
-    <t t-extend="ViewManager" t-name="ViewManagerAction">
-        <t t-jquery=".oe-view-manager-header" t-operation="append">
-            <a t-if="self.flags.display_title !== false" class="oe_process" title="Process View" href="javascript: void(0)"></a>
-        </t>
-    </t>
-    <t t-name="ProcessView">
-        <table class="view" border="0" width="100%" height="100%" cellpadding="0" cellspacing="0">
-            <tr>
-                <td width="75%" valign="top" class="fields collapsed" style="padding-top:10px;">
-                    <h1 class="process_h1">
-                        <t t-esc="action.name"/> (<t t-esc="model"/>)
-                    </h1>
-                    <p class="process-links">
-                        <a class="cta-a" target="_blank" href="http://doc.openerp.com/">
-                            <span>
-                                <strong>Documentation</strong>
-                                Read Documentation Online
-                            </span>
-                        </a>
-                        <a class="cta-a" target="_blank" href="http://www.openerp.com/forum/">
-                            <span>
-                                <strong>Forum</strong>
-                                Community Discussion
-                            </span>
-                        </a>
-                        <a class="cta-a" target="_blank" href="http://www.openerp.com/catalog/150">
-                            <span>
-                                <strong>Books</strong>
-                                Get the books
-                            </span>
-                        </a>
-                        <a class="cta-a" target="_blank" href="http://www.openerp.com/catalog">
-                            <span>
-                                <strong>OpenERP Enterprise</strong>
-                                Purchase OpenERP Enterprise
-                            </span>
-                        </a>
-                    </p>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <p><t t-esc="process_help"/></p>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <h2>
-                        <t t-esc="process_title"/> Process
-                    </h2>
-                    <t t-if="process_notes">
-                        <p>
-                            <strong>Notes:</strong> <t t-esc="process_notes"/>
-                        </p>
-                        <p>
-                            <strong>Last modified by:</strong> N/A
-                        </p>
-                        <t t-if="process_subflows.length">
-                            <strong>Subflows:</strong>
-
-                            <t t-foreach="process_subflows" t-as="subflow">
-                                <t t-if="subflow.subflow[0] != process_id">
-                                    <p>
-                                        <a class="process_subflow" t-att-id="subflow.subflow[0]" href="javascript: void(0)">
-                                            <t t-esc="subflow.subflow[1]"/>
-                                        </a>
-                                    </p>
-                                </t>
-                            </t>
-                        </t>
-                        <t t-if="process_related.length and process_related[0][0] != process_id">
-                            <strong>Related:</strong>
-                            <p>
-                                <a class="process_subflow" t-att-id="process_related[0][0]" href="javascript: void(0)">
-                                    <t t-esc="process_related[0][1]"/>
-                                </a>
-                            </p>
-                        </t>
-                    </t>
-                </td>
-            </tr>
-            <tr t-if="process_selection">
-                <td>
-                    <fieldset>
-                        <legend>
-                            Select Process
-                            </legend>
-                        <select id="select_process">
-                            <t t-foreach="process_selection" t-as="prc">
-                                <option t-att-value="prc[0]">
-                                    <t t-esc="prc[1]"/>
-                                </option>
-                            </t>
-                        </select>
-                        <button class="oe_button" id="change_process">Select</button>
-                    </fieldset>
-                </td>
-            </tr>
-            <tr t-if="process_id">
-                <td>
-                    <div id="process_canvas" style="overflow: auto;"></div>
-                </td>
-            </tr>
-            <tr t-if="process_id">
-                <td>
-                    <button class="oe_button" id="edit_process">Edit Process</button>
-                </td>
-            </tr>
-        </table>
-    </t>
-</template>

From d86d0f51b4ebe6b8509a02eb3c429c583165a300 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 6 Sep 2012 23:55:09 +0200
Subject: [PATCH 916/999] [FIX] ulgy grey topbar border

bzr revid: al@openerp.com-20120906215509-z6mexulridkcwgjv
---
 addons/web/static/src/css/base.css  | 8 ++++----
 addons/web/static/src/css/base.sass | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 03898f25d78..8698fdb9f94 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -1007,7 +1007,6 @@
 .openerp .oe_topbar {
   width: 100%;
   height: 31px;
-  border-top: solid 1px #d3d3d3;
   background-color: #646060;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
   background-image: -webkit-linear-gradient(top, #646060, #262626);
@@ -1238,10 +1237,11 @@
 }
 .openerp .oe_secondary_submenu .oe_menu_counter:hover {
   cursor: pointer;
-  -moz-transform: scale(1.1);
   -webkit-transform: scale(1.1);
-  -o-transform: scale(1.1);
+  -moz-transform: scale(1.1);
   -ms-transform: scale(1.1);
+  -o-transform: scale(1.1);
+  transform: scale(1.1);
 }
 .openerp .oe_secondary_submenu .oe_active {
   border-top: 1px solid lightGray;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 65146407e54..374f3a6fc4e 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -794,7 +794,6 @@ $sheet-max-width: 860px
     .oe_topbar
         width: 100%
         height: 31px
-        border-top: solid 1px #d3d3d3
         @include vertical-gradient(#646060, #262626)
         @include semantic-html-override
         .oe_topbar_item

From a158707ad8753d3882a571f2aed1c3b8d5a1c4dc Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 7 Sep 2012 00:41:23 +0200
Subject: [PATCH 917/999] [MERGE] process view (manual merge, moved the code
 from web_process)

bzr revid: al@openerp.com-20120906224123-walwe4rc3x4wycsc
---
 addons/process/__openerp__.py                 |  10 +
 addons/process/process.py                     |   4 +-
 addons/process/static/src/css/process.css     |  70 +++++
 addons/process/static/src/img/button-a-a.png  | Bin 0 -> 6595 bytes
 addons/process/static/src/img/cta-a.gif       | Bin 0 -> 108 bytes
 .../process/static/src/img/iconset-a-help.gif | Bin 0 -> 379 bytes
 .../process/static/src/img/node-current.png   | Bin 0 -> 3143 bytes
 addons/process/static/src/img/node-gray.png   | Bin 0 -> 3128 bytes
 .../static/src/img/node-subflow-gray.png      | Bin 0 -> 6837 bytes
 .../process/static/src/img/node-subflow.png   | Bin 0 -> 6851 bytes
 addons/process/static/src/img/node.png        | Bin 0 -> 3205 bytes
 addons/process/static/src/js/process.js       | 249 ++++++++++++++++++
 addons/process/static/src/xml/process.xml     |  93 +++++++
 13 files changed, 424 insertions(+), 2 deletions(-)
 create mode 100644 addons/process/static/src/css/process.css
 create mode 100644 addons/process/static/src/img/button-a-a.png
 create mode 100644 addons/process/static/src/img/cta-a.gif
 create mode 100644 addons/process/static/src/img/iconset-a-help.gif
 create mode 100644 addons/process/static/src/img/node-current.png
 create mode 100644 addons/process/static/src/img/node-gray.png
 create mode 100644 addons/process/static/src/img/node-subflow-gray.png
 create mode 100644 addons/process/static/src/img/node-subflow.png
 create mode 100644 addons/process/static/src/img/node.png
 create mode 100644 addons/process/static/src/js/process.js
 create mode 100644 addons/process/static/src/xml/process.xml

diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index ef554fe7226..f0ece3704dc 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -45,5 +45,15 @@ This module shows the basic processes involved in the selected modules and in th
     'auto_install': False,
     'certificate': '0055447636669',
     'images': ['images/process_nodes.jpeg','images/process_transitions.jpeg', 'images/processes.jpeg'],
+    'js': [
+        'static/src/js/process.js'
+    ],
+    'css': [
+        'static/src/css/process.css'
+    ],
+    'qweb': [
+        'static/src/xml/*.xml'
+    ],
+    'auto_install': True
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/process/process.py b/addons/process/process.py
index f9744608c50..fa7596287a3 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -195,8 +195,8 @@ class process_process(osv.osv):
             if nodes[nid].get('directory_id', False):
                 resource['directory'] = self.pool.get('document.directory').get_resource_path(cr, uid, nodes[nid]['directory_id'], ref_model, ref_id)
 
-            resource['name'] = refobj.name_get(context)[0][1]
-            resource['perm'] = pool.get(ref_model).perm_read(cr, uid, [ref_id], context)[0]
+            resource['name'] = pool.get(ref_model).name_get(cr, uid, [ref_id], context=context)[0][1]
+            resource['perm'] = pool.get(ref_model).perm_read(cr, uid, [ref_id], context=context)[0]
 
             for r in relatives:
                 node = nodes[r]
diff --git a/addons/process/static/src/css/process.css b/addons/process/static/src/css/process.css
new file mode 100644
index 00000000000..7442db9bc4a
--- /dev/null
+++ b/addons/process/static/src/css/process.css
@@ -0,0 +1,70 @@
+
+a.cta-a {
+    float: left;
+    padding: 5px 10px;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    background: #eeeded url(/process/static/src/img/cta-a.gif) repeat-x;
+    box-shadow: 0 1px 0 #fff;
+    -moz-box-shadow: 0 1px 0 #fff;
+    -webkit-box-shadow: 0 1px 0 #fff;
+    color: #8c8c8c;
+    font-size: 0.9em;
+    text-transform: uppercase;
+    font-weight: bold;
+    text-shadow: #fff 0 1px 0;
+    margin: 2px;
+}
+
+a.cta-a span {
+    float: left;
+    padding: 7px 0 5px 5px;
+    background-position: 0 50%;
+    background-repeat: no-repeat;
+    cursor: pointer;
+}
+
+a.cta-a strong {
+    display: block;
+    color: #393939;
+}
+.process-links {
+    padding: 5px 10px;
+    text-align: center;
+    display: table;
+    margin: auto;
+}
+.process-links a.cta-a {
+    display: table-cell;
+}
+.process_canvas{
+    border: 1px solid #aaa;
+    background-color:#FFF;
+}
+.process_canvas svg{
+    height:500px;!important;
+    padding:15px;
+}
+.oe_process {
+    height: 20px;
+    margin-top:3px;
+    padding: 0;
+    width: 24px;
+    cursor: pointer;
+    display: block;
+    background: url(/web/static/src/img/iconset-a-help.png) no-repeat  center center;
+    float: left;
+}
+
+.process-help-text {
+    float: left;
+    padding:5px 10px;
+    min-height:56px;
+    font-size: 120%;
+}
+
+td.process_fields,button.toggle_fields span:last-child {
+    display: none;
+}
diff --git a/addons/process/static/src/img/button-a-a.png b/addons/process/static/src/img/button-a-a.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd046bbbef7da60895536a7a18323abbbe21e7fb
GIT binary patch
literal 6595
zcmd6rcRw2r1H?m7N>wSbg@_fg_l~_sMD0zj*t2NL&!)s)MU84vd+%9l)7q=3+Iw%F
zzKrKSpS$l1xclp(v^ABUKcjvI005q=D9a=MvHzbH@t^$5b_poXKTvro7<lQrzVY(4
z^soiMZCtHvK`PFccD4vxOPjau1GW+X09J>#I#Pj!g@uWUNlZ*kSXfw8RFsE@hnt&Q
zLP7!tgYok6ii?YLad9Ci$a>XfQS?-eLeLrkjxv6BcM!Ftq@*t+Z7_tsh?gx8Ojp3o
zlFbE4<X}qYWR743ePCnM)YL>E5K>Z7`uh6P($X3l8n0i!*4EZGHa6DP)m2hbQdd{E
zw6rubGLn^*H8nLgF)>k7Q?szJP*qixlatfZ(vp#p(bLm2G&EFJRyH#;v$C>MR8%xD
zFi=rZv9YmHP*8xw;YcLX+}vD8M~9r8+}hgO&d$!())oi^zIpS;-rnBD#f6!f83Y13
zIyyQzIiXM}XJ=;z2Zy-0xYX2CH#awWdU_8JkC>R4$jHdBu(0^}_~hhdZ*T9!#Keq@
zjOgg-;NakpkPvA)YBpNhw|p=I5N%sqn-@EC3_DXWC#0vl`wI{2^z^hHFAUDhV=lz+
z31QF_<VP_x2the~!Sut!!!63vqobpFJS<+Kf>AJ*crF$_YM>055z4_K!oyQnSC=U(
zj$mf&@9!TUA8%}IWMyR)6cl7<XXoSNlb4ql5D?(t;1CiL5)lz$V`GCtp%4g!larI5
zpZ{OcG<LnY|B&K^(A0hWKNLX7hDHPcptx3%ha>&wCo?0Gz%%ZBn|M@f%sthx0mV_#
zCox2eR#9yl4U=@3WaT8}=$t6)=L{^oklT>^-L5A27W+&@O6u3A7TtvR?GHD*Iddg?
zX6<*s7azA8n&*04+X9PQ@3b^-kLVm2+D|XUUB&nBfvz1rhq%iP=B?L%a65#T15bND
ze&yeXn!inYu`em*al;YYleQdiIAp$lI&=XHG#A|5(Bsy%oewa7cs8+I;O=*7b5`5)
zE!JiTc-ZkMJAa$ibuoH-*m^Gof~y4>S31piv?ANTzB{rk&2j;%F1a{la;23_)i^W-
z2(1T7NlMe?tdE5QH&0_$@BVoBy%jYX-b_n79a<Q=U04ur7jDp6mkaQ@+&d^^)yk0!
z*oCzpwx1ugjAgAEk6n3e+++~7-|h{NZSWo+3{0@j`rVvu4D63gd~6w7FfO%z&)d;z
zU^2QH)B7jT&)p|SdTcY;bDB=`>y$&gQKrwe-omy=9+E5YDEI=lj!^r$aPQNERP~)G
zJgGJ2NEx!bK1kl4*fu18Vh8NG<N3r8J<@w`#cOWzdwGo8^}zMe_2BTp<<sxQ-^-G3
z@z^@u0h>t;zp;1uyT%Fuz)i}8T~^<*^t-bG-PG#4i;ID!`;qlKde#F*dvw&hI|Gwp
zOA;-v(b1B4(b5f3t*=WGB;T&PYqjx?Yc*co%$pnsj>nx3-OF}pcXs#)XKSW4Z=VRf
z51+USPPn@kP3AlS#+>%9|3SI)wzf8Qel+$mUtA>lbp3qGg_%Q(&e2^_=Gk^o2iYa)
z(`^f@udgr8%0V$_V^4~BR%26JS8Q0%=(<}w<!Hppo0wHYZ)MI-DcT&3)9b*xOzy(G
zR&iWstRh=0(p{j`5nF_M3mx>kRT;X;#05CGE}MsRj2RuA;5Z(tDe|A*|1&&C^-@aO
znB?#2>b0AcbVs`RaAB}T95t6Ku;EfOnd|W2Feln>QBuKAI21#&81!*<;d%tdIsUe$
z(VN1|#H9O&RU;*Fgy-I-!noY5{7aEUR$}`vNDbd1+dH=NA?NWgL)))QaUXn6a@mr6
zpcz@UR%d;`{Mg%ThbGvaeoa(!mPZedHuEs4c(P0rT*i+8-Re83(3h8NR&lgPf8SI!
zM%Z$3(N*PMhuOPvjTidD(W{bpSJ~pn*)e_;cEE1^DR<oZMozs`o8H>c@gb1o*W<5?
zuE1Z3GhqgN;lP2{iaMzoHp~-)-;D;QnN@^C?$Oew-5L_yWa6qadGT6lC8i&;yT;z0
z2O5-BAI8f){AbeI2)fvmWep{TafFC$epgG5GvJ~Cs)M^WMn4ZRc5(wLMW3SUnu`*{
z`;{xLA6pl~ssfv$!4n=$3lKmUA`f<Rcxmk%Jg3>0D3kr2FGIzqm=m0Y{G2kZ&UbIX
zpnrs$U3Xh1o0p}zrjcjPL6Yv$tY-1`mEdH!7BYmiiFIeU+guOr7gReos@*Hf(->l&
zm0GQ|<@OeT<SyN?%`IJ~RCiW7DNyQgW32gFqCVJsCzVjw2L@>6<cj}Aq8dYhwjZm#
zsTyET%ot`Wn?}riWvO`$op3B<NmBRVi>jl<K#bL$HJ-hDX4DcpX;qlcgK%j$F4o@q
z@)b2z_Id)La8g)~-^Ag}k?WR(5=&#mA5|+OiA2a}A5u+Ne3r*fitJXSN-ZfA=t`64
zivJ1uuFKIYzj<VsOa1a0ax$*>rc9YdC<+3uQU5}|${)3t;%$?v8pfZ2<VegAWXiyY
zWehVLSD~xN6bNM#w{2RMxtWc(+mqyYkQ;K>Te=TLj0k1sPhb90z@cdqep3pRy4oje
zCB{3NQ6&@U{3%hT4r#p@_GgMC?>cqEE0?)0qvZ3J9Dyvnn!GEZ2Ln8PK3<TVr+m?;
zLcW(rO4EbQIv*h%H74K`#}x%8QWXV6>?DffV=e2wy85r;Pao<CkWh9A(||3XqPI-o
zVh~7Uv1qYUu}P+-&_Lzcr&s+_g9pBZ`=sPwOjf8MMp~Eb9M$EWOwn3~lu0S~-72@R
z1b;p`9400VrKrpcA}#6!W$@H9Exru5&k4$5p2bI{*bjY1ym+fepc!RmjwmD;I2uMk
z_*;3L1vXqoeV4_W9>X|bz(B`x3u7Ix4EqR6fNiJ956YVf5S7~`Dmfd)4WOy9<NXk9
zaLBMjfp@eP%{=P>L0S<A{C0QNwU_A+z;}SCG=!DUNq`#lVklM~ob_>pw8@Yot7M9L
z<poW&o{E<kd3%UzdD6E@#}v1GUbRpi>VCV7SN`8g!+DsvYTt-t3=i`qQ7kaqp%T5K
zaVL_x&76L*zU=ymv5j}_kWA>74bxIAN?JTKrlS2XEK-*pVhC|a+JbaLTB;^c*w<&_
zJ*zlOtLZ_H$dW{WIoC^KeaEOpz-$!HN=>TOxnlM_oAI^{bdESS*o4a@BaFr>|7Yaq
zH^nL}q?&?E{2#^|HAnao6h#D8AT*Yt)GD@HJt{lPHbN?^w;u#zm~|5da8NbsP(e8=
z*s&o8k<XDBzZyQ|2)BaW5=EM0X*VrHwYLE9DgPzIXc8KnGZ^NyYLuV)4Z@LP0uv5;
z&@4+F`R~0A`-M=;{;QY}c$w57adn+h*$>79u$xHmfFW}lsc3l5bJ0+60uP|S5<k^0
z0gomE95ndZBbIier<6q2I11nGa~L>2bATDaAMu1pVZ}nx&W}Z)5D}FDru3*`+@wuw
zIs%0?xs~Y*=#e%VL3D<utJ~mZGrL5Nbvkwe^Bz040ogCFoO_pP$zw+RJ;lp00lilB
zKipty0P(AwZ$VON;NW=6e7M+4PJ&k!Hqs($L^hhZ?>*|Ms);r^$n(?ELm9=gK(|4C
zynEVDnwTz-ObN;aZhM8)<R@g|2I=^oYbG&AbEH6j!>f^Ko9enUKn2D>#M!-e<W0lE
zF~#J$RqK}iU9VLU6~=R^6w|k0<u0*v?)X<N0yKr!CjV3sFUllN#M>=afV$E$)<AgN
zxg=HjuN$E^p!`3+V<^$2TQrI&q>MuGWeV{M>8MH2>u&PtNzys2n||A>S*p%{fX+m9
z3cNmP=t40{liQfedADw#Lcec8vwjxm!UxGM6mWj!C+;}CyWnqnbW2`Fc@q1vm)Aw%
z-A|S(c9(|UE}?}1A3VwLB9v!hBB6j9Nn`|16o2f!n0y&_P&8S@BIqgoPZ^j}r?x<0
z2vzQ2p7k3*BMW0GiFIgPGKAm3%2(h&VX=B}f`}<<X8T-QyX`kwYp+h5C<}hCdrf=n
z54hNc3J>jF=AZN8wQ&(@qT)Pzw?*0?1;<|+K~74u^DY4kX7&9ULOVnjPrI2r_k=q$
zjD&=XR8~R%Vb_6I3K@_@fEL7VR3ZF%Fo|ul<Vt;g84#Ln<PK#z^x7%PVMFN*Tkv#$
zq_49xwj28yDf9h@f>EnTI7+JBB9Qil;tvfy$<<2^df!PpkK26r6oL}&EyCV+BUY{K
zpEi6JK3w*#aT0-A{VQf@bZPvFRleTW1HN<r2=Vv%-dDLmrOX(i^`mSLnkjxRh6AWK
zh{*rhZ`ovsipv~%NhQ`@$mG9#@!3~A4!GM{@dUgRcbng?E$|snj!{#C!A))?zG6G(
z_7CeFeec>rSYS)h&H`?T_$Sv*!X|gfAd%klW?R#uB1OhL%2-v9ty<_{l^Jcpl36wf
z0=S&n%T$YiRfkZE(MECk8;XSgWoi}D>Brww@UQW1T@_<CP|-q4;m!Ne(utFDC)U~b
ziOzKG;}PZl*VXvq$i<?&m3mo0?k5=<L#q8wN|5rbn5d~hihQM=4vVmFo$u9ruVKHJ
zAU*0P-!C+e<u<lpkDp$=Qbvy!vnw9~uG)zN?O4msI5B;2)(tPPR_VB+fV;-Xci=~E
zP@2tAG03)SYfo|w7aZ7UF>=W^o=aEBZ{uI*W+9If@LBJ$Y{`glLxQ3s{%f(ABu6ZH
z#I3bPZ^F~4y%gl!y@5mu1#m=^&9gx?C86jEq4OHkZ<fh80+Gm{%l5|1%6vg~3O5BH
z_+*!eJV1()+LOWeTmF+ga!&XgxP<Y_u;zJF{#BLS^GBK(4z_;0)JC~3vWM7e-gj_v
zBV^jPu3`9owy|JSvc$ZK{Q3^~-5HMI6Uw<p!&2doCCXJ)`JS{KE=t7clMl`K{k)6(
zM47qblqe6z3`%lPE^g8gjFd;Op-CLiv@2VDOK54d-DT>W*Faq_wnY4rcxOs`EA)K<
z?NXkpw&0QrzkPGQcv|!peoixC)Z3&vzYULfwU|m=Q}GF00Oj!jn&T>vSjvitO2GjY
ztvc62h15|Q-}kApj4b$$r3|NBDD!Dq<BEiMZu$_wxt8N3O&A&u-(NNbR=+0!YLMfK
zUSXo+$XMQv`EHuQ30c#c_?M&_bxh$CvG}G83rfj>E;{)*`0dQ)Qj7en(6|~lc1qvm
zN^HCFkqzjj4tc_!&&E!QWbXTJdWIQ0JbfufJchvbDT0pjEv`@Hc;3LpQWJGg+$HTl
zo-IfqYMU>AxB2k#fDn72@Y^@tPciKvV=^z_ae<{~bh5XUtaJI|sL>4T!tLX&m)OXZ
z<E9YruK4OqN=gZTRGV*kw$?f+o)1Uf#lBY-xF7C6WnMg1$HzFl{@^{0j+Qe0Ynurd
z^InozHD|X^8lI;!C6${fBzq~0&12dEHt@kAc@g!e;+N7xdj6TY-Tv1t-Gqvdua*er
z*9ba_)4w$FdF%SR#(gUw#=m@dj$jwsaH;dyhMqRg7k$V~jNefF@=-jSzilHN>Ak&Y
zv%}Tr!=-DrGhZ}pz8^PUbE`2c-CSjZo@_5B0bl-v_|AGvkH0>cQq(t90vcNeZvI9g
zu^lp%&Z>FYNjb;$8eEzUt*}*De^7z;zOA{~mYdL^5}_ZbdS-puOIedlSojwY3N#fK
z>CVY1UPD<D^!Kdsay{z^aw++9YjWIe8jZUaeiCfsrDCx5@N8V+Sl@z!#B*Ed`yMps
z_JyEnZgt|(*sq%-<Nzhw-Osv(luC%mH8%SuC4&oG{DqnqRlP8yoQ6OHXNmF@r4P;6
zH_@gT=t-RHDd@uY*-OGwY<hKnY+@xS!R|9UzayWpAynN7$_J~@dyc5sB`#Tyvs`8!
zMB=aCom3tm!8P};CRpo*B7I-Gv5w^Ll<!7ftYj-Pm$bHWkv}n5rkC{I6`TEDX<Q*R
z7j^_JPoOUxXHl(67}gbXsf6ITDzKUt@YJ@eXI9_+Z&84OW`teATVZPWrAwpOFNq&P
zdzC-c>(Bipe#dV5Euy^sM0aU)exrLr|9nYST}E1#Uv4;JA*kHB)eM6Uq`WO5C9+r2
zIHlDneVU8SBqa77H$6xrbxR3Wc`{hOS2TpgDA_$78Cp}Od{+8;{^zb>8xQ%cpAe~^
zXCVQ$WUl0g``kaLJyCYvi&w$|FWA?Yw&<6@ENx<HmI+%=<ix7J%H^YNQuO-^9O#!0
zQ&Jvcmn)p(7W-!oSziX7@m#!%*1EivL?7HM<+uF2^V^>jVVNb(p&XCm_7qyg!`^#R
z0&ri(iELXQVxg|_?oeJU;{SWj(1ul!F5bNpGJDCMXWe;t)qL!Kq+g$W4CrwSQ=sq@
zO!atfI(&B3WX(;$kAr(>7DqE2V=0sX#|VQ!-WTsFZy6!Y1hbja7EdMW{~86MJ7yH0
zV#)7Z&n&+)oj1RqBpb(1at;u}(pZ?SSL`B2?U6kckv8B%HA#e{vzFJ+1GXy#F}8;2
zT?XmP+X|K2daGF)?)277XG5&x2=RXDRSeX9!O2hO%M25CDi+%K)E~xO4dI)Sz7Clw
zc=x!g??zkMnrwnb%bhyn8Q~O!NS6yd-<;>+WMb?w8?km1aGPF}4!n1jx-_bFl{yK4
z+pR?Jn^0z2&YE?5b}u9Qg3O%4Z3FI|Xn=wp^=1=xLya@<&qod)kDbQbPwy-YK&KVY
z7cPvl?o#&~?kRTMk1#36XlMI+XJhKjU(CE8+RPUYpNA~}t}uDOsU>}T5msSJlNxSu
z;nZPUhNUWx8j6vAAbY4nm{bUkbS%fvWY)i7F<XgK400Q5znM>KKgwwMBq_ZYg)^yY
zWRDKek~$Q0cBQ!>c&}4@E9l&0QhqP=Fh6wudkiDd4I#+MlX&b+liI!LtuTk8&uY(Z
zpFfhG4b}D5)tk*<+=O<-fzb-Q)8ifH&?}4C0H<QM@0iNcl=GV#C-b|~1+5(OIXo-<
zyJ%;F05!(KdnX>K6W@<6bNza!P#b8f2DhbQ3|alB$`#6-xgn+HtJAUO`};ANZIp5+
z!AOyfgK;0}=fzppJ7cNvcOtZ?+gzSi83W~5$x&M3K1&CvzVuCt^zHD%GJR(O0Aa`l
zFQ0u{Y$khZ`L-JawmCyPbCYi{NyQu#uFZ6balTwTq51T<x8VD}S$Z#4(47%`=pO5X
zljX9JI61+ch=+{5-y62u!s_Kig29K%P=J`b>-E~$<G{aSj<saV_B(}%ZH|A}6FU*E
z(`sJzCfp|qSh>Bg>}QrsuzaG!>+9;Ud|xn=cmL-{z?#eh6SJDfQsUn<R04|RPQ*&b
z3)a+YxoB`u77|7~<Fu$hEq&MXZ&A0O_66rGl5oD`Br^x$ME%)WNuy=#fB=N7?Oi*V
zQHctCV>ds?(1(H!(t$XjkEN1q7ak6gXn9nsM>qE`Y#xkym|4$8ky|`#fivaPwPp0C
zx5MMn>60<xT@WNKS$LetU|^FBO>0Pl#PaB)fUS;YZW2y8c6>q6<#Zfh@tUJuTiwN^
zA8dbE+l^Btc1>)@>g#IJReb5#@$>e(>-#pb_Jcw2a^Paw?|TpClC#p?j0@J!s^iBg
zb_HQ_>aF%`FhSsQ=Kn`hXh4H#A&yX*nZcBomy1gIpWR&->~88~{+`TV_g^;M>0VBq
zdn#5?wY(v%DQA#OtJ?jxS>2!E4dXXFNN*9-_;XskFWqc}orQ1U<XF`^BO{6AecJIi
za#Empv_3LUb7wvWx!MF)qOHBqk7%pzXf`^i@MAj0s|=-{PpN80SlD&6Hd{e_%FCyV
z(sO#qvn6_pc&Zas`@w@&)bFo(<gfFZ-R{mV(hvp8Uh4ZQgffHv^sk7~w0VAcjgqcu
zlfpwXh5@#)F**)xCj*Wb?>;IU$s_g*kS^;MM?{6p2=ybZsX@==uM{bx)nNcDmomdg
zo{M$zFs?rey$E^jQ8pdJlYB@Db<}YQwp_s6T4z9T*S|+@S91FefdsEQrR}1DrxShw
zN@d&l@bZPVc@B8if~qd|Df8q@leg0{FPvs$UTCS7=1QH!R6EP%{sGK}5I0{Depn(#
zY#DxU+`@%xU+|oRF0%Ds^|E6}QcP97#CRF!Fd{_}jxb~=>je9Z1m^%>l&DU<9|=3+
z?iGO;B1}~w8GC71cy@r|;|t68-$EfDPT~_jciFyGV8n0^$RgR_Rw$#2=kjq{zor`I
zlY~T%s`EX!u9wikf*j(U$RyrBAFy7t+>1zg(eSjGxz(_mid+9F!JQe>&*GWuja4Sk
ze07i6U?#koU0KF4FWHSA!KQHH3wys+*>RelsBfo`5Hay&b{U;}r<A_eC2Dpuqxqa=
zPCii?Sv#0|)L*xHr_lKz%bWnD)4iXT5G|H@Ww@0hjXQn9;?4&!?wpkly+1OCazFC5
zruh1@?5#&>x+5D|p4fK(X2;m%fQ`GOX%mD`LJLABWz;T0CeD8)v<2aDswT1{P+6A~
z%cb|uYs=;w+~yA}Jx3P}&0*44T|;S)kWN5@<+rEuU8b-9z4QPT1x@*KS&RSv2fMY%
AIsgCw

literal 0
HcmV?d00001

diff --git a/addons/process/static/src/img/cta-a.gif b/addons/process/static/src/img/cta-a.gif
new file mode 100644
index 0000000000000000000000000000000000000000..daa561e29f58d52f0806ada27a6ad25c1e30f24a
GIT binary patch
literal 108
zcmZ?wbhEHbWMt4`*v!E2_3PJ<A3wf(_wLiDPw(Hq|M20%m(QO+e)#b9%a>0dKfZtW
z?lTa4`t;??mk;mXzkB;u@h1xd2<U(akQodtk^+n^vrH>8j~(|&5Rgd;v{>OR;HAys
JFXPT&4FG9+IZXfn

literal 0
HcmV?d00001

diff --git a/addons/process/static/src/img/iconset-a-help.gif b/addons/process/static/src/img/iconset-a-help.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5400acec57bd30ea50c05765808d2d20684a6f90
GIT binary patch
literal 379
zcmV->0fhcXNk%w1VGaNe0M$MK@$m5T^Yiuf_4D%b_xJbd=jZF|>)qSi|NsBt-{11_
z@#^X6-rU^r@$u~H>h10A?d$96=;+wj*W%#dt*x!*<mBMq-un9b`T6<T*VpLh=hxNM
z+}zxSg@xYT-S_tP#Kgq5wzl8h-O|$1qN1YP+uN(FtB8n*xw*N`&CS`^*sH3l`1tt3
z!ouw9>*wa??(FRA>FMa^=JxjX{r&y)^z`N9<LT(=>gww5?(XpL@cjJz?Ck9C?d@Dy
zSpWb4A^8LW002G!EC2ui01f~S000J<K%a0(Ec$xA84ZD;&5*+$fVQhzX@K4lw!2_j
zr_Ks<*}-~_20<WDl~N>^fY5NrK7qlY#sZD<0W&f-H9Cem6ev80H8wU1IgvRb9FUO!
zHWe=qJe{7M4=)u3A_h38CKRVQ1|9_v69)@7H#IY~3kMSrJrNce2`{uS2^kg<T0Jo~
Z3=$g~5)3vmT0<}~8Zt5(F)%|x06T~2*E|3K

literal 0
HcmV?d00001

diff --git a/addons/process/static/src/img/node-current.png b/addons/process/static/src/img/node-current.png
new file mode 100644
index 0000000000000000000000000000000000000000..51f86b04c786e91411168f858503553f1469f4e8
GIT binary patch
literal 3143
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
QFFwFf-&7BK<No9S0af=I>;M1&

literal 0
HcmV?d00001

diff --git a/addons/process/static/src/img/node-gray.png b/addons/process/static/src/img/node-gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..972013540cf00d5e379f9c9136b11499ab2e93f7
GIT binary patch
literal 3128
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

literal 0
HcmV?d00001

diff --git a/addons/process/static/src/img/node-subflow-gray.png b/addons/process/static/src/img/node-subflow-gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffafe1bd681f01d622bcb371dea2488a7d724868
GIT binary patch
literal 6837
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

literal 0
HcmV?d00001

diff --git a/addons/process/static/src/img/node-subflow.png b/addons/process/static/src/img/node-subflow.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd2a480204d87d73a476a452746e4962ba5665df
GIT binary patch
literal 6851
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

literal 0
HcmV?d00001

diff --git a/addons/process/static/src/img/node.png b/addons/process/static/src/img/node.png
new file mode 100644
index 0000000000000000000000000000000000000000..853ac85cd566516bf18e7e4532ecf28610b25e0d
GIT binary patch
literal 3205
zcmY*cc{J2*8~%|QV_&jIug0#i%O3HCCX6j+M79|cvW~*Y8fEO1hDa+Kdy;)iW|WXL
z_K`8kE=#h;H}!u1eCIjObuZ^U_g~k2UFS)*L6~!~i?IU$zy-f>-i{G-85aWq0|3);
zmtAj0!E)8u$`}A@GB^%AK#UsfX<>dIIQnxQx0d8EI&47~oI(MByX((oA_taY7)@3z
z+{%=7f=wK(r|5LOgcSfdnc?S+FNKe<6yj_yjYyE&w`+J%sAhw=%y^I<_eDE&(8o-@
z52YQJIX-?*t)Q|VCRXDZGr0^c^zl2QC;a@;M8re#JR#3pJ#Q3#g1BJmIrB`0T`Do#
z4EZ*8S-HAed0Bb+6>fVfbf0w<jOhf~2JhZFyu3<Z4s4GaXlxJtp*t7SU}9mBqNk~O
zyH}-^C7u45sHl_vAIteIe~MfYL>&0?<x6QrMMWu*_}29qpM9c!#K!Z*t;iZ*ilQnB
z04UD&2x2BjT3SQ>OE%Bfg_QkYRtoAThaiGN$ixVPN9{}<-6_IjVZv_$s7+g`YS<e$
zHfUn1g1)}Ki@HGd<%&7xxN})6jdMv$sB*yrcF*AT89@rA&&A3rjUAAYkpWa^@rKoy
zWV9vqr=ugH>2Z43o%P=&vrR%z@dre0#9sNjiSr2uIYpS*0~I%Ld(6?{E@0#AjJuLZ
zjhHL!I@45ALUu(WA4p8uy12lWuzKrTx}lG49VRWav$NM`rX|URx}o0-h8AG#Kjh`*
zA%s5fTRT6HX=a3=(BNad37zhPJ!wu(PJ3A^D~PJ?VlV|=PhT-jDITdAGA2znhQFr~
zBI2l-dWbk%cY#qXi=&;Ly5iu$Mz2a>gpFI&dUy5(8$?NH3Yi`uH@WB*xpxgB))$m*
zP@rI4X>Q=8u7N|gZo8U&+eZ``Ry0uqfLJoUb8l;jwjH@%^6}$CB0o8paP(2bqLD;0
zqj=Yv-nf^W3l(5z0;2siq3hl_{9Nb6%C8<U2_-EFgwM*lz3x)GyLk8DV(zROE1QGE
zJo4U!`(E1egaMv^ND07e07``dnbK@tUS9RDe_huWyXuOo>s>0$OOpqg8r#|k2>ctq
zG$^d!48B%3p2v5ui)LdMuoiBxSi#w|fQ_#r68Q&;jQ$xL9UbinyK!SGJGQC0IjgA1
zsOjq1$jEm3(88o={RC}$U+tAWZ9P0QKc86X+M18kl>rr>11xQM1J?|AjCobb7-sV3
zg_xg%U(y2G#)KE7>+9+yUXS@(Gq|HBcN!o6?%nw}QM)0oqNn=fHbUgD4#dAyoRI)^
zAY$qLh5FkmZEbBvtjuwxtdXs*<<9j1_j=zJ=!NqhMXZ~argpcwa|4qv?MpBjWU2G|
zk^<~cT3TGZQqyo!J!8X3T^6~L&xs9}5lX-{ex^Q_jK$bex*Qm|OC++>!A8r)Y(EGu
z=4NR~TVkL=_0sO#;LSD3SKc9?RqaRHZmJwkZ_UWbAu>@l*~m+`i`tG1lLb#3p=y)f
zHLd9DNed;Ldh-3nEYzQniIN`f6ST<nB8N-Ouo%Y<%;j7trd{QW3Ju--oW(O=DYUe+
zP9Hy^)v~7bw6YRG10FXt=y>$zDjhPGFqlVKQPCtMWTX7J0xx8`cEHfDw6qkZM^c}i
zoi!JRp@L!p0+jjr`OQ`=;P5y^iM^e@ePU`Vr%xqkNLu~k@X$~~dOEi%iT$*qBGfvP
ze3vpY;pd$y@pJ!oFUASc9(lCzO8uKMigzo;%yDGxS?!t+ZG!2(TF}Bm^c6%u*=W2K
zw@LUaeCS>~#*fu2Y;SFqP=3IXs+L+HY47ZuGUAHkx>8Z0(-3rON9R_<hfM?i<Hyy=
z7?X{eZsC)<k=Q}`8h<V4U!Oi@w!U})8ua!brcgY{=@Jld0uWmW0;yudx^Lm`69|wq
z3h>>qz$%gVwFlAdRL`38f{PP@?GiEqK#OmUqz;GJ&GxT6jaAk=)DQRPm}1+5Xm90K
zR#xa*H@2xai(qiHeZ>J$@nh0GsC4gIfnFUi(2$e_4r_U0a596H$LL_KG=f>`rIwgS
z0f^h4341>`x@SMCEtn^ynM&{(-c6D+2MiB!mg2Fixw&<ouiuM%h@frF2W~6CRLFPY
zV=*KWComY|@}(0xvd1&!Yl{V*avjdU8RPFxes}kU)m|C}e|DliBTpg+23h;+oj@f#
zosO}x67dNjL4oglje=;{-lBAlaiFR@Spcb#_ugf7p;H3{LKVyNWz7rq={)zsOjrH>
zT`eqdKA)9;No={Q%6#B{ib%5Hu_~7qNZdO-7upQmX71VDFX7}Q?O0wO{mY5}wBxJQ
z#yjuwIscz@e|Y$ZfyRIFZ^81v)?bDWW0Pg@P=(vHmuFtV^mmfM(_(2PHrDBWSuhyf
zzvfzn%)0=CXM49^4yZrT>Av<L3XP_JPUbd<*!Wgnl;`B;R&~kIQE%r;^Nll<krC}Q
zZQXMvL!F*Ax4r$s{C#|4iNyCE_t)1;tc#+}t453nd3kv+MwZB$0iEtP^Q)`ed6u#s
z#pM&YXKaZk46iY@wjMYjpTvCxxt!4r?aM!N^TqS$n!-XtP$eZUsX2t7rWnTCJ6<hm
zcXLikK|w)TPH#8L5R1h=Zf`$AnVNPVliIf0@w=it0<{&`=H%j{{@C7UC=nlog_k|?
zF>$d0`N3Tk(oE$pqu@V(wws+i5eRvZA(1eKiTBRc(QuvC2?%HNvSk_Av=IQoIfQ<S
z2`iUh{=K(!B(mL7ri~2?oAs$1mr6)T=#9kT2ETsgfoE6d1-vA(Kj=*y9(FW1+@Ujc
z#vl#W%NRf;&Wx^7eMajz%pS2m1eI}+HS`L(lfhkUbB&?57EU88Bj!8eYHicDC`dP%
zZ{NNh_yq-3mzI@r7#68~pFAtVIkQyNZf0s~DlaEzF4Y@yX;V{NH@@9yOTf~AC$n*e
zgdq}5`ueu6!rTn27C$}tA(U|R{bAthuy5U50it9&q*0b4DlRU5o8sI3=K91Xl8Cmg
z`Eg*muP+=odyyb=%)GF_q0xmoHihmU{VnUxo0zpuvWvaFz1F~{L_obWq&;255#wZL
zVZp&LaiTg&M~387)^-?uaJbs+5!8H&8H<!c*Z{BB4Q{iZM18c##&*nYvK>2iEJwMA
z7UbTI7qoPs5UfA|IEPJte7r;DvgYaGL4pzluoF$dE_^oHJtt`+4q=fkwCR1t>6FW`
z5fy70(K!&4N`Y>|msjd6vG6eRwXxc~WIRnf2J2Meou%g8HmoQ-2zmJ4UDajecS6xW
zy7BpozEKQWW=7@@`Mn7zifz`6Nb#%r3veYNL2AsZ?mO#3M*T`)?vB`rzJa?}UHr<*
zYTh*EAEsy!GNqsVddGIKKV%*J>sdzT>gFkq*lXfBg9$!RS<TBz7eDl_e`vd<GfqwG
za#e}GaiDXEBTLNVL$)N*eD>e(^ybo3Dk{RqJmZwk2u7<5sTDr=^74qm>2H(~dr<Fw
zZq84&HY~lDdm@MC8|qtJ^nHF8Dw;z0F6~xjKJ_*c1M}S5U4L{I1Dhe8BSCvmETSol
z!T%x#7SG5Tm}<)V7c*-hjGTe$LdO3h3Hm4h`|w|6Jg*!;rPe4^H1q_E>!c@Kv^aTO
zs$qk~pU4AFuu83gtB9P&Lm2{13)1nSp`j*{ybM3`o7vyn<4!brVyhyGuj^LNv#dtJ
zA{`vA$)K6Dr8|A=OtPQ<=b+f?;ZzfL!Hz-i9IXfPc!qxK#2mI*{vhX3<?->11sL^z
zlW+A<t5pW*s6mqrVK7*M9De338yj1W@2$ViN57&h{7~a6cgc%-T%TT);Xh(xVhmrI
zqP9eA%1#sOW3G=@pVC)RsZ!R~*4Ah2eU4hPB*ex+P&P+FGjPhlDkMam#aNO;Cv<ii
zqhLZh;_3Z1^4K58tqlf6;rE{wR(o_Mv9y0ZA}=p5EA8&?_Vo0`cDl!!J!9KuA-DSb
zYUZ!W*qssKEEw}o8uYpCT6ISrpS7tV*L*87LYy3@28L&=s;UBI6!tq^OisC9DGS&M
zt$;}#O<C5A7i-zs{2Jt7zlcX}WkjNrK(}~0{WDs3#9h^Wb+WOiuP>1?QXU_jX7+40
z;*sm8vt1sk#<l`-<X}gDJDu(;4JW=VFUPtpO&%Tl<?vnK$ZevY@j(FKrik;EChqb7
E1-$h9vH$=8

literal 0
HcmV?d00001

diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
new file mode 100644
index 00000000000..bbf9080de95
--- /dev/null
+++ b/addons/process/static/src/js/process.js
@@ -0,0 +1,249 @@
+openerp.process = function (instance) {
+var QWeb = instance.web.qweb,
+      _t = instance.web._t;
+instance.web.ViewManager.include({
+    start: function() {
+        var self = this;
+        var _super = this._super();
+        this.process_help = this.action ? this.action.help : '';
+        self.process_help = $(this.process_help).text();
+        if(this.action) {
+            this.process_model = this.action.res_model;
+        } else {
+            this.process_model = this.dataset.model;
+        }
+        this.$el.on('click', '.oe_process', function(ev) { self.initialize_process_view(ev);});
+        return _super;
+    },
+    initialize_process_view: function(ev) {
+        var self = this;
+        this.record_id = false;
+        if(this.active_view == 'form') {
+            this.record_id = this.views[this.active_view].controller.datarecord.id;
+        }
+        this.process_get_object().pipe(function(process) {
+            if(process && process.length) {
+                if(process.length > 1) {
+                    self.process_selection = process;
+                } else {
+                    self.process_id = process[0][0],
+                    self.process_title = process[0][1];
+                }
+            }
+            return $.Deferred().resolve();
+        }).pipe(function() {
+            var def = $.Deferred();
+            if(self.process_id) {
+                $.when(self.process_graph_get()).done(function(res) {
+                    self.process_notes = res.notes;
+                    self.process_title = res.name;
+                    self.process_subflows = _(res.nodes).chain()
+                          .filter(function (node) { return node['subflow'] !== false; })
+                          .uniq(false, function (node) { return node['subflow'][0]; }).value();
+                    self.process_related = res.related;
+                    def.resolve(res);
+                });
+            } else def.resolve();
+            return def.promise();
+        }).done(function(res) {
+            $.when(self.process_render_view()).done(function() {
+                if(res) {
+                    self.process_draw_graph(res);
+                }
+            });
+        });
+    },
+    process_graph_get: function() {
+        var self = this;
+        var def = $.Deferred();
+        this.process_id = parseInt(this.process_id, 10);
+        this.process_dataset
+        .call("graph_get",[self.process_id, self.model || self.dataset.model, self.record_id, [80,80,150,100], self.session.user_context])
+        .done(function(res) {
+            self.process_dataset
+                .call("search_by_model",[self.model || self.dataset.model, self.session.user_context])
+                .done(
+                function(r) {
+                    res['related'] = r;
+                    def.resolve(res);
+                });
+        });
+        return def.promise();
+    },
+    process_get_object : function() {
+        var self = this,
+            def = $.Deferred();
+        if(this.process_id)
+            return def.resolve().promise();
+        this.process_dataset = new instance.web.DataSet(self, "process.process", self.session.user_context);
+        this.process_dataset
+        .call("search_by_model", [self.process_model,self.session.user_context])
+        .done(function(res) {
+            if (!res.length) {
+                self.process_model = false;
+                self.process_get_object().done(def.resolve);
+            }
+            else {
+                def.resolve(res);
+            }
+        })
+        .fail(def.reject);
+        return def.promise();
+    },
+    process_render_view : function() {
+        var self = this;
+        this.$el.html(QWeb.render("process.ProcessView", this));
+        this.$el.addClass('oe_view_process').css({'background-color':'#F0EEEE'});
+        this.$el.find('#edit_process').click(function() {
+            self.process_edit_view();
+        });
+        var $parent = this.getParent().$el;
+        $parent.find('#change_process').click(function() {
+            self.process_selection = false,
+            self.process_id = $parent.find('#select_process').val(),
+            self.process_title = $.trim($parent.find('#select_process option:selected').text());
+            self.initialize_process_view();
+        });
+        this.$el.find(".process_subflow").click(function() {
+            self.process_id = this.id;
+            self.initialize_process_view();
+        });
+    },
+    process_draw_graph : function(result) {
+        var self = this;
+        var res_nodes = result['nodes'];
+        var res_edges = result['transitions'];
+        var id_to_node = {};
+        var canvas = $('div.process_canvas').empty().get(0);
+        var style = {
+            edge_color: "#A0A0A0",
+            edge_label_font_size: 10,
+            edge_width: 2,
+            edge_spacing: 40,
+            edge_loop_radius: 200,
+
+            node_label_color: "#333",
+            node_label_font_size: 12,
+            node_outline_color: "#333",
+            node_outline_width: 1,
+            node_outline_color: "#F5F5F5",
+            node_outline_width: 0,
+            node_selected_width: 0,
+            node_size_x: 150,
+            node_size_y: 100,
+
+            gray: "#DCDCDC",
+            white: "#FFF",
+            viewport_margin: 50
+        };
+        var r  = new Raphael(canvas,'100%','100%');
+        var graph  = new CuteGraph(r,style,canvas.parentNode);
+        var render_process = function(r,nodes){
+            //For Image 
+            var image_node = nodes.kind == "subflow" ? "node-subflow" : "node";
+            image_node = nodes.gray ? image_node + "-gray" : image_node;
+            image_node = nodes.active ? 'node-current': image_node;
+            var img_src = '/web_process/static/src/img/'+ image_node + '.png';
+            var image = r['image'](img_src, nodes.x-25, nodes.y,150, 100).attr({"cursor": "default"}) .mousedown(function() { return false; });
+            //For Node
+            var process_node = r['rect'](nodes.x, nodes.y, 150, 150).attr({stroke: "none"});
+            // Node text
+            if(nodes.name.length > 18){
+               var text = nodes.name.substr(0,16) + '...'
+            }
+            var node_text =  r.text(nodes.x+60, nodes.y+10,(text || nodes.name.substr(0,18))).attr({"fill": "#fff","font-weight": "bold", "cursor": "default","title":nodes.name});
+            //Node Description
+            var new_notes = nodes.notes;
+            if(nodes.notes.length > 25) {
+               var to;
+               var temp_str = new_notes = '';
+               var from = to = 0;
+               while (1) {
+                 from = 25;
+                 temp_str = nodes.notes.substr(to, 25);
+                 if (temp_str.lastIndexOf(" ") < 25 && temp_str.length >= 25) {
+                      from = temp_str.lastIndexOf(" ");
+                 }
+                 new_notes += "\n" + nodes.notes.substr(to, from);
+                 if (new_notes.length > 80){
+                     break;
+                 }
+                 to += from;
+              }
+            }
+            if(nodes.res)
+                 new_notes = nodes.res.name + '\n' + new_notes;
+            if(nodes.notes.length > 60){
+                var notes = new_notes.substring(0,60) +'..';
+            }
+            r.text(nodes.x+60, nodes.y+30, (notes || new_notes)).attr({"title":nodes.notes,"cursor": "default"});
+            if(nodes.menu) {
+                 r['image']('/web/static/src/img/icons/gtk-jump-to.png', nodes.x+100, nodes.y+75, 16, 16)
+                    .attr({"cursor": "pointer", "title": nodes.menu.name})
+                    .click(function() {
+                        self.process_jump_to_view(nodes.res_model, nodes.menu.id);
+                 });
+            }
+            var process_set =r.set().push(process_node);
+            process_set.mousedown(function() {
+                    return false;
+            });
+            return process_set;
+        }
+        _.each(res_nodes, function(node,id) {
+            node['res_model'] = self.model,
+            node['res_id'] = false,
+            node['color'] = 'gray'
+            var n = new CuteNode(
+                graph,
+                node.x + 50,  //FIXME the +50 should be in the layout algorithm
+                node.y + 50,
+                CuteGraph.wordwrap("", 14));
+            n.id = id;
+            id_to_node[id] = n;
+            return render_process(r,node);
+        });
+        _.each(res_edges, function(edge) {
+            var e =  new CuteEdge(
+                graph,
+                CuteGraph.wordwrap(" ",0),
+                id_to_node[edge.source],
+                id_to_node[edge.target] || id_to_node[edge.source]);
+            e.id = edge.id;
+        });
+    },
+    process_jump_to_view: function(model,id) {
+        var self = this;
+        var dataset = new instance.web.DataSet(this, 'ir.values', this.session.user_context);
+        var action_manager = new instance.web.ActionManager(self);
+        dataset.call('get',
+            ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context],
+            function(res) {
+                var action = res[0][res[0].length - 1];
+                self.rpc("/web/action/load", {
+                    action_id: action.id,
+                    context: dataset.context
+                    }, function(result) {
+                        action_manager.replace(self.$el);
+                        action_manager.do_action(result.result);
+                    })
+            });
+    },
+    process_edit_view: function() {
+        var self = this;
+        var pop = new instance.web.form.FormOpenPopup(self);
+        pop.show_element(
+            self.process_dataset.model,
+            self.process_id,
+            self.context || self.dataset.context,
+            {
+                title: _t('Process')
+            });
+        var form_controller = pop.view_form;
+        pop.on_write_completed.add_last(function() {
+                self.initialize_process_view();
+        });
+    }
+});
+};
+// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/process/static/src/xml/process.xml b/addons/process/static/src/xml/process.xml
new file mode 100644
index 00000000000..b1a39aa6ce8
--- /dev/null
+++ b/addons/process/static/src/xml/process.xml
@@ -0,0 +1,93 @@
+<template>
+<!-- vim:fdl=1:
+-->
+<t t-extend="ViewManagerAction">
+    <t t-jquery="h2.oe_view_title" t-operation="after">
+        <t t-if="widget.session.debug &amp;&amp; widget.flags.display_title !== false">
+            <a class="oe_process" title="Process View" href="javascript: void(0)"></a>
+        </t>
+    </t>
+</t>
+<t t-name="process.ProcessView">
+    <table class="view" border="0" width="auto" height="auto" cellpadding="0" cellspacing="0">
+        <tr>
+            <td width="70%" valign="top" class="fields collapsed">
+                <div class="oe_view_manager oe_view_manager_current">
+                   <div class="oe_view_manager_header" style="padding: 8px;">
+                       <div class="oe_header_row">
+                            <h2 class="oe_view_title">
+                                <span class="oe_view_title_text oe_breadcrumb_title"><t t-esc="action.name"/> (<t t-esc="action.res_model"/>)</span>
+                            </h2>
+                       </div>
+                    </div>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td style="padding-left:10px;">
+                <p><t t-esc="process_help"/></p>
+            </td>
+        </tr>
+        <tr>
+            <td style="padding-left:10px;">
+                <h2> <t t-esc="process_title"/> Process </h2>
+                <t t-if="process_notes">
+                    <p>
+                        <strong>Notes:</strong> <t t-esc="process_notes"/>
+                    </p>
+                    <p>
+                        <strong>Last modified by:</strong> N/A
+                    </p>
+                    <t t-if="process_subflows.length">
+                        <strong>Subflows:</strong>
+                        <t t-foreach="process_subflows" t-as="subflow">
+                            <t t-if="subflow.subflow[0] != process_id">
+                                <p>
+                                    <a class="oe_bold process_subflow" t-att-id="subflow.subflow[0]" href="javascript: void(0)">
+                                        <t t-esc="subflow.subflow[1]"/>
+                                    </a>
+                                </p>
+                            </t>
+                        </t>
+                    </t>
+                    <t t-if="process_related.length and process_related[0][0] != process_id">
+                        <strong>Related:</strong>
+                        <p>
+                            <a class="oe_bold process_subflow" t-att-id="process_related[0][0]" href="javascript: void(0)">
+                                <t t-esc="process_related[0][1]"/>
+                            </a>
+                        </p>
+                    </t>
+                </t>
+            </td>
+        </tr>
+        <tr t-if="process_selection">
+            <td style="padding-left:10px;">
+                <fieldset>
+                    <legend>
+                        Select Process
+                        </legend>
+                    <select id="select_process">
+                        <t t-foreach="process_selection" t-as="prc">
+                            <option t-att-value="prc[0]">
+                                <t t-esc="prc[1]"/>
+                            </option>
+                        </t>
+                    </select>
+                    <button class="oe_button oe_highlight" id="change_process">Select</button>
+                </fieldset>
+            </td>
+        </tr>
+        <tr t-if="process_id">
+            <td>
+                <div class="process_canvas"></div>
+            </td>
+        </tr>
+        <tr t-if="process_id">
+            <td style="padding-left:10px;">
+                <button class="oe_button oe_highlight" id="edit_process">Edit Process</button>
+            </td>
+        </tr>
+    </table>
+</t>
+</template>

From 0f0a665c33ca7d78cd1f67d9382a394f634029c2 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 7 Sep 2012 04:55:53 +0000
Subject: [PATCH 918/999] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120907045553-mg1y2dezmwei1mqx
---
 openerp/addons/base/i18n/es_MX.po | 15177 ++++++++++++++++++++++++++++
 1 file changed, 15177 insertions(+)
 create mode 100644 openerp/addons/base/i18n/es_MX.po

diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po
new file mode 100644
index 00000000000..dbc674d754a
--- /dev/null
+++ b/openerp/addons/base/i18n/es_MX.po
@@ -0,0 +1,15177 @@
+# Spanish (Mexico) translation for openobject-server
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-server package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:44+0000\n"
+"PO-Revision-Date: 2012-09-07 01:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Mexico) <es_MX@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: 2012-09-07 04:55+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: base
+#: model:res.country,name:base.sh
+msgid "Saint Helena"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Other Configuration"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "DateTime"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_mailgate
+msgid "Tasks-Mail Integration"
+msgstr ""
+
+#. module: base
+#: code:addons/fields.py:582
+#, python-format
+msgid ""
+"The second argument of the many2many field %s must be a SQL table !You used "
+"%s, which is not a valid SQL table name."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,arch:0
+#: field:ir.ui.view.custom,arch:0
+msgid "View Architecture"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project
+msgid ""
+"\n"
+"Project management module tracks multi-level projects, tasks, work done on "
+"tasks, eso.\n"
+"============================================================================="
+"=========\n"
+"\n"
+"It is able to render planning, order tasks, eso.\n"
+"\n"
+"Dashboard for project members that includes:\n"
+"--------------------------------------------\n"
+"    * List of my open tasks\n"
+"    * List of my delegated tasks\n"
+"    * Graph of My Projects: Planned vs Total Hours\n"
+"    * Graph of My Remaining Hours by Project\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:base.language.import,code:0
+msgid "Code (eg:en__US)"
+msgstr ""
+
+#. module: base
+#: view:workflow:0
+#: view:workflow.activity:0
+#: field:workflow.activity,wkf_id:0
+#: field:workflow.instance,wkf_id:0
+#: field:workflow.transition,wkf_id:0
+#: field:workflow.workitem,wkf_id:0
+msgid "Workflow"
+msgstr ""
+
+#. module: base
+#: selection:ir.sequence,implementation:0
+msgid "No gap"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Hungarian / Magyar"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PY) / Español (PY)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_project_management
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,display_menu_tip:0
+msgid "Display Menu Tips"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,model:0
+msgid ""
+"Model name on which the method to be called is located, e.g. 'res.partner'."
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Created Views"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:532
+#, python-format
+msgid ""
+"You can not write in this document (%s) ! Be sure your user belongs to one "
+"of these groups: %s."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_event_project
+msgid ""
+"\n"
+"Organization and management of events.\n"
+"======================================\n"
+"\n"
+"This module allows you to create retro planning for managing your events.\n"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,domain:0
+msgid ""
+"The optional domain to restrict possible values for relationship fields, "
+"specified as a Python expression defining a list of triplets. For example: "
+"[('color','=','red')]"
+msgstr ""
+
+#. module: base
+#: field:res.partner,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
+msgid "Belgium - Structured Communication"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,target:0
+msgid "Target Window"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
+msgid "Sales Analytic Distribution"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_process
+msgid "Process"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
+msgid "Billing Rates on Contracts"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:558
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:344
+#, python-format
+msgid ""
+"Properties of base fields cannot be altered in this manner! Please modify "
+"them through Python code, preferably through a custom addon!"
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:129
+#, python-format
+msgid "Constraint Error"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view_custom
+msgid "ir.ui.view.custom"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:313
+#, python-format
+msgid "Renaming sparse field \"%s\" is not allowed"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sz
+msgid "Swaziland"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4206
+#, python-format
+msgid "created."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_tr
+msgid "Turkey - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_subproduct
+msgid "MRP Subproducts"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:390
+#, python-format
+msgid ""
+"Some installed modules depend on the module you plan to Uninstall :\n"
+" %s"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,number_increment:0
+msgid "Increment Number"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_company_tree
+#: model:ir.ui.menu,name:base.menu_action_res_company_tree
+msgid "Company's Structure"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.todo.category,name:base.category_sales_management_config
+#: model:ir.module.category,name:base.module_category_sales_management
+#: model:ir.module.module,shortdesc:base.module_sale
+msgid "Sales Management"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Search Partner"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_export_language.py:60
+#, python-format
+msgid "new"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,multi:0
+msgid "On multiple doc."
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,module_nr:0
+msgid "Number of Modules"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,company_dest_id:0
+msgid "Company to store the current record"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank.type.field,size:0
+msgid "Max. Size"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_reporting
+#: model:ir.ui.menu,name:base.menu_lunch_reporting
+#: model:ir.ui.menu,name:base.menu_project_report
+#: model:ir.ui.menu,name:base.menu_report_association
+#: model:ir.ui.menu,name:base.menu_report_marketing
+#: model:ir.ui.menu,name:base.menu_reporting
+#: model:ir.ui.menu,name:base.next_id_64
+#: model:ir.ui.menu,name:base.next_id_73
+#: model:ir.ui.menu,name:base.reporting_menu
+msgid "Reporting"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: field:res.partner,subname:0
+#: field:res.partner.address,name:0
+msgid "Contact Name"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_export_language.py:56
+#, python-format
+msgid ""
+"Save this document to a %s file and edit it with a specific software or a "
+"text editor. The file encoding is UTF-8."
+msgstr ""
+
+#. module: base
+#: help:ir.values,key2:0
+msgid ""
+"For actions, one of the possible action slots: \n"
+"  - client_action_multi\n"
+"  - client_print_multi\n"
+"  - client_action_relate\n"
+"  - tree_but_open\n"
+"For defaults, an optional condition"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.lang:0
+msgid "The name of the language must be unique !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_import_base
+msgid ""
+"\n"
+"        This module provide a class import_framework to help importing \n"
+"        complex data from other software\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.wizard,wiz_name:0
+msgid "Wizard Name"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_partner_manager
+msgid "Partner Manager"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_customer_relationship_management
+msgid "Customer Relationship Management"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Extra"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2526
+#, python-format
+msgid "Invalid group_by"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,child_ids:0
+msgid "Child Applications"
+msgstr ""
+
+#. module: base
+#: field:res.partner,credit_limit:0
+msgid "Credit Limit"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_graph
+msgid "Openerp web graph view"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,date_update:0
+msgid "Update Date"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_action_rule
+msgid "Automated Action Rules"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Owner"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,src_model:0
+msgid "Source Object"
+msgstr ""
+
+#. module: base
+#: model:res.partner.bank.type,format_layout:base.bank_normal
+msgid "%(bank_name)s: %(acc_number)s"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Config Wizard Steps"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view_sc
+msgid "ir.ui.view_sc"
+msgstr ""
+
+#. module: base
+#: field:res.widget.user,widget_id:0
+#: field:res.widget.wizard,widgets_list:0
+msgid "Widget"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: field:ir.model.access,group_id:0
+msgid "Group"
+msgstr ""
+
+#. module: base
+#: constraint:res.lang:0
+msgid ""
+"Invalid date/time format directive specified. Please refer to the list of "
+"allowed directives, displayed when you edit a language."
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3895
+#, python-format
+msgid ""
+"One of the records you are trying to modify has already been deleted "
+"(Document type: %s)."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_pad_project
+msgid "Specifications on PADs"
+msgstr ""
+
+#. module: base
+#: help:ir.filters,user_id:0
+msgid ""
+"The user this filter is available to. When left empty the filter is usable "
+"by the system only."
+msgstr ""
+
+#. module: base
+#: help:res.partner,website:0
+msgid "Website of Partner."
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,views:0
+msgid ""
+"This function field computes the ordered list of views that should be "
+"enabled when displaying the result of an action, federating view mode, views "
+"and reference view. The result is returned as an ordered list of pairs "
+"(view_id,view_mode)."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tv
+msgid "Tuvalu"
+msgstr ""
+
+#. module: base
+#: selection:ir.model,state:0
+msgid "Custom Object"
+msgstr ""
+
+#. module: base
+#: field:res.lang,date_format:0
+msgid "Date Format"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_report_designer
+msgid "OpenOffice Report Designer"
+msgstr ""
+
+#. module: base
+#: field:res.bank,email:0
+#: field:res.partner.address,email:0
+msgid "E-Mail"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.an
+msgid "Netherlands Antilles"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ro
+msgid "Romania"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:396
+#, python-format
+msgid ""
+"You can not remove the admin user as it is used internally for resources "
+"created by OpenERP (updates, module installation, ...)"
+msgstr ""
+
+#. module: base
+#: view:ir.values:0
+msgid "Action Binding"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gf
+msgid "French Guyana"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Bosnian / bosanski jezik"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,attachment_use:0
+msgid ""
+"If you check this, then the second time the user prints with same attachment "
+"name, it returns the previous report."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_layout
+msgid "Sales Orders Print Layout"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (VE) / Español (VE)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
+msgid "Invoice on Timesheets"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Your system will be updated."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.todo,note:0
+#: selection:ir.property,type:0
+msgid "Text"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"==========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"    Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"    Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"It will generate a PDF with all the letters according to the the\n"
+"different levels of recall defined. You can define different policies\n"
+"for different companies. You can also send mail to the customer.\n"
+"\n"
+"Note that if you want to check the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"    Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: field:res.country,name:0
+msgid "Country Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.co
+msgid "Colombia"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:1390
+#, python-format
+msgid "Key/value '%s' not found in selection field '%s'"
+msgstr ""
+
+#. module: base
+#: help:res.country,code:0
+msgid ""
+"The ISO country code in two chars.\n"
+"You can use this field for quick search."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pw
+msgid "Palau"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Untranslated"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,context:0
+msgid ""
+"Context dictionary as Python expression, empty by default (Default: {})"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_miscellaneoussuppliers0
+msgid "Miscellaneous Suppliers"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:287
+#, python-format
+msgid "Custom fields must have a name that starts with 'x_' !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_mx
+msgid "Mexico - Accounting"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,action_id:0
+msgid "Select the Action Window, Report, Wizard to be executed."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ai
+msgid "Anguilla"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Export done"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_plugin_outlook
+msgid "Outlook Plug-In"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: field:ir.model,name:0
+msgid "Model Description"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,src_model:0
+msgid ""
+"Optional model name of the objects on which this action should be visible"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,trigger_expr_id:0
+msgid "Trigger Expression"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.jo
+msgid "Jordan"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,nextcall:0
+msgid "Next planned execution date for this job."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:139
+#, python-format
+msgid "You can not remove the model '%s' !"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.er
+msgid "Eritrea"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: base
+#: view:res.config:0
+#: view:res.config.installer:0
+msgid "description"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_action_rule
+#: model:ir.ui.menu,name:base.menu_base_action_rule_admin
+msgid "Automated Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ro
+msgid "Romania - Accounting"
+msgstr ""
+
+#. module: base
+#: view:partner.wizard.ean.check:0
+msgid "Want to check Ean ? "
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,mobile:0
+msgid ""
+"Provides fields that be used to fetch the mobile number, e.g. you select the "
+"invoice, then `object.invoice_address_id.mobile` is the field which gives "
+"the correct mobile number"
+msgstr ""
+
+#. module: base
+#: view:ir.mail_server:0
+msgid "Security and Authentication"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"OpenERP translations (core, modules, clients) are managed through "
+"Launchpad.net, our open source project management facility. We use their "
+"online interface to synchronize all translations efforts."
+msgstr ""
+
+#. module: base
+#: help:ir.actions.todo,type:0
+msgid ""
+"Manual: Launched manually.\n"
+"Automatic: Runs whenever the system is reconfigured.\n"
+"Launch Manually Once: after hacing been launched manually, it sets "
+"automatically to Done."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Swedish / svenska"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.rs
+msgid "Serbia"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Wizard View"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kh
+msgid "Cambodia, Kingdom of"
+msgstr ""
+
+#. module: base
+#: field:base.language.import,overwrite:0
+#: field:base.language.install,overwrite:0
+msgid "Overwrite Existing Terms"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_import
+msgid "Language Import"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,interval_number:0
+msgid "Repeat every x."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Albanian / Shqip"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_crm_config_opportunity
+msgid "Opportunities"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_export
+msgid "base.language.export"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,report_type:0
+msgid "Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document_webdav
+msgid "Shared Repositories (WebDAV)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_import_google
+msgid ""
+"The module adds google contact in partner address and add google calendar "
+"events details in Meeting"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Email Preferences"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_audittrail
+msgid ""
+"\n"
+"This module lets administrator track every user operation on all the objects "
+"of the system.\n"
+"============================================================================="
+"==============\n"
+"\n"
+"The administrator can subscribe to rules for read, write and\n"
+"delete on objects and can check logs.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_4
+msgid "Basic Partner"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference.graph:0
+msgid ","
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "My Partners"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "XML Report"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.es
+msgid "Spain"
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+msgid "Please be patient, as this operation may take a few seconds..."
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,domain:0
+msgid ""
+"Optional domain filtering of the destination data, as a Python expression"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
+#: model:ir.model,name:base.model_base_module_upgrade
+msgid "Module Upgrade"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (UY) / Español (UY)"
+msgstr ""
+
+#. module: base
+#: field:res.partner,mobile:0
+#: field:res.partner.address,mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.om
+msgid "Oman"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp
+msgid "MRP"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference.graph:0
+msgid "1cm 28cm 20cm 28cm"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nu
+msgid "Niue"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_membership
+msgid "Membership Management"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Other OSI Approved Licence"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_menu_create
+#: view:wizard.ir.model.menu.create:0
+msgid "Create Menu"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.in
+msgid "India"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_request_link-act
+#: model:ir.ui.menu,name:base.menu_res_request_link_act
+msgid "Request Reference Types"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_google_base_account
+msgid "Google Users"
+msgstr ""
+
+#. module: base
+#: help:ir.server.object.lines,value:0
+msgid ""
+"Expression containing a value specification. \n"
+"When Formula type is selected, this field may be a Python expression  that "
+"can use the same values as for the condition field on the server action.\n"
+"If Value type is selected, the value will be used directly without "
+"evaluation."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ad
+msgid "Andorra, Principality of"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,child_ids:0
+msgid "Child Categories"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,format:0
+msgid "TGZ Archive"
+msgstr ""
+
+#. module: base
+#: view:res.groups:0
+msgid ""
+"Users added to this group are automatically added in the following groups."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%B - Full month name."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.todo,type:0
+#: view:ir.attachment:0
+#: field:ir.attachment,type:0
+#: field:ir.model,state:0
+#: field:ir.model.fields,state:0
+#: field:ir.property,type:0
+#: field:ir.server.object.lines,type:0
+#: field:ir.translation,type:0
+#: view:ir.ui.view:0
+#: view:ir.values:0
+#: field:ir.values,key:0
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Type"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_user:0
+msgid "Username"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:398
+#, python-format
+msgid ""
+"Language with code \"%s\" is not defined in your system !\n"
+"Define it through the Administration menu."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gu
+msgid "Guam (USA)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:558
+#, python-format
+msgid "Setting empty passwords is not allowed for security reasons!"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:192
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+#: selection:workflow.activity,kind:0
+msgid "Dummy"
+msgstr ""
+
+#. module: base
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ky
+msgid "Cayman Islands"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kr
+msgid "South Korea"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4615
+#, python-format
+msgid "Record #%d of %s not found, cannot copy!"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,contributors:0
+msgid "Contributors"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_planning
+msgid ""
+"Keep track of your planning\n"
+"This module helps you to manage your plannings.\n"
+"===============================================\n"
+"\n"
+"This module is based on the analytic accounting and is totally integrated "
+"with\n"
+"* the timesheets encoding\n"
+"* the holidays management\n"
+"* the project management\n"
+"\n"
+"So that, each department manager can know if someone in his team has still "
+"unallocated time for a given planning (taking in consideration the validated "
+"leaves) or if he still needs to encode tasks.\n"
+"\n"
+"At the end of the month, the planning manager can also check if the encoded "
+"timesheets are respecting the planned time on each analytic account.\n"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Char"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Slovak / Slovenský jazyk"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (AR) / Español (AR)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ug
+msgid "Uganda"
+msgstr ""
+
+#. module: base
+#: field:ir.model.access,perm_unlink:0
+msgid "Delete Access"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ne
+msgid "Niger"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Chinese (HK)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ba
+msgid "Bosnia-Herzegovina"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"To improve or expand the official translations, you should use directly "
+"Lauchpad's web interface (Rosetta). If you need to perform mass translation, "
+"Launchpad also allows uploading full .po files at once"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (GT) / Español (GT)"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_port:0
+msgid "SMTP Port"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_import_sugarcrm
+msgid "SugarCRM Import"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid ""
+"%W - Week number of the year (Monday as the first day of the week) as a "
+"decimal number [00,53]. All days in a new year preceding the first Monday "
+"are considered to be in week 0."
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_language_install.py:55
+#, python-format
+msgid "Language Pack"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_tests
+msgid "Tests"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view_sc,res_id:0
+msgid "Resource Ref."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gs
+msgid "S. Georgia & S. Sandwich Isls."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.url,url:0
+msgid "Action URL"
+msgstr ""
+
+#. module: base
+#: field:base.module.import,module_name:0
+msgid "Module Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mh
+msgid "Marshall Islands"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:368
+#, python-format
+msgid "Changing the model of a field is forbidden!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ht
+msgid "Haiti"
+msgstr ""
+
+#. module: base
+#: view:ir.ui.view:0
+#: selection:ir.ui.view,type:0
+msgid "Search"
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:132
+#, python-format
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,parent_id:0
+msgid "Parent Application"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:222
+#, python-format
+msgid "Operation Canceled"
+msgstr ""
+
+#. module: base
+#: help:base.language.export,lang:0
+msgid "To export a new language, do not select a language."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document
+#: model:ir.module.module,shortdesc:base.module_knowledge
+msgid "Document Management System"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_claim
+msgid "Claims Management"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_purchase_root
+msgid "Purchases"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.md
+msgid "Moldavia"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Features"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.bank_account_update
+msgid ""
+"Configure your company's bank accounts and select those that must appear on "
+"the report footer. You can reorder bank accounts from the list view. If you "
+"use the accounting application of OpenERP, journals and accounts will be "
+"created automatically based on these data."
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: report:ir.module.reference.graph:0
+msgid "Version"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sale order:\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_sequence
+msgid "Entries Sequence Numbering"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_exports
+msgid "ir.exports"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:38
+#, python-format
+msgid "No language with code \"%s\" exists"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"\n"
+"    * User Authentication\n"
+"    * Document Indexation :- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+"\n"
+"ATTENTION:\n"
+"    - When you install this module in a running company that have already "
+"PDF files stored into the database,\n"
+"      you will lose them all.\n"
+"    - After installing this module PDF's are no longer stored into the "
+"database,\n"
+"      but in the servers rootpad like /server/bin/filestore.\n"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%Y - Year with century."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_gantt
+msgid ""
+"\n"
+"        OpenERP Web gantt chart view.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference.graph:0
+msgid "-"
+msgstr ""
+
+#. module: base
+#: view:publisher_warranty.contract.wizard:0
+msgid ""
+"This wizard helps you register a publisher warranty contract in your OpenERP "
+"system. After the contract has been registered, you will be able to send "
+"issues directly to OpenERP."
+msgstr ""
+
+#. module: base
+#: view:wizard.ir.model.menu.create:0
+msgid "Create _Menu"
+msgstr ""
+
+#. module: base
+#: field:res.payterm,name:0
+msgid "Payment Term (short name)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_bank
+#: view:res.bank:0
+#: field:res.partner.bank,bank:0
+msgid "Bank"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_exports_line
+msgid "ir.exports.line"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_html_view
+msgid ""
+"\n"
+"This is the test module which shows HTML tag support in normal XML form "
+"view.\n"
+"============================================================================="
+"\n"
+"\n"
+"Creates a sample form-view using HTML tags. It is visible only in OpenERP "
+"Web.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_purchase_management
+msgid ""
+"Helps you manage your purchase-related processes such as requests for "
+"quotations, supplier invoices, etc..."
+msgstr ""
+
+#. module: base
+#: help:base.language.install,overwrite:0
+msgid ""
+"If you check this box, your customized translations will be overwritten and "
+"replaced by the official ones."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_rml:0
+msgid "Main report file path"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_action_report_xml
+#: field:ir.module.module,reports_by_module:0
+#: model:ir.ui.menu,name:base.menu_ir_action_report_xml
+msgid "Reports"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window.view,multi:0
+#: help:ir.actions.report.xml,multi:0
+msgid ""
+"If set to true, the action will not be displayed on the right toolbar of a "
+"form view."
+msgstr ""
+
+#. module: base
+#: field:workflow,on_create:0
+msgid "On Create"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:681
+#, python-format
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+
+#. module: base
+#: field:partner.sms.send,user:0
+#: field:res.users,login:0
+msgid "Login"
+msgstr ""
+
+#. module: base
+#: view:base.update.translations:0
+#: model:ir.actions.act_window,name:base.action_wizard_update_translations
+#: model:ir.ui.menu,name:base.menu_wizard_update_translations
+msgid "Synchronize Terms"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"Access all the fields related to the current object using expressions, i.e. "
+"object.partner_id.name "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_event
+msgid ""
+"\n"
+"Organization and management of Events.\n"
+"======================================\n"
+"\n"
+"This module allows you\n"
+"    * to manage your events and their registrations\n"
+"    * to use emails to automatically confirm and send acknowledgements for "
+"any registration to an event\n"
+"    * ...\n"
+"\n"
+"Note that:\n"
+"    - You can define new types of events in\n"
+"        Association / Configuration / Types of Events\n"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_tools
+msgid "Tools"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Float"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_warehouse_management
+#: model:ir.module.module,shortdesc:base.module_stock
+msgid "Warehouse Management"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_request_link
+msgid "res.request.link"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.wizard,name:0
+msgid "Wizard Info"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+#: model:ir.actions.act_window,name:base.action_wizard_lang_export
+#: model:ir.ui.menu,name:base.menu_wizard_lang_export
+msgid "Export Translation"
+msgstr ""
+
+#. module: base
+#: help:res.log,secondary:0
+msgid ""
+"Do not display this log if it belongs to the same object the user is working "
+"on"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_lu
+msgid "Luxembourg - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tp
+msgid "East Timor"
+msgstr ""
+
+#. module: base
+#: model:res.company,follow_up_msg:base.main_company
+msgid ""
+"Date : %(date)s\n"
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Please find in attachment a reminder of all your unpaid invoices, for a "
+"total amount due of:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_share
+msgid ""
+"\n"
+"This module adds generic sharing tools to your current OpenERP database.\n"
+"========================================================================\n"
+"\n"
+"It specifically adds a 'share' button that is available in the Web client "
+"to\n"
+"share any kind of OpenERP data with colleagues, customers, friends, etc.\n"
+"\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the\n"
+"shared users only have access to the data that has been shared with them.\n"
+"\n"
+"This is extremely useful for collaborative work, knowledge sharing,\n"
+"synchronization with other companies, etc.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.currency,accuracy:0
+msgid "Computational Accuracy"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_lunch
+msgid ""
+"\n"
+"    The base module to manage lunch\n"
+"\n"
+"    keep track for the Lunch Order ,Cash Moves ,CashBox ,Product.\n"
+"    Apply Different Category for the product.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kg
+msgid "Kyrgyz Republic (Kyrgyzstan)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_wizard_ir_model_menu_create_line
+msgid "wizard.ir.model.menu.create.line"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,res_id:0
+msgid "Attached ID"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_vat
+msgid ""
+"\n"
+"VAT validation for Partners' VAT numbers\n"
+"========================================\n"
+"\n"
+"After installing this module, values entered in the VAT field of Partners "
+"will\n"
+"be validated for all supported countries. The country is inferred from the\n"
+"2-letter country code that prefixes the VAT number, e.g. ``BE0477472701``\n"
+"will be validated using the Belgian rules.\n"
+"\n"
+"There are two different levels of VAT number validation:\n"
+"\n"
+" * By default, a simple off-line check is performed using the known "
+"validation\n"
+"   rules for the country, usually a simple check digit. This is quick and \n"
+"   always available, but allows numbers that are perhaps not truly "
+"allocated,\n"
+"   or not valid anymore.\n"
+" * When the \"VAT VIES Check\" option is enabled (in the configuration of "
+"the user's\n"
+"   Company), VAT numbers will be instead submitted to the online EU VIES\n"
+"   database, which will truly verify that the number is valid and currently\n"
+"   allocated to a EU company. This is a little bit slower than the simple\n"
+"   off-line check, requires an Internet connection, and may not be "
+"available\n"
+"   all the time. If the service is not available or does not support the\n"
+"   requested country (e.g. for non-EU countries), a simple check will be "
+"performed\n"
+"   instead.\n"
+"\n"
+"Supported countries currently include EU countries, and a few non-EU "
+"countries\n"
+"such as Chile, Colombia, Mexico, Norway or Russia. For unsupported "
+"countries,\n"
+"only the country code will be validated.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Day: %(day)s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_point_of_sale
+msgid ""
+"Helps you get the most out of your points of sales with fast sale encoding, "
+"simplified payment mode encoding, automatic picking lists generation and "
+"more."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mv
+msgid "Maldives"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_idea
+msgid ""
+"\n"
+"This module allows your user to easily and efficiently participate in "
+"enterprise innovation.\n"
+"============================================================================="
+"===============\n"
+"\n"
+"It allows everybody to express ideas about different subjects.\n"
+"Then, other users can comment on these ideas and vote for particular ideas.\n"
+"Each idea has a score based on the different votes.\n"
+"The managers can obtain an easy view of best ideas from all the users.\n"
+"Once installed, check the menu 'Ideas' in the 'Tools' main menu."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_rule
+msgid "ir.rule"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Days"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_rpc
+msgid "OpenERP Web web"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_html_view
+msgid "Html View"
+msgstr ""
+
+#. module: base
+#: field:res.currency,position:0
+msgid "Symbol position"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_process
+msgid "Enterprise Process"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,function:0
+msgid "Name of the method to be called when this job is processed."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_evaluation
+msgid "Employee Appraisals"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Write Object"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:66
+#: code:addons/base/res/res_partner.py:175
+#, python-format
+msgid " (copy)"
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_footer1:0
+msgid "General Information Footer"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "7.  %H:%M:%S      ==> 18:25:20"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: view:res.partner.category:0
+#: field:res.partner.category,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,parent_left:0
+msgid "Left parent"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_mrp
+msgid "Create Tasks on SO"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,res_model:0
+msgid "Attached Model"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank,footer:0
+msgid "Display on Reports"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_cn
+msgid ""
+"\n"
+"        添加中文省份数据\n"
+"        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
+"        ============================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_model_access
+msgid "ir.model.access"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,priority:0
+#: field:ir.mail_server,sequence:0
+#: field:res.request,priority:0
+#: field:res.request.link,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,act_from:0
+msgid "Source Activity"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Legend (for prefix, suffix)"
+msgstr ""
+
+#. module: base
+#: selection:ir.server.object.lines,type:0
+msgid "Formula"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:396
+#, python-format
+msgid "Can not remove root user!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mw
+msgid "Malawi"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ec
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Ecuador in "
+"OpenERP.\n"
+"============================================================================="
+"=\n"
+"\n"
+"Accounting chart and localization for Ecuador.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_filters.py:38
+#: code:addons/base/res/res_users.py:80
+#: code:addons/base/res/res_users.py:420
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_chart
+msgid "Template of Charts of Accounts"
+msgstr ""
+
+#. module: base
+#: field:res.partner.address,type:0
+msgid "Address Type"
+msgstr ""
+
+#. module: base
+#: view:ir.ui.menu:0
+msgid "Full Path"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
+"(NFe)\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and "
+"account.tax objects to allow the proper computation of some Brazilian VATs "
+"such as ICMS. The chart of account creation wizard has been extended to "
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic fiscal Invoicing which is already operational) are brought by "
+"more than 15 additional modules of the Brazilian Launchpad localization "
+"project https://launchpad.net/openerp.pt-br-localiz and their dependencies "
+"in the extra addons branch. Those modules aim at not breaking with the "
+"remarkable OpenERP modularity, this is why they are numerous but small. One "
+"of the reasons for maintaining those modules apart is that Brazilian "
+"Localization leaders need commit rights agility to complete the localization "
+"as companies fund the remaining legal requirements (such as soon fiscal "
+"ledgers, accounting SPED, fiscal SPED and PAF ECF that are still missing as "
+"September 2011). Those modules are also strictly licensed under AGPL V3 and "
+"today don't come with any additional paid permission for online use of "
+"'private modules'."
+msgstr ""
+
+#. module: base
+#: view:res.request:0
+msgid "References"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid ""
+"%U - Week number of the year (Sunday as the first day of the week) as a "
+"decimal number [00,53]. All days in a new year preceding the first Sunday "
+"are considered to be in week 0."
+msgstr ""
+
+#. module: base
+#: view:ir.ui.view:0
+msgid "Advanced"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fi
+msgid "Finland"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:156
+#, python-format
+msgid "Website: "
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_administration
+msgid "Settings"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,view_type:0
+#: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
+#: selection:ir.ui.view,type:0
+#: selection:wizard.ir.model.menu.create.line,view_type:0
+msgid "Tree"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_analytic_multicurrency
+msgid "Multi-Currency in Analytic"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "https://help.launchpad.net/Translations"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,view_mode:0
+msgid "View Mode"
+msgstr ""
+
+#. module: base
+#: help:res.partner.bank,footer:0
+msgid ""
+"Display this bank account on the footer of printed documents like invoices "
+"and sales orders."
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid ""
+"When using CSV format, please also check that the first line of your file is "
+"one of the following:"
+msgstr ""
+
+#. module: base
+#: view:res.log:0
+msgid "Logs"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish / Español"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Korean (KP) / 한국어 (KP)"
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+msgid ""
+"This wizard will scan all module repositories on the server side to detect "
+"newly added modules as well as any change to existing modules."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_journal
+msgid ""
+"\n"
+"The sales journal modules allows you to categorise your sales and deliveries "
+"(picking lists) between different journals.\n"
+"============================================================================="
+"===========================================\n"
+"\n"
+"This module is very helpful for bigger companies that\n"
+"works by departments.\n"
+"\n"
+"You can use journal for different purposes, some examples:\n"
+"    * isolate sales of different departments\n"
+"    * journals for deliveries by truck or by UPS\n"
+"\n"
+"Journals have a responsible and evolves between different status:\n"
+"    * draft, open, cancel, done.\n"
+"\n"
+"Batch operations can be processed on the different journals to\n"
+"confirm all sales at once, to validate or invoice packing, ...\n"
+"\n"
+"It also supports batch invoicing methods that can be configured by partners "
+"and sales orders, examples:\n"
+"    * daily invoicing,\n"
+"    * monthly invoicing, ...\n"
+"\n"
+"Some statistics by journals are provided.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.company,logo:0
+msgid "Logo"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cr
+msgid "Costa Rica - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Uninstall (beta)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"This module aims to manage employee's expenses.\n"
+"===============================================\n"
+"\n"
+"The whole workflow is implemented:\n"
+"    * Draft expense\n"
+"    * Confirmation of the sheet by the employee\n"
+"    * Validation by his manager\n"
+"    * Validation by the accountant and invoice creation\n"
+"    * Payment of the invoice to the employee\n"
+"\n"
+"This module also uses the analytic accounting and is compatible with\n"
+"the invoice on timesheet module so that you will be able to automatically\n"
+"re-invoice your customer's expenses if your work by project.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.values,action_id:0
+msgid "Action (change only)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_subscription
+msgid "Recurring Documents"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bs
+msgid "Bahamas"
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "active"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_partner.py:273
+#, python-format
+msgid ""
+"Couldn't generate the next id because some partners have an alphabetic id !"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ie
+msgid "Ireland"
+msgstr ""
+
+#. module: base
+#: field:base.module.update,update:0
+msgid "Number of modules updated"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,function:0
+msgid "Method"
+msgstr ""
+
+#. module: base
+#: view:res.partner.event:0
+msgid "General Description"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+msgid "Workflow Activity"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_ui_view
+msgid ""
+"Views allows you to personalize each view of OpenERP. You can add new "
+"fields, move fields, rename them or delete the ones that you do not need."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_setup
+msgid "Initial Setup Tools"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,groups_id:0
+#: model:ir.actions.act_window,name:base.action_res_groups
+#: view:ir.actions.report.xml:0
+#: field:ir.actions.report.xml,groups_id:0
+#: view:ir.actions.todo:0
+#: field:ir.actions.todo,groups_id:0
+#: field:ir.actions.wizard,groups_id:0
+#: view:ir.model:0
+#: field:ir.model.fields,groups:0
+#: field:ir.rule,groups:0
+#: view:ir.ui.menu:0
+#: field:ir.ui.menu,groups_id:0
+#: model:ir.ui.menu,name:base.menu_action_res_groups
+#: view:res.groups:0
+#: field:res.users,groups_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (CL) / Español (CL)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bz
+msgid "Belize"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,header:0
+msgid "Add or not the corporate RML header"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manages job positions and the recruitment process.\n"
+"==================================================\n"
+"\n"
+"It's integrated with the survey module to allow you to define interview for "
+"different jobs.\n"
+"\n"
+"This module is integrated with the mail gateway to automatically tracks "
+"email\n"
+"sent to jobs@YOURCOMPANY.com. It's also integrated with the document "
+"management\n"
+"system to store and search in your CV base.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_widget_wizard
+msgid "Homepage Widgets Management"
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_header1:0
+msgid "Report Header / Company Slogan"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pl
+msgid "Poland"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,view_mode:0
+msgid ""
+"Comma-separated list of allowed view modes, such as 'form', 'tree', "
+"'calendar', etc. (Default: tree,form)"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3615
+#, python-format
+msgid "A document was modified since you last viewed it (%s:%d)"
+msgstr ""
+
+#. module: base
+#: view:workflow:0
+msgid "Workflow Editor"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "To be removed"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_sequence
+msgid "ir.sequence"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,expression:0
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_debug:0
+msgid "Debugging"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_helpdesk
+msgid ""
+"\n"
+"Helpdesk Management.\n"
+"====================\n"
+"\n"
+"Like records and processing of claims, Helpdesk and Support are good tools\n"
+"to trace your interventions. This menu is more adapted to oral "
+"communication,\n"
+"which is not necessarily related to a claim. Select a customer, add notes\n"
+"and categorize your interventions with a channel and a priority level.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.ui.view_sc:0
+msgid "Shortcut for this menu already exists!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_resource
+msgid ""
+"\n"
+"Module for resource management.\n"
+"===============================\n"
+"\n"
+"A resource represent something that can be scheduled\n"
+"(a developer on a task or a work center on manufacturing orders).\n"
+"This module manages a resource calendar associated to every resource.\n"
+"It also manages the leaves of every resource.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Groups (no group = global)"
+msgstr ""
+
+#. module: base
+#: selection:res.users,view:0
+msgid "Simplified"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.st
+msgid "Saint Tome (Sao Tome) and Principe"
+msgstr ""
+
+#. module: base
+#: selection:res.partner.address,type:0
+msgid "Invoice"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Portugese (BR) / Português (BR)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bb
+msgid "Barbados"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_synchro
+msgid ""
+"\n"
+"Synchronization with all objects.\n"
+"=================================\n"
+"\n"
+"Configure servers and trigger synchronization with its database objects.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mg
+msgid "Madagascar"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:116
+#, python-format
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.configuration.wizard,note:0
+msgid "Next Wizard"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_menu_admin
+#: view:ir.ui.menu:0
+#: field:ir.ui.menu,name:0
+msgid "Menu"
+msgstr ""
+
+#. module: base
+#: field:res.currency,rate:0
+msgid "Current Rate"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_crm
+msgid "Opportunity to Quotation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_analytic_plans
+msgid ""
+"\n"
+"The base module to manage analytic distribution and sales orders.\n"
+"=================================================================\n"
+"\n"
+"Using this module you will be able to link analytic accounts to sales "
+"orders.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.url,target:0
+msgid "Action Target"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_calendar
+msgid "Calendar Layer"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.report_ir_model_overview
+msgid "Model Overview"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_margin
+msgid "Margins by Products"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_invoiced
+msgid "Invoicing"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view_sc,name:0
+msgid "Shortcut Name"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,limit:0
+msgid "Default limit for the list view"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.zw
+msgid "Zimbabwe"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.io
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_translation_export
+msgid "Import / Export"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.todo.category,name:base.category_tools_customization_config
+msgid "Tools / Customization"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,res_id:0
+#: field:ir.values,res_id:0
+msgid "Record ID"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,email:0
+msgid "Email Address"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "French (BE) / Français (BE)"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: field:workflow.activity,action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.client,params:0
+msgid "Arguments sent to the client along withthe view tag"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_gtd
+msgid ""
+"\n"
+"This module implements all concepts defined by the Getting Things Done "
+"methodology.\n"
+"============================================================================="
+"======\n"
+"\n"
+"This module implements a simple personnal Todo list based on tasks. It adds "
+"in\n"
+"the project application an editable list of tasks simplified to the minimum\n"
+"required fields.\n"
+"\n"
+"The todo list is based on the GTD methodology. This world-wide used "
+"methodology\n"
+"is used for personal time management improvement.\n"
+"\n"
+"Getting Things Done (commonly abbreviated as GTD) is an action management\n"
+"method created by David Allen, and described in a book of the same name.\n"
+"\n"
+"GTD rests on the principle that a person needs to move tasks out of the mind "
+"by\n"
+"recording them externally. That way, the mind is freed from the job of\n"
+"remembering everything that needs to be done, and can concentrate on "
+"actually\n"
+"performing those tasks.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tt
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lv
+msgid "Latvia"
+msgstr ""
+
+#. module: base
+#: view:partner.sms.send:0
+msgid "SMS - Gateway: clickatell"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Field Mappings"
+msgstr ""
+
+#. module: base
+#: code:addons/base/publisher_warranty/publisher_warranty.py:125
+#: code:addons/base/publisher_warranty/publisher_warranty.py:163
+#, python-format
+msgid "Error during communication with the publisher warranty server."
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_sale_manager
+#: model:res.groups,name:base.group_tool_manager
+msgid "Manager"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_custom
+msgid "Customization"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.py
+msgid "Paraguay"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_act_window_close
+msgid "ir.actions.act_window_close"
+msgstr ""
+
+#. module: base
+#: field:ir.server.object.lines,col1:0
+msgid "Destination"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lt
+msgid "Lithuania"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_partner_clear_ids
+#: model:ir.model,name:base.model_partner_clear_ids
+#: view:partner.clear.ids:0
+msgid "Clear IDs"
+msgstr ""
+
+#. module: base
+#: view:res.groups:0
+msgid "Inherited"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,serialization_field_id:0
+msgid "Serialization Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_report_designer
+msgid ""
+"Lets you install various tools to simplify and enhance OpenERP's report "
+"creation."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%y - Year without century [00,99]."
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:155
+#, python-format
+msgid "Fax: "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.si
+msgid "Slovenia"
+msgstr ""
+
+#. module: base
+#: help:res.currency,name:0
+msgid "Currency Code (ISO 4217)"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_log_act_window
+#: model:ir.ui.menu,name:base.menu_res_log_act_window
+msgid "Client Logs"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:1883
+#: code:addons/orm.py:1894
+#, python-format
+msgid "Invalid Object Architecture!"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:311
+#: code:addons/base/ir/ir_model.py:313
+#: code:addons/base/ir/ir_model.py:343
+#: code:addons/base/ir/ir_model.py:357
+#: code:addons/base/ir/ir_model.py:359
+#: code:addons/base/ir/ir_model.py:361
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:371
+#: code:addons/base/module/wizard/base_update_translations.py:38
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_fr_rib
+msgid "French RIB Bank Details"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%p - Equivalent of either AM or PM."
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Iteration Actions"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,company_id:0
+msgid "Company where the user is connected"
+msgstr ""
+
+#. module: base
+#: field:publisher_warranty.contract,date_stop:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nz
+msgid "New Zealand"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_pad_project
+msgid ""
+"\n"
+"This module adds a PAD in all project kanban views\n"
+"==================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_country
+msgid ""
+"Display and manage the list of all countries that can be assigned to your "
+"partner records. You can create or delete countries to make sure the ones "
+"you are working on will be maintained."
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_7
+msgid "Openstuff.net"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nf
+msgid "Norfolk Island"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Korean (KR) / 한국어 (KR)"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,model:0
+msgid "The technical name of the model this field belongs to"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,action_id:0
+#: selection:ir.actions.server,state:0
+msgid "Client Action"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bd
+msgid "Bangladesh"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_retro_planning
+msgid "Project Retro-planning"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock_planning
+msgid "Master Procurement Schedule"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_module_category
+#: field:ir.module.module,application:0
+#: field:res.groups,category_id:0
+msgid "Application"
+msgstr ""
+
+#. module: base
+#: selection:publisher_warranty.contract,state:0
+msgid "Valid"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_decimal_precision
+msgid ""
+"\n"
+"Configure the price accuracy you need for different kinds of usage: "
+"accounting, sales, purchases, etc.\n"
+"============================================================================="
+"=========================\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pl
+msgid ""
+"\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
+"\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.client,params_store:0
+msgid "Params storage"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:409
+#, python-format
+msgid "Can not upgrade module '%s'. It is not installed."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cu
+msgid "Cuba"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_profiling
+msgid ""
+"\n"
+"This module allows users to perform segmentation within partners.\n"
+"=================================================================\n"
+"\n"
+"It uses the profiles criteria from the earlier segmentation module and "
+"improve it. Thanks to the new concept of questionnaire. You can now regroup "
+"questions into a questionnaire and directly use it on a partner.\n"
+"\n"
+"It also has been merged with the earlier CRM & SRM segmentation tool because "
+"they were overlapping.\n"
+"\n"
+"    * Note: this module is not compatible with the module segmentation, "
+"since it's the same which has been renamed.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/report_sxw.py:434
+#, python-format
+msgid "Unknown report type: %s"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:282
+#, python-format
+msgid "For selection fields, the Selection Options must be given!"
+msgstr ""
+
+#. module: base
+#: model:res.widget,title:base.facebook_widget
+msgid "Facebook"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.am
+msgid "Armenia"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_property_form
+#: model:ir.ui.menu,name:base.menu_ir_property_form_all
+msgid "Configuration Parameters"
+msgstr ""
+
+#. module: base
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.se
+msgid "Sweden"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+#: selection:wizard.ir.model.menu.create.line,view_type:0
+msgid "Gantt"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+msgid "Property"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner_bank_type
+#: field:res.partner.bank,state:0
+#: view:res.partner.bank.type:0
+msgid "Bank Account Type"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,config_logo:0
+#: field:base.language.import,config_logo:0
+#: field:base.language.install,config_logo:0
+#: field:base.module.import,config_logo:0
+#: field:base.module.update,config_logo:0
+#: field:base.update.translations,config_logo:0
+#: field:ir.actions.configuration.wizard,config_logo:0
+#: field:ir.wizard.screen,config_logo:0
+#: field:publisher_warranty.contract.wizard,config_logo:0
+#: field:res.config,config_logo:0
+#: field:res.config.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Iteration Action Configuration"
+msgstr ""
+
+#. module: base
+#: selection:publisher_warranty.contract,state:0
+msgid "Canceled"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.at
+msgid "Austria"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Cancel Install"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be_invoice_bba
+msgid ""
+"\n"
+"    \n"
+"Belgian localisation for in- and outgoing invoices (prereq to "
+"account_coda):\n"
+"    - Rename 'reference' field labels to 'Communication'\n"
+"    - Add support for Belgian Structured Communication\n"
+"\n"
+"A Structured Communication can be generated automatically on outgoing "
+"invoices according to the following algorithms:\n"
+"    1) Random : +++RRR/RRRR/RRRDD+++\n"
+"        R..R = Random Digits, DD = Check Digits\n"
+"    2) Date : +++DOY/YEAR/SSSDD+++\n"
+"        DOY = Day of the Year, SSS = Sequence Number, DD = Check Digits)\n"
+"    3) Customer Reference +++RRR/RRRR/SSSDDD+++\n"
+"        R..R = Customer Reference without non-numeric characters, SSS = "
+"Sequence Number, DD = Check Digits)  \n"
+"        \n"
+"The preferred type of Structured Communication and associated Algorithm can "
+"be specified on the Partner records. \n"
+"A 'random' Structured Communication will generated if no algorithm is "
+"specified on the Partner record. \n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_wiki_quality_manual
+msgid "Wiki: Quality Manual"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: model:ir.ui.menu,name:base.menu_calendar_configuration
+#: selection:ir.ui.view,type:0
+#: selection:wizard.ir.model.menu.create.line,view_type:0
+msgid "Calendar"
+msgstr ""
+
+#. module: base
+#: field:res.partner.address,partner_id:0
+msgid "Partner Name"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,signal_send:0
+msgid "Signal (subflow.*)"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_17
+msgid "HR sector"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_dashboard_admin
+msgid "Administration Dashboard"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4408
+#, python-format
+msgid ""
+"Invalid \"order\" specified. A valid \"order\" specification is a comma-"
+"separated list of valid field names (optionally followed by asc/desc for the "
+"direction)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_module_module_dependency
+msgid "Module dependency"
+msgstr ""
+
+#. module: base
+#: selection:publisher_warranty.contract.wizard,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: base
+#: selection:res.users,view:0
+msgid "Extended"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_title_contact
+msgid ""
+"Manage the contact titles you want to have available in your system and the "
+"way you want to print them in letters and other documents. Some example: "
+"Mr., Mrs. "
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: view:res.groups:0
+#: field:res.groups,model_access:0
+msgid "Access Controls"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:237
+#, python-format
+msgid ""
+"The Selection Options expression is not a valid Pythonic expression.Please "
+"provide an expression in the [('key','Label'), ...] format."
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_survey_user
+msgid "Survey / User"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: field:ir.module.module,dependencies_id:0
+msgid "Dependencies"
+msgstr ""
+
+#. module: base
+#: field:multi_company.default,company_id:0
+msgid "Main Company"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon_hover:0
+msgid "Web Icon File (hover)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_diagram
+msgid "Openerp web Diagram view"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_hr_user
+msgid "HR Officer"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_contract
+msgid "Employee Contracts"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_wiki_faq
+msgid ""
+"\n"
+"This module provides a Wiki FAQ Template.\n"
+"=========================================\n"
+"\n"
+"It provides demo data, thereby creating a Wiki Group and a Wiki Page\n"
+"for Wiki FAQ.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"If you use a formula type, use a python expression using the variable "
+"'object'."
+msgstr ""
+
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_users
+#: field:ir.default,uid:0
+#: model:ir.ui.menu,name:base.menu_action_res_users
+#: model:ir.ui.menu,name:base.menu_users
+#: view:res.groups:0
+#: field:res.groups,users:0
+#: view:res.users:0
+msgid "Users"
+msgstr ""
+
+#. module: base
+#: field:res.partner.address,birthdate:0
+msgid "Birthdate"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_title_contact
+#: model:ir.ui.menu,name:base.menu_partner_title_contact
+msgid "Contact Titles"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_manufacturer
+msgid "Products Manufacturers"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:217
+#, python-format
+msgid "SMTP-over-SSL mode unavailable"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_survey
+msgid "Survey"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid ""
+"Please double-check that the file encoding is set to UTF-8 (sometimes called "
+"Unicode) when the translator exports it."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (DO) / Español (DO)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.na
+msgid "Namibia"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_activity
+msgid "workflow.activity"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.view_sc,res_id:0
+msgid ""
+"Reference of the target resource, whose model/table depends on the 'Resource "
+"Name' field."
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,select_level:0
+msgid "Searchable"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.uy
+msgid "Uruguay"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_fetchmail_crm
+msgid "eMail Gateway for Leads"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Finnish / Suomi"
+msgstr ""
+
+#. module: base
+#: field:ir.rule,perm_write:0
+msgid "Apply For Write"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "German / Deutsch"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_dashboard
+msgid "web Dashboard"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale
+msgid ""
+"\n"
+"The base module to manage quotations and sales orders.\n"
+"======================================================\n"
+"\n"
+"Workflow with validation steps:\n"
+"-------------------------------\n"
+"    * Quotation -> Sales order -> Invoice\n"
+"\n"
+"Invoicing methods:\n"
+"------------------\n"
+"    * Invoice on order (before or after shipping)\n"
+"    * Invoice on delivery\n"
+"    * Invoice on timesheets\n"
+"    * Advance invoice\n"
+"\n"
+"Partners preferences:\n"
+"---------------------\n"
+"    * shipping\n"
+"    * invoicing\n"
+"    * incoterm\n"
+"\n"
+"Products stocks and prices\n"
+"--------------------------\n"
+"\n"
+"Delivery methods:\n"
+"-----------------\n"
+"    * all at once\n"
+"    * multi-parcel\n"
+"    * delivery costs\n"
+"\n"
+"Dashboard for Sales Manager that includes:\n"
+"------------------------------------------\n"
+"    * Quotations\n"
+"    * Sales by Month\n"
+"    * Graph of Sales by Salesman in last 90 days\n"
+"    * Graph of Sales per Customer in last 90 days\n"
+"    * Graph of Sales by Product's Category in last 90 days\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Portugese / Português"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_sir
+msgid "Sir"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ca
+msgid ""
+"\n"
+"This is the module to manage the English and French - Canadian accounting "
+"chart in OpenERP.\n"
+"============================================================================="
+"==============\n"
+"\n"
+"Canadian accounting charts and localizations.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid "Select module package to import (.zip file):"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "French / Français"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mt
+msgid "Malta"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,fields_lines:0
+msgid "Field Mappings."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the KLUWER Chart of Accounts,\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,demo:0
+msgid "Demo data"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal
+msgid ""
+"\n"
+"This module defines 'portals' to customize the access to your OpenERP "
+"database\n"
+"for external users.\n"
+"\n"
+"A portal defines customized user menu and access rights for a group of "
+"users\n"
+"(the ones associated to that portal).  It also associates user groups to "
+"the\n"
+"portal users (adding a group in the portal automatically adds it to the "
+"portal\n"
+"users, etc).  That feature is very handy when used in combination with the\n"
+"module 'share'.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:res.request,priority:0
+msgid "High"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,description:0
+#: field:ir.mail_server,name:0
+#: field:ir.module.category,description:0
+#: view:ir.module.module:0
+#: field:ir.module.module,description:0
+#: view:res.partner.event:0
+#: field:res.partner.event,description:0
+#: view:res.request:0
+msgid "Description"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_instance_form
+#: model:ir.ui.menu,name:base.menu_workflow_instance
+msgid "Instances"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_host:0
+msgid "Hostname or IP of SMTP server"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Japanese / 日本語"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,auto:0
+msgid "Custom python parser"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "XSL"
+msgstr ""
+
+#. module: base
+#: field:res.lang,grouping:0
+msgid "Separator Format"
+msgstr ""
+
+#. module: base
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_report_webkit
+msgid "Webkit Report Engine"
+msgstr ""
+
+#. module: base
+#: selection:publisher_warranty.contract,state:0
+msgid "Unvalidated"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_9
+msgid "Database Structure"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_mass_mail
+#: model:ir.model,name:base.model_partner_massmail_wizard
+#: view:partner.massmail.wizard:0
+msgid "Mass Mailing"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.yt
+msgid "Mayotte"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_todo
+msgid "Tasks on CRM"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_generic_modules_accounting
+#: view:res.company:0
+msgid "Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_payment
+msgid ""
+"\n"
+"Module to manage invoice payment.\n"
+"=================================\n"
+"\n"
+"This module provides :\n"
+"----------------------\n"
+"* a more efficient way to manage invoice payment.\n"
+"* a basic mechanism to easily plug various automated payment.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Interaction between rules"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_invoice_layout
+msgid ""
+"\n"
+"This module provides some features to improve the layout of the invoices.\n"
+"=========================================================================\n"
+"\n"
+"It gives you the possibility to:\n"
+"--------------------------------\n"
+"    * order all the lines of an invoice\n"
+"    * add titles, comment lines, sub total lines\n"
+"    * draw horizontal lines and put page breaks\n"
+"\n"
+"Moreover, there is one option which allows you to print all the selected "
+"invoices with a given special message at the bottom of it. This feature can "
+"be very useful for printing your invoices with end-of-year wishes, special "
+"punctual conditions.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: base
+#: view:res.payterm:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: base
+#: selection:res.lang,direction:0
+msgid "Right-to-Left"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner_event
+msgid "res.partner.event"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: model:ir.actions.act_window,name:base.actions_ir_filters_view
+#: view:ir.filters:0
+#: model:ir.model,name:base.model_ir_filters
+#: model:ir.ui.menu,name:base.menu_ir_filters
+msgid "Filters"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.open_module_tree
+msgid ""
+"You can install new modules in order to activate new features, menu, reports "
+"or data in your OpenERP instance. To install some modules, click on the "
+"button \"Install\" from the form view and then click on \"Start Upgrade\"."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_cron_act
+#: view:ir.cron:0
+#: model:ir.ui.menu,name:base.menu_ir_cron_act
+msgid "Scheduled Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_chat
+msgid ""
+"\n"
+"        OpenERP Web chat module.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: field:res.partner.address,title:0
+#: field:res.partner.title,name:0
+#: field:res.widget,title:0
+msgid "Title"
+msgstr ""
+
+#. module: base
+#: help:ir.property,res_id:0
+msgid "If not set, acts as a default value for new resources"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3988
+#, python-format
+msgid "Recursivity Detected."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_report_webkit_sample
+msgid "Webkit Report Samples"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_point_of_sale
+msgid "Point Of Sale"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:302
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+msgid ""
+"This wizard helps you add a new language to your OpenERP system. After "
+"loading a new language it becomes available as default interface language "
+"for users and partners."
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "Create a Menu"
+msgstr ""
+
+#. module: base
+#: help:res.partner,vat:0
+msgid ""
+"Value Added Tax number. Check the box if the partner is subjected to the "
+"VAT. Used by the VAT legal statement."
+msgstr ""
+
+#. module: base
+#: selection:ir.sequence,implementation:0
+msgid "Standard"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_maintenance_contract
+msgid "maintenance.contract"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ru
+msgid "Russian Federation"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Urdu / اردو"
+msgstr ""
+
+#. module: base
+#: field:res.company,name:0
+msgid "Company Name"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2683
+#, python-format
+msgid ""
+"Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
+"integer): \"%s\""
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_human_resources
+msgid "Human Resources"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_country
+#: model:ir.ui.menu,name:base.menu_country_partner
+msgid "Countries"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "RML  (deprecated - use Report)"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+msgid "Field Information"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_multilang
+msgid ""
+"\n"
+"    * Multi language support for Chart of Accounts, Taxes, Tax Codes , "
+"Journals, Accounting Templates,\n"
+"        Analytic Chart of Accounts and Analytic Journals.\n"
+"    * Setup wizard changes\n"
+"        - Copy translations for COA, Tax, Tax Code and Fiscal Position from "
+"templates to target objects.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Search Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_partner_wizard_ean_check
+#: view:partner.wizard.ean.check:0
+msgid "Ean check"
+msgstr ""
+
+#. module: base
+#: field:res.partner,vat:0
+msgid "VAT"
+msgstr "RFC"
+
+#. module: base
+#: field:res.users,new_password:0
+msgid "Set password"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "12. %w              ==> 5 ( Friday is the 6th day)"
+msgstr ""
+
+#. module: base
+#: constraint:res.partner.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%x - Appropriate date representation."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_mobile
+msgid ""
+"\n"
+"        OpenERP Web mobile.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%d - Day of the month [01,31]."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tj
+msgid "Tajikistan"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL-2 or later version"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_sir
+msgid "M."
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:519
+#, python-format
+msgid ""
+"Can not create the module file:\n"
+" %s"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_wizard
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.wizard"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3437
+#, python-format
+msgid ""
+"Operation prohibited by access rules, or performed on an already deleted "
+"document (Operation: read, Document type: %s)."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nr
+msgid "Nauru"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference.graph:0
+msgid "Introspection report on objects"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:240
+#, python-format
+msgid "The certificate ID of the module must be unique !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_hn
+msgid ""
+"Agrega una nomenclatura contable para Honduras. También incluye impuestos y "
+"la moneda Lempira. -- Adds accounting chart for Honduras.  It also includes "
+"taxes and the Lempira currency"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,view_type:0
+#: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
+#: selection:ir.ui.view,type:0
+#: selection:wizard.ir.model.menu.create.line,view_type:0
+msgid "Form"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_it
+msgid ""
+"\n"
+"Piano dei conti italiano di un'impresa generica.\n"
+"================================================\n"
+"\n"
+"Italian accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.me
+msgid "Montenegro"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document_ics
+msgid "iCal Support"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_fetchmail
+msgid "Email Gateway"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:439
+#, python-format
+msgid ""
+"Mail delivery failed via SMTP server '%s'.\n"
+"%s: %s"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+msgid "Technical Data"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: field:res.partner,category_id:0
+msgid "Categories"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_mobile
+msgid "OpenERP Web mobile"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid ""
+"If you need another language than the official ones available, you can "
+"import a language pack from here. Other OpenERP languages than the official "
+"ones can be found on launchpad."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_accountant
+msgid ""
+"\n"
+"Accounting Access Rights.\n"
+"=========================\n"
+"\n"
+"This module gives the admin user the access to all the accounting features\n"
+"like the journal items and the chart of accounts.\n"
+"\n"
+"It assigns manager and user access rights to the Administrator, and only\n"
+"user rights to Demo user.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "To be upgraded"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ly
+msgid "Libya"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cf
+msgid "Central African Republic"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.li
+msgid "Liechtenstein"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_rpc
+msgid "Openerp web web"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_issue_sheet
+msgid "Timesheet on Issues"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_ltd
+msgid "Ltd"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Account Voucher module includes all the basic requirements of Voucher "
+"Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc.\n"
+"============================================================================="
+"=======================================================\n"
+"\n"
+"    * Voucher Entry\n"
+"    * Voucher Receipt\n"
+"    * Cheque Register\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.partner,ean13:0
+msgid "EAN13"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2134
+#, python-format
+msgid "Invalid Architecture!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pt
+msgid "Portugal"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_share
+msgid "Share any Document"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,certificate:0
+msgid "Quality Certificate"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "6.  %d, %m         ==> 05, 12"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_analytic_multicurrency
+msgid ""
+"\n"
+"This improve OpenERP multi-currency handling in analytic accountiong, "
+"overall for multi-company.\n"
+"\n"
+"This module is based on the work made in all c2c_multicost* available on the "
+"v5.0 stable version and\n"
+"allow you to shar analytic account between company (even if currency differs "
+"in each one).\n"
+"\n"
+"What has been done here:\n"
+"\n"
+"  * Adapt the owner of analytic line (= to company that own the general "
+"account associated with en analytic line)\n"
+"  * Add multi-currency on analytic lines (similar to financial accounting)\n"
+"  * Correct all \"costs\" indicators into analytic account to base them on "
+"the right currency (owner's company)\n"
+"  * By default, nothing change for single company implementation.\n"
+"\n"
+"As a result, we can now really share the same analytic account between "
+"companies that doesn't have the same \n"
+"currency. This setup becomes True, Enjoy !\n"
+"\n"
+"- Company A : EUR\n"
+"- Company B : CHF\n"
+"\n"
+"- Analytic Account A : USD, owned by Company A\n"
+"    - Analytic Account B : CHF, owned by Company A\n"
+"    - Analytic Account C : EUR, owned by Company B\n"
+"\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_it
+msgid "Italy - Accounting"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,help:0
+msgid "Action description"
+msgstr ""
+
+#. module: base
+#: help:res.partner,customer:0
+msgid "Check this box if the partner is a customer."
+msgstr ""
+
+#. module: base
+#: help:ir.module.module,auto_install:0
+msgid ""
+"An auto-installable module is automatically installed by the system when all "
+"its dependencies are satisfied. If the module has no dependency, it is "
+"always installed."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_lang_act_window
+#: model:ir.model,name:base.model_res_lang
+#: model:ir.ui.menu,name:base.menu_res_lang_act_window
+#: view:res.lang:0
+msgid "Languages"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"This modules allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"============================================================================="
+"===\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_localization_account_charts
+msgid "Account Charts"
+msgstr ""
+
+#. module: base
+#: view:res.request:0
+msgid "Request Date"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_export_language.py:52
+#, python-format
+msgid ""
+"Save this document to a .CSV file and open it with your favourite "
+"spreadsheet software. The file encoding is UTF-8. You have to translate the "
+"latest column before reimporting it."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_customer_form
+#: model:ir.actions.act_window,name:base.action_partner_form
+#: model:ir.ui.menu,name:base.menu_partner_form
+#: view:res.partner:0
+msgid "Customers"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.au
+msgid "Australia"
+msgstr ""
+
+#. module: base
+#: help:res.partner,lang:0
+msgid ""
+"If the selected language is loaded in the system, all documents related to "
+"this partner will be printed in this language. If not, it will be english."
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference.graph:0
+msgid "Menu :"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,state:0
+msgid "Base Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_anonymization
+msgid ""
+"\n"
+"This module allows you to anonymize a database.\n"
+"===============================================\n"
+"\n"
+"This module allows you to keep your data confidential for a given database.\n"
+"This process is useful if you want to use the migration process and protect\n"
+"your own or your customer’s confidential data. The principle is that you "
+"run\n"
+"an anonymization tool which will hide your confidential data(they are "
+"replaced\n"
+"by ‘XXX’ characters). Then you can send the anonymized database to the "
+"migration\n"
+"team. Once you get back your migrated database, you restore it and reverse "
+"the\n"
+"anonymization process to recover your previous data.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:publisher_warranty.contract,name:0
+#: help:publisher_warranty.contract.wizard,name:0
+msgid ""
+"Your OpenERP Publisher's Warranty Contract unique key, also called serial "
+"number."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_setup
+msgid ""
+"\n"
+"This module helps to configure the system at the installation of a new "
+"database.\n"
+"============================================================================="
+"===\n"
+"\n"
+"Shows you a list of applications features to install from.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_sxw_content:0
+#: field:ir.actions.report.xml,report_sxw_content_data:0
+msgid "SXW content"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pl
+msgid "Poland - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+msgid "Action to Trigger"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Constraint"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase
+msgid ""
+"\n"
+"Purchase module is for generating a purchase order for purchase of goods "
+"from a supplier.\n"
+"============================================================================="
+"============\n"
+"\n"
+"A supplier invoice is created for the particular purchase order.\n"
+"\n"
+"Dashboard for purchase management that includes:\n"
+"    * Current Purchase Orders\n"
+"    * Draft Purchase Orders\n"
+"    * Graph for quantity and amount per month\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
+#: field:ir.model.fields,required:0
+#: field:res.partner.bank.type.field,required:0
+msgid "Required"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Default Filters"
+msgstr ""
+
+#. module: base
+#: field:res.request.history,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_hidden_dependency
+msgid "Dependency"
+msgstr ""
+
+#. module: base
+#: field:multi_company.default,expression:0
+msgid "Expression"
+msgstr ""
+
+#. module: base
+#: view:publisher_warranty.contract:0
+msgid "Validate"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Header/Footer"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,sequence:0
+msgid ""
+"When no specific mail server is requested for a mail, the highest priority "
+"one is used. Default priority is 10 (smaller number = higher priority)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_partner_assign
+msgid ""
+"\n"
+"This is the module used by OpenERP SA to redirect customers to its partners, "
+"based on geolocalization.\n"
+"============================================================================="
+"=========================\n"
+"\n"
+"You can geolocalize your opportunities by using this module.\n"
+"\n"
+"Use geolocalization when assigning opportunities to partners.\n"
+"Determine the GPS coordinates according to the address of the partner.\n"
+"The most appropriate partner can be assigned.\n"
+"You can also use the geolocalization without using the GPS coordinates.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,help:0
+msgid ""
+"Optional help text for the users with a description of the target view, such "
+"as its usage and purpose."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.va
+msgid "Holy See (Vatican City State)"
+msgstr ""
+
+#. module: base
+#: field:base.module.import,module_file:0
+msgid "Module .ZIP file"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_16
+msgid "Telecom sector"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,trigger_model:0
+msgid "Trigger Object"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.sequence.type:0
+msgid "`code` must be unique."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_expense
+msgid "Expenses Management"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,in_transitions:0
+msgid "Incoming Transitions"
+msgstr ""
+
+#. module: base
+#: field:ir.values,value_unpickle:0
+msgid "Default value or action reference"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_timesheet
+msgid "Bill Time on Tasks"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_marketing
+#: model:ir.module.module,shortdesc:base.module_marketing
+#: model:ir.ui.menu,name:base.marketing_menu
+msgid "Marketing"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Bank account"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_gr
+msgid "Greece - Accounting"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (HN) / Español (HN)"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence.type:0
+msgid "Sequence Type"
+msgstr ""
+
+#. module: base
+#: view:ir.ui.view.custom:0
+msgid "Customized Architecture"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_gantt
+msgid "web Gantt"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,license:0
+msgid "License"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_graph
+msgid "web Graph"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,url:0
+msgid "Url"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "SQL Constraint"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.menu,groups_id:0
+msgid ""
+"If you have groups, the visibility of this menu will be based on these "
+"groups. If this field is empty, OpenERP will compute visibility based on the "
+"related object's read access."
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid ""
+"We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_subscription
+msgid ""
+"\n"
+"Create recurring documents.\n"
+"===========================\n"
+"\n"
+"This module allows to create new documents and add subscriptions on that "
+"document.\n"
+"\n"
+"e.g. To have an invoice generated automatically periodically:\n"
+"    * Define a document type based on Invoice object\n"
+"    * Define a subscription whose source document is the document defined as "
+"above. Specify the interval information and partner to be invoice.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,srcmodel_id:0
+#: field:ir.model,model:0
+#: field:ir.model.fields,model_id:0
+#: view:ir.values:0
+msgid "Model"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+msgid ""
+"The selected language has been successfully installed. You must change the "
+"preferences of the user and open a new menu to view the changes."
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.config_parameter:0
+msgid "Key must be unique."
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "Open a Window"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gq
+msgid "Equatorial Guinea"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_warning
+msgid "Warning Messages and Alerts"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+#: model:ir.actions.act_window,name:base.action_view_base_module_import
+msgid "Module Import"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ch
+msgid "Switzerland - Accounting"
+msgstr ""
+
+#. module: base
+#: field:res.bank,zip:0
+#: field:res.company,zip:0
+#: field:res.partner.address,zip:0
+#: field:res.partner.bank,zip:0
+msgid "Zip"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: field:ir.module.module,author:0
+msgid "Author"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mk
+msgid "FYROM"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%c - Appropriate date and time representation."
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:386
+#, python-format
+msgid ""
+"Your database is now fully configured.\n"
+"\n"
+"Click 'Continue' and enjoy your OpenERP experience..."
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_marketing
+msgid "Helps you manage your marketing campaigns step by step."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Hebrew / עִבְרִי"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bo
+msgid "Bolivia"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gh
+msgid "Ghana"
+msgstr ""
+
+#. module: base
+#: field:res.lang,direction:0
+msgid "Direction"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: model:ir.actions.act_window,name:base.action_ui_view
+#: field:ir.actions.act_window,view_ids:0
+#: field:ir.actions.act_window,views:0
+#: view:ir.model:0
+#: field:ir.model,view_ids:0
+#: field:ir.module.module,views_by_module:0
+#: model:ir.ui.menu,name:base.menu_action_ui_view
+#: view:ir.ui.view:0
+msgid "Views"
+msgstr ""
+
+#. module: base
+#: view:res.groups:0
+#: field:res.groups,rule_groups:0
+msgid "Rules"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_host:0
+msgid "SMTP Server"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:256
+#, python-format
+msgid "You try to remove a module that is installed or will be installed"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "The selected modules have been updated / installed !"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PR) / Español (PR)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gt
+msgid "Guatemala"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,message:0
+msgid ""
+"Email contents, may contain expressions enclosed in double brackets based on "
+"the same values as those available in the condition field, e.g. `Dear [[ "
+"object.partner_id.name ]]`"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_form
+#: model:ir.ui.menu,name:base.menu_low_workflow
+#: model:ir.ui.menu,name:base.menu_workflow
+#: model:ir.ui.menu,name:base.menu_workflow_root
+msgid "Workflows"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_profile_tools
+msgid ""
+"\n"
+"Installer for extra Hidden like lunch, survey, idea, share, etc.\n"
+"===============================================================\n"
+"\n"
+"Makes the Extra Hidden Configuration available from where you can install\n"
+"modules like share, lunch, pad, idea, survey and subscription.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_specific_industry_applications
+msgid "Specific Industry Applications"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_retailers0
+msgid "Retailers"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_uservoice
+msgid "Receive User Feedback"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ls
+msgid "Lesotho"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_vat
+msgid "VAT Number Validation"
+msgstr "Validación del RFC"
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_partner_assign
+msgid "Partners Geo-Localization"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ke
+msgid "Kenya"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_translation
+#: model:ir.ui.menu,name:base.menu_action_translation
+msgid "Translated Terms"
+msgstr ""
+
+#. module: base
+#: view:res.partner.event:0
+msgid "Event"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_custom_reports
+msgid "Custom Reports"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Abkhazian / аҧсуа"
+msgstr ""
+
+#. module: base
+#: view:base.module.configuration:0
+msgid "System Configuration Done"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:1459
+#, python-format
+msgid "Error occurred while validating the field(s) %s: %s"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+msgid "Generic"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "SMS Configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_document_webdav
+msgid ""
+"\n"
+"With this module, the WebDAV server for documents is activated.\n"
+"===============================================================\n"
+"\n"
+"You can then use any compatible browser to remotely see the attachments of "
+"OpenObject.\n"
+"\n"
+"After installation, the WebDAV server can be controlled by a [webdav] "
+"section in the server's config.\n"
+"Server Configuration Parameter:\n"
+"\n"
+"    [webdav]\n"
+"    ; enable = True ; Serve webdav over the http(s) servers\n"
+"    ; vdir = webdav ; the directory that webdav will be served at\n"
+"    ; this default val means that webdav will be\n"
+"    ; on \"http://localhost:8069/webdav/\n"
+"    ; verbose = True ; Turn on the verbose messages of webdav\n"
+"    ; debug = True ; Turn on the debugging messages of webdav\n"
+"    ; since the messages are routed to the python logging, with\n"
+"    ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"    ; these options on\n"
+"\n"
+"Also implements IETF RFC 5785 for services discovery on a http server,\n"
+"which needs explicit configuration in openerp-server.conf, too.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sm
+msgid "San Marino"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_survey
+msgid ""
+"\n"
+"This module is used for surveying.\n"
+"==================================\n"
+"\n"
+"It depends on the answers or reviews of some questions by different users.\n"
+"A survey may have multiple pages. Each page may contain multiple questions "
+"and each question may have multiple answers.\n"
+"Different users may give different answers of question and according to that "
+"survey is done.\n"
+"Partners are also sent mails with user name and password for the invitation "
+"of the survey\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bm
+msgid "Bermuda"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pe
+msgid "Peru"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,on_delete:0
+msgid "Set NULL"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bj
+msgid "Benin"
+msgstr ""
+
+#. module: base
+#: code:addons/base/publisher_warranty/publisher_warranty.py:295
+#: sql_constraint:publisher_warranty.contract:0
+#, python-format
+msgid "That contract is already registered in the system."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_partner_bank_type_form
+#: model:ir.ui.menu,name:base.menu_action_res_partner_bank_typeform
+msgid "Bank Account Types"
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_user:0
+msgid "Optional username for SMTP authentication"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_actions
+msgid "ir.actions.actions"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,select_level:0
+msgid "Not Searchable"
+msgstr ""
+
+#. module: base
+#: field:ir.config_parameter,key:0
+msgid "Key"
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_header:0
+msgid "RML Header"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:271
+#, python-format
+msgid ""
+"Please keep in mind that documents currently displayed may not be relevant "
+"after switching to another company. If you have unsaved changes, please make "
+"sure to save and close all forms before switching to a different company. "
+"(You can click on Cancel in the User Preferences now)"
+msgstr ""
+
+#. module: base
+#: field:partner.sms.send,app_id:0
+msgid "API ID"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:533
+#, python-format
+msgid ""
+"You can not create this document (%s) ! Be sure your user belongs to one of "
+"these groups: %s."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_chat
+msgid "Web Chat"
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_footer2:0
+msgid "Bank Accounts Footer"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mu
+msgid "Mauritius"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: view:ir.rule:0
+msgid "Full Access"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: view:ir.actions.report.xml:0
+#: view:ir.actions.wizard:0
+#: view:ir.model.fields:0
+#: model:ir.ui.menu,name:base.menu_security
+msgid "Security"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:311
+#, python-format
+msgid "Changing the storing system for field \"%s\" is not allowed."
+msgstr ""
+
+#. module: base
+#: help:res.partner.bank,company_id:0
+msgid "Only if this bank account belong to your company"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.za
+msgid "South Africa"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "Installed"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Ukrainian / українська"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sn
+msgid "Senegal"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase_requisition
+msgid ""
+"\n"
+"This module allows you to manage your Purchase Requisition.\n"
+"===========================================================\n"
+"\n"
+"When a purchase order is created, you now have the opportunity to save the "
+"related requisition.\n"
+"This new object will regroup and will allow you to easily keep track and "
+"order all your purchase orders.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hu
+msgid "Hungary"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_recruitment
+msgid "Recruitment Process"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.br
+msgid "Brazil"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%M - Minute [00,59]."
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Affero GPL-3"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,number_next:0
+msgid "Next Number"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,condition:0
+msgid "Expression to be satisfied if we want the transition done."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_publisher_warranty_contract_wizard
+msgid "publisher_warranty.contract.wizard"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PA) / Español (PA)"
+msgstr ""
+
+#. module: base
+#: view:res.currency:0
+#: field:res.currency,rate_ids:0
+msgid "Rates"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sy
+msgid "Syria"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "======================================================"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "System update completed"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.model:0
+msgid "Each model must be unique!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_localization
+msgid "Localization"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_mrp
+msgid ""
+"\n"
+"This module provides facility to the user to install mrp and sales modulesat "
+"a time.\n"
+"============================================================================="
+"=======\n"
+"\n"
+"It is basically used when we want to keep track of production\n"
+"orders generated from sales order.\n"
+"It adds sales name and sales Reference on production order.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "draft"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+#: field:res.currency,date:0
+#: field:res.currency.rate,name:0
+#: field:res.partner,date:0
+#: field:res.partner.event,date:0
+#: field:res.request,date_sent:0
+msgid "Date"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_sxw:0
+msgid "SXW path"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Data"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_timesheet_invoice
+msgid ""
+"Generate your Invoices from Expenses, Timesheet Entries, ...\n"
+"Module to generate invoices based on costs (human resources, expenses, "
+"...).\n"
+"============================================================================"
+"\n"
+"\n"
+"You can define price lists in analytic account, make some theoretical "
+"revenue\n"
+"reports, etc."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,parent_id:0
+#: field:wizard.ir.model.menu.create,menu_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank,owner_name:0
+msgid "Account Owner Name"
+msgstr ""
+
+#. module: base
+#: field:ir.rule,perm_unlink:0
+msgid "Apply For Delete"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:359
+#, python-format
+msgid "Cannot rename column to %s, because that column already exists!"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Attached To"
+msgstr ""
+
+#. module: base
+#: field:res.lang,decimal_point:0
+msgid "Decimal Separator"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:346
+#: view:ir.module.module:0
+#, python-format
+msgid "Install"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_groups
+msgid ""
+"A group is a set of functional areas that will be assigned to the user in "
+"order to give them access and rights to specific applications and tasks in "
+"the system. You can create custom groups or edit the ones existing by "
+"default in order to customize the view of the menu that users will be able "
+"to see. Whether they can have a read, write, create and delete access right "
+"can be managed from here."
+msgstr ""
+
+#. module: base
+#: field:ir.filters,name:0
+msgid "Filter Name"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: view:res.request:0
+#: field:res.request,history:0
+msgid "History"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_uk
+msgid ""
+"This is the latest UK OpenERP localisation necesary to run OpenERP "
+"accounting for UK SME's with:\n"
+"    - a CT600-ready chart of accounts\n"
+"    - VAT100-ready tax structure\n"
+"    - InfoLogic UK counties listing\n"
+"    - a few other adaptations"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,create_uid:0
+msgid "Creator"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_asset
+msgid ""
+"Financial and accounting asset management.\n"
+"    This Module manages the assets owned by a company or an individual. It "
+"will keep track of depreciation's occurred on\n"
+"    those assets. And it allows to create Move's of the depreciation lines.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bv
+msgid "Bouvet Island"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_config_plugins
+msgid "Plugins"
+msgstr ""
+
+#. module: base
+#: field:res.company,child_ids:0
+msgid "Child Companies"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ni
+msgid "Nicaragua"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Belgium in "
+"OpenERP.\n"
+"============================================================================="
+"=\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company, the chart template to follow, the no. of digits to generate, the "
+"code for your account and bank account, currency to create journals.\n"
+"\n"
+"Thus, the pure copy of Chart Template is generated.\n"
+"\n"
+"Wizards provided by this module:\n"
+"    * Partner VAT Intra: Enlist the partners with their related VAT and "
+"invoiced amounts.Prepares an XML file format.\n"
+"            Path to access : Accounting/Reporting//Legal Statements/Belgium "
+"Statements/Partner VAT Listing\n"
+"    * Periodical VAT Declaration: Prepares an XML file for Vat Declaration "
+"of the Main company of the User currently Logged in.\n"
+"            Path to access : Accounting/Reporting/Legal Statements/Belgium "
+"Statements/Periodical VAT Declaration\n"
+"    * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for "
+"Vat Declaration of the Main company of the User currently Logged in.Based on "
+"Fiscal year\n"
+"            Path to access : Accounting/Reporting/Legal Statements/Belgium "
+"Statements/Annual Listing Of VAT-Subjected Customers\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.property,fields_id:0
+#: selection:ir.translation,type:0
+#: field:multi_company.default,field_id:0
+msgid "Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_long_term
+msgid "Long Term Projects"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ve
+msgid "Venezuela"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "9.  %j              ==> 340"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.zm
+msgid "Zambia"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Launch Configuration Wizard"
+msgstr ""
+
+#. module: base
+#: help:res.partner,user_id:0
+msgid ""
+"The internal user that is in charge of communicating with this partner if "
+"any."
+msgstr ""
+
+#. module: base
+#: field:res.partner,parent_id:0
+msgid "Parent Partner"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Cancel Upgrade"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ci
+msgid "Ivory Coast (Cote D'Ivoire)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kz
+msgid "Kazakhstan"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%w - Weekday number [0(Sunday),6]."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_form
+msgid ""
+"A customer is an entity you do business with, like a company or an "
+"organization. A customer can have several contacts or addresses which are "
+"the people working for this company. You can use the history tab, to follow "
+"all transactions related to a customer: sales order, emails, opportunities, "
+"claims, etc. If you use the email gateway, the Outlook or the Thunderbird "
+"plugin, don't forget to register emails to each contact so that the gateway "
+"will automatically attach incoming emails to the right partner."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,name:0
+#: field:ir.actions.todo,name:0
+#: field:ir.actions.todo.category,name:0
+#: field:ir.cron,name:0
+#: field:ir.model.access,name:0
+#: field:ir.model.fields,name:0
+#: field:ir.module.category,name:0
+#: view:ir.module.module:0
+#: field:ir.module.module,name:0
+#: field:ir.module.module.dependency,name:0
+#: report:ir.module.reference.graph:0
+#: field:ir.property,name:0
+#: field:ir.rule,name:0
+#: field:ir.sequence,name:0
+#: field:ir.sequence.type,name:0
+#: field:ir.values,name:0
+#: field:multi_company.default,name:0
+#: field:res.bank,name:0
+#: field:res.currency.rate.type,name:0
+#: field:res.groups,name:0
+#: field:res.lang,name:0
+#: field:res.partner,name:0
+#: field:res.partner.bank.type,name:0
+#: view:res.partner.event:0
+#: field:res.request.link,name:0
+#: field:workflow,name:0
+#: field:workflow.activity,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,multi:0
+msgid ""
+"If set to true, the action will not be displayed on the right toolbar of a "
+"form view"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ms
+msgid "Montserrat"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_decimal_precision
+msgid "Decimal Precision Configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_translation_app
+msgid "Application Terms"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"OpenERP Inventory Management module can manage multi-warehouses, multi and "
+"structured stock locations.\n"
+"============================================================================="
+"=========================\n"
+"\n"
+"Thanks to the double entry management, the inventory controlling is powerful "
+"and flexible:\n"
+"    * Moves history and planning,\n"
+"    * Different inventory methods (FIFO, LIFO, ...)\n"
+"    * Stock valuation (standard or average price, ...)\n"
+"    * Robustness faced with Inventory differences\n"
+"    * Automatic reordering rules (stock level, JIT, ...)\n"
+"    * Bar code supported\n"
+"    * Rapid detection of mistakes through double entry system\n"
+"    * Traceability (upstream/downstream, production lots, serial number, "
+"...)\n"
+"    * Dashboard for warehouse that includes:\n"
+"        * Procurement in exception\n"
+"        * List of Incoming Products\n"
+"        * List of Outgoing Products\n"
+"        * Graph : Products to receive in delay (date < = today)\n"
+"        * Graph : Products to send in delay (date < = today)\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_module_module
+#: view:ir.model.data:0
+#: field:ir.model.data,module:0
+#: view:ir.module.module:0
+#: field:ir.module.module.dependency,module_id:0
+#: report:ir.module.reference.graph:0
+msgid "Module"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "English (UK)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.aq
+msgid "Antarctica"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,act_from:0
+msgid ""
+"Source activity. When this activity is over, the condition is tested to "
+"determine if we can start the ACT_TO activity."
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_3
+msgid "Starter Partner"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,relation_field:0
+msgid ""
+"For one2many fields, the field on the target model that implement the "
+"opposite many2one relationship"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_budget
+msgid ""
+"\n"
+"This module allows accountants to manage analytic and crossovered budgets.\n"
+"==========================================================================\n"
+"\n"
+"Once the Master Budgets and the Budgets are defined (in "
+"Accounting/Budgets/),\n"
+"the Project Managers can set the planned amount on each Analytic Account.\n"
+"\n"
+"The accountant has the possibility to see the total of amount planned for "
+"each\n"
+"Budget and Master Budget in order to ensure the total planned is not\n"
+"greater/lower than what he planned for this Budget/Master Budget. Each list "
+"of\n"
+"record can also be switched to a graphical view of it.\n"
+"\n"
+"Three reports are available:\n"
+"    1. The first is available from a list of Budgets. It gives the "
+"spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
+"\n"
+"    2. The second is a summary of the previous one, it only gives the "
+"spreading, for the selected Budgets, of the Analytic Accounts.\n"
+"\n"
+"    3. The last one is available from the Analytic Chart of Accounts. It "
+"gives the spreading, for the selected Analytic Accounts, of the Master "
+"Budgets per Budgets.\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: help:res.lang,iso_code:0
+msgid "This ISO code is the name of po files to use for translations"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_act_window_view
+msgid "ir.actions.act_window.view"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference.graph:0
+msgid "Web"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_lunch
+msgid "Lunch Orders"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "English (CA)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_coda
+msgid ""
+"\n"
+"    Module to import CODA bank statements.\n"
+"\n"
+"    Supported are CODA flat files in V2 format from Belgian bank accounts.\n"
+"    - CODA v1 support.\n"
+"    - CODA v2.2 support.\n"
+"    - Foreign Currency support.\n"
+"    - Support for all data record types (0, 1, 2, 3, 4, 8, 9).\n"
+"    - Parsing & logging of all Transaction Codes and Structured Format "
+"Communications.\n"
+"    - Automatic Financial Journal assignment via CODA configuration "
+"parameters.\n"
+"    - Support for multiple Journals per Bank Account Number.\n"
+"    - Support for multiple statements from different bank accounts in a "
+"single CODA file.\n"
+"    - Support for 'parsing only' CODA Bank Accounts (defined as type='info' "
+"in the CODA Bank Account configuration records).\n"
+"    - Multi-language CODA parsing, parsing configuration data provided for "
+"EN, NL, FR.\n"
+"\n"
+"    The machine readable CODA Files are parsed and stored in human readable "
+"format in CODA Bank Statements.\n"
+"    Also Bank Statements are generated containing a subset of the CODA "
+"information (only those transaction lines\n"
+"    that are required for the creation of the Financial Accounting "
+"records).\n"
+"    The CODA Bank Statement is a 'read-only' object, hence remaining a "
+"reliable representation of the original CODA file\n"
+"    whereas the Bank Statement will get modified as required by accounting "
+"business processes.\n"
+"\n"
+"    CODA Bank Accounts configured as type 'Info' will only generate CODA "
+"Bank Statements.\n"
+"\n"
+"    A removal of one object in the CODA processing results in the removal of "
+"the associated objects.\n"
+"    The removal of a CODA File containing multiple Bank Statements will also "
+"remove those associated\n"
+"    statements.\n"
+"\n"
+"    The following reconciliation logic has been implemented in the CODA "
+"processing:\n"
+"    1) The Company's Bank Account Number of the CODA statement is compared "
+"against the Bank Account Number field\n"
+"       of the Company's CODA Bank Account configuration records (whereby "
+"bank accounts defined in type='info' configuration records are ignored).\n"
+"       If this is the case an 'internal transfer' transaction is generated "
+"using the 'Internal Transfer Account' field of the CODA File Import wizard.\n"
+"    2) As a second step the 'Structured Communication' field of the CODA "
+"transaction line is matched against\n"
+"       the reference field of in- and outgoing invoices (supported : Belgian "
+"Structured Communication Type).\n"
+"    3) When the previous step doesn't find a match, the transaction "
+"counterparty is located via the\n"
+"       Bank Account Number configured on the OpenERP Customer and Supplier "
+"records.\n"
+"    4) In case the previous steps are not successful, the transaction is "
+"generated by using the 'Default Account\n"
+"       for Unrecognized Movement' field of the CODA File Import wizard in "
+"order to allow further manual processing.\n"
+"\n"
+"    In stead of a manual adjustment of the generated Bank Statements, you "
+"can also re-import the CODA\n"
+"    after updating the OpenERP database with the information that was "
+"missing to allow automatic reconciliation.\n"
+"\n"
+"    Remark on CODA V1 support:\n"
+"    In some cases a transaction code, transaction category or structured "
+"communication code has been given a new or clearer description in CODA V2.\n"
+"    The description provided by the CODA configuration tables is based upon "
+"the CODA V2.2 specifications.\n"
+"    If required, you can manually adjust the descriptions via the CODA "
+"configuration menu.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.et
+msgid "Ethiopia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_analytic_plans
+msgid ""
+"\n"
+"This module allows to use several analytic plans, according to the general "
+"journal.\n"
+"============================================================================="
+"======\n"
+"\n"
+"Here multiple analytic lines are created when the invoice or the entries\n"
+"are confirmed.\n"
+"\n"
+"For example, you can define the following analytic structure:\n"
+"  Projects\n"
+"      Project 1\n"
+"          SubProj 1.1\n"
+"          SubProj 1.2\n"
+"\n"
+"      Project 2\n"
+"  Salesman\n"
+"      Eric\n"
+"      Fabien\n"
+"\n"
+"Here, we have two plans: Projects and Salesman. An invoice line must\n"
+"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
+"Fabien. The amount can also be split. The following example is for\n"
+"an invoice that touches the two subproject and assigned to one salesman:\n"
+"\n"
+"Plan1:\n"
+"    SubProject 1.1 : 50%\n"
+"    SubProject 1.2 : 50%\n"
+"Plan2:\n"
+"    Eric: 100%\n"
+"\n"
+"So when this line of invoice will be confirmed, it will generate 3 analytic "
+"lines,\n"
+"for one account entry.\n"
+"The analytic plan validates the minimum and maximum percentage at the time "
+"of creation\n"
+"of distribution models.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: help:res.country.state,code:0
+msgid "The state code in three chars.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sj
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_hidden_test
+msgid "Test"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_kanban
+msgid "Base Kanban"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: view:ir.actions.report.xml:0
+#: view:ir.actions.server:0
+#: view:res.request:0
+msgid "Group By"
+msgstr ""
+
+#. module: base
+#: view:res.config:0
+#: view:res.config.installer:0
+msgid "title"
+msgstr ""
+
+#. module: base
+#: field:base.language.install,state:0
+#: field:base.module.import,state:0
+#: field:base.module.update,state:0
+msgid "state"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_analytic_analysis
+msgid ""
+"\n"
+"This module is for modifying account analytic view to show important data to "
+"project manager of services companies.\n"
+"============================================================================="
+"======================================\n"
+"\n"
+"Adds menu to show relevant information to each manager.\n"
+"You can also view the report of account analytic summary\n"
+"user-wise as well as month wise.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_install
+msgid "Install Language"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Translation"
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "closed"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_cr
+msgid ""
+"\n"
+"Chart of accounts for Costa Rica.\n"
+"=================================\n"
+"\n"
+"Includes:\n"
+"* account.type\n"
+"* account.account.template\n"
+"* account.tax.template\n"
+"* account.tax.code.template\n"
+"* account.chart.template\n"
+"\n"
+"Everything is in English with Spanish translation. Further translations are "
+"welcome, please go to\n"
+"http://translations.launchpad.net/openerp-costa-rica\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,state:0
+msgid "get"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,on_delete:0
+msgid "On delete property for many2one fields"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_accounting_and_finance
+msgid "Accounting & Finance"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,write_id:0
+msgid "Write Id"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_product
+msgid "Products"
+msgstr ""
+
+#. module: base
+#: help:res.users,name:0
+msgid "The new user's real name, used for searching and most listings"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_values_form_defaults
+#: model:ir.ui.menu,name:base.menu_values_form_defaults
+#: view:ir.values:0
+msgid "User-defined Defaults"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_usability
+#: view:res.users:0
+msgid "Usability"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,domain:0
+#: field:ir.filters,domain:0
+msgid "Domain Value"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_module_quality
+msgid "Analyse Module Quality"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (BO) / Español (BO)"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_access_act
+#: model:ir.ui.menu,name:base.menu_ir_access_act
+msgid "Access Controls List"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.um
+msgid "USA Minor Outlying Islands"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,numbercall:0
+msgid ""
+"How many times the method is called,\n"
+"a negative number indicates no limit."
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank.type.field,bank_type_id:0
+msgid "Bank Type"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:87
+#: code:addons/base/res/res_users.py:96
+#, python-format
+msgid "The name of the group can not start with \"-\""
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Apps"
+msgstr ""
+
+#. module: base
+#: view:ir.ui.view_sc:0
+#: field:res.partner.title,shortcut:0
+msgid "Shortcut"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,date_init:0
+msgid "Init Date"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Gujarati / ગુજરાતી"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:297
+#, python-format
+msgid ""
+"Unable to process module \"%s\" because an external dependency is not met: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll
+msgid "Belgium - Payroll"
+msgstr ""
+
+#. module: base
+#: view:publisher_warranty.contract.wizard:0
+msgid "Please enter the serial key provided in your contract document:"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,flow_start:0
+msgid "Flow Start"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner_title
+msgid "res.partner.title"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Bank Account Owner"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_uncategorized
+msgid "Uncategorized"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_default
+msgid "ir.default"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_payroll
+msgid ""
+"\n"
+"Generic Payroll system.\n"
+"=======================\n"
+"\n"
+"    * Employee Details\n"
+"    * Employee Contracts\n"
+"    * Passport based Contract\n"
+"    * Allowances / Deductions\n"
+"    * Allow to configure Basic / Grows / Net Salary\n"
+"    * Employee Payslip\n"
+"    * Monthly Payroll Register\n"
+"    * Integrated with Holiday Management\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Hours"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gp
+msgid "Guadeloupe (French)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:187
+#: code:addons/base/res/res_lang.py:189
+#: code:addons/base/res/res_lang.py:191
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,signal:0
+msgid ""
+"When the operation of transition comes from a button pressed in the client "
+"form, signal tests the name of the pressed button. If signal is NULL, no "
+"button is necessary to validate this transition."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_diagram
+msgid "OpenERP Web Diagram"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "My Banks"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,object_id:0
+msgid "Object affected by this rule"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference.graph:0
+msgid "Directory"
+msgstr ""
+
+#. module: base
+#: field:wizard.ir.model.menu.create,name:0
+msgid "Menu Name"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Author Website"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_board
+msgid ""
+"\n"
+"Lets the user create a custom dashboard.\n"
+"========================================\n"
+"\n"
+"This module also creates the Administration Dashboard.\n"
+"\n"
+"The user can also publish notes.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_scrum
+msgid "Methodology: SCRUM"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Month"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.my
+msgid "Malaysia"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+#: model:ir.actions.act_window,name:base.action_view_base_language_install
+msgid "Load Official Translation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_cancel
+msgid "Cancel Journal Entries"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Client Action Configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner_address
+#: view:res.partner.address:0
+msgid "Partner Addresses"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_debug:0
+msgid ""
+"If enabled, the full output of SMTP sessions will be written to the server "
+"log at DEBUG level(this is very verbose and may include confidential info!)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_report_creator
+msgid "Query Builder"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,type:0
+msgid "Launch Automatically"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mail
+msgid ""
+"\n"
+"A generic email subsystem with message storage and queuing\n"
+"==========================================================\n"
+"\n"
+"This email subsystem is not intended to be used as as standalone\n"
+"application, but to provide a unified email abstraction that all\n"
+"other applications can use.\n"
+"\n"
+"The main features are:\n"
+"\n"
+"    * Relies on the global Outgoing Mail Servers configured in the \n"
+"      Administration menu for delivering outgoing mail\n"
+"    * Provides an API for sending messages and archiving them,\n"
+"      grouped by conversation\n"
+"    * Any OpenERP document can act as a conversation topic, provided\n"
+"      it includes the necessary support for handling incoming emails\n"
+"      (see the ``mail.thread`` class for more details). \n"
+"    * Includes queuing mechanism with automated configurable\n"
+"      scheduler-based processing\n"
+"    * Includes a generic email composition assistant, that can turn\n"
+"      into a mass-mailing assistant, and is capable of interpreting\n"
+"      simple *placeholder expressions* that will be replaced with\n"
+"      dynamic data when each email is actually sent.\n"
+"      This generic assistant is easily extensible to provide advanced\n"
+"      features (see ``email_template`` for example, which adds email\n"
+"      templating features to this assistant)\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%S - Seconds [00,61]."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cv
+msgid "Cape Verde"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_contact
+msgid ""
+"\n"
+"This module allows you to manage your contacts\n"
+"==============================================\n"
+"\n"
+"It lets you define:\n"
+"    * contacts unrelated to a partner,\n"
+"    * contacts working at several addresses (possibly for different "
+"partners),\n"
+"    * contacts with possibly different functions for each of its job's "
+"addresses\n"
+"\n"
+"It also adds new menu items located in\n"
+"    Purchases / Address Book / Contacts\n"
+"    Sales / Address Book / Contacts\n"
+"\n"
+"Pay attention that this module converts the existing addresses into "
+"\"addresses + contacts\". It means that some fields of the addresses will be "
+"missing (like the contact name), since these are supposed to be defined in "
+"an other object.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_res_partner_event
+#: model:ir.ui.menu,name:base.menu_event_association
+#: field:res.partner,events:0
+#: field:res.partner.event,name:0
+#: model:res.widget,title:base.events_widget
+msgid "Events"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_url
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.url"
+msgstr ""
+
+#. module: base
+#: model:res.widget,title:base.currency_converter_widget
+msgid "Currency Converter"
+msgstr ""
+
+#. module: base
+#: help:ir.values,key:0
+msgid ""
+"- Action: an action attached to one slot of the given model\n"
+"- Default: a default value for a model field"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_addess_tree
+#: view:res.partner:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base
+#: field:base.module.update,add:0
+msgid "Number of modules added"
+msgstr ""
+
+#. module: base
+#: view:res.currency:0
+msgid "Price Accuracy"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Latvian / latviešu valoda"
+msgstr ""
+
+#. module: base
+#: view:res.config:0
+#: view:res.config.installer:0
+msgid "vsep"
+msgstr ""
+
+#. module: base
+#: model:res.widget,title:base.openerp_favorites_twitter_widget
+msgid "OpenERP Tweets"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:392
+#, python-format
+msgid "Uninstall"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_budget
+msgid "Budgets Management"
+msgstr ""
+
+#. module: base
+#: field:workflow.triggers,workitem_id:0
+msgid "Workitem"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_anonymization
+msgid "Database Anonymization"
+msgstr ""
+
+#. module: base
+#: selection:ir.mail_server,smtp_encryption:0
+msgid "SSL/TLS"
+msgstr ""
+
+#. module: base
+#: field:publisher_warranty.contract,check_opw:0
+msgid "OPW"
+msgstr ""
+
+#. module: base
+#: field:res.log,secondary:0
+msgid "Secondary Log"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window.view,act_window_id:0
+#: view:ir.actions.actions:0
+#: field:ir.actions.todo,action_id:0
+#: field:ir.ui.menu,action:0
+#: view:ir.values:0
+#: selection:ir.values,key:0
+#: view:res.users:0
+msgid "Action"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Email Configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_cron
+msgid "ir.cron"
+msgstr ""
+
+#. module: base
+#: field:partner.sms.send,mobile_to:0
+#: field:res.request,act_to:0
+#: field:res.request.history,act_to:0
+msgid "To"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Current Year without Century: %(y)s"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.client,tag:0
+msgid ""
+"An arbitrary string, interpreted by the client according to its own needs "
+"and wishes. There is no central tag repository across clients."
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.rule:0
+msgid "Rule must have at least one checked access right !"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fj
+msgid "Fiji"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_document_ftp
+msgid ""
+"\n"
+"This is a support FTP Interface with document management system.\n"
+"================================================================\n"
+"\n"
+"With this module you would not only be able to access documents through "
+"OpenERP\n"
+"but you would also be able to connect with them through the file system "
+"using the\n"
+"FTP client.\n"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,size:0
+msgid "Size"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_analytic_user_function
+msgid ""
+"\n"
+"This module allows you to define what is the default function of a specific "
+"user on a given account.\n"
+"============================================================================="
+"=======================\n"
+"\n"
+"This is mostly used when a user encodes his timesheet: the values are "
+"retrieved and the fields are auto-filled. But the possibility to change "
+"these values is still available.\n"
+"\n"
+"Obviously if no data has been recorded for the current account, the default "
+"value is given as usual by the employee data so that this module is "
+"perfectly compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_audittrail
+msgid "Audit Trail"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sd
+msgid "Sudan"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_currency_rate_type_form
+#: model:ir.model,name:base.model_res_currency_rate_type
+#: field:res.currency.rate,currency_rate_type_id:0
+#: view:res.currency.rate.type:0
+msgid "Currency Rate Type"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fm
+msgid "Micronesia"
+msgstr ""
+
+#. module: base
+#: field:res.widget,content:0
+msgid "Content"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,menus_by_module:0
+#: view:res.groups:0
+msgid "Menus"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,type:0
+msgid "Launch Manually Once"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_hidden
+msgid "Hidden"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Serbian (Latin) / srpski"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.il
+msgid "Israel"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_syscohada
+msgid "OHADA - Accounting"
+msgstr ""
+
+#. module: base
+#: help:res.bank,bic:0
+msgid "Sometimes called BIC or Swift."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
+"========================================================================\n"
+"\n"
+"Mexican accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.lang,time_format:0
+msgid "Time Format"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2134
+#, python-format
+msgid "There is no view of type '%s' defined for the structure!"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Defined Reports"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_payterm_form
+#: model:ir.model,name:base.model_res_payterm
+msgid "Payment term"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Report xml"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,modules:0
+#: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
+#: field:ir.module.category,module_ids:0
+#: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.menu_management
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Modules"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: selection:workflow.activity,kind:0
+#: field:workflow.activity,subflow_id:0
+#: field:workflow.workitem,subflow_id:0
+msgid "Subflow"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_config
+msgid "res.config"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,signal:0
+msgid "Signal (button Name)"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_bank_form
+#: model:ir.ui.menu,name:base.menu_action_res_bank_form
+#: view:res.bank:0
+#: field:res.partner,bank_ids:0
+msgid "Banks"
+msgstr ""
+
+#. module: base
+#: view:res.log:0
+msgid "Unread"
+msgstr ""
+
+#. module: base
+#: field:res.users,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,doall:0
+msgid "Repeat Missed"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_import.py:69
+#, python-format
+msgid "Can not create the module file: %s !"
+msgstr ""
+
+#. module: base
+#: field:ir.server.object.lines,server_id:0
+msgid "Object Mapping"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,xml_id:0
+msgid "External ID"
+msgstr ""
+
+#. module: base
+#: help:res.currency.rate,rate:0
+msgid "The rate of the currency to the currency of rate 1"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.uk
+msgid "United Kingdom"
+msgstr ""
+
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: base
+#: help:res.partner.category,active:0
+msgid "The active field allows you to hide the category without removing it."
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference.graph:0
+msgid "Object:"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bw
+msgid "Botswana"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_title_partner
+#: model:ir.ui.menu,name:base.menu_partner_title_partner
+#: view:res.partner.title:0
+msgid "Partner Titles"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,auto_refresh:0
+msgid "Add an auto-refresh on the view"
+msgstr ""
+
+#. module: base
+#: help:res.partner,employee:0
+msgid "Check this box if the partner is an Employee."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_profiling
+msgid "Customer Profiling"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_issue
+msgid "Issues Tracker"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Work Days"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_multi_company
+msgid "Multi-Company"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_rml_content:0
+#: field:ir.actions.report.xml,report_rml_content_data:0
+msgid "RML content"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_workitem_form
+#: model:ir.ui.menu,name:base.menu_workflow_workitem
+msgid "Workitems"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:1300
+#, python-format
+msgid ""
+"Please check that all your lines have %d columns.Stopped around line %d "
+"having %d columns."
+msgstr ""
+
+#. module: base
+#: field:base.language.export,advice:0
+msgid "Advice"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Header/Footer of Reports"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:746
+#: view:res.users:0
+#, python-format
+msgid "Applications"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4086
+#, python-format
+msgid ""
+"You cannot perform this operation. New Record Creation is not allowed for "
+"this object as this object is for reporting purpose."
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,translate:0
+msgid ""
+"Whether values for this field can be translated (enables the translation "
+"mechanism for that field)"
+msgstr ""
+
+#. module: base
+#: selection:res.currency,position:0
+msgid "After Amount"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Lithuanian / Lietuvių kalba"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,record_id:0
+msgid ""
+"Provide the field name where the record id is stored after the create "
+"operations. If it is empty, you can not track the new record."
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,relation:0
+msgid "For relationship fields, the technical name of the target model"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Indonesian / Bahasa Indonesia"
+msgstr ""
+
+#. module: base
+#: help:base.language.import,overwrite:0
+msgid ""
+"If you enable this option, existing translations (including custom ones) "
+"will be overwritten and replaced by those in this file"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,inherit_id:0
+msgid "Inherited View"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Source Term"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
+msgid "Timesheets Validation"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_main_pm
+msgid "Project"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon_hover_data:0
+msgid "Web Icon Image (hover)"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid "Module file successfully imported!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ws
+msgid "Samoa"
+msgstr ""
+
+#. module: base
+#: field:publisher_warranty.contract,name:0
+#: field:publisher_warranty.contract.wizard,name:0
+msgid "Serial Key"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_timesheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: base
+#: field:res.partner,function:0
+msgid "function"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_audit
+msgid "Audit"
+msgstr ""
+
+#. module: base
+#: help:ir.values,company_id:0
+msgid "If set, action binding only applies for this company"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lc
+msgid "Saint Lucia"
+msgstr ""
+
+#. module: base
+#: help:res.users,new_password:0
+msgid ""
+"Specify a value only when creating a user or if you're changing the user's "
+"password, otherwise leave empty. After a change of password, the user has to "
+"login again."
+msgstr ""
+
+#. module: base
+#: view:publisher_warranty.contract:0
+msgid "Maintenance Contract"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_user
+#: field:res.partner,employee:0
+msgid "Employee"
+msgstr ""
+
+#. module: base
+#: field:ir.model.access,perm_create:0
+msgid "Create Access"
+msgstr ""
+
+#. module: base
+#: field:res.bank,state:0
+#: field:res.company,state_id:0
+#: field:res.partner.address,state_id:0
+#: field:res.partner.bank,state_id:0
+msgid "Fed. State"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,copy_object:0
+msgid "Copy Of"
+msgstr ""
+
+#. module: base
+#: field:ir.model,osv_memory:0
+msgid "In-memory model"
+msgstr ""
+
+#. module: base
+#: view:partner.clear.ids:0
+msgid "Clear Ids"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Edit"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.client,params:0
+msgid "Supplementary arguments"
+msgstr ""
+
+#. module: base
+#: field:res.users,view:0
+msgid "Interface"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Field Mapping"
+msgstr ""
+
+#. module: base
+#: view:publisher_warranty.contract:0
+msgid "Refresh Validation Dates"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,ttype:0
+msgid "Field Type"
+msgstr ""
+
+#. module: base
+#: field:res.country.state,code:0
+msgid "State Code"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,on_delete:0
+msgid "On delete"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_multilang
+msgid "Multi Language Chart of Accounts"
+msgstr ""
+
+#. module: base
+#: selection:res.lang,direction:0
+msgid "Left-to-Right"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+#: field:res.lang,translatable:0
+msgid "Translatable"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_analytic
+msgid ""
+"\n"
+"Module for defining analytic accounting object.\n"
+"===============================================\n"
+"\n"
+"In OpenERP, analytic accounts are linked to general accounts but are "
+"treated\n"
+"totally independently. So you can enter various different analytic "
+"operations\n"
+"that have no counterpart in the general financial accounts.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.users,signature:0
+msgid "Signature"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_caldav
+msgid "Meetings Synchronization"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,context:0
+#: field:ir.filters,context:0
+msgid "Context Value"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_widget_user
+msgid "res.widget.user"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,complete_name:0
+msgid "Full Name"
+msgstr ""
+
+#. module: base
+#: view:base.module.configuration:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:238
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_contact
+msgid "Contacts Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_fr_rib
+msgid ""
+"\n"
+"This module lets users enter the banking details of Partners in the RIB "
+"format (French standard for bank accounts details).\n"
+"RIB Bank Accounts can be entered in the \"Accounting\" tab of the Partner "
+"form by specifying the account type \"RIB\". The four standard RIB fields "
+"will then become mandatory:\n"
+"- Bank Code\n"
+"- Office Code\n"
+"- Account number\n"
+"- RIB key\n"
+"As a safety measure, OpenERP will check the RIB key whenever a RIB is saved, "
+"and will refuse to record the data if the key is incorrect. Please bear in "
+"mind that this can only happen when the user presses the \"save\" button, "
+"for example on the Partner Form.\n"
+"Since each bank account may relate to a Bank, users may enter the RIB Bank "
+"Code in the Bank form - it will the pre-fill the Bank Code on the RIB when "
+"they select the Bank. \n"
+"To make this easier, this module will also let users find Banks using their "
+"RIB code.\n"
+"\n"
+"The module base_iban can be a useful addition to this module, because French "
+"banks are now progressively adopting the international IBAN format instead "
+"of the RIB format.\n"
+"The RIB and IBAN codes for a single account can be entered by recording two "
+"Bank Accounts in OpenERP: the first with the type \"RIB\", the second with "
+"the type \"IBAN\". \n"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+msgid "Parameters that are used by all resources."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mz
+msgid "Mozambique"
+msgstr ""
+
+#. module: base
+#: help:ir.values,action_id:0
+msgid ""
+"Action bound to this entry - helper field for binding an action, will "
+"automatically set the correct reference"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_project_long_term
+msgid "Long Term Planning"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,message:0
+#: field:partner.massmail.wizard,text:0
+#: view:partner.sms.send:0
+#: field:res.log,name:0
+msgid "Message"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window.view,multi:0
+msgid "On Multiple Doc."
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: field:res.partner,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_accountant
+msgid "Accounting and Finance"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:429
+#: view:ir.module.module:0
+#, python-format
+msgid "Upgrade"
+msgstr ""
+
+#. module: base
+#: field:res.partner,address:0
+#: view:res.partner.address:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fo
+msgid "Faroe Islands"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_encryption:0
+msgid "Connection Security"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:653
+#, python-format
+msgid "Please specify an action to launch !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_us
+msgid ""
+"\n"
+"        United States - Chart of accounts\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.widget.wizard:0
+msgid "Add"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ec
+msgid "Ecuador - Accounting"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,name:0
+msgid "Category Name"
+msgstr ""
+
+#. module: base
+#: view:res.widget:0
+msgid "Widgets"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cz
+msgid "Czech Republic"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr
+msgid ""
+"\n"
+"Module for human resource management.\n"
+"=====================================\n"
+"\n"
+"You can manage:\n"
+"    * Employees and hierarchies : You can define your employee with User and "
+"display hierarchies\n"
+"    * HR Departments\n"
+"    * HR Jobs\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.widget.wizard:0
+msgid "Widget Wizard"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hn
+msgid "Honduras - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_report_intrastat
+msgid "Intrastat Reporting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:222
+#, python-format
+msgid ""
+"Please use the change password wizard (in User Preferences or User menu) to "
+"change your own password."
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:1883
+#, python-format
+msgid "Insufficient fields for Calendar View!"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Integer"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Hindi / हिंदी"
+msgstr ""
+
+#. module: base
+#: help:res.users,company_id:0
+msgid "The company this user is currently working for."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_wizard_ir_model_menu_create
+msgid "wizard.ir.model.menu.create"
+msgstr ""
+
+#. module: base
+#: view:workflow.transition:0
+msgid "Transition"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,active:0
+#: field:ir.sequence,active:0
+#: field:res.bank,active:0
+#: field:res.currency,active:0
+#: field:res.lang,active:0
+#: field:res.partner,active:0
+#: field:res.partner.address,active:0
+#: field:res.partner.category,active:0
+#: field:res.request,active:0
+#: field:res.users,active:0
+#: view:workflow.instance:0
+#: view:workflow.workitem:0
+msgid "Active"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ma
+msgid "Maroc - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mn
+msgid "Mongolia"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Created Menus"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_analytic_default
+msgid "Account Analytic Defaults"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_contract
+msgid ""
+"\n"
+"Add all information on the employee form to manage contracts.\n"
+"=============================================================\n"
+"\n"
+"    * Marital status,\n"
+"    * Security number,\n"
+"    * Place of birth, birth date, ...\n"
+"\n"
+"You can assign several contracts per employee.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.view,type:0
+msgid "mdx"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_crm
+msgid ""
+"\n"
+"This module adds a shortcut on one or several opportunity cases in the CRM.\n"
+"===========================================================================\n"
+"\n"
+"This shortcut allows you to generate a sales order based on the selected "
+"case.\n"
+"If different cases are open (a list), it generates one sale order by\n"
+"case.\n"
+"The case is then closed and linked to the generated sales order.\n"
+"\n"
+"We suggest you to install this module if you installed both the sale and "
+"the\n"
+"crm modules.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bi
+msgid "Burundi"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+#: view:base.module.import:0
+#: view:base.module.update:0
+#: view:publisher_warranty.contract.wizard:0
+#: view:res.request:0
+msgid "Close"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (MX) / Español (MX)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/publisher_warranty/publisher_warranty.py:145
+#, python-format
+msgid "Please verify your publisher warranty serial number and validity."
+msgstr ""
+
+#. module: base
+#: view:res.log:0
+msgid "My Logs"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bt
+msgid "Bhutan"
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,number_next:0
+msgid "Next number of this sequence"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_11
+msgid "Textile Suppliers"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.url,target:0
+msgid "This Window"
+msgstr ""
+
+#. module: base
+#: view:publisher_warranty.contract:0
+msgid "Publisher Warranty Contracts"
+msgstr ""
+
+#. module: base
+#: help:res.log,name:0
+msgid "The logging message."
+msgstr ""
+
+#. module: base
+#: field:base.language.export,format:0
+msgid "File Format"
+msgstr ""
+
+#. module: base
+#: field:res.lang,iso_code:0
+msgid "ISO code"
+msgstr ""
+
+#. module: base
+#: view:res.log:0
+#: field:res.log,read:0
+msgid "Read"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_association
+msgid "Associations Management"
+msgstr ""
+
+#. module: base
+#: help:ir.model,modules:0
+msgid "List of modules in which the object is defined or inherited"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_payroll
+msgid "Payroll"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_country_state
+msgid ""
+"If you are working on the American market, you can manage the different "
+"federal states you are working on from here. Each state is attached to one "
+"country."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_delivery
+msgid ""
+"\n"
+"Allows you to add delivery methods in sale orders and picking.\n"
+"==============================================================\n"
+"\n"
+"You can define your own carrier and delivery grids for prices.\n"
+"When creating invoices from picking, OpenERP is able to add and compute the "
+"shipping line.\n"
+"\n"
+"     "
+msgstr ""
+
+#. module: base
+#: view:workflow.workitem:0
+msgid "Workflow Workitems"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vc
+msgid "Saint Vincent & Grenadines"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_pass:0
+#: field:partner.sms.send,password:0
+#: field:res.users,password:0
+msgid "Password"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_anglo_saxon
+msgid ""
+"\n"
+"This module supports the Anglo-Saxon accounting methodology by changing the "
+"accounting logic with stock transactions.\n"
+"============================================================================="
+"========================================\n"
+"\n"
+"The difference between the Anglo-Saxon accounting countries\n"
+"and the Rhine or also called Continental accounting countries is the moment "
+"of taking the Cost of Goods Sold versus Cost of Sales.\n"
+"Anglo-Saxons accounting does take the cost when sales invoice is created, "
+"Continental accounting will take the cost at the moment the goods are "
+"shipped.\n"
+"This module will add this functionality by using a interim account, to store "
+"the value of shipped goods and will contra book this interim account\n"
+"when the invoice is created to transfer this amount to the debtor or "
+"creditor account.\n"
+"Secondly, price differences between actual purchase price and fixed product "
+"standard price are booked on a separate account"
+msgstr ""
+
+#. module: base
+#: field:res.partner,title:0
+msgid "Partner Firm"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_fields
+#: view:ir.model:0
+#: field:ir.model,field_id:0
+#: model:ir.model,name:base.model_ir_model_fields
+#: view:ir.model.fields:0
+#: model:ir.ui.menu,name:base.ir_model_model_fields
+msgid "Fields"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_employee_form
+msgid "Employees"
+msgstr ""
+
+#. module: base
+#: field:ir.exports.line,name:0
+#: field:ir.translation,name:0
+#: field:res.partner.bank.type.field,name:0
+msgid "Field Name"
+msgstr ""
+
+#. module: base
+#: help:res.log,read:0
+msgid ""
+"If this log item has been read, get() should not send it to the client"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_uservoice
+msgid ""
+"\n"
+"Add Feedback button in header.\n"
+"==============================\n"
+"\n"
+"Invite OpenERP user feedback, powered by uservoice.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_header2:0
+#: field:res.company,rml_header3:0
+msgid "RML Internal Header"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,search_view_id:0
+msgid "Search View Ref."
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,installed_version:0
+msgid "Latest version"
+msgstr ""
+
+#. module: base
+#: view:ir.mail_server:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_address_form
+#: model:ir.ui.menu,name:base.menu_partner_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mm
+msgid "Myanmar"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,modules:0
+msgid "List of modules in which the field is defined"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Chinese (CN) / 简体中文"
+msgstr ""
+
+#. module: base
+#: field:res.bank,street:0
+#: field:res.company,street:0
+#: field:res.partner.address,street:0
+#: field:res.partner.bank,street:0
+msgid "Street"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.yu
+msgid "Yugoslavia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase_double_validation
+msgid ""
+"\n"
+"Double-validation for purchases exceeding minimum amount.\n"
+"=========================================================\n"
+"\n"
+"This module modifies the purchase workflow in order to validate purchases\n"
+"that exceeds minimum amount set by configuration wizard.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.currency,rounding:0
+msgid "Rounding Factor"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ca
+msgid "Canada"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:158
+#, python-format
+msgid "Reg: "
+msgstr ""
+
+#. module: base
+#: help:res.currency.rate,currency_rate_type_id:0
+msgid ""
+"Allow you to define your own currency rate types, like 'Average' or 'Year to "
+"Date'. Leave empty if you simply want to use the normal 'spot' rate type"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module.dependency,state:0
+msgid "Unknown"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_users_my
+msgid "Change My Preferences"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:167
+#, python-format
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: base
+#: field:partner.sms.send,text:0
+msgid "SMS Message"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ro
+msgid ""
+"\n"
+"This is the module to manage the accounting chart, VAT structure and "
+"Registration Number for Romania in OpenERP.\n"
+"============================================================================="
+"===================================\n"
+"\n"
+"Romanian accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cm
+msgid "Cameroon"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bf
+msgid "Burkina Faso"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,state:0
+msgid "Custom Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_retro_planning
+msgid ""
+"\n"
+"Changes dates according to change in project End Date.\n"
+"======================================================\n"
+"\n"
+"If end date of project is changed then the deadline date and start date for "
+"all the tasks will change accordingly.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:res.users,view:0
+msgid ""
+"OpenERP offers a simplified and an extended user interface. If you use "
+"OpenERP for the first time we strongly advise you to select the simplified "
+"interface, which has less features but is easier to use. You can switch to "
+"the other interface from the User/Preferences menu at any time."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cc
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,state:0
+#: selection:base.module.import,state:0
+#: selection:base.module.update,state:0
+msgid "init"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "11. %U or %W       ==> 48 (49th week)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner_bank_type_field
+msgid "Bank type fields"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Dutch / Nederlands"
+msgstr ""
+
+#. module: base
+#: selection:res.company,paper_format:0
+msgid "US Letter"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock_location
+msgid ""
+"\n"
+"This module supplements the Warehouse application by effectively "
+"implementing Push and Pull inventory flows.\n"
+"============================================================================="
+"===============================\n"
+"\n"
+"Typically this could be used to:\n"
+"    * Manage product manufacturing chains\n"
+"    * Manage default locations per product\n"
+"    * Define routes within your warehouse according to business needs, such "
+"as:\n"
+"       - Quality Control\n"
+"       - After Sales Services\n"
+"       - Supplier Returns\n"
+"\n"
+"    * Help rental management, by generating automated return moves for "
+"rented products\n"
+"\n"
+"Once this module is installed, an additional tab appear on the product form, "
+"where you can add\n"
+"Push and Pull flow specifications. The demo data of CPU1 product for that "
+"push/pull :\n"
+"\n"
+"Push flows\n"
+"----------\n"
+"Push flows are useful when the arrival of certain products in a given "
+"location should always\n"
+"be followed by a corresponding move to another location, optionally after a "
+"certain delay.\n"
+"The original Warehouse application already supports such Push flow "
+"specifications on the\n"
+"Locations themselves, but these cannot be refined per-product.\n"
+"\n"
+"A push flow specification indicates which location is chained with which "
+"location, and with\n"
+"what parameters. As soon as a given quantity of products is moved in the "
+"source location,\n"
+"a chained move is automatically foreseen according to the parameters set on "
+"the flow specification\n"
+"(destination location, delay, type of move, journal, etc.) The new move can "
+"be automatically\n"
+"processed, or require a manual confirmation, depending on the parameters.\n"
+"\n"
+"Pull flows\n"
+"----------\n"
+"Pull flows are a bit different from Push flows, in the sense that they are "
+"not related to\n"
+"the processing of product moves, but rather to the processing of procurement "
+"orders.\n"
+"What is being pulled is a need, not directly products.\n"
+"A classical example of Pull flow is when you have an Outlet company, with a "
+"parent Company\n"
+"that is responsible for the supplies of the Outlet.\n"
+"\n"
+"  [ Customer ] <- A - [ Outlet ]  <- B -  [ Holding ] <~ C ~ [ Supplier ]\n"
+"\n"
+"When a new procurement order (A, coming from the confirmation of a Sale "
+"Order for example) arrives\n"
+"in the Outlet, it is converted into another procurement (B, via a Pull flow "
+"of type 'move')\n"
+"requested from the Holding. When procurement order B is processed by the "
+"Holding company, and\n"
+"if the product is out of stock, it can be converted into a Purchase Order "
+"(C) from the Supplier\n"
+"(Pull flow of type Purchase). The result is that the procurement order, the "
+"need, is pushed\n"
+"all the way between the Customer and Supplier.\n"
+"\n"
+"Technically, Pull flows allow to process procurement orders differently, not "
+"only depending on\n"
+"the product being considered, but also depending on which location holds the "
+"\"need\" for that\n"
+"product (i.e. the destination location of that procurement order).\n"
+"\n"
+"Use-Case\n"
+"--------\n"
+"\n"
+"You can use the demo data as follow:\n"
+"  CPU1: Sell some CPU1 from Shop 1 and run the scheduler\n"
+"     - Warehouse: delivery order, Shop 1: reception\n"
+"  CPU3:\n"
+"     - When receiving the product, it goes to Quality Control location then "
+"stored to shelf 2.\n"
+"     - When delivering the customer: Pick List -> Packing -> Delivery Order "
+"from Gate A\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_marketing
+msgid ""
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_knowledge_management
+msgid "Knowledge Management"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.bank_account_update
+msgid "Company Bank Accounts"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_pass:0
+msgid "Optional password for SMTP authentication"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_mrp
+msgid ""
+"\n"
+"Automatically creates project tasks from procurement lines\n"
+"==========================================================\n"
+"\n"
+"This module will automatically create a new task for each procurement\n"
+"order line (e.g. for sale order lines), if the corresponding product\n"
+"meets the following characteristics:\n"
+"\n"
+"  * Type = Service\n"
+"  * Procurement method (Order fulfillment) = MTO (make to order)\n"
+"  * Supply/Procurement method = Produce\n"
+"\n"
+"If on top of that a projet is specified on the product form (in the "
+"Procurement\n"
+"tab), then the new task will be created in that specific project.\n"
+"Otherwise, the new task will not belong to any project, and may be added to "
+"a\n"
+"project manually later.\n"
+"\n"
+"When the project task is completed or cancelled, the workflow of the "
+"corresponding\n"
+"procurement line is updated accordingly. For example if this procurement "
+"corresponds\n"
+"to a sale order line, the sale order line will be considered delivered when "
+"the\n"
+"task is completed.\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:348
+#, python-format
+msgid ""
+"\n"
+"\n"
+"This addon is already installed on your system"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_check_writing
+msgid ""
+"\n"
+"    Module for the Check writing and check printing  \n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.partner.bank.type,name:base.bank_normal
+msgid "Normal Bank Account"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.wizard:0
+#: field:wizard.ir.model.menu.create.line,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_mailgate
+msgid ""
+"\n"
+"This module can automatically create Project Tasks based on incoming emails\n"
+"===========================================================================\n"
+"\n"
+"Allows creating tasks based on new emails arriving at a given mailbox,\n"
+"similarly to what the CRM application has for Leads/Opportunities.\n"
+"There are two common alternatives to configure the mailbox integration:\n"
+"\n"
+" * Install the ``fetchmail`` module and configure a new mailbox, then "
+"select\n"
+"   ``Project Tasks`` as the target for incoming emails.\n"
+" * Set it up manually on your mail server based on the 'mail gateway' "
+"script\n"
+"   provided in the ``mail`` module - and connect it to the `project.task` "
+"model.\n"
+"\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_membership
+msgid ""
+"\n"
+"This module allows you to manage all operations for managing memberships.\n"
+"=========================================================================\n"
+"\n"
+"It supports different kind of members:\n"
+"* Free member\n"
+"* Associated member (eg.: a group subscribes to a membership for all "
+"subsidiaries)\n"
+"* Paid members,\n"
+"* Special member prices, ...\n"
+"\n"
+"It is integrated with sales and accounting to allow you to automatically\n"
+"invoice and send propositions for membership renewal.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_attendance
+msgid ""
+"\n"
+"This module aims to manage employee's attendances.\n"
+"==================================================\n"
+"\n"
+"Keeps account of the attendances of the employees on the basis of the\n"
+"actions(Sign in/Sign out) performed by them.\n"
+"       "
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,maintainer:0
+msgid "Maintainer"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mo
+msgid "Macau"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.res_partner_address_report
+msgid "Labels"
+msgstr ""
+
+#. module: base
+#: field:partner.massmail.wizard,email_from:0
+msgid "Sender's email"
+msgstr ""
+
+#. module: base
+#: field:ir.default,field_name:0
+msgid "Object Field"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PE) / Español (PE)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "French (CH) / Français (CH)"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,subject:0
+msgid ""
+"Email subject, may contain expressions enclosed in double brackets based on "
+"the same values as those available in the condition field, e.g. `Hello [[ "
+"object.partner_id.name ]]`"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_sequence
+msgid ""
+"\n"
+"This module maintains internal sequence number for accounting entries.\n"
+"======================================================================\n"
+"\n"
+"Allows you to configure the accounting sequences to be maintained.\n"
+"\n"
+"You can customize the following attributes of the sequence:\n"
+"    * Prefix\n"
+"    * Suffix\n"
+"    * Next Number\n"
+"    * Increment Number\n"
+"    * Number Padding\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.to
+msgid "Tonga"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,serialization_field_id:0
+msgid ""
+"If set, this field will be stored in the sparse structure of the "
+"serialization field, instead of having its own database column. This cannot "
+"be changed after creation."
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Bank accounts belonging to one of your companies"
+msgstr ""
+
+#. module: base
+#: help:res.users,action_id:0
+msgid ""
+"If specified, this action will be opened at logon for this user, in addition "
+"to the standard menu."
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,complexity:0
+msgid "Easy"
+msgstr ""
+
+#. module: base
+#: view:ir.values:0
+msgid "Client Actions"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,trigger_obj_id:0
+msgid ""
+"The field on the current object that links to the target object record (must "
+"be a many2one, or an integer field with the record ID)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:423
+#, python-format
+msgid ""
+"You try to upgrade a module that depends on the module: %s.\n"
+"But this module is not available in your system."
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,act_to:0
+msgid "Destination Activity"
+msgstr ""
+
+#. module: base
+#: help:res.currency,position:0
+msgid ""
+"Determines where the currency symbol should be placed after or before the "
+"amount."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_update_translations
+msgid "base.update.translations"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,parent_id:0
+msgid "Parent Category"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Integer Big"
+msgstr ""
+
+#. module: base
+#: selection:res.partner.address,type:0
+#: selection:res.partner.title,domain:0
+msgid "Contact"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_at
+msgid "Austria - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_project_management
+#: model:ir.module.module,shortdesc:base.module_project
+msgid "Project Management"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.us
+msgid "United States"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_fundraising
+msgid "Fundraising"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Cancel Uninstall"
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Communication"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_analytic
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "RML Report"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_server_object_lines
+msgid "ir.server.object.lines"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be
+msgid "Belgium - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:622
+#, python-format
+msgid "Module %s: Invalid Quality Certificate"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kw
+msgid "Kuwait"
+msgstr ""
+
+#. module: base
+#: field:workflow.workitem,inst_id:0
+msgid "Instance"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,attachment:0
+msgid ""
+"This is the filename of the attachment used to store the printing result. "
+"Keep empty to not save the printed reports. You can use a python expression "
+"with the object and time variables."
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.model.data:0
+msgid ""
+"You cannot have multiple records with the same external ID in the same "
+"module!"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Many2One"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ng
+msgid "Nigeria"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_caldav
+msgid ""
+"\n"
+"Caldav features in Meeting.\n"
+"===========================\n"
+"\n"
+"    *  Share meeting with other calendar clients like sunbird\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_iban
+msgid "IBAN Bank Accounts"
+msgstr ""
+
+#. module: base
+#: field:res.company,user_ids:0
+msgid "Accepted Users"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon_data:0
+msgid "Web Icon Image"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,wkf_model_id:0
+msgid "Target Object"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,select_level:0
+msgid "Always Searchable"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hk
+msgid "Hong Kong"
+msgstr ""
+
+#. module: base
+#: field:ir.default,ref_id:0
+msgid "ID Ref."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_address_form
+msgid ""
+"Customers (also called Partners in other areas of the system) helps you "
+"manage your address book of companies whether they are prospects, customers "
+"and/or suppliers. The partner form allows you to track and record all the "
+"necessary information to interact with your partners from the company "
+"address to their contacts as well as pricelists, and much more. If you "
+"installed the CRM, with the history tab, you can track all the interactions "
+"with a partner such as opportunities, emails, or sales orders issued."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ph
+msgid "Philippines"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ma
+msgid "Morocco"
+msgstr ""
+
+#. module: base
+#: help:ir.values,model_id:0
+msgid ""
+"Model to which this entry applies - helper field for setting a model, will "
+"automatically set the correct model name"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "2.  %a ,%A         ==> Fri, Friday"
+msgstr ""
+
+#. module: base
+#: view:res.request.history:0
+msgid "Request History"
+msgstr ""
+
+#. module: base
+#: help:ir.rule,global:0
+msgid "If no group is specified the rule is global and applied to everyone"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.td
+msgid "Chad"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,priority:0
+msgid ""
+"The priority of the job, as an integer: 0 means higher priority, 10 means "
+"lower priority."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_transition
+msgid "workflow.transition"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%a - Abbreviated weekday name."
+msgstr ""
+
+#. module: base
+#: view:ir.ui.menu:0
+msgid "Submenus"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_extended
+msgid "Extended View"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pf
+msgid "Polynesia (French)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.dm
+msgid "Dominica"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_module_record
+msgid "Record and Create Modules"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_partner_sms_send
+#: view:partner.sms.send:0
+msgid "Send SMS"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_holidays
+msgid ""
+"\n"
+"This module allows you to manage leaves and leaves' requests.\n"
+"=============================================================\n"
+"\n"
+"Implements a dashboard for human resource management that includes.\n"
+"    * Leaves\n"
+"\n"
+"Note that:\n"
+"    - A synchronisation with an internal agenda (use of the CRM module) is "
+"possible: in order to automatically create a case when an holiday request is "
+"accepted, you have to link the holidays status to a case section. You can "
+"set up this info and your colour preferences in\n"
+"                Human Resources/Configuration/Holidays/Leave Type\n"
+"    - An employee can make an ask for more off-days by making a new "
+"Allocation It will increase his total of that leave type available (if the "
+"request is accepted).\n"
+"    - There are two ways to print the employee's holidays:\n"
+"        * The first will allow to choose employees by department and is used "
+"by clicking the menu item located in\n"
+"                Human Resources/Reporting/Holidays/Leaves by Department\n"
+"        * The second will allow you to choose the holidays report for "
+"specific employees. Go on the list\n"
+"                Human Resources/Human Resources/Employees\n"
+"                then select the ones you want to choose, click on the print "
+"icon and select the option\n"
+"                'Employee's Holidays'\n"
+"    - The wizard allows you to choose if you want to print either the "
+"Confirmed & Validated holidays or only the Validated ones. These states must "
+"be set up by a user from the group 'HR'. You can define these features in "
+"the security tab from the user data in\n"
+"                Administration / Users / Users\n"
+"                for example, you maybe will do it for the user 'admin'.\n"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_xsl:0
+msgid "XSL path"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_invoice_layout
+msgid "Invoice Layouts"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock_location
+msgid "Advanced Routes"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_pad
+msgid "Collaborative Pads"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_anglo_saxon
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.np
+msgid "Nepal"
+msgstr ""
+
+#. module: base
+#: help:res.groups,implied_ids:0
+msgid "Users of this group automatically inherit those groups"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_attendance
+msgid "Attendances"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,visible:0
+msgid "Visible"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_ui_view_custom
+#: model:ir.ui.menu,name:base.menu_action_ui_view_custom
+#: view:ir.ui.view.custom:0
+msgid "Customized Views"
+msgstr ""
+
+#. module: base
+#: view:partner.sms.send:0
+msgid "Bulk SMS send"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_wiki_quality_manual
+msgid ""
+"\n"
+"Quality Manual Template.\n"
+"========================\n"
+"\n"
+"It provides demo data, thereby creating a Wiki Group and a Wiki Page\n"
+"for Wiki Quality Manual.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_values_form_action
+#: model:ir.ui.menu,name:base.menu_values_form_action
+#: view:ir.values:0
+msgid "Action Bindings"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Seconde: %(sec)s"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_view_base_module_update
+msgid "Update Modules List"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:295
+#, python-format
+msgid ""
+"Unable to upgrade module \"%s\" because an external dependency is not met: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account
+msgid "eInvoicing"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_association
+msgid ""
+"\n"
+"This module is to configure modules related to an association.\n"
+"==============================================================\n"
+"\n"
+"It installs the profile for associations to manage events, registrations, "
+"memberships, membership products (schemes), etc.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2693
+#, python-format
+msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.configuration.wizard:0
+msgid "Continue"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Thai / ภาษาไทย"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:343
+#, python-format
+msgid "Object %s does not exists"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%j - Day of the year [001,366]."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Slovenian / slovenščina"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_wiki
+msgid "Wiki"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_de
+msgid ""
+"\n"
+"Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem "
+"SKR03.\n"
+"============================================================================="
+"=\n"
+"\n"
+"German accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,attachment_use:0
+msgid "Reload from Attachment"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Hide technical modules"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_procurement
+msgid ""
+"\n"
+"This is the module for computing Procurements.\n"
+"==============================================\n"
+"\n"
+"In the MRP process, procurements orders are created to launch manufacturing\n"
+"orders, purchase orders, stock allocations, etc. Procurement orders are\n"
+"generated automatically by the system and unless there is a problem, the\n"
+"user will not be notified. In case of problems, the system will raise some\n"
+"procurement exceptions to inform the user about blocking problems that need\n"
+"to be resolved manually (like, missing BoM structure or missing supplier).\n"
+"\n"
+"The procurement order will schedule a proposal for automatic procurement\n"
+"for the product which needs replenishment. This procurement will start a\n"
+"task, either a purchase order form for the supplier, or a production order\n"
+"depending on the product's configuration.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mx
+msgid "Mexico"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:414
+#, python-format
+msgid "Missing SMTP Server"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,data:0
+#: field:base.language.import,data:0
+msgid "File"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_install
+msgid "Module Upgrade Install"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_email_template
+msgid "E-Mail Templates"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_configuration_wizard
+msgid "ir.actions.configuration.wizard"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_report_webkit
+msgid ""
+"\n"
+"This module adds a new Report Engine based on WebKit library (wkhtmltopdf) "
+"to support reports designed in HTML + CSS.\n"
+"============================================================================="
+"========================================\n"
+"\n"
+"The module structure and some code is inspired by the report_openoffice "
+"module.\n"
+"\n"
+"The module allows:\n"
+"\n"
+"    - HTML report definition\n"
+"    - Multi header support\n"
+"    - Multi logo\n"
+"    - Multi company support\n"
+"    - HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
+"    - JavaScript support\n"
+"    - Raw HTML debugger\n"
+"    - Book printing capabilities\n"
+"    - Margins definition\n"
+"    - Paper size definition\n"
+"\n"
+"... and much more\n"
+"\n"
+"Multiple headers and logos can be defined per company.\n"
+"CSS style, header and footer body are defined per company.\n"
+"\n"
+"For a sample report see also the webkit_report_sample module, and this "
+"video:\n"
+"    http://files.me.com/nbessi/06n92k.mov\n"
+"\n"
+"Requirements and Installation\n"
+"-----------------------------\n"
+"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"as\n"
+"PDF. Version 0.9.9 or later is necessary, and can be found at "
+"http://code.google.com/p/wkhtmltopdf/\n"
+"for Linux, Mac OS X (i386) and Windows (32bits).\n"
+"\n"
+"After installing the library on the OpenERP Server machine, you need to set "
+"the\n"
+"path to the ``wkthtmltopdf`` executable file on each Company.\n"
+"\n"
+"If you are experiencing missing header/footer problems on Linux, be sure to\n"
+"install a \"static\" version of the library. The default ``wkhtmltopdf`` on\n"
+"Ubuntu is known to have this issue.\n"
+"\n"
+"\n"
+"TODO\n"
+"----\n"
+"\n"
+" * JavaScript support activation deactivation\n"
+" * Collated and book format support\n"
+" * Zip return for separated PDF\n"
+" * Web client WYSIWYG\n"
+"\n"
+"                    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_gt
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Guatemala.\n"
+"=====================================================================\n"
+"\n"
+"Agrega una nomenclatura contable para Guatemala. También icluye impuestos y "
+"la moneda del Quetzal. -- Adds accounting chart for Guatemala.  It also "
+"includes taxes and the Quetzal currency"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%b - Abbreviated month name."
+msgstr ""
+
+#. module: base
+#: field:res.partner,supplier:0
+#: view:res.partner.address:0
+#: field:res.partner.address,is_supplier_add:0
+#: model:res.partner.category,name:base.res_partner_category_8
+msgid "Supplier"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: selection:ir.actions.server,state:0
+msgid "Multi Actions"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+#: view:base.language.import:0
+#: view:wizard.ir.model.menu.create:0
+msgid "_Close"
+msgstr ""
+
+#. module: base
+#: field:multi_company.default,company_dest_id:0
+msgid "Default Company"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (EC) / Español (EC)"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.view,xml_id:0
+msgid "ID of the view defined in xml file"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_import
+msgid "Import Module"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.as
+msgid "American Samoa"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,res_model:0
+msgid "Model name of the object to open in the view window"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_caldav
+msgid ""
+"\n"
+"This module contains basic functionality for Caldav system.\n"
+"===========================================================\n"
+"\n"
+"  - Webdav server that provides remote access to calendar\n"
+"  - Synchronisation of calendar using WebDAV\n"
+"  - Customize calendar event and todo attribute with any of OpenERP model\n"
+"  - Provides iCal Import/Export functionality\n"
+"\n"
+"To access Calendars using CalDAV clients, point them to:\n"
+"    http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"To access OpenERP Calendar using WebCal to remote site use the URL like:\n"
+"    http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"    Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
+"created\n"
+"        CALENDAR_NAME: Name of calendar to access\n"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,selectable:0
+msgid "Selectable"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:199
+#, python-format
+msgid "Everything seems properly set up!"
+msgstr ""
+
+#. module: base
+#: field:res.users,date:0
+msgid "Latest Connection"
+msgstr ""
+
+#. module: base
+#: view:res.request.link:0
+msgid "Request Link"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_plugin_outlook
+msgid ""
+"\n"
+"This module provides the Outlook Plug-in.\n"
+"=========================================\n"
+"Outlook plug-in allows you to select an object that you would like to add\n"
+"to your email and its attachments from MS Outlook. You can select a partner, "
+"a task,\n"
+"a project, an analytical account, or any other object and archive selected\n"
+"mail into mail.message with attachments.\n"
+"      "
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: selection:ir.attachment,type:0
+#: field:ir.module.module,url:0
+msgid "URL"
+msgstr ""
+
+#. module: base
+#: help:res.users,context_tz:0
+msgid ""
+"The user's timezone, used to output proper date and time values inside "
+"printed reports. It is important to set a value for this field. You should "
+"use the same timezone that is otherwise used to pick and render date and "
+"time values: your computer's timezone."
+msgstr ""
+
+#. module: base
+#: help:res.country,name:0
+msgid "The full name of the country."
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Iteration"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_planning
+msgid "Resources Planing"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,complexity:0
+msgid "Complexity"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,target:0
+msgid "Inline"
+msgstr ""
+
+#. module: base
+#: model:res.partner.bank.type.field,name:base.bank_normal_field_bic
+msgid "bank_bic"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3988
+#: code:addons/orm.py:4085
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_analytic_default
+msgid ""
+"Set default values for your analytic accounts\n"
+"Allows to automatically select analytic accounts based on criterions:\n"
+"=====================================================================\n"
+"\n"
+"* Product\n"
+"* Partner\n"
+"* User\n"
+"* Company\n"
+"* Date\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ae
+msgid "United Arab Emirates"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3704
+#, python-format
+msgid ""
+"Unable to delete this document because it is used as a default property"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
+msgid "Recruitment"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_gr
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Greece.\n"
+"==================================================================\n"
+"\n"
+"Greek accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.values:0
+msgid "Action Reference"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.re
+msgid "Reunion (French)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:361
+#, python-format
+msgid ""
+"New column name must still start with x_ , because it is a custom field!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_wiki
+msgid ""
+"\n"
+"The base module to manage documents(wiki).\n"
+"==========================================\n"
+"\n"
+"Keep track of Wiki groups, pages, and history.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_repair
+msgid "Repairs Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_asset
+msgid "Assets Management"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: view:ir.rule:0
+#: field:ir.rule,global:0
+msgid "Global"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock_planning
+msgid ""
+"\n"
+"MPS allows to create a manual procurement plan apart of the normal MRP "
+"scheduling, which works automatically based on minimum stock rules\n"
+"============================================================================="
+"============================================================\n"
+"\n"
+"Quick Glossary\n"
+"--------------\n"
+"- Stock Period - the time boundaries (between Start Date and End Date) for "
+"your Sales and Stock forecasts and planning\n"
+"- Sales Forecast - the quantity of products you plan to sell during the "
+"related Stock Period.\n"
+"- Stock Planning - the quantity of products you plan to purchase or produce "
+"for the related Stock Period.\n"
+"\n"
+"To avoid confusion with the terms used by the ``sale_forecast`` module, "
+"(\"Sales Forecast\" and \"Planning\" are amounts) we use terms \"Stock and "
+"Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
+"values.\n"
+"\n"
+"Where to begin\n"
+"--------------\n"
+"Using this module is done in three steps:\n"
+"\n"
+" * Create Stock Periods via the Warehouse>Configuration>Stock Periods menu "
+"(Mandatory step)\n"
+" * Create Sale Forecasts fill them with forecast quantities, via the "
+"Sales>Sales Forecast menu. (Optional step but useful for further planning)\n"
+" * Create the actual MPS plan, check the balance and trigger the "
+"procurements as required. The actual procurement is the final step for the "
+"Stock Period.\n"
+"\n"
+"Stock Period configuration\n"
+"--------------------------\n"
+"You have two menu items for Periods in \"Warehouse > Configuration > Stock "
+"Periods\". There are:\n"
+"\n"
+" * \"Create Stock Periods\" - can automatically creating daily, weekly or "
+"monthly periods.\n"
+" * \"Stock Periods\" - allows to create any type of periods, change the "
+"dates and change the state of period.\n"
+"\n"
+"Creating periods is the first step. You can create custom periods using the "
+"\"New\" button in \"Stock Periods\", but it is recommended to use the "
+"automatic assistant \"Create Stock Periods\".\n"
+"\n"
+"Remarks:\n"
+"\n"
+" - These periods (Stock Periods) are completely distinct from Financial or "
+"other periods in the system.\n"
+" - Periods are not assigned to companies (when you use multicompany). Module "
+"suppose that you use the same periods across companies. If you wish to use "
+"different periods for different companies define them as you wish (they can "
+"overlap). Later on in this text will be indications how to use such "
+"periods.\n"
+" - When periods are created automatically their start and finish dates are "
+"with start hour 00:00:00 and end hour 23:59:00. When you create daily "
+"periods they will have start date 31.01.2010 00:00:00 and end date "
+"31.01.2010 23:59:00. It works only in automatic creation of periods. When "
+"you create periods manually you have to take care about hours because you "
+"can have incorrect values form sales or stock.\n"
+" - If you use overlapping periods for the same product, warehouse and "
+"company results can be unpredictable.\n"
+" - If current date doesn't belong to any period or you have holes between "
+"periods results can be unpredictable.\n"
+"\n"
+"Sales Forecasts configuration\n"
+"-----------------------------\n"
+"You have few menus for Sales forecast in \"Sales > Sales Forecasts\":\n"
+"\n"
+" - \"Create Sales Forecasts\" - can automatically create forecast lines "
+"according to your needs\n"
+" - \"Sales Forecasts\" - for managing the Sales forecasts\n"
+"\n"
+"Menu \"Create Sales Forecasts\" creates Forecasts for products from selected "
+"Category, for selected Period and for selected Warehouse.\n"
+"It is also possible to copy the previous forecast.\n"
+"\n"
+"Remarks:\n"
+"\n"
+" - This tool doesn't duplicate lines if you already have an entry for the "
+"same Product, Period, Warehouse, created or validated by the same user. If "
+"you wish to create another forecast, if relevant lines exists you have to do "
+"it manually as described below.\n"
+" - When created lines are validated by someone else you can use this tool to "
+"create another line for the same Period, Product and Warehouse.\n"
+" - When you choose \"Copy Last Forecast\", created line take quantity and "
+"other settings from your (validated by you or created by you if not "
+"validated yet) forecast which is for last period before period of created "
+"forecast.\n"
+"\n"
+"On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
+"\"Product Quantity\".\n"
+"Further calculation can work for draft forecasts. But validation can save "
+"your data against any accidental changes.\n"
+"You can click \"Validate\" button but it is not mandatory.\n"
+"\n"
+"Instead of forecast quantity you may enter the amount of forecast sales via "
+"the \"Product Amount\" field.\n"
+"The system will count quantity from amount according to Sale price of the "
+"Product.\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form.\n"
+"You can select a unit of measure from the default category or from secondary "
+"category.\n"
+"When you change unit of measure the forecast product quantity will be re-"
+"computed according to new UoM.\n"
+"\n"
+"To work out your Sale Forecast you can use the \"Sales History\" of the "
+"product.\n"
+"You have to enter parameters to the top and left of this table and system "
+"will count sale quantities according to these parameters.\n"
+"So you can get results for a given sales team or period.\n"
+"\n"
+"\n"
+"MPS or Procurement Planning\n"
+"---------------------------\n"
+"An MPS planning consists in Stock Planning lines, used to analyze and "
+"possibly drive the procurement of \n"
+"products for each relevant Stock Period and Warehouse.\n"
+"The menu is located in \"Warehouse > Schedulers > Master Procurement "
+"Schedule\":\n"
+"\n"
+" - \"Create Stock Planning Lines\" - a wizard to help automatically create "
+"many planning lines\n"
+" - \"Master Procurement Schedule\" - management of your planning lines\n"
+"\n"
+"Similarly to the way Sales forecast serves to define your sales planning, "
+"the MPS lets you plan your procurements (Purchase/Manufacturing).\n"
+"You can quickly populate the MPS with the \"Create Stock Planning Lines\" "
+"wizard, and then proceed to review them via the \"Master Procurement "
+"Schedule\" menu.\n"
+"\n"
+"The \"Create Stock Planning Lines\" wizard lets you to quickly create all "
+"MPS lines for a given Product Category, and a given Period and Warehouse.\n"
+"When you enable the \"All Products with Forecast\" option of the wizard, the "
+"system creates lines for all products having sales forecast for selected\n"
+"Period and Warehouse (the selected Category will be ignored in this case).\n"
+"\n"
+"Under menu \"Master Procurement Schedule\" you will usually change the "
+"\"Planned Out\" and \"Planned In\" quantities and observe the resulting "
+"\"Stock Simulation\" value\n"
+"to decide if you need to procure more products for the given Period.\n"
+"\"Planned Out\" will be initially based on \"Warehouse Forecast\" which is "
+"the sum of all outgoing stock moves already planned for the Period and "
+"Warehouse.\n"
+"Of course you can alter this value to provide your own quantities. It is not "
+"necessary to have any forecast.\n"
+"\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
+"is the quantity to be procured to reach the \"Stock Simulation\" at the end "
+"of Period.\n"
+"You can compare \"Stock Simulation\" quantity to minimum stock rules visible "
+"on the form.\n"
+"And you can plan different quantity than in Minimum Stock Rules. "
+"Calculations are done for whole Warehouse by default,\n"
+"if you want to see values for Stock location of calculated warehouse you can "
+"check \"Stock Location Only\".\n"
+"\n"
+"When you are satisfied with the \"Planned Out\", \"Planned In\" and end of "
+"period \"Stock Simulation\",\n"
+"you can click on \"Procure Incoming Left\" to create a procurement for the "
+"\"Incoming Left\" quantity.\n"
+"You can decide if procurement will go to the to Stock or Input location of "
+"the Warehouse.\n"
+"\n"
+"If you don't want to Produce or Buy the product but just transfer the "
+"calculated quantity from another warehouse\n"
+"you can click \"Supply from Another Warehouse\" (instead of \"Procure "
+"Incoming Left\") and the system will\n"
+"create the appropriate picking list (stock moves).\n"
+"You can choose to take the goods from the Stock or the Output location of "
+"the source warehouse.\n"
+"Destination location (Stock or Input) in the destination warehouse will be "
+"taken as for the procurement case.\n"
+"\n"
+"To see update the quantities of \"Confirmed In\", \"Confirmed Out\", "
+"\"Confirmed In Before\", \"Planned Out Before\"\n"
+"and \"Stock Simulation\" you can press \"Calculate Planning\".\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form.\n"
+"You can select one of unit of measure from default category or from "
+"secondary category.\n"
+"When you change unit of measure the editable quantities will be re-computed "
+"according to new UoM. The others will be updated after pressing \"Calculate "
+"Planning\".\n"
+"\n"
+"Computation of Stock Simulation quantities\n"
+"------------------------------------------\n"
+"The Stock Simulation value is the estimated stock quantity at the end of the "
+"period.\n"
+"The calculation always starts with the real stock on hand at the beginning "
+"of the current period, then\n"
+"adds or subtracts the computed quantities.\n"
+"When you are in the same period (current period is the same as calculated) "
+"Stock Simulation is calculated as follows:\n"
+"\n"
+"Stock Simulation =\n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out\n"
+"\t+ Planned In\n"
+"\n"
+"When you calculate period next to current:\n"
+"\n"
+"Stock Simulation =\n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out of current Period\n"
+"\t+ Confirmed In of current Period  (incl. Already In)\n"
+"\t- Planned Out of calculated Period\n"
+"\t+ Planned In of calculated Period .\n"
+"\n"
+"As you see the calculated Period is taken the same way as in previous case, "
+"but the calculation in the current\n"
+"Period is a little bit different. First you should note that system takes "
+"for only Confirmed moves for the\n"
+"current period. This means that you should complete the planning and "
+"procurement of the current Period before\n"
+"going to the next one.\n"
+"\n"
+"When you plan for future Periods:\n"
+"\n"
+"Stock Simulation =\n"
+"\tStock of beginning of current Period\n"
+"\t- Sum of Planned Out of Periods before calculated\n"
+"\t+ Sum of Confirmed In of Periods before calculated (incl. Already In)\n"
+"\t- Planned Out of calculated Period\n"
+"\t+ Planned In of calculated Period.\n"
+"\n"
+"Here \"Periods before calculated\" designates all periods starting with the "
+"current until the period before the one being calculated.\n"
+"\n"
+"Remarks:\n"
+"\n"
+" - Remember to make the proceed with the planning of each period in "
+"chronological order, otherwise the numbers will not reflect the\n"
+"   reality\n"
+" - If you planned for future periods and find that real Confirmed Out is "
+"larger than Planned Out in some periods before,\n"
+"   you can repeat Planning and make another procurement. You should do it in "
+"the same planning line.\n"
+"   If you create another planning line the suggestions can be wrong.\n"
+" - When you wish to work with different periods for some products, define "
+"two kinds of periods (e.g. Weekly and Monthly) and use\n"
+"   them for different products. Example: If you use always Weekly periods "
+"for Product A, and Monthly periods for Product B\n"
+"   all calculations will work correctly. You can also use different kind of "
+"periods for the same product from different warehouse\n"
+"   or companies. But you cannot use overlapping periods for the same "
+"product, warehouse and company because results\n"
+"   can be unpredictable. The same applies to Forecasts lines.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mp
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_claim_from_delivery
+msgid "Claim on Deliveries"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sb
+msgid "Solomon Islands"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:537
+#: code:addons/orm.py:3436
+#: code:addons/orm.py:3656
+#: code:addons/orm.py:3668
+#: code:addons/orm.py:3894
+#: code:addons/orm.py:4408
+#, python-format
+msgid "AccessError"
+msgstr ""
+
+#. module: base
+#: view:res.request:0
+msgid "Waiting"
+msgstr ""
+
+#. module: base
+#: field:ir.exports,resource:0
+#: model:ir.module.module,shortdesc:base.module_resource
+#: view:ir.property:0
+#: field:ir.property,res_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "8.  %I:%M:%S %p  ==> 06:25:20 PM"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_module_doc_rst
+msgid ""
+"\n"
+"This module generates the Technical Guides of selected modules in "
+"Restructured Text format (RST).\n"
+"============================================================================="
+"====================\n"
+"\n"
+"    * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST\n"
+"    * It creates a tarball (.tgz file suffix) containing an index file and "
+"one file per module\n"
+"    * Generates Relationship Graph\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.log,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+#: model:ir.ui.menu,name:base.menu_translation
+msgid "Translations"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_gtd
+msgid "Todo Lists"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Report"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:218
+#, python-format
+msgid ""
+"Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
+"instead.If SSL is needed, an upgrade to Python 2.6 on the server-side should "
+"do the trick."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ua
+msgid "Ukraine"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,website:0
+#: field:res.company,website:0
+#: field:res.partner,website:0
+msgid "Website"
+msgstr ""
+
+#. module: base
+#: selection:ir.mail_server,smtp_encryption:0
+msgid "None"
+msgstr ""
+
+#. module: base
+#: view:ir.module.category:0
+msgid "Module Category"
+msgstr ""
+
+#. module: base
+#: view:partner.wizard.ean.check:0
+msgid "Ignore"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference.graph:0
+msgid "Reference Guide"
+msgstr ""
+
+#. module: base
+#: view:ir.values:0
+msgid "Default Value Scope"
+msgstr ""
+
+#. module: base
+#: view:ir.ui.view:0
+msgid "Architecture"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ml
+msgid "Mali"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_at
+msgid ""
+"This module provides the standard Accounting Chart for Austria which is "
+"based on the Template from BMF.gv.at. Please keep in mind that you should "
+"review and adapt it with your Accountant, before using it in a live "
+"Environment."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Flemish (BE) / Vlaams (BE)"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,interval_number:0
+msgid "Interval Number"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tk
+msgid "Tokelau"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_timesheet_sheet
+msgid ""
+"\n"
+"This module helps you to easily encode and validate timesheet and "
+"attendances within the same view.\n"
+"============================================================================="
+"======================\n"
+"\n"
+"The upper part of the view is for attendances and track (sign in/sign out) "
+"events.\n"
+"The lower part is for timesheet.\n"
+"\n"
+"Other tabs contains statistics views to help you analyse your\n"
+"time or the time of your team:\n"
+"* Time spent by day (with attendances)\n"
+"* Time spent by project\n"
+"\n"
+"This module also implements a complete timesheet validation process:\n"
+"* Draft sheet\n"
+"* Confirmation at the end of the period by the employee\n"
+"* Validation by the project manager\n"
+"\n"
+"The validation can be configured in the company:\n"
+"* Period size (day, week, month, year)\n"
+"* Maximal difference between timesheet and attendances\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bn
+msgid "Brunei Darussalam"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_fetchmail_crm
+#: model:ir.module.module,description:base.module_fetchmail_crm_claim
+#: model:ir.module.module,description:base.module_fetchmail_hr_recruitment
+#: model:ir.module.module,description:base.module_fetchmail_project_issue
+msgid ""
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: field:ir.actions.act_window,view_type:0
+#: field:ir.actions.act_window.view,view_mode:0
+#: field:ir.ui.view,type:0
+#: field:wizard.ir.model.menu.create.line,view_type:0
+msgid "View Type"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_2
+msgid "User Interface"
+msgstr ""
+
+#. module: base
+#: field:res.partner,child_ids:0
+#: field:res.request,ref_partner_id:0
+msgid "Partner Ref."
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,create_date:0
+msgid "Date Created"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,trigger_name:0
+msgid "The workflow signal to trigger"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp
+msgid ""
+"\n"
+"This is the base module to manage the manufacturing process in OpenERP.\n"
+"=======================================================================\n"
+"\n"
+"Features:\n"
+"---------\n"
+"    * Make to Stock / Make to Order (by line)\n"
+"    * Multi-level BoMs, no limit\n"
+"    * Multi-level routing, no limit\n"
+"    * Routing and work center integrated with analytic accounting\n"
+"    * Scheduler computation periodically / Just In Time module\n"
+"    * Multi-pos, multi-warehouse\n"
+"    * Different reordering policies\n"
+"    * Cost method by product: standard price, average price\n"
+"    * Easy analysis of troubles or needs\n"
+"    * Very flexible\n"
+"    * Allows to browse Bill of Materials in complete structure that include "
+"child and phantom BoMs\n"
+"\n"
+"It supports complete integration and planification of stockable goods,\n"
+"consumable of services. Services are completely integrated with the rest\n"
+"of the software. For instance, you can set up a sub-contracting service\n"
+"in a BoM to automatically purchase on order the assembly of your "
+"production.\n"
+"\n"
+"Reports provided by this module:\n"
+"--------------------------------\n"
+"    * Bill of Material structure and components\n"
+"    * Load forecast on Work Centers\n"
+"    * Print a production order\n"
+"    * Stock forecasts\n"
+"\n"
+"Dashboard provided by this module:\n"
+"----------------------------------\n"
+"    * List of next production orders\n"
+"    * List of procurements in exception\n"
+"    * Graph of work center load\n"
+"    * Graph of stock value variation\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_google_base_account
+msgid "The module adds google user in res user"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,state:0
+#: selection:base.module.import,state:0
+#: selection:base.module.update,state:0
+msgid "done"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "General Settings"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_uy
+msgid "Uruguay - Chart of Accounts"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_administration_shortcut
+msgid "Custom Shortcuts"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.dz
+msgid "Algeria"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_plugin
+msgid "CRM Plugins"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_model
+#: model:ir.model,name:base.model_ir_model
+#: model:ir.ui.menu,name:base.ir_model_model_menu
+msgid "Models"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_cron.py:292
+#, python-format
+msgid "Record cannot be modified right now"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,type:0
+msgid "Launch Manually"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.be
+msgid "Belgium"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Preview Header"
+msgstr ""
+
+#. module: base
+#: field:res.company,paper_format:0
+msgid "Paper Format"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,lang:0
+#: field:base.language.install,lang:0
+#: field:base.update.translations,lang:0
+#: field:ir.translation,lang:0
+#: field:res.partner,lang:0
+#: field:res.users,context_lang:0
+msgid "Language"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gm
+msgid "Gambia"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_company_form
+#: model:ir.model,name:base.model_res_company
+#: model:ir.ui.menu,name:base.menu_action_res_company_form
+#: model:ir.ui.menu,name:base.menu_res_company_global
+#: view:res.company:0
+#: field:res.users,company_ids:0
+msgid "Companies"
+msgstr ""
+
+#. module: base
+#: help:res.currency,symbol:0
+msgid "Currency sign, to be used when printing amounts."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%H - Hour (24-hour clock) [00,23]."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:451
+#, python-format
+msgid ""
+"Your server does not seem to support SSL, you may want to try STARTTLS "
+"instead"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_widget
+msgid "res.widget"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:290
+#, python-format
+msgid "Model %s does not exist!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_plugin
+msgid ""
+"\n"
+"The common interface for pugin.\n"
+"=====================================================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_jit
+msgid "Just In Time Scheduling"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_bank_statement_extensions
+msgid "Bank Statement extensions to support e-banking"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: field:ir.actions.server,code:0
+#: selection:ir.actions.server,state:0
+msgid "Python Code"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,state:0
+msgid "Type of the Action that is to be executed"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base
+msgid "The kernel of OpenERP, needed for all installation."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_osv_memory_autovacuum
+msgid "osv_memory.autovacuum"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_us
+msgid "United States - Chart of accounts"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+#: view:base.module.import:0
+#: view:base.module.update:0
+#: view:base.module.upgrade:0
+#: view:base.update.translations:0
+#: view:partner.clear.ids:0
+#: view:partner.massmail.wizard:0
+#: view:partner.sms.send:0
+#: view:publisher_warranty.contract.wizard:0
+#: view:res.config:0
+#: view:res.config.installer:0
+#: view:res.widget.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,format:0
+msgid "PO File"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nt
+msgid "Neutral Zone"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "Custom"
+msgstr ""
+
+#. module: base
+#: view:res.request:0
+msgid "Current"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_fundraising
+msgid ""
+"\n"
+"Fundraising.\n"
+"============\n"
+"\n"
+"When you wish to support your organization or a campaign, you can trace\n"
+"all your activities for collecting money. The menu opens a search list\n"
+"where you can find fund descriptions, email, history and probability of\n"
+"success. Several action buttons allow you to easily modify your different\n"
+"fund status.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_margin
+msgid "Margins in Sales Orders"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_9
+msgid "Components Supplier"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_purchase_management
+#: model:ir.module.module,shortdesc:base.module_purchase
+msgid "Purchase Management"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,published_version:0
+msgid "Published Version"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.is
+msgid "Iceland"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_action_window
+#: model:ir.ui.menu,name:base.menu_ir_action_window
+msgid "Window Actions"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%I - Hour (12-hour clock) [01,12]."
+msgstr ""
+
+#. module: base
+#: selection:publisher_warranty.contract.wizard,state:0
+msgid "Finished"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.de
+msgid "Germany"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Week of the year: %(woy)s"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_14
+msgid "Bad customers"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference.graph:0
+msgid "Reports :"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_multi_company
+msgid ""
+"\n"
+"This module is for managing a multicompany environment.\n"
+"=======================================================\n"
+"\n"
+"This module is the base module for other multi-company modules.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_property
+msgid "ir.property"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_fetchmail
+msgid ""
+"\n"
+"Retrieve incoming email on POP / IMAP servers\n"
+"=============================================\n"
+"\n"
+"Enter the parameters of your POP/IMAP account(s), and any incoming\n"
+"emails on these accounts will be automatically downloaded into your OpenERP\n"
+"system. All POP3/IMAP-compatible servers are supported, included those\n"
+"that require an encrypted SSL/TLS connection.\n"
+"\n"
+"This can be used to easily create email-based workflows for many\n"
+"email-enabled OpenERP documents, such as:\n"
+"\n"
+" * CRM Leads/Opportunities\n"
+" * CRM Claims\n"
+" * Project Issues\n"
+" * Project Tasks\n"
+" * Human Resource Recruitments (Applicants)\n"
+" * etc.\n"
+"\n"
+"Just install the relevant application, and you can assign any of\n"
+"these document types (Leads, Project Issues, etc.) to your incoming\n"
+"email accounts. New emails will automatically spawn new documents\n"
+"of the chosen type, so it's a snap to create a mailbox-to-OpenERP\n"
+"integration. Even better: these documents directly act as mini\n"
+"conversations synchronized by email. You can reply from within\n"
+"OpenERP, and the answers will automatically be collected when\n"
+"they come back, and attached to the same *conversation* document.\n"
+"\n"
+"For more specific needs, you may also assign custom-defined actions\n"
+"(technically: Server Actions) to be triggered for each incoming\n"
+"mail. \n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,email:0
+msgid ""
+"Expression that returns the email address to send to. Can be based on the "
+"same values as for the condition field.\n"
+"Example: object.invoice_address_id.email, or 'me@example.com'"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_hello
+msgid ""
+"\n"
+"        OpenERP Web example module.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gy
+msgid "Guyana"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_expiry
+msgid "Products Expiry Date"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account
+msgid ""
+"\n"
+"Accounting and Financial Management.\n"
+"====================================\n"
+"\n"
+"Financial and accounting module that covers:\n"
+"--------------------------------------------\n"
+"General accountings\n"
+"Cost / Analytic accounting\n"
+"Third party accounting\n"
+"Taxes management\n"
+"Budgets\n"
+"Customer and Supplier Invoices\n"
+"Bank statements\n"
+"Reconciliation process by partner\n"
+"\n"
+"Creates a dashboard for accountants that includes:\n"
+"--------------------------------------------------\n"
+"* List of Customer Invoice to Approve\n"
+"* Company Analysis\n"
+"* Graph of Aged Receivables\n"
+"* Graph of Treasury\n"
+"\n"
+"The processes like maintaining of general ledger is done through the defined "
+"financial Journals (entry move line or\n"
+"grouping is maintained through journal) for a particular financial year and "
+"for preparation of vouchers there is a\n"
+"module named account_voucher.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,view_type:0
+msgid ""
+"View type: set to 'tree' for a hierarchical tree view, or 'form' for other "
+"views"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:385
+#, python-format
+msgid "Click 'Continue' to configure the next addon..."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,record_id:0
+msgid "Create Id"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hn
+msgid "Honduras"
+msgstr ""
+
+#. module: base
+#: help:res.users,menu_tips:0
+msgid ""
+"Check out this box if you want to always display tips on each menu action"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.eg
+msgid "Egypt"
+msgstr ""
+
+#. module: base
+#: field:ir.rule,perm_read:0
+msgid "Apply For Read"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,model_id:0
+msgid ""
+"Select the object on which the action will work (read, write, create)."
+msgstr ""
+
+#. module: base
+#: field:base.language.import,name:0
+msgid "Language Name"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Boolean"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_encryption:0
+msgid ""
+"Choose the connection encryption scheme:\n"
+"- None: SMTP sessions are done in cleartext.\n"
+"- TLS (STARTTLS): TLS encryption is requested at start of SMTP session "
+"(Recommended)\n"
+"- SSL/TLS: SMTP sessions are encrypted with SSL/TLS through a dedicated port "
+"(default: 465)"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "Fields Description"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_report_designer
+msgid ""
+"\n"
+"Installer for reporting Hidden.\n"
+"==============================\n"
+"\n"
+"Makes the Reporting Hidden Configuration available from where you can "
+"install\n"
+"modules like base_report_designer and base_report_creator.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_synchro
+msgid "Multi-DB Synchronization"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,complexity:0
+msgid "Expert"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_holidays
+msgid "Leaves Management"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+#: view:ir.attachment:0
+#: view:ir.cron:0
+#: view:ir.model.access:0
+#: view:ir.model.data:0
+#: view:ir.model.fields:0
+#: view:ir.ui.view:0
+#: view:ir.values:0
+#: view:res.partner:0
+#: view:res.partner.address:0
+#: view:workflow.activity:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
+#: field:ir.model.fields,readonly:0
+#: field:res.partner.bank.type.field,readonly:0
+msgid "Readonly"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_todo
+msgid ""
+"\n"
+"Todo list for CRM leads and opportunities.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window.view,view_id:0
+#: field:ir.default,page:0
+#: selection:ir.translation,type:0
+#: field:wizard.ir.model.menu.create.line,view_id:0
+msgid "View"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_wiki_sale_faq
+msgid "Wiki: Sale FAQ"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "To be installed"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,display_menu_tip:0
+msgid ""
+"It gives the status if the tip has to be displayed or not when a user "
+"executes an action"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: model:ir.module.module,shortdesc:base.module_base
+#: field:res.currency,base:0
+msgid "Base"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,model:0
+#: field:ir.values,model:0
+msgid "Model Name"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Telugu / తెలుగు"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_document_ics
+msgid ""
+"\n"
+"Allows to synchronise calendars with others applications.\n"
+"=========================================================\n"
+"\n"
+"Will allow you to synchronise your OpenERP calendars with your phone, "
+"outlook, Sunbird, ical, ...\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lr
+msgid "Liberia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_in
+msgid ""
+"\n"
+"Indian Accounting : Chart of Account.\n"
+"=====================================\n"
+"\n"
+"Indian accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: view:ir.model:0
+#: view:res.groups:0
+#: view:res.partner:0
+#: field:res.partner,comment:0
+#: model:res.widget,title:base.note_widget
+msgid "Notes"
+msgstr ""
+
+#. module: base
+#: field:ir.config_parameter,value:0
+#: field:ir.property,value_binary:0
+#: field:ir.property,value_datetime:0
+#: field:ir.property,value_float:0
+#: field:ir.property,value_integer:0
+#: field:ir.property,value_reference:0
+#: field:ir.property,value_text:0
+#: selection:ir.server.object.lines,type:0
+#: field:ir.server.object.lines,value:0
+#: field:ir.values,value:0
+msgid "Value"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,code:0
+#: field:ir.sequence.type,code:0
+#: selection:ir.translation,type:0
+#: field:res.partner.bank.type,code:0
+msgid "Code"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_config_installer
+msgid "res.config.installer"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mc
+msgid "Monaco"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid "Please be patient, this operation may take a few minutes..."
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base
+#: view:res.currency:0
+msgid "Display"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Help"
+msgstr ""
+
+#. module: base
+#: help:res.users,menu_id:0
+msgid ""
+"If specified, the action will replace the standard menu for this user."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_google_map
+msgid "Google Maps on Customers"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.preview_report
+msgid "Preview Report"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase_analytic_plans
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_analytic_journal_billing_rate
+msgid ""
+"\n"
+"This module allows you to define what is the default invoicing rate for a "
+"specific journal on a given account.\n"
+"============================================================================="
+"=================================\n"
+"\n"
+"This is mostly used when a user encodes his timesheet: the values are "
+"retrieved and the fields are auto-filled. But the possibility to change "
+"these values is still available.\n"
+"\n"
+"Obviously if no data has been recorded for the current account, the default "
+"value is given as usual by the account data so that this module is perfectly "
+"compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_fundrising
+msgid "Fund Raising"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_sequence_type
+#: model:ir.ui.menu,name:base.menu_ir_sequence_type
+msgid "Sequence Codes"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (CO) / Español (CO)"
+msgstr ""
+
+#. module: base
+#: view:base.module.configuration:0
+msgid ""
+"All pending configuration wizards have been executed. You may restart "
+"individual wizards via the list of configuration wizards."
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Current Year with Century: %(year)s"
+msgstr ""
+
+#. module: base
+#: field:ir.exports,export_fields:0
+msgid "Export ID"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fr
+msgid "France"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_log
+msgid "res.log"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,flow_stop:0
+msgid "Flow Stop"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Weeks"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:157
+#, python-format
+msgid "VAT: "
+msgstr "RFC "
+
+#. module: base
+#: model:res.country,name:base.af
+msgid "Afghanistan, Islamic State of"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_import.py:60
+#: code:addons/base/module/wizard/base_module_import.py:68
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_marketing_campaign_crm_demo
+msgid "Marketing Campaign - Demo"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_fetchmail_hr_recruitment
+msgid "eMail Gateway for Applicants"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_coda
+msgid "Belgium - Import bank CODA statements"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,interval_type:0
+msgid "Interval Unit"
+msgstr ""
+
+#. module: base
+#: field:publisher_warranty.contract,kind:0
+#: field:workflow.activity,kind:0
+msgid "Kind"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4368
+#, python-format
+msgid "This method does not exist anymore"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_import_google
+msgid "Google Import"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_12
+msgid "Segmentation"
+msgstr ""
+
+#. module: base
+#: field:res.lang,thousands_sep:0
+msgid "Thousands Separator"
+msgstr ""
+
+#. module: base
+#: field:res.request,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Keywords"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cn
+msgid "中国会计科目表 - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: field:ir.model.access,perm_read:0
+#: view:ir.rule:0
+msgid "Read Access"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,loop_action:0
+msgid ""
+"Select the action that will be executed. Loop action will not be avaliable "
+"inside loop."
+msgstr ""
+
+#. module: base
+#: help:ir.model.data,res_id:0
+msgid "ID of the target record in the database"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_analytic_analysis
+msgid "Contracts Management"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Chinese (TW) / 正體字"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_request
+msgid "res.request"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "In Memory"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Todo"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_visible_discount
+msgid "Prices Visible Discounts"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,datas:0
+msgid "File Content"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pa
+msgid "Panama"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_bank_statement_extensions
+msgid ""
+"\n"
+"Module that extends the standard account_bank_statement_line object for "
+"improved e-banking support.\n"
+"\n"
+"Adds\n"
+"- valuta date\n"
+"- batch payments\n"
+"- traceability of changes to bank statement lines\n"
+"- bank statement line views\n"
+"- bank statements balances report\n"
+"- performance improvements for digital import of bank statement (via "
+"'ebanking_import' context flag)\n"
+"- name_search on res.partner.bank enhanced to allow search on bank and iban "
+"account numbers\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:1895
+#, python-format
+msgid ""
+"Insufficient fields to generate a Calendar View for %s, missing a date_stop "
+"or a date_delay\" % (self._name)))\n"
+"\n"
+"        return view\n"
+"\n"
+"    def _get_default_search_view(self, cr, uid, context=None):\n"
+"        \"\n"
+"        :param cr: database cursor\n"
+"        :param int user: user id\n"
+"        :param dict context: connection context\n"
+"        :returns: an lxml document of the view\n"
+"        :rtype: etree._Element\n"
+"        \"\n"
+"        form_view = self.fields_view_get(cr, uid, False, 'form', "
+"context=context)\n"
+"        tree_view = self.fields_view_get(cr, uid, False, 'tree', "
+"context=context)\n"
+"\n"
+"        # TODO it seems _all_columns could be used instead of fields_get (no "
+"need for translated fields info)\n"
+"        fields = self.fields_get(cr, uid, context=context)\n"
+"        fields_to_search = set(\n"
+"            field for field, descriptor in fields.iteritems()\n"
+"            if descriptor.get('select'))\n"
+"\n"
+"        for view in (form_view, tree_view):\n"
+"            view_root = etree.fromstring(view['arch'])\n"
+"            # Only care about select=1 in xpath below, because select=2 is "
+"covered\n"
+"            # by the custom advanced search in clients\n"
+"            "
+"fields_to_search.update(view_root.xpath(\"//field[@select=1]/@name"
+msgstr ""
+
+#. module: base
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gi
+msgid "Gibraltar"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_name:0
+msgid "Service Name"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_import_base
+msgid "Framework for complex import"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo.category:0
+msgid "Wizard Category"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_cancel
+msgid ""
+"\n"
+"Allows cancelling accounting entries.\n"
+"=====================================\n"
+"\n"
+"This module adds 'Allow cancelling entries' field on form view of account "
+"journal. If set to true it allows user to cancel entries & invoices.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_rule
+#: model:ir.ui.menu,name:base.menu_action_rule
+msgid "Record Rules"
+msgstr ""
+
+#. module: base
+#: field:res.users,name:0
+msgid "User Name"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Day of the year: %(doy)s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_portal
+#: model:ir.module.module,shortdesc:base.module_portal
+msgid "Portal"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_claim_from_delivery
+msgid ""
+"\n"
+"Create a claim from a delivery order.\n"
+"=====================================\n"
+"\n"
+"Adds a Claim link to the delivery order.\n"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: view:ir.model.fields:0
+#: view:workflow.activity:0
+msgid "Properties"
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: base
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%A - Full weekday name."
+msgstr ""
+
+#. module: base
+#: help:ir.values,user_id:0
+msgid "If set, action binding only applies for this user."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gw
+msgid "Guinea Bissau"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,search_view:0
+msgid "Search View"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid "- module,type,name,res_id,src,value"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.lang:0
+msgid "The code of the language must be unique !"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_attachment
+#: view:ir.actions.report.xml:0
+#: view:ir.attachment:0
+#: model:ir.ui.menu,name:base.menu_action_attachment
+msgid "Attachments"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_uy
+msgid ""
+"\n"
+"General Chart of Accounts\n"
+"=========================\n"
+"\n"
+"Provide Templates for Chart of Accounts, Taxes for Uruguay\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: help:res.company,bank_ids:0
+msgid "Bank accounts related to this company"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_partner
+#: model:ir.ui.menu,name:base.menu_sale_config_sales
+#: model:ir.ui.menu,name:base.menu_sales
+msgid "Sales"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,child_ids:0
+msgid "Other Actions"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,doall:0
+msgid ""
+"Specify if missed occurrences should be executed when the server restarts."
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_miss
+msgid "Miss"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: field:ir.model.access,perm_write:0
+#: view:ir.rule:0
+msgid "Write Access"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%m - Month number [01,12]."
+msgstr ""
+
+#. module: base
+#: field:res.bank,city:0
+#: field:res.company,city:0
+#: field:res.partner,city:0
+#: field:res.partner.address,city:0
+#: field:res.partner.bank,city:0
+msgid "City"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.qa
+msgid "Qatar"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.it
+msgid "Italy"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+#: selection:ir.actions.todo,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Estonian / Eesti keel"
+msgstr ""
+
+#. module: base
+#: field:res.partner,email:0
+msgid "E-mail"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL-3 or later version"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_google_map
+msgid ""
+"\n"
+"The module adds Google Map field in partner address.\n"
+"====================================================\n"
+"\n"
+"Using this you can directly open Google Map from the URL widget."
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,action:0
+msgid "Python Action"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_report_webkit_sample
+msgid ""
+"\n"
+"Samples for Webkit Report Engine (report_webkit module).\n"
+"========================================================\n"
+"\n"
+"A sample invoice report is included in this module, as well as a wizard to\n"
+"add Webkit Report entries on any Document in the system.\n"
+"\n"
+"You have to create the print buttons by calling the wizard. For more details "
+"see:\n"
+"    http://files.me.com/nbessi/06n92k.mov\n"
+"                    "
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "English (US)"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_title_partner
+msgid ""
+"Manage the partner titles you want to have available in your system. The "
+"partner titles is the legal status of the company: Private Limited, SA, etc."
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "To browse official translations, you can start with these links:"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:531
+#, python-format
+msgid ""
+"You can not read this document (%s) ! Be sure your user belongs to one of "
+"these groups: %s."
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+#: view:res.partner.address:0
+msgid "Address"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:308
+#, python-format
+msgid ""
+"You try to install module '%s' that depends on module '%s'.\n"
+"But the latter module is not available in your system."
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,latest_version:0
+msgid "Installed version"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Mongolian / монгол"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mr
+msgid "Mauritania"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_manufacturer
+msgid ""
+"\n"
+"A module that adds manufacturers and attributes on the product form.\n"
+"====================================================================\n"
+"\n"
+"You can now define the following for a product:\n"
+"    * Manufacturer\n"
+"    * Manufacturer Product Name\n"
+"    * Manufacturer Product Code\n"
+"    * Product Attributes\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_todo_category
+msgid "Configuration Wizard Category"
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+msgid "Module update result"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.workitem,act_id:0
+msgid "Activity"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Postal Address"
+msgstr ""
+
+#. module: base
+#: field:res.company,parent_id:0
+msgid "Parent Company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_iban
+msgid ""
+"\n"
+"This module installs the base for IBAN (International Bank Account Number) "
+"bank accounts and checks for its validity.\n"
+"============================================================================="
+"========================================\n"
+"\n"
+"The ability to extract the correctly represented local accounts from IBAN "
+"accounts with a single statement.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_mail_server
+msgid "ir.mail_server"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (CR) / Español (CR)"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"Global rules (non group-specific) are restrictions, and cannot be bypassed. "
+"Group-local rules grant additional permissions, but are constrained within "
+"the bounds of global ones. The first group rules restrict further than "
+"global rules, but any additional group rule will add more permissions"
+msgstr ""
+
+#. module: base
+#: field:res.currency.rate,rate:0
+msgid "Rate"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cg
+msgid "Congo"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Examples"
+msgstr ""
+
+#. module: base
+#: field:ir.default,value:0
+#: view:ir.values:0
+msgid "Default Value"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_country_state
+msgid "Country state"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_5
+msgid "Sequences & Identifiers"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_th
+msgid ""
+"\n"
+"Chart of Accounts for Thailand.\n"
+"===============================\n"
+"\n"
+"Thai accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kn
+msgid "Saint Kitts & Nevis Anguilla"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_point_of_sale
+msgid "Point of Sales"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_payroll_account
+msgid ""
+"\n"
+"Generic Payroll system Integrated with Accountings.\n"
+"===================================================\n"
+"\n"
+"    * Expense Encoding\n"
+"    * Payment Encoding\n"
+"    * Company Contribution Management\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_currency.py:190
+#, python-format
+msgid ""
+"No rate found \n"
+"for the currency: %s \n"
+"at the date: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"This module provides a quick and easy sale process.\n"
+"===================================================\n"
+"\n"
+"Main features :\n"
+"---------------\n"
+"    * Fast encoding of the sale.\n"
+"    * Allow to choose one payment mode (the quick way) or to split the "
+"payment between several payment mode.\n"
+"    * Computation of the amount of money to return.\n"
+"    * Create and confirm picking list automatically.\n"
+"    * Allow the user to create invoice automatically.\n"
+"    * Allow to refund former sales.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_ui_view_custom
+msgid ""
+"Customized views are used when users reorganize the content of their "
+"dashboard views (via web client)"
+msgstr ""
+
+#. module: base
+#: help:publisher_warranty.contract,check_opw:0
+msgid ""
+"Checked if this is an OpenERP Publisher's Warranty contract (versus older "
+"contract types"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,model:0
+msgid "Object Name"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,srcmodel_id:0
+msgid ""
+"Object in which you want to create / write the object. If it is empty then "
+"refer to the Object field."
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "Not Installed"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,out_transitions:0
+msgid "Outgoing Transitions"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_human_resources
+msgid ""
+"Helps you manage your human resources by encoding your employees structure, "
+"generating work sheets, tracking attendance and more."
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,model_id:0
+msgid "The model this field belongs to"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mq
+msgid "Martinique (French)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_wiki_sale_faq
+msgid ""
+"\n"
+"This module provides a Wiki Sales FAQ Template.\n"
+"===============================================\n"
+"\n"
+"It provides demo data, thereby creating a Wiki Group and a Wiki Page\n"
+"for Wiki Sale FAQ.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.sequence.type:0
+msgid "Sequences Type"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_action_rule
+msgid ""
+"\n"
+"This module allows to implement action rules for any object.\n"
+"============================================================\n"
+"\n"
+"Use automated actions to automatically trigger actions for various screens.\n"
+"\n"
+"Example: a lead created by a specific user may be automatically set to a "
+"specific\n"
+"sales team, or an opportunity which still has status pending after 14 days "
+"might\n"
+"trigger an automatic reminder email.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_request-act
+#: model:ir.ui.menu,name:base.menu_res_request_act
+#: model:ir.ui.menu,name:base.menu_resquest_ref
+#: view:res.request:0
+msgid "Requests"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ye
+msgid "Yemen"
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,split_mode:0
+msgid "Or"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_br
+msgid "Brazilian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pk
+msgid "Pakistan"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_margin
+msgid ""
+"\n"
+"Adds a reporting menu in products that computes sales, purchases, margins "
+"and other interesting indicators based on invoices.\n"
+"============================================================================="
+"================================================\n"
+"\n"
+"The wizard to launch the report has several options to help you get the data "
+"you need.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.al
+msgid "Albania"
+msgstr ""
+
+#. module: base
+#: help:ir.module.module,complexity:0
+msgid ""
+"Level of difficulty of module. Easy: intuitive and easy to use for everyone. "
+"Normal: easy to use for business experts. Expert: requires technical skills."
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:191
+#, python-format
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+msgid ""
+"Please be patient, this operation may take a few minutes (depending on the "
+"number of modules currently installed)..."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,child_id:0
+msgid "Child IDs"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:748
+#: code:addons/base/ir/ir_actions.py:751
+#, python-format
+msgid "Problem in configuration `Record Id` in Server Action!"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2682
+#: code:addons/orm.py:2692
+#, python-format
+msgid "ValidateError"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+#: view:base.module.update:0
+msgid "Open Modules"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_margin
+msgid ""
+"\n"
+"This module adds the 'Margin' on sales order.\n"
+"=============================================\n"
+"\n"
+"This gives the profitability by calculating the difference between the Unit "
+"Price and Cost Price.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_bank_form
+msgid "Manage bank records you want to be used in the system."
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid "Import module"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,loop_action:0
+msgid "Loop Action"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,report_file:0
+msgid ""
+"The path to the main report file (depending on Report Type) or NULL if the "
+"content is in another field"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.la
+msgid "Laos"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+#: model:ir.ui.menu,name:base.menu_email
+#: field:res.company,email:0
+#: field:res.users,user_email:0
+msgid "Email"
+msgstr ""
+
+#. module: base
+#: field:res.users,action_id:0
+msgid "Home Action"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_event_project
+msgid "Retro-Planning on Events"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
+#, python-format
+msgid ""
+"The sum of the data (2nd field) is null.\n"
+"We can't draw a pie chart !"
+msgstr ""
+
+#. module: base
+#: view:partner.clear.ids:0
+msgid "Want to Clear Ids ? "
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Information About the Bank"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,condition:0
+msgid ""
+"Condition that is tested before the action is executed, and prevent "
+"execution if it is not verified.\n"
+"Example: object.list_price > 5000\n"
+"It is a Python expression that can use the following values:\n"
+" - self: ORM model of the record on which the action is triggered\n"
+" - object or obj: browse_record of the record on which the action is "
+"triggered\n"
+" - pool: ORM model pool (i.e. self.pool)\n"
+" - time: Python time module\n"
+" - cr: database cursor\n"
+" - uid: current user id\n"
+" - context: current context"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"2. Group-specific rules are combined together with a logical OR operator"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
+msgid "Wood Suppliers"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tg
+msgid "Togo"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Other Proprietary"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ec
+msgid "Ecuador"
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,kind:0
+msgid "Stop All"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_analytic_user_function
+msgid "Jobs on Contracts"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_import_sugarcrm
+msgid ""
+"This Module Import SugarCRM \"Leads\", \"Opportunities\", \"Users\", "
+"\"Accounts\", \n"
+"            \"Contacts\", \"Employees\", Meetings, Phonecalls, Emails, and "
+"Project, Project Tasks Data into OpenERP Module."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_add_wizard
+#: model:ir.ui.menu,name:base.menu_publisher_warranty_contract_add
+#: view:publisher_warranty.contract.wizard:0
+msgid "Register a Contract"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
+"===========================================================================\n"
+"\n"
+"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+msgstr ""
+
+#. module: base
+#: view:ir.model.data:0
+msgid "Updatable"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "3.  %x ,%X         ==> 12/05/08, 18:25:20"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,on_delete:0
+msgid "Cascade"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_knowledge_management
+msgid ""
+"Lets you install addons geared towards sharing knowledge with and between "
+"your employees."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Arabic / الْعَرَبيّة"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_hello
+msgid "Hello"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.configuration.wizard:0
+msgid "Next Configuration Step"
+msgstr ""
+
+#. module: base
+#: field:res.groups,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_hr_manager
+msgid "HR Manager"
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+#: field:ir.model.fields,domain:0
+#: field:ir.rule,domain:0
+#: field:ir.rule,domain_force:0
+#: field:res.partner.title,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_marketing_campaign
+msgid "Marketing Campaigns"
+msgstr ""
+
+#. module: base
+#: code:addons/base/publisher_warranty/publisher_warranty.py:144
+#, python-format
+msgid "Contract validation error"
+msgstr ""
+
+#. module: base
+#: field:ir.values,key2:0
+msgid "Qualifier"
+msgstr ""
+
+#. module: base
+#: field:res.country.state,name:0
+msgid "State Name"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Update Languague Terms"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,join_mode:0
+msgid "Join Mode"
+msgstr ""
+
+#. module: base
+#: field:res.users,context_tz:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_wiki_faq
+msgid "Wiki: Internal FAQ"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_issue_sheet
+msgid ""
+"\n"
+"This module adds the Timesheet support for the Issues/Bugs Management in "
+"Project.\n"
+"============================================================================="
+"====\n"
+"\n"
+"Worklogs can be maintained to signify number of hours spent by users to "
+"handle an issue.\n"
+"                "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_sequence_form
+#: view:ir.sequence:0
+#: model:ir.ui.menu,name:base.menu_ir_sequence_form
+msgid "Sequences"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_miss
+msgid "Mss"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
+#. module: base
+#: help:res.lang,code:0
+msgid "This field is used to set/get locales for user"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_2
+msgid "OpenERP Partners"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:293
+#, python-format
+msgid ""
+"Unable to install module \"%s\" because an external dependency is not met: %s"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Search modules"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.by
+msgid "Belarus"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,name:0
+#: field:ir.actions.act_window_close,name:0
+#: field:ir.actions.actions,name:0
+#: field:ir.actions.client,name:0
+#: field:ir.actions.server,name:0
+#: field:ir.actions.url,name:0
+msgid "Action Name"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_users
+msgid ""
+"Create and manage users that will connect to the system. Users can be "
+"deactivated should there be a period of time during which they will/should "
+"not connect to the system. You can assign them groups in order to give them "
+"specific access to the applications they need to use in the system."
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,complexity:0
+#: selection:res.request,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase_double_validation
+msgid "Double Validation on Purchases"
+msgstr ""
+
+#. module: base
+#: field:res.bank,street2:0
+#: field:res.company,street2:0
+#: field:res.partner.address,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_base_module_update
+msgid "Module Update"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_upgrade.py:95
+#, python-format
+msgid "Following modules are not installed or unknown: %s"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+#: field:ir.cron,user_id:0
+#: field:ir.filters,user_id:0
+#: field:ir.ui.view.custom,user_id:0
+#: field:ir.values,user_id:0
+#: model:res.groups,name:base.group_document_user
+#: model:res.groups,name:base.group_tool_user
+#: field:res.log,user_id:0
+#: field:res.partner.event,user_id:0
+#: view:res.users:0
+#: field:res.widget.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pr
+msgid "Puerto Rico"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "Open Window"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,auto_search:0
+msgid "Auto Search"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,filter:0
+msgid "Filter"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_madam
+msgid "Ms."
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid ""
+"This wizard helps you to import a new module to your OpenERP system. After "
+"importing a new module you can install it by clicking on the button "
+"\"Install\" from the form view."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ch
+msgid "Switzerland"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gd
+msgid "Grenada"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Trigger Configuration"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+msgid "Load"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_warning
+msgid ""
+"\n"
+"Module to trigger warnings in OpenERP objects.\n"
+"==============================================\n"
+"\n"
+"Warning messages can be displayed for objects like sale order, purchase "
+"order,\n"
+"picking and invoice. The message is triggered by the form's onchange event.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:150
+#: code:addons/osv.py:152
+#, python-format
+msgid "Integrity Error"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_wizard_screen
+msgid "ir.wizard.screen"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:255
+#, python-format
+msgid "Size of the field can never be less than 1 !"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.so
+msgid "Somalia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_operations
+msgid "Manufacturing Operations"
+msgstr ""
+
+#. module: base
+#: selection:publisher_warranty.contract,state:0
+msgid "Terminated"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_13
+msgid "Important customers"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Update Terms"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_messages
+msgid ""
+"\n"
+"This module provides the functionality to send messages within a project.\n"
+"=========================================================================\n"
+"\n"
+"A user can send messages individually to other user. He can even broadcast\n"
+"it to all the users.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr
+msgid "Employee Directory"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+#: field:ir.cron,args:0
+msgid "Arguments"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:1260
+#, python-format
+msgid "Database ID doesn't exist: %s : %s"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL Version 2"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL Version 3"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_report_intrastat
+msgid ""
+"\n"
+"A module that adds intrastat reports.\n"
+"=====================================\n"
+"\n"
+"This module gives the details of the goods traded between the countries of "
+"European Union "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock_invoice_directly
+msgid ""
+"\n"
+"Invoice Wizard for Delivery.\n"
+"============================\n"
+"\n"
+"When you send or deliver goods, this module automatically launch\n"
+"the invoicing wizard if the delivery is to be invoiced.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:1388
+#, python-format
+msgid "key '%s' not found in selection field '%s'"
+msgstr ""
+
+#. module: base
+#: selection:ir.values,key:0
+#: selection:res.partner.address,type:0
+msgid "Default"
+msgstr ""
+
+#. module: base
+#: view:partner.wizard.ean.check:0
+msgid "Correct EAN13"
+msgstr ""
+
+#. module: base
+#: selection:res.company,paper_format:0
+msgid "A4"
+msgstr ""
+
+#. module: base
+#: field:publisher_warranty.contract,check_support:0
+msgid "Support Level 1"
+msgstr ""
+
+#. module: base
+#: field:res.partner,customer:0
+#: view:res.partner.address:0
+#: field:res.partner.address,is_customer_add:0
+#: model:res.partner.category,name:base.res_partner_category_0
+msgid "Customer"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (NI) / Español (NI)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_visible_discount
+msgid ""
+"\n"
+"This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+"============================================================================="
+"==================================\n"
+"\n"
+"To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+"\n"
+"Example:\n"
+"    For the product PC1 and the partner \"Asustek\": if listprice=450, and "
+"the price calculated using Asustek's pricelist is 225\n"
+"    If the check box is checked, we will have on the sale order line: Unit "
+"price=450, Discount=50,00, Net price=225\n"
+"    If the check box is unchecked, we will have on Sale Order and Invoice "
+"lines: Unit price=225, Discount=0,00, Net price=225\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,shortdesc:0
+msgid "Short Description"
+msgstr ""
+
+#. module: base
+#: field:res.country,code:0
+msgid "Country Code"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Hour 00->24: %(h24)s"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,nextcall:0
+msgid "Next Execution Date"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,padding:0
+msgid "Number Padding"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,field_id:0
+msgid "Select field property"
+msgstr ""
+
+#. module: base
+#: field:res.request.history,date_sent:0
+msgid "Date sent"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Month: %(month)s"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window.view,sequence:0
+#: field:ir.actions.server,sequence:0
+#: field:ir.actions.todo,sequence:0
+#: field:ir.actions.todo.category,sequence:0
+#: view:ir.cron:0
+#: field:ir.module.category,sequence:0
+#: field:ir.module.module,sequence:0
+#: view:ir.sequence:0
+#: field:ir.ui.menu,sequence:0
+#: view:ir.ui.view:0
+#: field:ir.ui.view,priority:0
+#: field:ir.ui.view_sc,sequence:0
+#: field:multi_company.default,sequence:0
+#: field:res.partner.bank,sequence:0
+#: field:res.widget.user,sequence:0
+#: field:wizard.ir.model.menu.create.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tn
+msgid "Tunisia"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Wizards to be Launched"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_manufacturing
+#: model:ir.ui.menu,name:base.menu_mrp_root
+msgid "Manufacturing"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.km
+msgid "Comoros"
+msgstr ""
+
+#. module: base
+#: view:res.request:0
+msgid "Draft and Active"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_server_action
+#: view:ir.actions.server:0
+#: model:ir.ui.menu,name:base.menu_server_action
+msgid "Server Actions"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank.type,format_layout:0
+msgid "Format Layout"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,selection:0
+msgid "Selection Options"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_plugin_thunderbird
+msgid ""
+"\n"
+"This module is required for the Thuderbird Plug-in to work properly.\n"
+"====================================================================\n"
+"\n"
+"The plugin allows you archive email and its attachments to the selected\n"
+"OpenERP objects. You can select a partner, a task, a project, an analytical\n"
+"account, or any other object and attach the selected mail as a .eml file in\n"
+"the attachment of a selected record. You can create documents for CRM Lead,\n"
+"HR Applicant and Project Issue from selected mails.\n"
+"      "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Legends for Date and Time Formats"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Copy Object"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mail
+msgid "Emails Management"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,trigger_name:0
+msgid "Trigger Signal"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:119
+#, python-format
+msgid ""
+"Group(s) cannot be deleted, because some user(s) still belong to them: %s !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_repair
+msgid ""
+"\n"
+"The aim is to have a complete module to manage all products repairs. The "
+"following topics should be covered by this module:\n"
+"============================================================================="
+"==============================================\n"
+"\n"
+"    * Add/remove products in the reparation\n"
+"    * Impact for stocks\n"
+"    * Invoicing (products and/or services)\n"
+"    * Warranty concept\n"
+"    * Repair quotation report\n"
+"    * Notes for the technician and for the final customer\n"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_country_state
+#: model:ir.ui.menu,name:base.menu_country_state_partner
+msgid "Fed. States"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: view:res.groups:0
+msgid "Access Rules"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_knowledge
+msgid ""
+"\n"
+"Installer for knowledge-based Hidden.\n"
+"====================================\n"
+"\n"
+"Makes the Knowledge Application Configuration available from where you can "
+"install\n"
+"document and Wiki based Hidden.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.groups,trans_implied_ids:0
+msgid "Transitively inherits"
+msgstr ""
+
+#. module: base
+#: field:ir.default,ref_table:0
+msgid "Table Ref."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:443
+#, python-format
+msgid "Mail delivery failed"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,res_model:0
+#: field:ir.actions.report.xml,model:0
+#: field:ir.actions.server,model_id:0
+#: field:ir.actions.wizard,model:0
+#: field:ir.cron,model:0
+#: field:ir.default,field_tbl:0
+#: field:ir.filters,model_id:0
+#: view:ir.model.access:0
+#: field:ir.model.access,model_id:0
+#: view:ir.model.data:0
+#: view:ir.model.fields:0
+#: field:ir.rule,model_id:0
+#: selection:ir.translation,type:0
+#: view:ir.ui.view:0
+#: field:ir.ui.view,model:0
+#: field:multi_company.default,object_id:0
+#: field:res.log,res_model:0
+#: field:res.request.link,object:0
+#: field:workflow.triggers,model:0
+msgid "Object"
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:147
+#, python-format
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_analytic_plans
+msgid "Multiple Analytic Plans"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_timesheet
+msgid ""
+"\n"
+"Synchronization of project task work entries with timesheet entries.\n"
+"====================================================================\n"
+"\n"
+"This module lets you transfer the entries under tasks defined for Project "
+"Management to\n"
+"the Timesheet line entries for particular date and particular user  with the "
+"effect of creating, editing and deleting either ways.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Minute: %(min)s"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_10
+msgid "Scheduler"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_tools
+msgid "Base Tools"
+msgstr ""
+
+#. module: base
+#: help:res.country,address_format:0
+msgid ""
+"You can state here the usual format to use for the addresses belonging to "
+"this country.\n"
+"\n"
+"You can use the python-style string patern with all the field of the address "
+"(for example, use '%(street)s' to display the field 'street') plus\n"
+"            \n"
+"%(state_name)s: the name of the state\n"
+"            \n"
+"%(state_code)s: the code of the state\n"
+"            \n"
+"%(country_name)s: the name of the country\n"
+"            \n"
+"%(country_code)s: the code of the country"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_pad
+msgid ""
+"\n"
+"Adds enhanced support for (Ether)Pad attachments in the web client.\n"
+"===================================================================\n"
+"\n"
+"Lets the company customize which Pad installation should be used to link to "
+"new pads\n"
+"(by default, http://ietherpad.com/).\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_uk
+msgid "UK - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_scrum
+msgid ""
+"\n"
+"This module implements all concepts defined by the scrum project management "
+"methodology for IT companies.\n"
+"============================================================================="
+"============================\n"
+"\n"
+"    * Project with sprints, product owner, scrum master\n"
+"    * Sprints with reviews, daily meetings, feedbacks\n"
+"    * Product backlog\n"
+"    * Sprint backlog\n"
+"\n"
+"It adds some concepts to the project management module:\n"
+"    * Mid-term, long-term road-map\n"
+"    * Customers/functional requests VS technical ones\n"
+"\n"
+"It also creates a new reporting:\n"
+"    * Burn-down chart\n"
+"\n"
+"The scrum projects and tasks inherit from the real projects and\n"
+"tasks, so you can continue working on normal tasks that will also\n"
+"include tasks from scrum projects.\n"
+"\n"
+"More information on the methodology:\n"
+"    * http://controlchaos.com\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:371
+#, python-format
+msgid ""
+"Changing the type of a column is not yet supported. Please drop it and "
+"create it again!"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view_sc,user_id:0
+msgid "User Ref."
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:118
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: base
+#: model:res.widget,title:base.google_maps_widget
+msgid "Google Maps"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_config
+#: model:ir.ui.menu,name:base.menu_config
+#: model:ir.ui.menu,name:base.menu_event_config
+#: model:ir.ui.menu,name:base.menu_lunch_survey_root
+#: model:ir.ui.menu,name:base.menu_marketing_config_association
+#: model:ir.ui.menu,name:base.menu_marketing_config_root
+#: view:res.company:0
+#: model:res.groups,name:base.group_system
+msgid "Configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_in
+msgid "India - Accounting"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,expression:0
+msgid "Loop Expression"
+msgstr ""
+
+#. module: base
+#: field:publisher_warranty.contract,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_gt
+msgid "Guatemala - Accounting"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,args:0
+msgid "Arguments to be passed to the method, e.g. (uid,)."
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_5
+msgid "Gold Partner"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner
+#: field:res.company,partner_id:0
+#: view:res.partner.address:0
+#: field:res.partner.event,partner_id:0
+#: selection:res.partner.title,domain:0
+#: model:res.request.link,name:base.req_link_partner
+msgid "Partner"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,complete_name:0
+#: field:ir.ui.menu,complete_name:0
+msgid "Complete Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tr
+msgid "Turkey"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fk
+msgid "Falkland Islands"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lb
+msgid "Lebanon"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+#: field:ir.actions.report.xml,report_type:0
+msgid "Report Type"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.todo,state:0
+#: field:ir.module.module,state:0
+#: field:ir.module.module.dependency,state:0
+#: field:publisher_warranty.contract,state:0
+#: view:res.country.state:0
+#: view:res.request:0
+#: field:res.request,state:0
+#: field:workflow.instance,state:0
+#: field:workflow.workitem,state:0
+msgid "State"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_evaluation
+msgid ""
+"\n"
+"Ability to create employees evaluation.\n"
+"=======================================\n"
+"\n"
+"An evaluation can be created by employee for subordinates,\n"
+"juniors as well as his manager.The evaluation is done under a plan\n"
+"in which various surveys can be created and it can be defined which\n"
+"level of employee hierarchy fills what and final review and evaluation\n"
+"is done by the manager.Every evaluation filled by the employees can be "
+"viewed\n"
+"in the form of pdf file. Implements a dashboard for My Current Evaluations\n"
+"         "
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Galician / Galego"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.no
+msgid "Norway"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "4.  %b, %B         ==> Dec, December"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+#: model:ir.ui.menu,name:base.menu_view_base_language_install
+msgid "Load an Official Translation"
+msgstr ""
+
+#. module: base
+#: view:res.currency:0
+msgid "Miscelleanous"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_10
+msgid "Open Source Service Company"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Sinhalese / සිංහල"
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "waiting"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_file:0
+msgid "Report file"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_triggers
+msgid "workflow.triggers"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:74
+#, python-format
+msgid "Invalid search criterions"
+msgstr ""
+
+#. module: base
+#: view:ir.mail_server:0
+msgid "Connection Information"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Created"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.wizard,multi:0
+msgid ""
+"If set to true, the wizard will not be displayed on the right toolbar of a "
+"form view."
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid "- type,name,res_id,src,value"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hm
+msgid "Heard and McDonald Islands"
+msgstr ""
+
+#. module: base
+#: help:ir.model.data,name:0
+msgid ""
+"External Key/Identifier that can be used for data integration with third-"
+"party systems"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_operations
+msgid ""
+"\n"
+"This module adds state, date_start,date_stop in production order operation "
+"lines (in the \"Work Centers\" tab).\n"
+"============================================================================="
+"================================\n"
+"\n"
+"State: draft, confirm, done, cancel\n"
+"When finishing/confirming,cancelling production orders set all state lines "
+"to the according state\n"
+"\n"
+"Create menus:\n"
+"    Manufacturing > Manufacturing > Work Orders\n"
+"\n"
+"Which is a view on \"Work Centers\" lines in production order.\n"
+"\n"
+"Add buttons in the form view of production order under workcenter tab:\n"
+"    * start (set state to confirm), set date_start\n"
+"    * done (set state to done), set date_stop\n"
+"    * set to draft (set state to draft)\n"
+"    * cancel set state to cancel\n"
+"\n"
+"When the production order becomes \"ready to produce\", operations must\n"
+"become 'confirmed'. When the production order is done, all operations\n"
+"must become done.\n"
+"\n"
+"The field delay is the delay(stop date - start date).\n"
+"So that we can compare the theoretic delay and real delay.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auction
+msgid ""
+"\n"
+"This module manages the records of artists, auction articles, buyers and "
+"sellers.\n"
+"============================================================================="
+"====\n"
+"\n"
+"It completely manages an auction such as managing bids,\n"
+"keeping track of the sold articles along with the paid\n"
+"and unpaid objects including delivery of the articles.\n"
+"\n"
+"The dashboard for auction includes:\n"
+"    * Latest Objects (list)\n"
+"    * Latest Deposits (list)\n"
+"    * Objects Statistics (list)\n"
+"    * Total Adjudications (graph)\n"
+"    * Min/Adj/Max (graph)\n"
+"    * Objects By Day (graph)\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_crypt
+msgid ""
+"\n"
+"Replaces cleartext passwords in the database with a secure hash\n"
+"===============================================================\n"
+"For your existing user base, the removal of the cleartext\n"
+"passwords occurs immediately when you instal base_crypt.\n"
+"\n"
+"All passwords will be replaced by a secure, salted, cryptographic\n"
+"hash, preventing anyone from reading the original password in\n"
+"the database.\n"
+"\n"
+"After installing this module it won't be possible to recover a\n"
+"forgotten password for your users, the only solution is for an\n"
+"admin to set a new password.\n"
+"\n"
+"Security Warning\n"
+"++++++++++++++++\n"
+"Installing this module does not mean you can ignore other security "
+"measures,\n"
+"as the password is still transmitted unencrypted on the network, unless you\n"
+"are using a secure protocol such as XML-RPCS or HTTPS.\n"
+"It also does not protect the rest of the content of the database, which may\n"
+"contain critical data. Appropriate security measures need to be implemented\n"
+"by the system administrator in all areas, such as: protection of database\n"
+"backups, system files, remote shell access, physical server access, etc.\n"
+"\n"
+"Interation with LDAP authentication\n"
+"+++++++++++++++++++++++++++++++++++\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+"\n"
+"                    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,view_id:0
+msgid "View Ref."
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_sales_management
+msgid "Helps you handle your quotations, sale orders and invoicing."
+msgstr ""
+
+#. module: base
+#: field:res.groups,implied_ids:0
+msgid "Inherits"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Selection"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,type:0
+#: field:ir.actions.act_window_close,type:0
+#: field:ir.actions.actions,type:0
+#: field:ir.actions.client,type:0
+#: field:ir.actions.report.xml,type:0
+#: view:ir.actions.server:0
+#: field:ir.actions.server,state:0
+#: field:ir.actions.server,type:0
+#: field:ir.actions.url,type:0
+#: field:ir.actions.wizard,type:0
+msgid "Action Type"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vn
+msgid "Vietnam"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_syscohada
+msgid ""
+"This module implements the accounting chart for OHADA area.\n"
+"    It allows any company or association to manage its financial "
+"accounting.\n"
+"    Countries that use OHADA are the following:\n"
+"    Benin, Burkina Faso, Cameroon, Central African Republic, Comoros, "
+"Congo,\n"
+"    Ivory Coast, Gabon, Guinea, Guinea Bissau,\n"
+"    Equatorial Guinea, Mali, Niger, Replica of Democratic Congo, Senegal, "
+"Chad, Togo.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+#: model:ir.actions.act_window,name:base.action_view_base_import_language
+#: model:ir.ui.menu,name:base.menu_view_base_import_language
+msgid "Import Translation"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank.type,field_ids:0
+msgid "Type fields"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+#: field:ir.actions.todo,category_id:0
+#: field:ir.module.module,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: selection:ir.attachment,type:0
+#: selection:ir.property,type:0
+msgid "Binary"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,sms:0
+#: selection:ir.actions.server,state:0
+msgid "SMS"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cr
+msgid "Costa Rica"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_module_doc_rst
+msgid "Generate Docs of Modules"
+msgstr ""
+
+#. module: base
+#: model:res.company,overdue_msg:base.main_company
+msgid ""
+"Our records indicate that the following payments are still due. If the "
+"amount\n"
+"has already been paid, please disregard this notice. However, if you have "
+"any\n"
+"queries regarding your account, please contact us.\n"
+"Thank you in advance.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_users_ldap
+msgid "Authentication via LDAP"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+msgid "Conditions"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_other_form
+msgid "Other Partners"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_currency_form
+#: model:ir.ui.menu,name:base.menu_action_currency_form
+#: view:res.currency:0
+msgid "Currencies"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_client
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.client"
+msgstr ""
+
+#. module: base
+#: help:ir.values,value:0
+msgid "Default value (pickled) or reference to an action"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_report_designer
+msgid ""
+"\n"
+"This module is used along with OpenERP OpenOffice Plugin.\n"
+"=========================================================\n"
+"\n"
+"This module adds wizards to Import/Export .sxw report that\n"
+"you can modify in OpenOffice. Once you have modified it you can\n"
+"upload the report using the same wizard.\n"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Hour 00->12: %(h12)s"
+msgstr ""
+
+#. module: base
+#: help:res.partner.address,active:0
+msgid "Uncheck the active field to hide the contact."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_widget_wizard
+msgid "Add a widget for User"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.dk
+msgid "Denmark"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_calendar
+msgid ""
+"\n"
+"This is a full-featured calendar system.\n"
+"========================================\n"
+"\n"
+"It supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people\n"
+"\n"
+"If you need to manage your meetings, you should install the CRM module.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Rule definition (domain filter)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_instance
+msgid "workflow.instance"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:471
+#, python-format
+msgid "Unknown attribute %s in %s "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "10. %S              ==> 20"
+msgstr ""
+
+#. module: base
+#: code:addons/fields.py:122
+#, python-format
+msgid "undefined get method !"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Norwegian Bokmål / Norsk bokmål"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_madam
+msgid "Madam"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ee
+msgid "Estonia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_board
+#: model:ir.ui.menu,name:base.menu_dashboard
+msgid "Dashboards"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_procurement
+msgid "Procurements"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_payroll_account
+msgid "Payroll Accounting"
+msgstr ""
+
+#. module: base
+#: help:ir.attachment,type:0
+msgid "Binary File or external URL"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_order_dates
+msgid "Dates on Sales Order"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nl
+msgid "Netherlands"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_edi
+msgid ""
+"\n"
+"Provides a common EDI platform that other Applications can use\n"
+"==============================================================\n"
+"\n"
+"OpenERP specifies a generic EDI format for exchanging business\n"
+"documents between different systems, and provides generic\n"
+"mechanisms to import and export them.\n"
+"\n"
+"More details about OpenERP's EDI format may be found in the\n"
+"technical OpenERP documentation at http://doc.openerp.com\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_4
+msgid "Low Level Objects"
+msgstr ""
+
+#. module: base
+#: help:ir.values,model:0
+msgid "Model to which this entry applies"
+msgstr ""
+
+#. module: base
+#: field:res.country,address_format:0
+msgid "Address Format"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_no_one
+msgid "Technical Features"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Occitan (FR, post 1500) / Occitan"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:192
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_data
+#: view:ir.model.data:0
+#: model:ir.ui.menu,name:base.ir_model_data_menu
+msgid "External Identifiers"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_sale_salesman
+msgid "User - Own Leads Only"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cd
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Malayalam / മലയാളം"
+msgstr ""
+
+#. module: base
+#: view:res.request:0
+#: field:res.request,body:0
+#: field:res.request.history,req_id:0
+msgid "Request"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.act_ir_actions_todo_form
+msgid ""
+"The configuration wizards are used to help you configure a new instance of "
+"OpenERP. They are launched during the installation of new modules, but you "
+"can choose to restart some wizards manually from this menu."
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Portrait"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,numbercall:0
+msgid "Number of Calls"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_bank.py:189
+#, python-format
+msgid "BANK"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+#: field:base.module.upgrade,module_info:0
+msgid "Modules to update"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,sequence:0
+msgid ""
+"Important when you deal with multiple actions, the execution order will be "
+"decided based on this, low number is higher priority."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,header:0
+msgid "Add RML header"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_tr
+msgid ""
+"\n"
+"Türkiye için Tek düzen hesap planı şablonu OpenERP Modülü.\n"
+"============================================================================="
+"=\n"
+"\n"
+"Bu modül kurulduktan sonra, Muhasebe yapılandırma sihirbazı çalışır\n"
+"    * Sihirbaz sizden hesap planı şablonu, planın kurulacağı şirket,banka "
+"hesap bilgileriniz,ilgili para birimi gibi bilgiler isteyecek.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.config:0
+msgid "Apply"
+msgstr ""
+
+#. module: base
+#: field:res.request,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Croatian / hrvatski jezik"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.country:0
+msgid "The code of the country must be unique !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_kanban
+msgid ""
+"\n"
+"        OpenERP Web kanban view.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_project_management_time_tracking
+msgid "Time Tracking"
+msgstr ""
+
+#. module: base
+#: view:res.partner.category:0
+msgid "Partner Category"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: selection:ir.actions.server,state:0
+msgid "Trigger"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_warehouse_management
+msgid ""
+"Helps you manage your inventory and main stock operations: delivery orders, "
+"receptions, etc."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_update
+msgid "Update Module"
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
+#: field:ir.model.fields,translate:0
+msgid "Translate"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_users_ldap
+msgid ""
+"\n"
+"Adds support for authentication by LDAP server.\n"
+"===============================================\n"
+"This module allows users to login with their LDAP username and\n"
+"password, and will automatically create OpenERP users for them\n"
+"on the fly.\n"
+"\n"
+"**Note**: This module only work on servers who have Python's\n"
+"``ldap`` module installed.\n"
+"\n"
+"Configuration\n"
+"+++++++++++++\n"
+"After installing this module, you need to configure the LDAP\n"
+"parameters in the Configuration tab of the Company details.\n"
+"Different companies may have different LDAP servers, as long\n"
+"as they have unique usernames (usernames need to be unique in\n"
+"OpenERP, even across multiple companies).\n"
+"\n"
+"Anonymous LDAP binding is also supported (for LDAP servers\n"
+"that allow it), by simpling keeping the LDAP user and password\n"
+"empty in the LDAP configuration. This does **not** allow\n"
+"anonymous authentication for users, it is only for the master\n"
+"LDAP account that is used to verify if a user exists before\n"
+"attempting to authenticate it.\n"
+"\n"
+"Securing the connection with STARTTLS is available for LDAP\n"
+"servers supporting it, by enabling the TLS option in the LDAP\n"
+"configuration.\n"
+"\n"
+"For further options configuring the LDAP settings, refer to the\n"
+"ldap.conf manpage :manpage:`ldap.conf(5)`.\n"
+"\n"
+"Security Considerations\n"
+"+++++++++++++++++++++++\n"
+"Users' LDAP passwords are never stored in the OpenERP database,\n"
+"the LDAP server is queried whenever a user needs to be\n"
+"authenticated. No duplication of the password occurs, and\n"
+"passwords are managed in one place only.\n"
+"\n"
+"OpenERP does not manage password changes in the LDAP, so\n"
+"any change of password should be conducted by other means\n"
+"in the LDAP directory directly (for LDAP users).\n"
+"\n"
+"It is also possible to have local OpenERP users in the\n"
+"database along with LDAP-authenticated users (the Administrator\n"
+"account is one obvious example).\n"
+"\n"
+"Here is how it works:\n"
+"\n"
+"  * The system first attempts to authenticate users against\n"
+"    the local OpenERP database ;\n"
+"  * if this authentication fails (for example because the\n"
+"    user has no local password), the system then attempts\n"
+"    to authenticate against LDAP ;\n"
+"\n"
+"As LDAP users have blank passwords by default in the local\n"
+"OpenERP database (which means no access), the first step\n"
+"always fails and the LDAP server is queried to do the\n"
+"authentication.\n"
+"\n"
+"Enabling STARTTLS ensures that the authentication query to the\n"
+"LDAP server is encrypted.\n"
+"\n"
+"User Template\n"
+"+++++++++++++\n"
+"In the LDAP configuration on the Company form, it is possible to\n"
+"select a *User Template*. If set, this user will be used as\n"
+"template to create the local users whenever someone authenticates\n"
+"for the first time via LDAP authentication.\n"
+"This allows pre-setting the default groups and menus of the\n"
+"first-time users.\n"
+"\n"
+"**Warning**: if you set a password for the user template,\n"
+"this password will be assigned as local password for each new\n"
+"LDAP user, effectively setting a *master password* for these\n"
+"users (until manually changed). You usually do not want this.\n"
+"One easy way to setup a template user is to login once with\n"
+"a valid LDAP user, let OpenERP create a blank local user with the\n"
+"same login (and a blank password), then rename this new user\n"
+"to a username that does not exist in LDAP, and setup its\n"
+"groups the way you want.\n"
+"\n"
+"Interaction with base_crypt\n"
+"+++++++++++++++++++++++++++\n"
+"The base_crypt module is not compatible with this module, and\n"
+"will disable LDAP authentication if installed at the same time.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.request.history,body:0
+msgid "Body"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:199
+#, python-format
+msgid "Connection test succeeded!"
+msgstr ""
+
+#. module: base
+#: view:partner.massmail.wizard:0
+msgid "Send Email"
+msgstr ""
+
+#. module: base
+#: field:res.users,menu_id:0
+msgid "Menu Action"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,selection:0
+msgid ""
+"List of options for a selection field, specified as a Python expression "
+"defining a list of (key, label) pairs. For example: "
+"[('blue','Blue'),('yellow','Yellow')]"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,state:0
+msgid "choose"
+msgstr ""
+
+#. module: base
+#: help:ir.model,osv_memory:0
+msgid ""
+"Indicates whether this object model lives in memory only, i.e. is not "
+"persisted (osv.osv_memory)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:415
+#, python-format
+msgid ""
+"Please define at least one SMTP server, or provide the SMTP parameters "
+"explicitly."
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Filter on my documents"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,code:0
+msgid ""
+"Python code to be executed if condition is met.\n"
+"It is a Python block that can use the same values as for the condition field"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_supplier_form
+#: model:ir.ui.menu,name:base.menu_procurement_management_supplier_name
+#: view:res.partner:0
+msgid "Suppliers"
+msgstr ""
+
+#. module: base
+#: view:publisher_warranty.contract.wizard:0
+msgid "Register"
+msgstr ""
+
+#. module: base
+#: field:res.request,ref_doc2:0
+msgid "Document Ref 2"
+msgstr ""
+
+#. module: base
+#: field:res.request,ref_doc1:0
+msgid "Document Ref 1"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ga
+msgid "Gabon"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_multi_company
+msgid "Multi Companies"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: view:ir.rule:0
+#: view:res.groups:0
+#: model:res.groups,name:base.group_erp_manager
+#: view:res.users:0
+msgid "Access Rights"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gl
+msgid "Greenland"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_sale_salesman_all_leads
+msgid "User - All Leads"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank,acc_number:0
+msgid "Account Number"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"Example: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 OR "
+"GROUP_A_RULE_2) OR (GROUP_B_RULE_1 OR GROUP_B_RULE_2) )"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_th
+msgid "Thailand - Accounting"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "1.  %c              ==> Fri Dec  5 18:25:20 2008"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nc
+msgid "New Caledonia (French)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_jit
+msgid ""
+"\n"
+"This module allows Just In Time computation of procurement orders.\n"
+"==================================================================\n"
+"\n"
+"If you install this module, you will not have to run the regular "
+"procurement\n"
+"scheduler anymore (but you still need to run the minimum order point rule\n"
+"scheduler, or for example let it run daily.)\n"
+"All procurement orders will be processed immediately, which could in some\n"
+"cases entail a small performance impact.\n"
+"\n"
+"It may also increase your stock size because products are reserved as soon\n"
+"as possible and the scheduler time range is not taken into account anymore.\n"
+"In that case, you can not use priorities any more on the different picking.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cy
+msgid "Cyprus"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,subject:0
+#: field:partner.massmail.wizard,subject:0
+#: field:res.request,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: base
+#: selection:res.currency,position:0
+msgid "Before Amount"
+msgstr ""
+
+#. module: base
+#: field:res.request,act_from:0
+#: field:res.request.history,act_from:0
+msgid "From"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Preferences"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_consumers0
+msgid "Consumers"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Set Bank Accounts"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.client,tag:0
+msgid "Client action tag"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:189
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: field:ir.values,model_id:0
+msgid "Model (change only)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_marketing_campaign_crm_demo
+msgid ""
+"\n"
+"Demo data for the module marketing_campaign.\n"
+"============================================\n"
+"\n"
+"Creates demo data like leads, campaigns and segments for the module "
+"marketing_campaign.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Kanban"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:251
+#, python-format
+msgid ""
+"The Selection Options expression is must be in the [('key','Label'), ...] "
+"format!"
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "Current User"
+msgstr ""
+
+#. module: base
+#: field:res.company,company_registry:0
+msgid "Company Registry"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_ir_mail_server_list
+#: view:ir.mail_server:0
+#: model:ir.ui.menu,name:base.menu_mail_servers
+msgid "Outgoing Mail Servers"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cn
+msgid "China"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,wkf_model_id:0
+msgid ""
+"The object that should receive the workflow signal (must have an associated "
+"workflow)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_account_voucher
+msgid ""
+"Allows you to create your invoices and track the payments. It is an easier "
+"version of the accounting module for managers who are not accountants."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.eh
+msgid "Western Sahara"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_account_voucher
+msgid "Invoicing & Payments"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_company_form
+msgid ""
+"Create and manage the companies that will be managed by OpenERP from here. "
+"Shops or subsidiaries can be created and maintained from here."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.id
+msgid "Indonesia"
+msgstr ""
+
+#. module: base
+#: view:base.update.translations:0
+msgid ""
+"This wizard will detect new terms to translate in the application, so that "
+"you can then add translations manually or perform a complete export (as a "
+"template for a new language example)."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localisation :\n"
+" - DTA generation for a lot of payment types\n"
+" - BVR management (number generation, report, etc..)\n"
+" - Import account move from the bank file (like v11 etc..)\n"
+" - Simplify the way you handle the bank statement for reconciliation\n"
+"\n"
+"You can also add ZIP and bank completion with:\n"
+" - l10n_ch_zip\n"
+" - l10n_ch_bank\n"
+" \n"
+" Author: Camptocamp SA\n"
+" Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+"------------------------------------------------------------------------\n"
+"\n"
+"Module incluant la localisation Suisse de TinyERP revu et corrigé par "
+"Camptocamp. Cette nouvelle version\n"
+"comprend la gestion et l'émissionde BVR, le paiement électronique via DTA "
+"(pour les banques, le système postal est en développement)\n"
+"et l'import du relevé de compte depuis la banque de manière automatisée.\n"
+"De plus, nous avons intégré la définition de toutes les banques "
+"Suisses(adresse, swift et clearing).\n"
+"\n"
+"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
+"\n"
+"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
+" - l10n_ch_zip\n"
+" - l10n_ch_bank\n"
+" \n"
+" Auteur: Camptocamp SA\n"
+" Donateurs: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+"--------------------------------------------------------------------------\n"
+"TODO :\n"
+"- Implement bvr import partial reconciliation\n"
+"- Replace wizard by osv_memory when possible\n"
+"- Add mising HELP\n"
+"- Finish code comment\n"
+"- Improve demo data\n"
+"\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,expression:0
+msgid ""
+"Expression, must be True to match\n"
+"use context.get or user (browse)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bg
+msgid "Bulgaria"
+msgstr ""
+
+#. module: base
+#: view:publisher_warranty.contract.wizard:0
+msgid "Publisher warranty contract successfully registered!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tf
+msgid "French Southern Territories"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_currency
+#: field:res.company,currency_id:0
+#: field:res.company,currency_ids:0
+#: view:res.currency:0
+#: field:res.currency,name:0
+#: field:res.currency.rate,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "5.  %y, %Y         ==> 08, 2008"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_ltd
+msgid "ltd"
+msgstr ""
+
+#. module: base
+#: field:res.log,res_id:0
+msgid "Object ID"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Landscape"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.todo.category,name:base.category_administration_config
+#: model:ir.module.category,name:base.module_category_administration
+msgid "Administration"
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+msgid "Click on Update below to start the process..."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ir
+msgid "Iran"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_widget_user_act_window
+#: model:ir.ui.menu,name:base.menu_res_widget_user_act_window
+msgid "Widgets per User"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_form
+#: model:ir.ui.menu,name:base.menu_publisher_warranty_contract
+msgid "Contracts"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,state:0
+#: field:ir.ui.menu,icon_pict:0
+#: field:publisher_warranty.contract.wizard,state:0
+msgid "unknown"
+msgstr ""
+
+#. module: base
+#: field:res.currency,symbol:0
+msgid "Symbol"
+msgstr ""
+
+#. module: base
+#: help:res.users,login:0
+msgid "Used to log into the system"
+msgstr ""
+
+#. module: base
+#: view:base.update.translations:0
+msgid "Synchronize Translation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_module_quality
+msgid ""
+"\n"
+"The aim of this module is to check the quality of other modules.\n"
+"================================================================\n"
+"\n"
+"It defines a wizard on the list of modules in OpenERP, which allows you to\n"
+"evaluate them on different criteria such as: the respect of OpenERP coding\n"
+"standards, the speed efficiency...\n"
+"\n"
+"This module also provides generic framework to define your own quality "
+"test.\n"
+"For further info, coders may take a look into base_module_quality\\"
+"README.txt\n"
+"\n"
+"WARNING: This module cannot work as a ZIP file, you must unzip it before\n"
+"using it, otherwise it may crash.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank,bank_name:0
+msgid "Bank Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ki
+msgid "Kiribati"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.iq
+msgid "Iraq"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_association
+#: model:ir.ui.menu,name:base.menu_association
+msgid "Association"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock_no_autopicking
+msgid ""
+"\n"
+"This module allows an intermediate picking process to provide raw materials "
+"to production orders.\n"
+"============================================================================="
+"====================\n"
+"\n"
+"One example of usage of this module is to manage production made by your\n"
+"suppliers (sub-contracting). To achieve this, set the assembled product\n"
+"which is sub-contracted to \"No Auto-Picking\" and put the location of the\n"
+"supplier in the routing of the assembly operation.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Action to Launch"
+msgstr ""
+
+#. module: base
+#: help:res.users,context_lang:0
+msgid ""
+"The default language used in the graphical user interface, when translations "
+"are available. To add a new language, you can use the 'Load an Official "
+"Translation' wizard available from the 'Administration' menu."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_es
+msgid ""
+"\n"
+"Spanish Charts of Accounts (PGCE 2008).\n"
+"=======================================\n"
+"\n"
+"* Defines the following chart of account templates:\n"
+"    * Spanish General Chart of Accounts 2008.\n"
+"    * Spanish General Chart of Accounts 2008 for small and medium "
+"companies.\n"
+"* Defines templates for sale and purchase VAT.\n"
+"* Defines tax code templates.\n"
+"\n"
+"Note: You should install the l10n_ES_account_balance_report module\n"
+"for yearly account reporting (balance, profit & losses).\n"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_sequence_type
+msgid "ir.sequence.type"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,format:0
+msgid "CSV File"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:154
+#, python-format
+msgid "Phone: "
+msgstr ""
+
+#. module: base
+#: field:res.company,account_no:0
+msgid "Account No."
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:187
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: selection:ir.model,state:0
+msgid "Base Object"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference.graph:0
+msgid "Dependencies :"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase_analytic_plans
+msgid ""
+"\n"
+"The base module to manage analytic distribution and purchase orders.\n"
+"====================================================================\n"
+"\n"
+"Allows the user to maintain several analysis plans. These let you split\n"
+"a line on a supplier purchase order into several accounts and analytic "
+"plans.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.company,vat:0
+msgid "Tax ID"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,field_description:0
+msgid "Field Label"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,report_rml:0
+msgid ""
+"The path to the main report file (depending on Report Type) or NULL if the "
+"content is in another data field"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.dj
+msgid "Djibouti"
+msgstr ""
+
+#. module: base
+#: field:ir.translation,value:0
+msgid "Translation Value"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ag
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3669
+#, python-format
+msgid ""
+"Operation prohibited by access rules, or performed on an already deleted "
+"document (Operation: %s, Document type: %s)."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.zr
+msgid "Zaire"
+msgstr ""
+
+#. module: base
+#: field:ir.translation,res_id:0
+#: field:workflow.instance,res_id:0
+#: field:workflow.triggers,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+#: field:ir.model,info:0
+msgid "Information"
+msgstr ""
+
+#. module: base
+#: view:res.widget.user:0
+msgid "User Widgets"
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+msgid "Update Module List"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:755
+#: code:addons/base/res/res_users.py:892
+#: selection:res.partner.address,type:0
+#: view:res.users:0
+#, python-format
+msgid "Other"
+msgstr ""
+
+#. module: base
+#: view:res.request:0
+msgid "Reply"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Turkish / Türkçe"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_long_term
+msgid ""
+"\n"
+"Long Term Project management module that tracks planning, scheduling, "
+"resources allocation.\n"
+"============================================================================="
+"==============\n"
+"\n"
+"Features\n"
+"--------\n"
+"    * Manage Big project.\n"
+"    * Define various Phases of Project.\n"
+"    * Compute Phase Scheduling: Compute start date and end date of the "
+"phases which are in draft,open and pending state of the project given.\n"
+"      If no project given then all the draft,open and pending state phases "
+"will be taken.\n"
+"    * Compute Task Scheduling: This works same as the scheduler button on "
+"project.phase. It takes the project as argument and computes all the "
+"open,draft and pending tasks.\n"
+"    * Schedule Tasks: All the tasks which are in draft,pending and open "
+"state are scheduled with taking the phase's start date\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_activity_form
+#: model:ir.ui.menu,name:base.menu_workflow_activity
+#: view:workflow:0
+#: field:workflow,activities:0
+msgid "Activities"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product
+msgid "Products & Pricelists"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,auto_refresh:0
+msgid "Auto-Refresh"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:74
+#, python-format
+msgid "The osv_memory field can only be compared with = and != operator."
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.view,type:0
+msgid "Diagram"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_es
+msgid "Spanish - Accounting (PGCE 2008)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock_no_autopicking
+msgid "Picking Before Manufacturing"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.wf
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,name:0
+msgid "Name it to easily find a record"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gr
+msgid "Greece"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_calendar
+msgid "web calendar"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,name:0
+msgid "External Identifier"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.grant_menu_access
+#: model:ir.ui.menu,name:base.menu_grant_menu_access
+msgid "Menu Items"
+msgstr ""
+
+#. module: base
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_event
+#: model:ir.ui.menu,name:base.menu_event_main
+msgid "Events Organisation"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_sequence_actions
+#: model:ir.ui.menu,name:base.menu_custom_action
+#: model:ir.ui.menu,name:base.menu_ir_sequence_actions
+#: model:ir.ui.menu,name:base.next_id_6
+#: view:workflow.activity:0
+msgid "Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_delivery
+msgid "Delivery Costs"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_cron.py:293
+#, python-format
+msgid ""
+"This cron task is currently being executed and may not be modified, please "
+"try again in a few minutes"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_expiry
+msgid ""
+"\n"
+"Track different dates on products and production lots.\n"
+"======================================================\n"
+"\n"
+"Following dates can be tracked:\n"
+"    - end of life\n"
+"    - best before date\n"
+"    - removal date\n"
+"    - alert date\n"
+"\n"
+"Used, for example, in food industries."
+msgstr ""
+
+#. module: base
+#: field:ir.exports.line,export_id:0
+msgid "Export"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_nl
+msgid "Netherlands - Accounting"
+msgstr ""
+
+#. module: base
+#: field:res.bank,bic:0
+#: field:res.partner.bank,bank_bic:0
+msgid "Bank Identifier Code"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tm
+msgid "Turkmenistan"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_process
+msgid ""
+"\n"
+"        OpenERP Web process view.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_chart
+msgid ""
+"\n"
+"Remove minimal account chart.\n"
+"=============================\n"
+"\n"
+"Deactivates minimal chart of accounts.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:653
+#: code:addons/base/ir/ir_actions.py:748
+#: code:addons/base/ir/ir_actions.py:751
+#: code:addons/base/ir/ir_model.py:139
+#: code:addons/base/ir/ir_model.py:236
+#: code:addons/base/ir/ir_model.py:250
+#: code:addons/base/ir/ir_model.py:264
+#: code:addons/base/ir/ir_model.py:282
+#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:290
+#: code:addons/base/module/module.py:255
+#: code:addons/base/module/module.py:298
+#: code:addons/base/module/module.py:302
+#: code:addons/base/module/module.py:308
+#: code:addons/base/module/module.py:390
+#: code:addons/base/module/module.py:408
+#: code:addons/base/module/module.py:423
+#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:622
+#: code:addons/base/publisher_warranty/publisher_warranty.py:124
+#: code:addons/base/publisher_warranty/publisher_warranty.py:163
+#: code:addons/base/publisher_warranty/publisher_warranty.py:295
+#: code:addons/base/res/res_currency.py:190
+#: code:addons/base/res/res_users.py:86
+#: code:addons/base/res/res_users.py:95
+#: code:addons/custom.py:555
+#: code:addons/orm.py:791
+#: code:addons/orm.py:3704
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_crypt
+msgid "DB Password Encryption"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,act_to:0
+msgid "The destination activity."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_check_writing
+msgid "Check writing"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_layout
+msgid ""
+"\n"
+"This module provides features to improve the layout of the Sales Order.\n"
+"=======================================================================\n"
+"\n"
+"It gives you the possibility to\n"
+"    * order all the lines of a sales order\n"
+"    * add titles, comment lines, sub total lines\n"
+"    * draw horizontal lines and put page breaks\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+#: view:base.module.upgrade:0
+#: view:base.update.translations:0
+msgid "Update"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.ir_module_reference_print
+msgid "Technical guide"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Address Information"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tz
+msgid "Tanzania"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Danish / Dansk"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,select_level:0
+msgid "Advanced Search (deprecated)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cx
+msgid "Christmas Island"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_livechat
+msgid "Live Chat Support"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Other Actions Configuration"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module.dependency,state:0
+msgid "Uninstallable"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_dashboard
+msgid ""
+"\n"
+"        OpenERP Web dashboard view.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Supplier Partners"
+msgstr ""
+
+#. module: base
+#: view:res.config.installer:0
+msgid "Install Modules"
+msgstr ""
+
+#. module: base
+#: view:ir.ui.view:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be_hr_payroll
+msgid ""
+"\n"
+"Belgian Payroll Rules\n"
+"=====================\n"
+"\n"
+"    * Employee Details\n"
+"    * Employee Contracts\n"
+"    * Passport based Contract\n"
+"    * Allowances / Deductions\n"
+"    * Allow to configure Basic / Grows / Net Salary\n"
+"    * Employee Payslip\n"
+"    * Monthly Payroll Register\n"
+"    * Integrated with Holiday Management\n"
+"    * Salary Maj, ONSS, Withholding Tax, Child Allowance, ...\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_partner_wizard_ean_check
+msgid "Ean Check"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Customer Partners"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_request_history
+msgid "res.request.history"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_multi_company_default
+msgid "Default multi company"
+msgstr ""
+
+#. module: base
+#: view:res.request:0
+msgid "Send"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_process
+msgid ""
+"\n"
+"This module shows the basic processes involved in the selected modules and "
+"in the sequence they occur.\n"
+"============================================================================="
+"=========================\n"
+"\n"
+"Note: This applies to the modules containing modulename_process_xml\n"
+"e.g product/process/product_process_xml\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.users,menu_tips:0
+msgid "Menu Tips"
+msgstr ""
+
+#. module: base
+#: field:ir.translation,src:0
+msgid "Source"
+msgstr ""
+
+#. module: base
+#: help:res.partner.address,partner_id:0
+msgid "Keep empty for a private address, not related to partner."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vu
+msgid "Vanuatu"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Internal Header/Footer"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm
+msgid "CRM"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_export_language.py:59
+#, python-format
+msgid ""
+"Save this document to a .tgz file. This archive containt UTF-8 %s files and "
+"may be uploaded to launchpad."
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Start configuration"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "_Export"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_followup
+msgid "Followup Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_fr
+msgid ""
+"\n"
+"This is the module to manage the accounting chart for France in OpenERP.\n"
+"========================================================================\n"
+"\n"
+"Credits: Sistheo Zeekom CrysaLEAD\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Catalan / Català"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Greek / Ελληνικά"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.do
+msgid "Dominican Republic"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Serbian (Cyrillic) / српски"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2527
+#, python-format
+msgid ""
+"Invalid group_by specification: \"%s\".\n"
+"A group_by specification must be a list of valid fields."
+msgstr ""
+
+#. module: base
+#: selection:ir.mail_server,smtp_encryption:0
+msgid "TLS (STARTTLS)"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,usage:0
+msgid "Used to filter menu and home actions from the user form."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sa
+msgid "Saudi Arabia"
+msgstr ""
+
+#. module: base
+#: help:res.company,rml_header1:0
+msgid "Appears by default on the top right corner of your printed documents."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_fetchmail_crm_claim
+msgid "eMail Gateway for CRM Claim"
+msgstr ""
+
+#. module: base
+#: help:res.partner,supplier:0
+msgid ""
+"Check this box if the partner is a supplier. If it's not checked, purchase "
+"people will not see it when encoding a purchase order."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,trigger_obj_id:0
+#: field:ir.model.fields,relation_field:0
+msgid "Relation Field"
+msgstr ""
+
+#. module: base
+#: view:res.partner.event:0
+msgid "Event Logs"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_configuration.py:38
+#, python-format
+msgid "System Configuration done"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Create / Write / Copy"
+msgstr ""
+
+#. module: base
+#: field:workflow.triggers,instance_id:0
+msgid "Destination Instance"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,multi:0
+#: field:ir.actions.wizard,multi:0
+msgid "Action on Multiple Doc."
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "https://translations.launchpad.net/openobject"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Export Translations"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_xml:0
+msgid "XML path"
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,implementation:0
+msgid ""
+"Two sequence object implementations are offered: Standard and 'No gap'. The "
+"later is slower than the former but forbids any gap in the sequence (while "
+"they are possible in the former)."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gn
+msgid "Guinea"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lu
+msgid "Luxembourg"
+msgstr ""
+
+#. module: base
+#: selection:res.request,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_ui_menu.py:284
+#, python-format
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"3. If user belongs to several groups, the results from step 2 are combined "
+"with logical OR operator"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_openid
+msgid "Allow users to login through OpenID."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_payment
+msgid "Suppliers Payment Management"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sv
+msgid "El Salvador"
+msgstr ""
+
+#. module: base
+#: field:res.bank,phone:0
+#: field:res.company,phone:0
+#: field:res.partner,phone:0
+#: field:res.partner.address,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: base
+#: field:res.groups,menu_access:0
+msgid "Access Menu"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.th
+msgid "Thailand"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_report_creator
+msgid ""
+"\n"
+"This module allows you to create any statistic report on several objects.\n"
+"=========================================================================\n"
+"\n"
+"It's an SQL query builder and browser\n"
+"for end-users.\n"
+"\n"
+"After installing the module, it adds a menu to define a custom report in\n"
+"the Administration / Customization / Reporting menu.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_report_designer
+msgid "Report Designer"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_address_book
+#: model:ir.ui.menu,name:base.menu_config_address_book
+#: model:ir.ui.menu,name:base.menu_procurement_management_supplier
+msgid "Address Book"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ma
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Maroc.\n"
+"=================================================================\n"
+"\n"
+"Ce  Module charge le modèle du plan de comptes standard Marocain et permet "
+"de générer les états comptables aux normes marocaines (Bilan, CPC (comptes "
+"de produits et charges), balance générale à 6 colonnes, Grand livre "
+"cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet "
+"d'expertise comptable Seddik au cours du troisième trimestre 2010"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_calendar
+msgid ""
+"\n"
+"        OpenERP Web calendar view.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_crm_config_lead
+msgid "Leads & Opportunities"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Romanian / română"
+msgstr ""
+
+#. module: base
+#: view:res.log:0
+msgid "System Logs"
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "And"
+msgstr ""
+
+#. module: base
+#: help:ir.values,res_id:0
+msgid ""
+"Database identifier of the record to which this applies. 0 = for all records"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,relation:0
+msgid "Object Relation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_voucher
+msgid "eInvoicing & Payments"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+#: view:res.partner:0
+msgid "General"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.uz
+msgid "Uzbekistan"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_act_window
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.act_window"
+msgstr ""
+
+#. module: base
+#: field:ir.rule,perm_create:0
+msgid "Apply For Create"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vi
+msgid "Virgin Islands (USA)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tw
+msgid "Taiwan"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_currency_rate
+msgid "Currency Rate"
+msgstr ""
+
+#. module: base
+#: field:workflow,osv:0
+#: field:workflow.instance,res_type:0
+msgid "Resource Object"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_helpdesk
+msgid "Helpdesk"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.grant_menu_access
+msgid ""
+"Manage and customize the items available and displayed in your OpenERP "
+"system menu. You can delete an item by clicking on the box at the beginning "
+"of each line and then delete it through the button that appeared. Items can "
+"be assigned to specific groups in order to make them accessible to some "
+"users within the system."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,field_parent:0
+msgid "Child Field"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Detailed algorithm:"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,usage:0
+#: field:ir.actions.act_window_close,usage:0
+#: field:ir.actions.actions,usage:0
+#: field:ir.actions.client,usage:0
+#: field:ir.actions.report.xml,usage:0
+#: field:ir.actions.server,usage:0
+#: field:ir.actions.wizard,usage:0
+msgid "Action Usage"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_workitem
+msgid "workflow.workitem"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_profile_tools
+msgid "Miscellaneous Tools"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_tools
+msgid ""
+"Lets you install various interesting but non-essential tools like Survey, "
+"Lunch and Ideas box."
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+msgid "Not Installable"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product
+msgid ""
+"\n"
+"This is the base module for managing products and pricelists in OpenERP.\n"
+"========================================================================\n"
+"\n"
+"Products support variants, different pricing methods, suppliers\n"
+"information, make to stock/order, different unit of measures,\n"
+"packaging and properties.\n"
+"\n"
+"Pricelists support:\n"
+"    * Multiple-level of discount (by product, category, quantities)\n"
+"    * Compute price based on different criteria:\n"
+"        * Other pricelist,\n"
+"        * Cost price,\n"
+"        * List price,\n"
+"        * Supplier price, ...\n"
+"\n"
+"Pricelists preferences by product and/or partners.\n"
+"\n"
+"Print product labels with barcode.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference.graph:0
+msgid "View :"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,view_load:0
+msgid "View Auto-Load"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:264
+#, python-format
+msgid "You cannot remove the field '%s' !"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Allowed Companies"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_de
+msgid "Deutschland - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auction
+msgid "Auction Houses"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon:0
+msgid "Web Icon File"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+#: model:ir.ui.menu,name:base.menu_view_base_module_upgrade
+msgid "Apply Scheduled Upgrades"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_journal
+msgid "Invoicing Journals"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Persian / فارس"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "View Ordering"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_upgrade.py:95
+#, python-format
+msgid "Unmet dependency !"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid ""
+"Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
+"Portable Objects)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:534
+#, python-format
+msgid ""
+"You can not delete this document (%s) ! Be sure your user belongs to one of "
+"these groups: %s."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_livechat
+msgid ""
+"\n"
+"Enable live chat support for those who have a maintenance contract.\n"
+"===================================================================\n"
+"\n"
+"Add \"Support\" button in header from where you can access OpenERP Support.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_configuration
+msgid "base.module.configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web
+msgid ""
+"\n"
+"        OpenERP Web core module.\n"
+"        This module provides the core of the OpenERP web client.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.country:0
+msgid "The name of the country must be unique !"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,name:0
+#: field:ir.attachment,datas_fname:0
+msgid "Filename"
+msgstr ""
+
+#. module: base
+#: field:ir.model,access_ids:0
+#: view:ir.model.access:0
+msgid "Access"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sk
+msgid "Slovak Republic"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.publisher_warranty
+msgid "Publisher Warranty"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.aw
+msgid "Aruba"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_import.py:60
+#, python-format
+msgid "File is not a zip file!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ar
+msgid "Argentina"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_issue
+msgid ""
+"\n"
+"This module provides Issues/Bugs Management in Project.\n"
+"=======================================================\n"
+"\n"
+"OpenERP allows you to manage the issues you might face in a project\n"
+"like bugs in a system, client complaints or material breakdowns. A\n"
+"list view allows the manager to quickly check the issues, assign them\n"
+"and decide on their status as they evolve.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.groups,full_name:0
+msgid "Group Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bh
+msgid "Bahrain"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web
+msgid "web"
+msgstr ""
+
+#. module: base
+#: field:res.bank,fax:0
+#: field:res.company,fax:0
+#: field:res.partner.address,fax:0
+msgid "Fax"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_nl
+msgid ""
+"\n"
+"This is the module to manage the accounting chart for Netherlands in "
+"OpenERP.\n"
+"============================================================================="
+"\n"
+"\n"
+"Read changelog in file __openerp__.py for version information.\n"
+"Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor "
+"Nederlandse bedrijven te installeren in OpenERP versie 5.\n"
+"\n"
+"De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te "
+"genereren, denk b.v. aan intracommunautaire verwervingen\n"
+"waarbij u 19% BTW moet opvoeren, maar tegelijkertijd ook 19% als voorheffing "
+"weer mag aftrekken.\n"
+"\n"
+"Na installatie van deze module word de configuratie wizard voor "
+"\"Accounting\" aangeroepen.\n"
+"    * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook "
+"het Nederlandse grootboekschema bevind.\n"
+"\n"
+"    * Als de configuratie wizard start, wordt u gevraagd om de naam van uw "
+"bedrijf in te voeren, welke grootboekschema te installeren, uit hoeveel "
+"cijfers een grootboekrekening mag bestaan, het rekeningnummer van uw bank en "
+"de currency om Journalen te creeren.\n"
+"\n"
+"Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit "
+"4 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal "
+"verhogen. De extra cijfers worden dan achter het rekeningnummer aangevult "
+"met \"nullen\"\n"
+"\n"
+"    * Dit is dezelfe configuratie wizard welke aangeroepen kan worden via "
+"Financial Management/Configuration/Financial Accounting/Financial "
+"Accounts/Generate Chart of Accounts from a Chart Template.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.partner.address:0
+msgid "Search Contact"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: field:ir.attachment,company_id:0
+#: field:ir.default,company_id:0
+#: field:ir.property,company_id:0
+#: field:ir.sequence,company_id:0
+#: field:ir.values,company_id:0
+#: view:res.company:0
+#: field:res.currency,company_id:0
+#: field:res.partner,company_id:0
+#: field:res.partner.address,company_id:0
+#: field:res.partner.bank,company_id:0
+#: view:res.users:0
+#: field:res.users,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_report_designer
+msgid "Advanced Reporting"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,target:0
+#: selection:ir.actions.url,target:0
+msgid "New Window"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_model_data
+msgid "ir.model.data"
+msgstr ""
+
+#. module: base
+#: view:publisher_warranty.contract:0
+msgid "Publisher Warranty Contract"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Bulgarian / български език"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_aftersale
+msgid "After-Sale Services"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_fr
+msgid "France - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Launch"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_caldav
+msgid "Share Calendar using CalDAV"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,limit:0
+msgid "Limit"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,group_id:0
+msgid ""
+"The group that a user must have to be authorized to validate this transition."
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:791
+#, python-format
+msgid "Serialization field `%s` not found for sparse field `%s`!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.jm
+msgid "Jamaica"
+msgstr ""
+
+#. module: base
+#: field:res.partner,color:0
+#: field:res.partner.address,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_category_form
+msgid ""
+"Manage the partner categories in order to better classify them for tracking "
+"and analysis purposes. A partner may belong to several categories and "
+"categories have a hierarchy structure: a partner belonging to a category "
+"also belong to his parent category."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.az
+msgid "Azerbaijan"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:450
+#: code:addons/base/res/res_partner.py:273
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_edi
+msgid "Electronic Data Interchange (EDI)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_tools
+msgid "Extra Tools"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vg
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+#: model:ir.ui.menu,name:base.next_id_15
+msgid "Parameters"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_email_template
+msgid ""
+"\n"
+"Email Templating (simplified version of the original Power Email by "
+"Openlabs)\n"
+"============================================================================="
+"\n"
+"\n"
+"Lets you design complete email templates related to any OpenERP document "
+"(Sale\n"
+"Orders, Invoices and so on), including sender, recipient, subject, body "
+"(HTML and\n"
+"Text). You may also automatically attach files to your templates, or print "
+"and\n"
+"attach a report.\n"
+"\n"
+"For advanced use, the templates may include dynamic attributes of the "
+"document\n"
+"they are related to. For example, you may use the name of a Partner's "
+"country\n"
+"when writing to them, also providing a safe default in case the attribute "
+"is\n"
+"not defined. Each template contains a built-in assistant to help with the\n"
+"inclusion of these dynamic values.\n"
+"\n"
+"If you enable the option, a composition assistant will also appear in the "
+"sidebar\n"
+"of the OpenERP documents to which the template applies (e.g. Invoices).\n"
+"This serves as a quick way to send a new email based on the template, after\n"
+"reviewing and adapting the contents, if needed.\n"
+"This composition assistant will also turn into a mass mailing system when "
+"called\n"
+"for multiple documents at once.\n"
+"\n"
+"These email templates are also at the heart of the marketing campaign "
+"system\n"
+"(see the ``marketing_campaign`` application), if you need to automate "
+"larger\n"
+"campaigns on any OpenERP document.\n"
+"\n"
+"Technical note: only the templating system of the original Power Email by\n"
+"Openlabs was kept\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Czech / Čeština"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_generic_modules
+msgid "Generic Modules"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_supplier_form
+msgid ""
+"You can access all information regarding your suppliers from the supplier "
+"form: accounting data, history of emails, meetings, purchases, etc. You can "
+"uncheck the 'Suppliers' filter button in order to search in all your "
+"partners, including customers and prospects."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.rw
+msgid "Rwanda"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_timesheet
+msgid ""
+"\n"
+"This module implements a timesheet system.\n"
+"==========================================\n"
+"\n"
+"Each employee can encode and track their time spent on the different "
+"projects.\n"
+"A project is an analytic account and the time spent on a project generates "
+"costs on\n"
+"the analytic account.\n"
+"\n"
+"Lots of reporting on time and employee tracking are provided.\n"
+"\n"
+"It is completely integrated with the cost accounting module. It allows you\n"
+"to set up a management by affair.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_port:0
+msgid "SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases."
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Day of the week (0:Monday): %(weekday)s"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ck
+msgid "Cook Islands"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,noupdate:0
+msgid "Non Updatable"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Klingon"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sg
+msgid "Singapore"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,target:0
+msgid "Current Window"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management.\n"
+"=====================================================\n"
+"\n"
+"This system enables a group of people to intelligently and efficiently "
+"manage\n"
+"leads, opportunities, meeting, phonecall etc.\n"
+"It manages key tasks such as communication, identification, prioritization,\n"
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and\n"
+"suppliers. It can automatically send reminders, escalate the request, "
+"trigger\n"
+"specific methods and lots of other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do "
+"anything\n"
+"special. They can just send email to the request tracker. OpenERP will take\n"
+"care of thanking them for their message, automatically routing it to the\n"
+"appropriate staff, and make sure all future correspondence gets to the "
+"right\n"
+"place.\n"
+"\n"
+"The CRM module has a email gateway for the synchronisation interface\n"
+"between mails and OpenERP.\n"
+"\n"
+"Creates a dashboard for CRM that includes:\n"
+"    * Opportunities by Categories (graph)\n"
+"    * Opportunities by Stage (graph)\n"
+"    * Planned Revenue by Stage and User (graph)\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_accounting_and_finance
+msgid ""
+"Helps you handle your accounting needs, if you are not an accountant, we "
+"suggest you to install only the Invoicing."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_plugin_thunderbird
+msgid "Thunderbird Plug-In"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_country
+#: field:res.bank,country:0
+#: field:res.company,country_id:0
+#: view:res.country:0
+#: field:res.country.state,country_id:0
+#: field:res.partner,country:0
+#: view:res.partner.address:0
+#: field:res.partner.address,country_id:0
+#: field:res.partner.bank,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_messages
+msgid "In-Project Messaging System"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pn
+msgid "Pitcairn Island"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_tests
+msgid ""
+"\n"
+"        OpenERP Web test suite.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: view:ir.values:0
+msgid "Action Bindings/Defaults"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"1. Global rules are combined together with a logical AND operator, and with "
+"the result of the following steps"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Change Color"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_15
+msgid "IT sector"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "Select Groups"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%X - Appropriate time representation."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (SV) / Español (SV)"
+msgstr ""
+
+#. module: base
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,auto_install:0
+msgid "Automatic Installation"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.jp
+msgid "Japan"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:357
+#, python-format
+msgid "Can only rename one column at a time!"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Wizard Button"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Report/Template"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_marketing_campaign
+msgid ""
+"\n"
+"This module provides leads automation through marketing campaigns (campaigns "
+"can in fact be defined on any resource, not just CRM Leads).\n"
+"============================================================================="
+"============================================================\n"
+"\n"
+"The campaigns are dynamic and multi-channels. The process is as follows:\n"
+"    * Design marketing campaigns like workflows, including email templates "
+"to send, reports to print and send by email, custom actions, etc.\n"
+"    * Define input segments that will select the items that should enter the "
+"campaign (e.g leads from certain countries, etc.)\n"
+"    * Run you campaign in simulation mode to test it real-time or "
+"accelerated, and fine-tune it\n"
+"    * You may also start the real campaign in manual mode, where each action "
+"requires manual validation\n"
+"    * Finally launch your campaign live, and watch the statistics as the "
+"campaign does everything fully automatically.\n"
+"\n"
+"While the campaign runs you can of course continue to fine-tune the "
+"parameters, input segments, workflow, etc.\n"
+"\n"
+"Note: If you need demo data, you can install the marketing_campaign_crm_demo "
+"module, but this will also install the CRM application as it depends on CRM "
+"Leads.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+#: selection:wizard.ir.model.menu.create.line,view_type:0
+msgid "Graph"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_server
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.server"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ca
+msgid "Canada - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
+#: field:ir.actions.todo.category,wizards_ids:0
+#: model:ir.model,name:base.model_ir_actions_todo
+#: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
+#: model:ir.ui.menu,name:base.next_id_11
+msgid "Configuration Wizards"
+msgstr ""
+
+#. module: base
+#: field:res.lang,code:0
+msgid "Locale Code"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,split_mode:0
+msgid "Split Mode"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Note that this operation might take a few minutes."
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_localisation
+msgid "Localisation"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,implementation:0
+msgid "Implementation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ve
+msgid "Venezuela - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cl
+msgid "Chile"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+msgid "Execution"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,condition:0
+#: view:ir.values:0
+#: field:workflow.transition,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: base
+#: help:res.currency,rate:0
+msgid "The rate of the currency to the currency of rate 1."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,name:0
+msgid "View Name"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document_ftp
+msgid "Shared Repositories (FTP)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Italian / Italiano"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,attachment:0
+msgid "Save As Attachment Prefix"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"Only one client action will be executed, last client action will be "
+"considered in case of multiple client actions."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hr
+msgid "Croatia"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,mobile:0
+msgid "Mobile No"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_by_category
+#: model:ir.actions.act_window,name:base.action_partner_category_form
+#: model:ir.model,name:base.model_res_partner_category
+#: model:ir.ui.menu,name:base.menu_partner_category_form
+#: view:res.partner.category:0
+msgid "Partner Categories"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "System Update"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Wizard Field"
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sc
+msgid "Seychelles"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
+#: model:ir.model,name:base.model_res_partner_bank
+#: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
+#: view:res.company:0
+#: field:res.company,bank_ids:0
+#: view:res.partner.bank:0
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: base
+#: field:ir.model,modules:0
+#: field:ir.model.fields,modules:0
+msgid "In modules"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sl
+msgid "Sierra Leone"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+#: view:res.partner:0
+msgid "General Information"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_fetchmail_project_issue
+msgid "eMail Gateway for Project Issues"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank,partner_id:0
+msgid "Account Owner"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:270
+#, python-format
+msgid "Company Switch Warning"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ge
+msgid "Georgia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_manufacturing
+msgid ""
+"Helps you manage your manufacturing processes and generate reports on those "
+"processes."
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:341
+#, python-format
+msgid "Wrong ID for the browse record, got %r, expected an integer."
+msgstr ""
+
+#. module: base
+#: field:res.partner.address,function:0
+#: selection:workflow.activity,kind:0
+msgid "Function"
+msgstr ""
+
+#. module: base
+#: view:res.widget:0
+msgid "Search Widget"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_customer_relationship_management
+msgid ""
+"Manage relations with prospects and customers using leads, opportunities, "
+"requests or issues."
+msgstr ""
+
+#. module: base
+#: selection:res.partner.address,type:0
+msgid "Delivery"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_pvt_ltd
+#: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
+msgid "Corp."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase_requisition
+msgid "Purchase Requisitions"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Months"
+msgstr ""
+
+#. module: base
+#: view:workflow.instance:0
+msgid "Workflow Instances"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_partner.py:284
+#, python-format
+msgid "Partners: "
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank,name:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kp
+msgid "North Korea"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Create Object"
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+#: field:res.log,context:0
+msgid "Context"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_mrp
+msgid "Sales and MRP Management"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_sms_send
+msgid "Send an SMS"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_1
+msgid "Prospect"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock_invoice_directly
+msgid "Invoice Picking Directly"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Polish / Język polski"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_tools
+msgid ""
+"\n"
+"Common base for tools modules.\n"
+"==============================\n"
+"\n"
+"Creates menu link for Tools from where tools like survey, lunch, idea, etc. "
+"are accessible if installed.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.exports,name:0
+msgid "Export Name"
+msgstr ""
+
+#. module: base
+#: help:res.partner.address,type:0
+msgid ""
+"Used to select automatically the right address according to the context in "
+"sales and purchases documents."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_widget_act_window
+#: model:ir.ui.menu,name:base.menu_res_widget_act_window
+msgid "Homepage Widgets"
+msgstr ""
+
+#. module: base
+#: help:res.company,rml_footer2:0
+msgid ""
+"This field is computed automatically based on bank accounts defined, having "
+"the display on footer checkbox set."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_subproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure sub-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lk
+msgid "Sri Lanka"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_module_record
+msgid ""
+"\n"
+"This module allows you to create a new module without any development.\n"
+"======================================================================\n"
+"\n"
+"It records all operations on objects during the recording session and\n"
+"produce a .ZIP module. So you can create your own module directly from\n"
+"the OpenERP client.\n"
+"\n"
+"This version works for creating and updating existing records. It "
+"recomputes\n"
+"dependencies and links for all types of widgets (many2one, many2many, ...).\n"
+"It also support workflows and demo/update data.\n"
+"\n"
+"This should help you to easily create reusable and publishable modules\n"
+"for custom configurations and demo/testing data.\n"
+"\n"
+"How to use it:\n"
+"Run Administration/Customization/Module Creation/Export Customizations As a "
+"Module wizard.\n"
+"Select datetime criteria of recording and objects to be recorded and Record "
+"module.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Russian / русский язык"
+msgstr ""

From ffc320dcc73a7636aa345eef4fb820863585a095 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 7 Sep 2012 05:05:24 +0000
Subject: [PATCH 919/999] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120907045929-grtx16xxp1c4m6rh
bzr revid: launchpad_translations_on_behalf_of_openerp-20120907050524-07x2fgbr194czqbs
---
 addons/base_vat/i18n/es_MX.po              | 107 +++----
 addons/board/i18n/nb.po                    | 348 +++++++++++++++++++++
 addons/crm_partner_assign/i18n/ar.po       |   8 +-
 addons/crm_partner_assign/i18n/bg.po       |   8 +-
 addons/crm_partner_assign/i18n/ca.po       |   8 +-
 addons/crm_partner_assign/i18n/da.po       |   8 +-
 addons/crm_partner_assign/i18n/de.po       |   8 +-
 addons/crm_partner_assign/i18n/el.po       |   8 +-
 addons/crm_partner_assign/i18n/es.po       |   8 +-
 addons/crm_partner_assign/i18n/es_CR.po    |   8 +-
 addons/crm_partner_assign/i18n/es_PY.po    |   8 +-
 addons/crm_partner_assign/i18n/fi.po       |   8 +-
 addons/crm_partner_assign/i18n/fr.po       |   8 +-
 addons/crm_partner_assign/i18n/gl.po       |   8 +-
 addons/crm_partner_assign/i18n/hr.po       |   8 +-
 addons/crm_partner_assign/i18n/hu.po       |   8 +-
 addons/crm_partner_assign/i18n/it.po       |   8 +-
 addons/crm_partner_assign/i18n/ja.po       |   8 +-
 addons/crm_partner_assign/i18n/lt.po       |   8 +-
 addons/crm_partner_assign/i18n/lv.po       |   8 +-
 addons/crm_partner_assign/i18n/nl.po       |   8 +-
 addons/crm_partner_assign/i18n/pl.po       |   8 +-
 addons/crm_partner_assign/i18n/pt.po       |   8 +-
 addons/crm_partner_assign/i18n/pt_BR.po    |   8 +-
 addons/crm_partner_assign/i18n/ro.po       |   8 +-
 addons/crm_partner_assign/i18n/ru.po       |   8 +-
 addons/crm_partner_assign/i18n/sq.po       |   8 +-
 addons/crm_partner_assign/i18n/sr@latin.po |   8 +-
 addons/crm_partner_assign/i18n/sv.po       |   8 +-
 addons/crm_partner_assign/i18n/tr.po       |   8 +-
 addons/crm_partner_assign/i18n/zh_CN.po    |   8 +-
 addons/crm_partner_assign/i18n/zh_TW.po    |   8 +-
 addons/crm_profiling/i18n/nb.po            | 212 +++++++++++++
 addons/document_ftp/i18n/nb.po             | 121 +++++++
 addons/email_template/i18n/ar.po           |  12 +-
 addons/email_template/i18n/bg.po           |  12 +-
 addons/email_template/i18n/ca.po           |  12 +-
 addons/email_template/i18n/da.po           |  12 +-
 addons/email_template/i18n/de.po           |  12 +-
 addons/email_template/i18n/es.po           |  12 +-
 addons/email_template/i18n/es_CL.po        |  12 +-
 addons/email_template/i18n/es_CR.po        |  12 +-
 addons/email_template/i18n/es_EC.po        |  12 +-
 addons/email_template/i18n/et.po           |  12 +-
 addons/email_template/i18n/fi.po           |  12 +-
 addons/email_template/i18n/fr.po           |  12 +-
 addons/email_template/i18n/hr.po           |  12 +-
 addons/email_template/i18n/hu.po           |  12 +-
 addons/email_template/i18n/it.po           |  12 +-
 addons/email_template/i18n/ja.po           |  12 +-
 addons/email_template/i18n/mn.po           |  12 +-
 addons/email_template/i18n/nb.po           |  12 +-
 addons/email_template/i18n/nl.po           |  12 +-
 addons/email_template/i18n/pl.po           |  12 +-
 addons/email_template/i18n/pt.po           |  12 +-
 addons/email_template/i18n/pt_BR.po        |  12 +-
 addons/email_template/i18n/ro.po           |  12 +-
 addons/email_template/i18n/ru.po           |  12 +-
 addons/email_template/i18n/sr.po           |  12 +-
 addons/email_template/i18n/sr@latin.po     |  12 +-
 addons/email_template/i18n/sv.po           |  12 +-
 addons/email_template/i18n/tr.po           |  36 ++-
 addons/email_template/i18n/zh_CN.po        |  12 +-
 addons/email_template/i18n/zh_TW.po        |  12 +-
 addons/purchase/i18n/ar.po                 |   6 +-
 addons/purchase/i18n/bg.po                 |   6 +-
 addons/purchase/i18n/bs.po                 |   6 +-
 addons/purchase/i18n/ca.po                 |   6 +-
 addons/purchase/i18n/cs.po                 |   6 +-
 addons/purchase/i18n/da.po                 |   6 +-
 addons/purchase/i18n/de.po                 |   6 +-
 addons/purchase/i18n/el.po                 |   6 +-
 addons/purchase/i18n/en_GB.po              |   6 +-
 addons/purchase/i18n/es.po                 |   6 +-
 addons/purchase/i18n/es_AR.po              |   6 +-
 addons/purchase/i18n/es_CL.po              |   6 +-
 addons/purchase/i18n/es_CR.po              |   6 +-
 addons/purchase/i18n/es_EC.po              |   6 +-
 addons/purchase/i18n/et.po                 |   6 +-
 addons/purchase/i18n/fi.po                 |   6 +-
 addons/purchase/i18n/fr.po                 |   6 +-
 addons/purchase/i18n/gl.po                 |   6 +-
 addons/purchase/i18n/hr.po                 |   6 +-
 addons/purchase/i18n/hu.po                 |   6 +-
 addons/purchase/i18n/id.po                 |   6 +-
 addons/purchase/i18n/it.po                 |   6 +-
 addons/purchase/i18n/ja.po                 |   6 +-
 addons/purchase/i18n/ko.po                 |   6 +-
 addons/purchase/i18n/lt.po                 |   6 +-
 addons/purchase/i18n/lv.po                 |   6 +-
 addons/purchase/i18n/mn.po                 |   6 +-
 addons/purchase/i18n/nb.po                 |   6 +-
 addons/purchase/i18n/nl.po                 |   6 +-
 addons/purchase/i18n/nl_BE.po              |   6 +-
 addons/purchase/i18n/pl.po                 |   6 +-
 addons/purchase/i18n/pt.po                 |   6 +-
 addons/purchase/i18n/pt_BR.po              |   6 +-
 addons/purchase/i18n/ro.po                 |   6 +-
 addons/purchase/i18n/ru.po                 |   6 +-
 addons/purchase/i18n/sk.po                 |   6 +-
 addons/purchase/i18n/sl.po                 |   6 +-
 addons/purchase/i18n/sq.po                 |   6 +-
 addons/purchase/i18n/sr.po                 |   6 +-
 addons/purchase/i18n/sr@latin.po           |   6 +-
 addons/purchase/i18n/sv.po                 | 213 ++++++++++---
 addons/purchase/i18n/th.po                 |   6 +-
 addons/purchase/i18n/tlh.po                |   6 +-
 addons/purchase/i18n/tr.po                 |  23 +-
 addons/purchase/i18n/uk.po                 |   6 +-
 addons/purchase/i18n/vi.po                 |   6 +-
 addons/purchase/i18n/zh_CN.po              |   6 +-
 addons/purchase/i18n/zh_TW.po              |   6 +-
 addons/sale/i18n/ar.po                     |   6 +-
 addons/sale/i18n/bg.po                     |   6 +-
 addons/sale/i18n/bs.po                     |   6 +-
 addons/sale/i18n/ca.po                     |   6 +-
 addons/sale/i18n/cs.po                     |   6 +-
 addons/sale/i18n/da.po                     |   6 +-
 addons/sale/i18n/de.po                     |  34 +-
 addons/sale/i18n/el.po                     |   6 +-
 addons/sale/i18n/es.po                     |   6 +-
 addons/sale/i18n/es_AR.po                  |   6 +-
 addons/sale/i18n/es_CL.po                  |   6 +-
 addons/sale/i18n/es_CR.po                  |   6 +-
 addons/sale/i18n/es_EC.po                  |   6 +-
 addons/sale/i18n/et.po                     |   6 +-
 addons/sale/i18n/fi.po                     |   6 +-
 addons/sale/i18n/fr.po                     |   6 +-
 addons/sale/i18n/gl.po                     |   6 +-
 addons/sale/i18n/hr.po                     |   6 +-
 addons/sale/i18n/hu.po                     |   6 +-
 addons/sale/i18n/id.po                     |   6 +-
 addons/sale/i18n/is.po                     |   6 +-
 addons/sale/i18n/it.po                     |   6 +-
 addons/sale/i18n/ja.po                     |   6 +-
 addons/sale/i18n/ko.po                     |   6 +-
 addons/sale/i18n/lo.po                     |   6 +-
 addons/sale/i18n/lt.po                     |   6 +-
 addons/sale/i18n/lv.po                     |   6 +-
 addons/sale/i18n/mn.po                     |   6 +-
 addons/sale/i18n/nb.po                     |  52 ++-
 addons/sale/i18n/nl.po                     |   6 +-
 addons/sale/i18n/nl_BE.po                  |   6 +-
 addons/sale/i18n/oc.po                     |   6 +-
 addons/sale/i18n/pl.po                     |   6 +-
 addons/sale/i18n/pt.po                     |   6 +-
 addons/sale/i18n/pt_BR.po                  |   6 +-
 addons/sale/i18n/ro.po                     |   6 +-
 addons/sale/i18n/ru.po                     |   6 +-
 addons/sale/i18n/sk.po                     |   6 +-
 addons/sale/i18n/sl.po                     |   6 +-
 addons/sale/i18n/sq.po                     |   6 +-
 addons/sale/i18n/sr.po                     |   6 +-
 addons/sale/i18n/sr@latin.po               |   6 +-
 addons/sale/i18n/sv.po                     |   6 +-
 addons/sale/i18n/th.po                     |   6 +-
 addons/sale/i18n/tlh.po                    |   6 +-
 addons/sale/i18n/tr.po                     | 108 ++++++-
 addons/sale/i18n/uk.po                     |   6 +-
 addons/sale/i18n/vi.po                     |   6 +-
 addons/sale/i18n/zh_CN.po                  |   6 +-
 addons/sale/i18n/zh_TW.po                  |   6 +-
 addons/web_calendar/i18n/hu.po             | 144 +++++++++
 163 files changed, 1825 insertions(+), 719 deletions(-)
 create mode 100644 addons/board/i18n/nb.po
 create mode 100644 addons/crm_profiling/i18n/nb.po
 create mode 100644 addons/document_ftp/i18n/nb.po
 create mode 100644 addons/web_calendar/i18n/hu.po

diff --git a/addons/base_vat/i18n/es_MX.po b/addons/base_vat/i18n/es_MX.po
index 57d269be72d..c3b0b12b4b7 100644
--- a/addons/base_vat/i18n/es_MX.po
+++ b/addons/base_vat/i18n/es_MX.po
@@ -1,70 +1,54 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_vat
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-25 18:58+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 00:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Mexico) <es_MX@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: 2011-09-05 05:10+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: base_vat
-#: code:addons/base_vat/base_vat.py:87
+#: code:addons/base_vat/base_vat.py:141
 #, python-format
 msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
-msgstr ""
-"El CIF/NIF parece que no sea correcto. Debería haber introducido algo como "
-"esto %s"
+"This VAT number does not seem to be valid.\n"
+"Note: the expected format is %s"
+msgstr "El RFC no es válido. El formato esperado es %s"
 
 #. module: base_vat
-#: model:ir.module.module,description:base_vat.module_meta_information
-msgid ""
-"\n"
-"    Enable the VAT Number for the partner. Check the validity of that VAT "
-"Number.\n"
-"\n"
-"    This module follows the methods stated at http://sima-pc.com/nif.php "
-"for\n"
-"    checking the validity of VAT Number assigned to partners in European "
-"countries.\n"
-"    "
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
 msgstr ""
-"\n"
-"    Permite la validación del CIF/NIF de las empresas. Comprueba si el "
-"CIF/NIF es un número válido.\n"
-"\n"
-"    Este módulo usa los métodos especificados en http://sima-pc.com/nif.php "
-"para\n"
-"    la validación del CIF/NIF asignado a las empresas de los países "
-"europeos.\n"
-"    "
-
-#. module: base_vat
-#: model:ir.module.module,shortdesc:base_vat.module_meta_information
-msgid "Base VAT - To check VAT number validity"
-msgstr "Base CIF/NIF - Para comprobar la validez de los CIF/NIF"
 
 #. module: base_vat
 #: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "¡Error! No puede crear miembros asociados recursivos."
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
 
 #. module: base_vat
-#: code:addons/base_vat/base_vat.py:88
-#, python-format
-msgid "The VAT is invalid, It should begin with the country code"
-msgstr "El CIF/NIF no es válido, debería empezar con el código del país"
+#: field:res.company,vat_check_vies:0
+msgid "VIES VAT Check"
+msgstr ""
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: base_vat
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
@@ -72,27 +56,20 @@ msgid ""
 "Check this box if the partner is subjected to the VAT. It will be used for "
 "the VAT legal statement."
 msgstr ""
-"Marque esta opción si la empresa está sujeta al IVA. Será utilizado para la "
-"declaración legal del IVA."
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr "Empresa"
+msgstr ""
+
+#. module: base_vat
+#: help:res.company,vat_check_vies:0
+msgid ""
+"If checked, Partners VAT numbers will be fully validated against EU's VIES "
+"service rather than via a simple format validation (checksum)."
+msgstr ""
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr "Sujeto a IVA"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "Enable the VAT Number for the partner. Check the validity of that VAT Number."
-#~ msgstr ""
-#~ "Activa el IVA (Impuesto Valor Añadido) para la empresa. Comprueba la validez "
-#~ "del CIF/NIF."
-
-#~ msgid "VAT"
-#~ msgstr "IVA"
+msgstr ""
diff --git a/addons/board/i18n/nb.po b/addons/board/i18n/nb.po
new file mode 100644
index 00000000000..2d759af27d1
--- /dev/null
+++ b/addons/board/i18n/nb.po
@@ -0,0 +1,348 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-06 14:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: board
+#: view:res.log.report:0
+msgid "  Year  "
+msgstr "  År  "
+
+#. module: board
+#: model:ir.model,name:board.model_board_menu_create
+msgid "Menu Create"
+msgstr "Meny laget"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Menu Information"
+msgstr "Meny informasjon"
+
+#. module: board
+#: view:res.users:0
+msgid "Latest Connections"
+msgstr "Siste Tilkoblinger"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log created in last month"
+msgstr "Logg opprettet i forrige måned"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.open_board_administration_form
+msgid "Administration Dashboard"
+msgstr "Administrasjon kontrollpanel"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log created in current year"
+msgstr "Logg opprettet i gjeldende år."
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "Board"
+msgstr "Brett"
+
+#. module: board
+#: field:board.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr "Menynavn"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
+#: view:res.log.report:0
+msgid "Weekly Global Activity"
+msgstr "Ukentlig global aktivitet"
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr "Tittel"
+
+#. module: board
+#: field:res.log.report,nbr:0
+msgid "# of Entries"
+msgstr "# av oppføringer"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log created in current month"
+msgstr "Logg opprettet i gjeldende måned."
+
+#. module: board
+#: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
+#: view:res.log.report:0
+msgid "Monthly Activity per Document"
+msgstr "Månedlig aktivitet per dokument"
+
+#. module: board
+#: view:board.board:0
+msgid "Configuration Overview"
+msgstr "Konfigurasjonsoversikt"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_list_form
+#: model:ir.ui.menu,name:board.menu_view_board_form
+msgid "Dashboard Definition"
+msgstr "Kontrollpanel Definisjon"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "August"
+msgstr "August"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_user_connection_tree
+msgid "User Connections"
+msgstr "Brukertilkoblinger"
+
+#. module: board
+#: field:res.log.report,creation_date:0
+msgid "Creation Date"
+msgstr "Opprettelsesdato"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log Analysis"
+msgstr "Logg analyse"
+
+#. module: board
+#: field:res.log.report,res_model:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr "Handling Visninger"
+
+#. module: board
+#: model:ir.model,name:board.model_res_log_report
+msgid "Log Report"
+msgstr "Logg rapport"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:46
+#, python-format
+msgid "Please Insert Dashboard View(s) !"
+msgstr "Vennligst Sett Kontrollpanel Vinsning (er)!"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "July"
+msgstr "juli"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Create Menu For Dashboard"
+msgstr "Opprett meny for Kontrollpanel."
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "Board Line"
+msgstr "bord Linje"
+
+#. module: board
+#: field:board.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Overordnet meny"
+
+#. module: board
+#: view:res.log.report:0
+msgid "    Month-1    "
+msgstr "    Måned-1    "
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: board
+#: view:board.board:0
+msgid "Users"
+msgstr "Brukere"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "November"
+msgstr "November"
+
+#. module: board
+#: help:board.board.line,sequence:0
+msgid ""
+"Gives the sequence order                         when displaying a list of "
+"board lines."
+msgstr "Gir rekkefølgen av når du viser en liste over bord linjer."
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "April"
+msgstr "April"
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+#: model:ir.ui.menu,name:board.menu_dasboard
+msgid "Dashboard"
+msgstr "Kontrollpanel"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:45
+#, python-format
+msgid "User Error!"
+msgstr "Bruker feil!"
+
+#. module: board
+#: field:board.board.line,action_id:0
+msgid "Action"
+msgstr "Handling"
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr "Posisjon"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Model"
+msgstr "Modell"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.board_homepage_action
+msgid "Home Page"
+msgstr "Hjemmeside"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_latest_activities_tree
+msgid "Latest Activities"
+msgstr "Senest aktiveter"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr "Venstre"
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr "Bord visning"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr "Høyre"
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr "Bredde"
+
+#. module: board
+#: view:res.log.report:0
+msgid "   Month   "
+msgstr "   Måned   "
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "December"
+msgstr "Desember"
+
+#. module: board
+#: view:board.board:0
+#: view:board.menu.create:0
+msgid "Create Menu"
+msgstr "Opprett meny"
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr "Høyde"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_board_menu_create
+msgid "Create Board Menu"
+msgstr "Opprett bord meny"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "May"
+msgstr "Mai"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,name:0
+msgid "Year"
+msgstr "År"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr "Kontrollpanel visning"
diff --git a/addons/crm_partner_assign/i18n/ar.po b/addons/crm_partner_assign/i18n/ar.po
index de0f43af5a6..53d88fd259a 100644
--- a/addons/crm_partner_assign/i18n/ar.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:39+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "التمركز الجغرافي"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -134,7 +134,7 @@ msgid "Highest"
 msgstr "أعلى"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/bg.po b/addons/crm_partner_assign/i18n/bg.po
index 8d34ce6a73c..cb670286522 100644
--- a/addons/crm_partner_assign/i18n/bg.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:39+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Най-висок"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/ca.po b/addons/crm_partner_assign/i18n/ca.po
index 1ff3ec07048..1f73a19b35a 100644
--- a/addons/crm_partner_assign/i18n/ca.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geo localitzar"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "El més alt"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/da.po b/addons/crm_partner_assign/i18n/da.po
index 4e249458019..5bb8265399f 100644
--- a/addons/crm_partner_assign/i18n/da.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr ""
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/de.po b/addons/crm_partner_assign/i18n/de.po
index 9257f3c329e..20a3352bc3f 100644
--- a/addons/crm_partner_assign/i18n/de.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geogr. Lokalisierung"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Text Version der Mitteilung"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Sehr Hoch"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Text Inhalt"
 
diff --git a/addons/crm_partner_assign/i18n/el.po b/addons/crm_partner_assign/i18n/el.po
index d621855b061..edad942b005 100644
--- a/addons/crm_partner_assign/i18n/el.po
+++ b/addons/crm_partner_assign/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Υψηλότερο"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/es.po b/addons/crm_partner_assign/i18n/es.po
index cfcbb629923..f4e6d399e15 100644
--- a/addons/crm_partner_assign/i18n/es.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geo localizar"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Más alta"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/es_CR.po b/addons/crm_partner_assign/i18n/es_CR.po
index 4315ece4f3b..383f2669379 100644
--- a/addons/crm_partner_assign/i18n/es_CR.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "Language: es\n"
 
 #. module: crm_partner_assign
@@ -75,7 +75,7 @@ msgid "Geo Localize"
 msgstr "Geo localizar"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Versión en texto plano del mensaje"
 
@@ -136,7 +136,7 @@ msgid "Highest"
 msgstr "Más alta"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Contenido del Texto"
 
diff --git a/addons/crm_partner_assign/i18n/es_PY.po b/addons/crm_partner_assign/i18n/es_PY.po
index b3e52bffc08..b250c96e070 100644
--- a/addons/crm_partner_assign/i18n/es_PY.po
+++ b/addons/crm_partner_assign/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geo localizar"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Muy alto"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/fi.po b/addons/crm_partner_assign/i18n/fi.po
index cd7065f8fd6..9c237cf5495 100644
--- a/addons/crm_partner_assign/i18n/fi.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Alueellista"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Korkein"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/fr.po b/addons/crm_partner_assign/i18n/fr.po
index 770f58f72a5..0d3f4e07808 100644
--- a/addons/crm_partner_assign/i18n/fr.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -75,7 +75,7 @@ msgid "Geo Localize"
 msgstr "Géolocalisation"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Version plein texte du message"
 
@@ -136,7 +136,7 @@ msgid "Highest"
 msgstr "La Plus haute"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Contenu du texte"
 
diff --git a/addons/crm_partner_assign/i18n/gl.po b/addons/crm_partner_assign/i18n/gl.po
index 5bf10d25f16..184f3a25386 100644
--- a/addons/crm_partner_assign/i18n/gl.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Xeolocalizar"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "A máis alta"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/hr.po b/addons/crm_partner_assign/i18n/hr.po
index e18b6c5188e..3236f0bd3ac 100644
--- a/addons/crm_partner_assign/i18n/hr.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Najviši"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/hu.po b/addons/crm_partner_assign/i18n/hu.po
index 816f93f1203..daaeca2363e 100644
--- a/addons/crm_partner_assign/i18n/hu.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Földrajzi fekvés meghatározása"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Legmagasabb"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/it.po b/addons/crm_partner_assign/i18n/it.po
index c008216c5d3..21d3c30d82b 100644
--- a/addons/crm_partner_assign/i18n/it.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geo localizzazione"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Maggiore"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/ja.po b/addons/crm_partner_assign/i18n/ja.po
index d6a739dc2b1..93dcbe346ca 100644
--- a/addons/crm_partner_assign/i18n/ja.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "ジオロカライゼーション"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "メッセージのテキスト版"
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "最高"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "テキストの内容"
 
diff --git a/addons/crm_partner_assign/i18n/lt.po b/addons/crm_partner_assign/i18n/lt.po
index 7c2f427260a..8e89e14575c 100644
--- a/addons/crm_partner_assign/i18n/lt.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr ""
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/lv.po b/addons/crm_partner_assign/i18n/lv.po
index a51b096e0a3..182f8990341 100644
--- a/addons/crm_partner_assign/i18n/lv.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Ģeo. lokalizācija"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Augstākā"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/nl.po b/addons/crm_partner_assign/i18n/nl.po
index ebb0cf33f10..ac9dc276e82 100644
--- a/addons/crm_partner_assign/i18n/nl.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geo lokaliseren"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Platte tekst versie van het bericht"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Hoogste"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Tekst inhoud"
 
diff --git a/addons/crm_partner_assign/i18n/pl.po b/addons/crm_partner_assign/i18n/pl.po
index 9645def6e96..31936f2794c 100644
--- a/addons/crm_partner_assign/i18n/pl.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Lokalizacja geograficzna"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Najwyższy"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/pt.po b/addons/crm_partner_assign/i18n/pt.po
index a1b159fe387..ba250d4519b 100644
--- a/addons/crm_partner_assign/i18n/pt.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Localizar Geograficamente"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Formatação do texto da versão da mensagem"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Maior"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Conteúdos do texto"
 
diff --git a/addons/crm_partner_assign/i18n/pt_BR.po b/addons/crm_partner_assign/i18n/pt_BR.po
index 10e51041d3f..fa7a7d0561c 100644
--- a/addons/crm_partner_assign/i18n/pt_BR.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -75,7 +75,7 @@ msgid "Geo Localize"
 msgstr "Localização Geográfica"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Versão em texto"
 
@@ -136,7 +136,7 @@ msgid "Highest"
 msgstr "Mais Alta"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Conteúdo"
 
diff --git a/addons/crm_partner_assign/i18n/ro.po b/addons/crm_partner_assign/i18n/ro.po
index d4e43523d6e..c385587a99b 100644
--- a/addons/crm_partner_assign/i18n/ro.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Localizare Geo"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Versiune text-simplu a mesajului"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Cel mai ridicat (cea mai ridicata)"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Cuprins text"
 
diff --git a/addons/crm_partner_assign/i18n/ru.po b/addons/crm_partner_assign/i18n/ru.po
index 4a5229b59b2..0a354515bf8 100644
--- a/addons/crm_partner_assign/i18n/ru.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Геолоцировать"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Высший"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/sq.po b/addons/crm_partner_assign/i18n/sq.po
index 56d7f386635..7d2f01a6693 100644
--- a/addons/crm_partner_assign/i18n/sq.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:39+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr ""
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/sr@latin.po b/addons/crm_partner_assign/i18n/sr@latin.po
index 6e9aab21f1c..0605ee65706 100644
--- a/addons/crm_partner_assign/i18n/sr@latin.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr ""
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/sv.po b/addons/crm_partner_assign/i18n/sv.po
index 345d61d10b3..0605d54bcaa 100644
--- a/addons/crm_partner_assign/i18n/sv.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geoplacering"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Textversion av meddelandet"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Högsta"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Textinnehåll"
 
diff --git a/addons/crm_partner_assign/i18n/tr.po b/addons/crm_partner_assign/i18n/tr.po
index da879a6156b..11fcc743002 100644
--- a/addons/crm_partner_assign/i18n/tr.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Coğrafi konumlama"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Mesajın düz-metin versiyonu"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "En yüksek"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Metin içeriği"
 
diff --git a/addons/crm_partner_assign/i18n/zh_CN.po b/addons/crm_partner_assign/i18n/zh_CN.po
index 67f4a4e74b8..ff25feafd25 100644
--- a/addons/crm_partner_assign/i18n/zh_CN.po
+++ b/addons/crm_partner_assign/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: 2012-08-28 06:40+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "geolocalization定位"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "内容的纯文本版本"
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "最高"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "文本内容"
 
diff --git a/addons/crm_partner_assign/i18n/zh_TW.po b/addons/crm_partner_assign/i18n/zh_TW.po
index 3c77816d71b..4870b464035 100644
--- a/addons/crm_partner_assign/i18n/zh_TW.po
+++ b/addons/crm_partner_assign/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: 2012-08-31 04:56+0000\n"
-"X-Generator: Launchpad (build 15887)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geo 定位"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "內容的純文字版本"
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "最高"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "文本內容"
 
diff --git a/addons/crm_profiling/i18n/nb.po b/addons/crm_profiling/i18n/nb.po
new file mode 100644
index 00000000000..653dc05522e
--- /dev/null
+++ b/addons/crm_profiling/i18n/nb.po
@@ -0,0 +1,212 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-06 14:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+msgid "Questions List"
+msgstr "Spørsmål liste."
+
+#. module: crm_profiling
+#: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
+msgid ""
+"You can create specific topic-related questionnaires to guide your team(s) "
+"in the sales cycle by helping them to ask the right questions. The "
+"segmentation tool allows you to automatically assign a partner to a category "
+"according to his answers to the different questionnaires."
+msgstr ""
+"Du kan opprette spesifikke tema-relaterte spørreskjemaer for å styre lag (e) "
+"i salgsperioden ved å hjelpe dem til å stille de riktige spørsmålene. "
+"Segmentering verktøyet lar deg automatisk tildele en partner til en kategori "
+"i henhold til hans svar til de ulike spørreskjemaer."
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,question_id:0
+#: field:crm_profiling.question,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_question
+#: field:open.questionnaire.line,question_id:0
+msgid "Question"
+msgstr "Spørsmål"
+
+#. module: crm_profiling
+#: model:ir.actions.act_window,name:crm_profiling.action_open_questionnaire
+#: view:open.questionnaire:0
+msgid "Open Questionnaire"
+msgstr "åpen Spørreskjema"
+
+#. module: crm_profiling
+#: field:crm.segmentation,child_ids:0
+msgid "Child Profiles"
+msgstr "Barn profiler"
+
+#. module: crm_profiling
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr "Partner segmenteringer"
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_answer
+#: field:open.questionnaire.line,answer_id:0
+msgid "Answer"
+msgstr "Svar"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_open_questionnaire_line
+msgid "open.questionnaire.line"
+msgstr "Åpen.Spørreskjema.Linje"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr "Partnersegmentering"
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Profiling"
+msgstr "Profilering"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+#: field:crm_profiling.questionnaire,description:0
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_no:0
+msgid "Excluded Answers"
+msgstr "Ekskluderte svar"
+
+#. module: crm_profiling
+#: view:crm_profiling.answer:0
+#: view:crm_profiling.question:0
+#: field:res.partner,answers_ids:0
+msgid "Answers"
+msgstr "Svar"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_open_questionnaire
+msgid "open.questionnaire"
+msgstr "Åpen.Spørresjema"
+
+#. module: crm_profiling
+#: field:open.questionnaire,questionnaire_id:0
+msgid "Questionnaire name"
+msgstr "Spørresjema navn."
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Use a questionnaire"
+msgstr "Bruk et spørresjema."
+
+#. module: crm_profiling
+#: view:open.questionnaire:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: crm_profiling
+#: field:open.questionnaire,question_ans_ids:0
+msgid "Question / Answers"
+msgstr "Spørsmål / Svar"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+#: model:ir.actions.act_window,name:crm_profiling.open_questionnaires
+#: model:ir.ui.menu,name:crm_profiling.menu_segm_questionnaire
+#: view:open.questionnaire:0
+msgid "Questionnaires"
+msgstr "Spørreskjemaer"
+
+#. module: crm_profiling
+#: help:crm.segmentation,profiling_active:0
+msgid ""
+"Check                             this box if you want to use this tab as "
+"part of the                              segmentation rule. If not checked, "
+"the criteria beneath will be ignored"
+msgstr ""
+"Kryss av her hvis du ønsker å bruke denne kategorien som en del av "
+"segmentering regelen. Hvis det ikke er merket, vil kriteriene under bli "
+"ignorert."
+
+#. module: crm_profiling
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr "Feil ! Du kan ikke lage rekursive profiler."
+
+#. module: crm_profiling
+#: field:crm.segmentation,profiling_active:0
+msgid "Use The Profiling Rules"
+msgstr "Bruk profileringen Regler"
+
+#. module: crm_profiling
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.question,answers_ids:0
+msgid "Avalaible Answers"
+msgstr ""
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_yes:0
+msgid "Included Answers"
+msgstr "Inkluderte svar."
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.questionnaire,questions_ids:0
+#: model:ir.actions.act_window,name:crm_profiling.open_questions
+#: model:ir.ui.menu,name:crm_profiling.menu_segm_answer
+msgid "Questions"
+msgstr "Spørsmål"
+
+#. module: crm_profiling
+#: field:crm.segmentation,parent_id:0
+msgid "Parent Profile"
+msgstr "Overordnede profil"
+
+#. module: crm_profiling
+#: view:open.questionnaire:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: crm_profiling
+#: code:addons/crm_profiling/wizard/open_questionnaire.py:77
+#: field:crm_profiling.questionnaire,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
+#: view:open.questionnaire:0
+#: view:open.questionnaire.line:0
+#: field:open.questionnaire.line,wizard_id:0
+#, python-format
+msgid "Questionnaire"
+msgstr "Spørreskjemaet"
+
+#. module: crm_profiling
+#: view:open.questionnaire:0
+msgid "Save Data"
+msgstr "Lagre data"
+
+#~ msgid "Avalaible answers"
+#~ msgstr "Tilgjengelige svar."
diff --git a/addons/document_ftp/i18n/nb.po b/addons/document_ftp/i18n/nb.po
new file mode 100644
index 00000000000..3598b00f54c
--- /dev/null
+++ b/addons/document_ftp/i18n/nb.po
@@ -0,0 +1,121 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-06 14:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "Automatisk Katalog Konfigurasjon."
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid ""
+"Indicate the network address on which your OpenERP server should be "
+"reachable for end-users. This depends on your network topology and "
+"configuration, and will only affect the links displayed to the users. The "
+"format is HOST:PORT and the default host (localhost) is only suitable for "
+"access from the server machine itself.."
+msgstr ""
+"Indikere nettverksadressen som din OpenERP server bør være tilgjengelige for "
+"sluttbrukerne. Dette avhenger av nettverkstopologi og konfigurasjon, og vil "
+"bare påvirke lenker som vises til brukerne. Formatet er HOST: PORT og "
+"standard verten (lokalhost) er bare egnet for tilgang fra serveren maskinen "
+"selv .."
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "Bla i filer"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "Bilde"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "Adresse"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTP-tjener"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "FTP Serverkonfigurasjon"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "_Bla gjennom"
+
+#. module: document_ftp
+#: help:document.ftp.configuration,host:0
+msgid ""
+"Server address or IP and port to which users should connect to for DMS access"
+msgstr ""
+"Server adresse eller IP og port til hvilke brukere som skal koble seg til "
+"for DMS tilgang"
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "Wikimedia Commons (FTP)"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "Konfigurer FTP serveren"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "tittel"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "Document FTP Bla i."
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "Kunnskap Programkonfigurasjon"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "Dokument Bla i."
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "Bla igjennom dokument"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr "res_konfig_innhold"
diff --git a/addons/email_template/i18n/ar.po b/addons/email_template/i18n/ar.po
index 8a89940d55a..777d520ab7b 100644
--- a/addons/email_template/i18n/ar.po
+++ b/addons/email_template/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: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -316,8 +316,8 @@ msgid "Add Signature"
 msgstr "إضافة توقيع"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "نص عادي نسخة من رسالة (ويمكن استخدام العناصر البديلة هنا)"
 
@@ -460,8 +460,8 @@ msgid "Cc"
 msgstr "نسخة"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/bg.po b/addons/email_template/i18n/bg.po
index e75f20173fd..511acb384a5 100644
--- a/addons/email_template/i18n/bg.po
+++ b/addons/email_template/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: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/ca.po b/addons/email_template/i18n/ca.po
index 49804a15b25..e53aadf814c 100644
--- a/addons/email_template/i18n/ca.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -307,8 +307,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -449,8 +449,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/da.po b/addons/email_template/i18n/da.po
index 08e8ef5795b..2a1f19128c4 100644
--- a/addons/email_template/i18n/da.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/de.po b/addons/email_template/i18n/de.po
index 299c243c0ed..838c035af4a 100644
--- a/addons/email_template/i18n/de.po
+++ b/addons/email_template/i18n/de.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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -317,8 +317,8 @@ msgid "Add Signature"
 msgstr "Signatur hinzufügen"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Text-Version der Nachricht (Platzhalter können verwendet werden)"
 
@@ -465,8 +465,8 @@ msgid "Cc"
 msgstr "CC"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "Text Inhalt"
 
diff --git a/addons/email_template/i18n/es.po b/addons/email_template/i18n/es.po
index 082735c52f7..368f6ca8476 100644
--- a/addons/email_template/i18n/es.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -307,8 +307,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -449,8 +449,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/es_CL.po b/addons/email_template/i18n/es_CL.po
index 28f7b0d864b..94fbfad1d9f 100644
--- a/addons/email_template/i18n/es_CL.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -305,8 +305,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -447,8 +447,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/es_CR.po b/addons/email_template/i18n/es_CR.po
index 444ba7ac5df..5e2d107161d 100644
--- a/addons/email_template/i18n/es_CR.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "Language: es\n"
 
 #. module: email_template
@@ -325,8 +325,8 @@ msgid "Add Signature"
 msgstr "Agregar Fima"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 "Versión en formato texto del mensaje (marcadores de posición se pueden "
@@ -475,8 +475,8 @@ msgid "Cc"
 msgstr "Cc"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/es_EC.po b/addons/email_template/i18n/es_EC.po
index 6614bc83fc1..74f8e228c91 100644
--- a/addons/email_template/i18n/es_EC.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/et.po b/addons/email_template/i18n/et.po
index 20888f21509..1407f14811b 100644
--- a/addons/email_template/i18n/et.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/fi.po b/addons/email_template/i18n/fi.po
index ea713d160e1..fe4c40f5a95 100644
--- a/addons/email_template/i18n/fi.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -308,8 +308,8 @@ msgid "Add Signature"
 msgstr "Lisää allekirjoitus"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Tekstiversio viestistä (voit käyttä täytettä)"
 
@@ -450,8 +450,8 @@ msgid "Cc"
 msgstr "Kopio viestistä"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/fr.po b/addons/email_template/i18n/fr.po
index e608e65df31..204167b1448 100644
--- a/addons/email_template/i18n/fr.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -322,8 +322,8 @@ msgid "Add Signature"
 msgstr "Ajouter une signature"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Version texte du message (des variables peuvent être utilisées ici)"
 
@@ -469,8 +469,8 @@ msgid "Cc"
 msgstr "Copie à (CC)"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/hr.po b/addons/email_template/i18n/hr.po
index b0a9017c923..b0d8757db77 100644
--- a/addons/email_template/i18n/hr.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/hu.po b/addons/email_template/i18n/hu.po
index dd639b18660..8e37f5cc98d 100644
--- a/addons/email_template/i18n/hu.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/it.po b/addons/email_template/i18n/it.po
index ac5b384d22d..e81017e9e8d 100644
--- a/addons/email_template/i18n/it.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -307,8 +307,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -449,8 +449,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/ja.po b/addons/email_template/i18n/ja.po
index 19137ca482a..58c19dad2e5 100644
--- a/addons/email_template/i18n/ja.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -310,8 +310,8 @@ msgid "Add Signature"
 msgstr "署名を追加する"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "このメッセージのテキスト"
 
@@ -452,8 +452,8 @@ msgid "Cc"
 msgstr "写し(CC)"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "テキストの内容"
 
diff --git a/addons/email_template/i18n/mn.po b/addons/email_template/i18n/mn.po
index 272ac0a445b..33c32862a0e 100644
--- a/addons/email_template/i18n/mn.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -316,8 +316,8 @@ msgid "Add Signature"
 msgstr "Гарын үсэг нэмэх"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Зурвасын цэвэр текст хувилбар (энд хувьсагч хэрэглэж болно)"
 
@@ -463,8 +463,8 @@ msgid "Cc"
 msgstr "Cc"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/nb.po b/addons/email_template/i18n/nb.po
index 4d313a0f35e..7ebba9bd384 100644
--- a/addons/email_template/i18n/nb.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/nl.po b/addons/email_template/i18n/nl.po
index be40e7d5683..b77f4ecd6e5 100644
--- a/addons/email_template/i18n/nl.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -323,8 +323,8 @@ msgid "Add Signature"
 msgstr "Handtekening toevoegen"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 "Platte tekst versie van het bericht (tijdelijke aanduidingen kan hier worden "
@@ -474,8 +474,8 @@ msgid "Cc"
 msgstr "Cc"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "Tekst inhoud"
 
diff --git a/addons/email_template/i18n/pl.po b/addons/email_template/i18n/pl.po
index c1c85f1cce5..327ab735302 100644
--- a/addons/email_template/i18n/pl.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -306,8 +306,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -448,8 +448,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/pt.po b/addons/email_template/i18n/pt.po
index f6bd3da718f..20a12007c16 100644
--- a/addons/email_template/i18n/pt.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -322,8 +322,8 @@ msgid "Add Signature"
 msgstr "Adicionar Assinatura"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 "Texto Simples sem formatação da mensagem (espaços reservados podem ser "
@@ -472,8 +472,8 @@ msgid "Cc"
 msgstr "Cc"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/pt_BR.po b/addons/email_template/i18n/pt_BR.po
index d1f2dddc371..ae61051acd4 100644
--- a/addons/email_template/i18n/pt_BR.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -319,8 +319,8 @@ msgid "Add Signature"
 msgstr "Adicionar Assinatura"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Versão em Texto da mensagem (placeholders podem ser usados aqui)"
 
@@ -467,8 +467,8 @@ msgid "Cc"
 msgstr "Cópia para"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "Conteúdo de Texto"
 
diff --git a/addons/email_template/i18n/ro.po b/addons/email_template/i18n/ro.po
index 0eda9a2f996..8331071afb7 100644
--- a/addons/email_template/i18n/ro.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -320,8 +320,8 @@ msgid "Add Signature"
 msgstr "Adauga Semnatura"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Versiunea simpla a mesajului (aici pot fi folositi inlocuitori)"
 
@@ -467,8 +467,8 @@ msgid "Cc"
 msgstr "Cc (copie carbon)"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/ru.po b/addons/email_template/i18n/ru.po
index 7d90042bfe4..6b61705ff48 100644
--- a/addons/email_template/i18n/ru.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/sr.po b/addons/email_template/i18n/sr.po
index 3c670f40bb1..703a71980d1 100644
--- a/addons/email_template/i18n/sr.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -306,8 +306,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -448,8 +448,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/sr@latin.po b/addons/email_template/i18n/sr@latin.po
index 808c900f19c..3ab2d2cf368 100644
--- a/addons/email_template/i18n/sr@latin.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -306,8 +306,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -448,8 +448,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/sv.po b/addons/email_template/i18n/sv.po
index b6b6fe45466..bec8aeb784b 100644
--- a/addons/email_template/i18n/sv.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -319,8 +319,8 @@ msgid "Add Signature"
 msgstr "Lägg till signatur"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Ren textversion av meddelandet (platshållare kan användas här)"
 
@@ -465,8 +465,8 @@ msgid "Cc"
 msgstr "Kopia"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/tr.po b/addons/email_template/i18n/tr.po
index 0746bd02381..3770b758b47 100644
--- a/addons/email_template/i18n/tr.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -318,8 +318,8 @@ msgid "Add Signature"
 msgstr "İmza Ekle"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Mesajın düz metin biçimi (burada yer tutucular kullanılabilir)"
 
@@ -463,8 +463,8 @@ msgid "Cc"
 msgstr "Cc"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "Metin içeriği"
 
@@ -524,6 +524,7 @@ msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
 msgstr ""
+"Kenar çubuğu bu şablonun ilgili belge modellerinde kullanılmasını sağlar"
 
 #. module: email_template
 #: field:email.template,model_object_field:0
@@ -553,7 +554,7 @@ msgstr ""
 #: help:email.template,email_bcc:0
 #: help:email_template.preview,email_bcc:0
 msgid "Blind carbon copy recipients (placeholders may be used here)"
-msgstr ""
+msgstr "Alıcıların görğnmez karbon kopyası (burada yer tutucular kullanılr)"
 
 #. module: email_template
 #: help:email.template,lang:0
@@ -564,6 +565,10 @@ msgid ""
 "a placeholder expression that provides the appropriate language code, e.g. "
 "${object.partner_id.lang.code}."
 msgstr ""
+"Bir eposta gönderilirken seçilecek seçime bağlı çeviri dili (ISO kodu). Eğer "
+"ayarlanmamışsa, İngilizce sürümü kullanılacaktır. Bu genellikle uygun dil "
+"kodunu belirten bir yertutucu ifadesi olabilir, örneğin; "
+"${object.partner_id.lang.code}."
 
 #. module: email_template
 #: field:email_template.preview,res_id:0
@@ -574,7 +579,7 @@ msgstr "Örnek Döküman"
 #: help:email.template,email_to:0
 #: help:email_template.preview,email_to:0
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
-msgstr ""
+msgstr "Virgülle ayrılmış alıcı adresleri (burada yertutucular kullanılır)"
 
 #. module: email_template
 #: field:email.template,name:0
@@ -608,6 +613,10 @@ msgid ""
 "instead.\n"
 "Placeholders must be used here, as this value always needs to be unique!"
 msgstr ""
+"Giden mesajlarda Mesaj-SMTP Kimliği bu şablonu temel alır. Lütfen bunun "
+"'Kaynak İzleme' seçeneğini gçersiz kılacağını not edin, bunun yerine giden "
+"epostaların yanıtlarını izlemek için o seçeneği etkinleştirin.\n"
+"Bu değer her zaman benzersiz olacağından burada yertutucular kullanılmalıdır!"
 
 #. module: email_template
 #: field:email.template,headers:0
@@ -625,7 +634,7 @@ msgstr "Bcc"
 #: help:email.template,reply_to:0
 #: help:email_template.preview,reply_to:0
 msgid "Preferred response address (placeholders may be used here)"
-msgstr ""
+msgstr "Yeğlenen yanıtlama adresi (burada yertutucular kullanılır)"
 
 #. module: email_template
 #: view:email.template:0
@@ -636,7 +645,7 @@ msgstr "Kenar Çubuğu butonunu kaldır"
 #: help:email.template,null_value:0
 #: help:email_template.preview,null_value:0
 msgid "Optional value to use if the target field is empty"
-msgstr ""
+msgstr "Hedef alanı boşsa kullanılacak seçimli değer"
 
 #. module: email_template
 #: view:email.template:0
@@ -653,7 +662,7 @@ msgstr "Mesaj referansları, tanımlayıcılar ya da önceki mesajlar"
 #: help:email.template,ref_ir_value:0
 #: help:email_template.preview,ref_ir_value:0
 msgid "Sidebar button to open the sidebar action"
-msgstr ""
+msgstr "Kenar çubuğu işlevini açacak kenar çubuğu düğmesi"
 
 #. module: email_template
 #: constraint:res.partner:0
@@ -673,6 +682,8 @@ msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
 msgstr ""
+"Giden postalar için yeğlenen seçimli sunucu. Eğer ayarlanmaışsa, en yüksek "
+"öncelikli olan kullanılacaktır."
 
 #. module: email_template
 #: selection:email.template,state:0
@@ -687,6 +698,8 @@ msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
 msgstr ""
+"İlk alan olarak ilişki alanı seçilmişse, bu alan, varış belge modeli içinden "
+"hedef alanını seçmenizi sağlar."
 
 #. module: email_template
 #: view:email.template:0
@@ -704,6 +717,7 @@ msgstr "Yazdırıp eklemek için opsiyonel rapor"
 #: help:email_template.preview,body_html:0
 msgid "Rich-text/HTML version of the message (placeholders may be used here)"
 msgstr ""
+"Mesajın Zengin-metin/HTML sürümü (burada yertutucular kullanılmalıdır)"
 
 #, python-format
 #~ msgid ""
diff --git a/addons/email_template/i18n/zh_CN.po b/addons/email_template/i18n/zh_CN.po
index 587b60a046d..66374b3d14b 100644
--- a/addons/email_template/i18n/zh_CN.po
+++ b/addons/email_template/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: 2012-08-28 06:35+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -307,8 +307,8 @@ msgid "Add Signature"
 msgstr "添加签名"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "内容的纯文本版本（可以在这里用占位符）"
 
@@ -449,8 +449,8 @@ msgid "Cc"
 msgstr "抄送"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "文本内容"
 
diff --git a/addons/email_template/i18n/zh_TW.po b/addons/email_template/i18n/zh_TW.po
index 9094107915f..c7526fbce77 100644
--- a/addons/email_template/i18n/zh_TW.po
+++ b/addons/email_template/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: 2012-08-31 04:56+0000\n"
-"X-Generator: Launchpad (build 15887)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -307,8 +307,8 @@ msgid "Add Signature"
 msgstr "加入簽名"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Plaintext 消息版本(佔位符可以用在這)"
 
@@ -450,8 +450,8 @@ msgid "Cc"
 msgstr "副本"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "文字內容"
 
diff --git a/addons/purchase/i18n/ar.po b/addons/purchase/i18n/ar.po
index 87ef655e38e..378d405db66 100644
--- a/addons/purchase/i18n/ar.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1806,7 +1806,7 @@ msgstr ""
 "الرجاء تعيين واحداً قبل اختيار المنتج."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index d9356e97ee2..5bc0064dd0c 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1768,7 +1768,7 @@ msgstr ""
 " Моля, изберете преди избора на продукт."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po
index c335ab087ce..e17c64da401 100644
--- a/addons/purchase/i18n/bs.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1763,7 +1763,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po
index 556b2e7932f..71da9bfdc15 100644
--- a/addons/purchase/i18n/ca.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1837,7 +1837,7 @@ msgstr ""
 "Indiqueu un abans de seleccionar un producte."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po
index fd4ac39416a..8c08429673d 100644
--- a/addons/purchase/i18n/cs.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: purchase
@@ -1777,7 +1777,7 @@ msgstr ""
 "Před výběrem výrobku prosíme nastavte jednoho."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/da.po b/addons/purchase/i18n/da.po
index 21a70f01728..32f4d820acf 100644
--- a/addons/purchase/i18n/da.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index b7857d453b0..be27e50799e 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1880,7 +1880,7 @@ msgstr ""
 "Auftragspositionen wählen."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po
index a63e402cc8f..6153fbf083d 100644
--- a/addons/purchase/i18n/el.po
+++ b/addons/purchase/i18n/el.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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -1770,7 +1770,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/en_GB.po b/addons/purchase/i18n/en_GB.po
index 93b488ebca1..d444a651b00 100644
--- a/addons/purchase/i18n/en_GB.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1818,7 +1818,7 @@ msgstr ""
 "Please set one before choosing a product."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index 15848dfcf07..35589f062dc 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1838,7 +1838,7 @@ msgstr ""
 "Indique uno antes de seleccionar un producto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es_AR.po b/addons/purchase/i18n/es_AR.po
index a6d64bb920e..93d07c576c1 100644
--- a/addons/purchase/i18n/es_AR.po
+++ b/addons/purchase/i18n/es_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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1766,7 +1766,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es_CL.po b/addons/purchase/i18n/es_CL.po
index a9798b07a2b..bd2b69e5b91 100644
--- a/addons/purchase/i18n/es_CL.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1838,7 +1838,7 @@ msgstr ""
 "Indique uno antes de seleccionar un producto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es_CR.po b/addons/purchase/i18n/es_CR.po
index a98b3da9cc3..877e382ad81 100644
--- a/addons/purchase/i18n/es_CR.po
+++ b/addons/purchase/i18n/es_CR.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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "Language: \n"
 
 #. module: purchase
@@ -1863,7 +1863,7 @@ msgstr ""
 "Indique uno antes de seleccionar un producto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es_EC.po b/addons/purchase/i18n/es_EC.po
index df1d28b21f1..3c3a694a896 100644
--- a/addons/purchase/i18n/es_EC.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1865,7 +1865,7 @@ msgstr ""
 "Indique uno antes de seleccionar un producto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index 157cb59a8a2..37b03923ce9 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:735
@@ -1770,7 +1770,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po
index feda226d820..aff6368643a 100644
--- a/addons/purchase/i18n/fi.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1818,7 +1818,7 @@ msgstr ""
 "Ole hyvä ja valitse yksi ennenkuin valitset tuotteen."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index dbc6411e03e..0fd3f5fb99c 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1870,7 +1870,7 @@ msgstr ""
 "Veuillez en sélectionner un avant de choisir un produit."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/gl.po b/addons/purchase/i18n/gl.po
index 60647d89d7a..65475c658d9 100644
--- a/addons/purchase/i18n/gl.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index b7c89ba215b..ab84932d9b4 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1820,7 +1820,7 @@ msgstr ""
 "naloga za nabavu."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po
index b2d22d2c062..32fc1a68540 100644
--- a/addons/purchase/i18n/hu.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1842,7 +1842,7 @@ msgstr ""
 "Kérem, állítsa be, mielőtt kiválasztaná a terméket!"
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po
index 9560ba073ea..23dd0de81e9 100644
--- a/addons/purchase/i18n/id.po
+++ b/addons/purchase/i18n/id.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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1808,7 +1808,7 @@ msgstr ""
 "Harap menetapkan satu sebelum memilih produk."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index dda4fa14d22..8e0d8bd90db 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1825,7 +1825,7 @@ msgstr ""
 "Inserire quindi una di queste voci prima di scegliere il prodotto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index 64fdc7d561f..3c3503dda31 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1789,7 +1789,7 @@ msgstr ""
 "製品を選択する前にどちらかをセットして下さい。"
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po
index 3c2e61b6282..fdebdb6a145 100644
--- a/addons/purchase/i18n/ko.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1752,7 +1752,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index de97b68ed9e..e4ea511a9b6 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1754,7 +1754,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/lv.po b/addons/purchase/i18n/lv.po
index 2ef362be035..2407428bfb1 100644
--- a/addons/purchase/i18n/lv.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po
index 62c274f6ceb..578cee625d4 100644
--- a/addons/purchase/i18n/mn.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1855,7 +1855,7 @@ msgstr ""
 "Бараа сонгохоосоо өмнө аль нэгийг нь сонго."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/nb.po b/addons/purchase/i18n/nb.po
index ffbc6422e80..c9da9748bf7 100644
--- a/addons/purchase/i18n/nb.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1845,7 +1845,7 @@ msgstr ""
 "Vennligst velg en før du velger prosukt."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index cc50ab56d40..94375e08522 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1868,7 +1868,7 @@ msgstr ""
 "Stel er een in voordat u een product kiest."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/nl_BE.po b/addons/purchase/i18n/nl_BE.po
index 1675d90fc6d..c86766b63de 100644
--- a/addons/purchase/i18n/nl_BE.po
+++ b/addons/purchase/i18n/nl_BE.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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1849,7 +1849,7 @@ msgstr ""
 "Gelieve dit te doen voordat u een product kiest."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 827add12e12..28c8bebad0a 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1838,7 +1838,7 @@ msgstr ""
 "Wybierz jedno z powyższych przed wybraniem produktu."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index 959815d37c6..325f63f78ef 100644
--- a/addons/purchase/i18n/pt.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1858,7 +1858,7 @@ msgstr ""
 "Por favor, defina um antes de escolher um artigo."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index d96d1d28320..8f2cccb110b 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1865,7 +1865,7 @@ msgstr ""
 "Por favor, selecione um antes de escolher um produto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po
index 23a41b61d22..0a8c4858c18 100644
--- a/addons/purchase/i18n/ro.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1875,7 +1875,7 @@ msgstr ""
 "Va rugam sa setati una inainte de a alege un produs."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 73c82213e6a..9fa7d0c5d39 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1796,7 +1796,7 @@ msgstr ""
 "Пожалуйста выберите, перед выбором ТМЦ."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sk.po b/addons/purchase/i18n/sk.po
index e49bbd2b301..739d72747c9 100644
--- a/addons/purchase/i18n/sk.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sl.po b/addons/purchase/i18n/sl.po
index cba54e28834..5bcbd3ddd5c 100644
--- a/addons/purchase/i18n/sl.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1800,7 +1800,7 @@ msgstr ""
 "Prosim izberi en sklop, preden se izbere izdelek."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sq.po b/addons/purchase/i18n/sq.po
index ba537c1e000..0f73670c8a8 100644
--- a/addons/purchase/i18n/sq.po
+++ b/addons/purchase/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: 2012-08-28 06:00+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sr.po b/addons/purchase/i18n/sr.po
index 5a7166b458e..ee8e7b3811b 100644
--- a/addons/purchase/i18n/sr.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1764,7 +1764,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sr@latin.po b/addons/purchase/i18n/sr@latin.po
index cafdb7c9d97..dc37c25f445 100644
--- a/addons/purchase/i18n/sr@latin.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1764,7 +1764,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index 14caf767e28..53a3f72dec7 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -22,6 +22,8 @@ msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
 msgstr ""
+"Köparen måste godkänna offertförfrågan innan den skickas till leverantören. "
+"Inköpsförfrågan blir då en bekräftad Inköpsorder."
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
@@ -43,7 +45,7 @@ msgstr "Destination"
 #: code:addons/purchase/purchase.py:236
 #, python-format
 msgid "In order to delete a purchase order, it must be cancelled first!"
-msgstr ""
+msgstr "För att ta bort en Inköpsorder, måste den avbrytas först!"
 
 #. module: purchase
 #: help:purchase.report,date:0
@@ -118,6 +120,9 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
+"Använd den här menyn för att söka i dina Inköpsordrar genom referenser, "
+"leverantör, produkter etc. Du kan spåra produkter som mottagits, och styra "
+"leverantörsfakturor, för varje Inköpsorder."
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_line_invoice.py:145
@@ -166,7 +171,7 @@ msgstr "Företag"
 #. module: purchase
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr ""
+msgstr "Detta är ledtiden för varje beställning."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
@@ -323,7 +328,7 @@ msgstr "Produkter"
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr ""
+msgstr "Totalt Antal och belopp per månad"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
@@ -331,6 +336,8 @@ msgid ""
 "A Pick list generates an invoice. Depending on the Invoicing control of the "
 "sale order, the invoice is based on delivered or on ordered quantities."
 msgstr ""
+"En plocklista genererar en faktura. Beroende på faktureringskontrollen av "
+"försäljningen blir fakturan baserad på levererad eller beställda kvantiteter."
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.order.line,state:0
@@ -394,7 +401,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr ""
+msgstr "Dest. Adress Kontakt Namn"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -440,6 +447,7 @@ msgstr "Ordrar under senaste månaden"
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
+"Du måste först avbryta alla inleveranser relaterade till denna Inköpsorder."
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
@@ -464,7 +472,7 @@ msgstr "Anger att plockningen är klar."
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in exception state"
-msgstr ""
+msgstr "Beställningar som befinner sig i undantag"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.report,validator:0
@@ -485,7 +493,7 @@ msgstr "Snittpris"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "Inkommande leveranser som redan behandlats"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -522,6 +530,9 @@ msgid ""
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
 msgstr ""
+"En plocklista genererar en leverantörsfaktura. Beroende på "
+"faktureringskontroll över Inköpsordern blir fakturan baserad på mottagna "
+"eller beställda kvantiteter."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -532,11 +543,16 @@ msgid ""
 "supplier invoice, you can generate a draft supplier invoice based on the "
 "lines from this menu."
 msgstr ""
+"Om du ställer in Faktureringskontrollen på en Inköpsorder som \"Baserat på "
+"rader i inköpsorder\", kan du spåra alla rader på Inköpsorder som du ännu "
+"inte har fått Leverantörsfaktura. När du är redo att ta emot en "
+"Leverantörsfaktura kan du då skapa ett utkast på leverantörsfaktura baserad "
+"på raderna från den här menyn."
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
-msgstr ""
+msgstr "Inköpsorder som befinner sig i undantag"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -544,6 +560,8 @@ msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
 msgstr ""
+"Mottagning Analys gör att du enkelt kan kontrollera och analysera företagets "
+"ordermottagningar och resultatet för dina leverantörens leveranser."
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -651,6 +669,9 @@ msgid ""
 "order is 'On picking'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Fakturan skapas  automatiskt om fakturakontroll av beställningen är \"Mot "
+"plockning\". Fakturan kan också genereras manuellt av den som bokför "
+"(Faktura kontroll = Manuell)."
 
 #. module: purchase
 #: report:purchase.order:0
@@ -664,6 +685,9 @@ msgid ""
 "purchase history and performance. From this menu you can track your "
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
+"Inköpsanalys gör att du kan analysera och enkelt kontrollera din köphistorik "
+"och företagets resultat. Från denna meny kan du spåra förhandlingsprestanda, "
+"leveranssäkerhet av dina leverantörer, osv."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_configuration_misc
@@ -674,7 +698,7 @@ msgstr "Allmänt"
 #: code:addons/purchase/purchase.py:769
 #, python-format
 msgid "The selected supplier only sells this product by %s"
-msgstr ""
+msgstr "Den valda leverantören säljer endast denna produkt med %s"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -739,7 +763,7 @@ msgstr "Inkommande leverans"
 #: code:addons/purchase/purchase.py:285
 #, python-format
 msgid "You cannot confirm a purchase order without any lines."
-msgstr ""
+msgstr "Du kan inte bekräfta en Inköpsorder utan några rader."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -749,12 +773,16 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
+"Använd den här menyn för att kontrollera inkommande leverantörsfakturor. "
+"OpenERP kan tillverka utkast till fakturor baserat dina beställningar eller "
+"mottagningar, beroende på dina inställningar. När du får en "
+"leverantörsfaktura kan du matcha den mot fakturautkastet och godkänna den."
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
 msgid "RFQ"
-msgstr "RFQ"
+msgstr "Offertförfrågan"
 
 #. module: purchase
 #: code:addons/purchase/edi/purchase_order.py:139
@@ -869,7 +897,7 @@ msgstr "Bild"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Total Orders Lines by User per month"
-msgstr ""
+msgstr "Totalt orderrader per användare per månad"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -978,7 +1006,7 @@ msgstr "Produktkategorier"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Pre-Generate Draft Invoices based on Purchase Orders"
-msgstr ""
+msgstr "Tillverka utkast på fakturor baserade på inköpsorder"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
@@ -1004,7 +1032,7 @@ msgstr "Calendar View"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Purchase Order Lines"
-msgstr ""
+msgstr "Baserat på inköpsorderrader"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
@@ -1015,7 +1043,7 @@ msgstr "Summa utan moms."
 #: code:addons/purchase/purchase.py:754
 #, python-format
 msgid "Selected UOM does not belong to the same category as the product UOM"
-msgstr ""
+msgstr "Vald enhet tillhör inte samma kategori som produktens enhet"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:907
@@ -1030,6 +1058,9 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"En inköpsorder genererar en leverantörsfaktura, så snart den bekräftas av "
+"köparen. Beroende på faktureringskontroll på beställningen blir fakturan "
+"baserad på mottagna eller beställda kvantiteter."
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -1078,6 +1109,9 @@ msgid ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Fakturan skapas automatiskt om Fakturakontrollen på beställningen är \"Mot "
+"order\". Fakturan kan också genereras manuellt av den som bokför (Faktura "
+"kontroll = Manuell)."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_email_templates
@@ -1119,13 +1153,13 @@ msgstr "Utökade filter..."
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "Invoicing Control on Purchases"
-msgstr ""
+msgstr "FaktureringsKontroll mot inköp"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:48
 #, python-format
 msgid "Please select multiple order to merge in the list view."
-msgstr ""
+msgstr "Välj flera för att sammanfoga i listvyn."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_import_create_supplier_installer
@@ -1182,12 +1216,12 @@ msgstr "Cancel Purchase Order"
 #: code:addons/purchase/purchase.py:411 code:addons/purchase/purchase.py:418
 #, python-format
 msgid "Unable to cancel this purchase order!"
-msgstr ""
+msgstr "Kan inte avbryta inköpsorder!"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr ""
+msgstr "En plocklista genereras för att spåra inkommande produkter."
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -1211,7 +1245,7 @@ msgstr "Referensen måste vara unik per bolag!"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_standard:0
 msgid "Products Value"
-msgstr ""
+msgstr "Varuvärde"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
@@ -1236,6 +1270,12 @@ msgid ""
 "Based on generated invoice: create a draft invoice you can validate later.\n"
 "Based on receptions: let you create an invoice when receptions are validated."
 msgstr ""
+"Baserat på rader i inköpsorder: placera enskilda rader i 'FakturaKontroll > "
+"Baserat på inköpsorderrader' från där du kan välja att skapa en faktura.\n"
+"Baserat på genererad faktura: skapar ett fakturautkast som du kan godkänna "
+"senare.\n"
+"Baserat på mottagningar: låter dig skapa en faktura när mottagningen "
+"godkänts."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
@@ -1256,7 +1296,7 @@ msgstr "Produkter per kategori"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr ""
+msgstr "Dagar för att godkänna"
 
 #. module: purchase
 #: help:purchase.order,origin:0
@@ -1267,7 +1307,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "Inköpsordrar som inte är godkända ännu."
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1279,12 +1319,12 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
-"The state of the purchase order or the quotation request. A quotation is a "
-"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
-"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
-"order to change the state to 'Approved'. When the purchase order is paid and "
-"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
-"or in the reception of goods, the state becomes in exception."
+"Tillstånd för Inköpsorder eller Offertförfråga. En offert är en Inköpsorder "
+"i \"utkast\"-läge. Ordern måste därefter bekräftas av användaren och växlar "
+"då över till \"Bekräftat\"-läge. Sedan måste leverantören bekräfta för att "
+"ändra tillståndet till \"Godkänd\". När beställningen är betald och "
+"mottagen, blir statusen \"Klar\". Om man Avbryter fakturan eller "
+"inleveransen blir statusen Undantag."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1306,7 +1346,7 @@ msgstr "Inköpsorder '%s' är bekräftad."
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr ""
+msgstr "Datum då inköpsorder har godkänts"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,state:0
@@ -1376,7 +1416,7 @@ msgstr "Purchase Order Lines"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "The supplier approves the Purchase Order."
-msgstr ""
+msgstr "Leverantören godkänner beställningen."
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:80
@@ -1406,7 +1446,7 @@ msgstr "Merge orders"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
-msgstr ""
+msgstr "Inköpsorderrader Tillverka Faktura"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
@@ -1416,7 +1456,7 @@ msgstr "Inkommande leveranser"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
-msgstr ""
+msgstr "Totalt order per användare per månad"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
@@ -1442,12 +1482,12 @@ msgstr "Our Order Reference"
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0
 msgid "Search Purchase Order"
-msgstr ""
+msgstr "Sök Inköpsorder"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_config
 msgid "Set the Default Invoicing Control Method"
-msgstr ""
+msgstr "Sätt Standardmetod för FaktureringsKontroll"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
@@ -1468,12 +1508,12 @@ msgstr "Datum godkänd"
 #. module: purchase
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
-msgstr ""
+msgstr "Väntar på Leverantörsbekräftelse"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "Based on draft invoices"
-msgstr ""
+msgstr "Baserat på fakturautkast"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1487,6 +1527,8 @@ msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
 "purchase less."
 msgstr ""
+"Den valda leverantören har en minimal mängd satt till %s %s, ska bör inte "
+"köpa mindre."
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
@@ -1545,6 +1587,9 @@ msgid ""
 "suppliers. You can track all your interactions with them through the History "
 "tab: emails, orders, meetings, etc."
 msgstr ""
+"Visar din leverantör och upprätthåller en god relation med din leverantör. "
+"Du kan spåra alla dina leverantörsaktiviteter genom fliken Historik: e-post, "
+"ordrar, möten mm"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1589,7 +1634,7 @@ msgstr "Reservation"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders that include lines not invoiced."
-msgstr ""
+msgstr "Beställningar som inkluderar rader som inte är fakturerade."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1607,6 +1652,8 @@ msgid ""
 "This tool will help you to select the method you want to use to control "
 "supplier invoices."
 msgstr ""
+"Detta verktyg hjälper dig att välja den metod du vill använda för att "
+"kontrollera leverantörsfakturor."
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
@@ -1614,6 +1661,9 @@ msgid ""
 "In case there is no supplier for this product, the buyer can fill the form "
 "manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
+"Om det inte finns någon leverantör för denna produkt, kan köparen fylla i "
+"formuläret manuellt och bekräfta det. Offertförfrågan blir en bekräftad "
+"Inköpsorder."
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1650,6 +1700,9 @@ msgid ""
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
 msgstr ""
+"Om du ställer in Faktureringskontroll på en beställning som \"Baserat på "
+"mottagningar\", kan du spåra alla mottagna produkter och skapa fakturor för "
+"dessa mottagningar."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1681,16 +1734,26 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" Notera att:\n"
+" \n"
+"  Beställningar kommer endast att slås samman om:\n"
+"  * Inköpsorder är utkast\n"
+"  * Inköpsorder tillhör samma leverantör\n"
+"  * Inköpsorder är har samma lagerplats, samma prislista\n"
+" \n"
+"  Rader kommer endast att slås samman om:\n"
+"  * Order rader är exakt samma utom produkter, kvantitet och enhet \n"
+" "
 
 #. module: purchase
 #: field:purchase.report,negociation:0
 msgid "Purchase-Standard Price"
-msgstr ""
+msgstr "Standardpris Inköp"
 
 #. module: purchase
 #: field:purchase.config.wizard,default_method:0
 msgid "Default Invoicing Control Method"
-msgstr ""
+msgstr "Standard Faktureringskontrollmetod"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
@@ -1734,6 +1797,13 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
+" * Tillståndet \"Utkast\" ställs in automatiskt när inköpsorder är i utkast "
+"tillstånd.\n"
+"* Tillståndet \"Bekräftad\" ställs in automatiskt när bekräfta när "
+"inköpsorder är i bekräfta tillstånd.\n"
+"* Tillståndet \"Klar\" ställs in automatiskt när inköpsorder är klar.\n"
+"* Tillståndet \"Inställd\" ställs in automatiskt när användaren avbryter ett "
+"inköp."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:426
@@ -1771,7 +1841,7 @@ msgstr ""
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
 msgid "From a purchase order"
-msgstr ""
+msgstr "Från en inköpsorder"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:735
@@ -1780,9 +1850,11 @@ msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"Du måste välja en prislista eller en leverantör i inköpsformuläret!\n"
+"Välj en innan du väljer produkt."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
@@ -1837,11 +1909,62 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Hej ${object.partner_address_id.name and ' ' or "
+"''}${object.partner_address_id.name or ''},\n"
+"\n"
+"Här är en inköpsorder bekräftelse från ${object.company_id.name}:\n"
+"       | Order number: *${object.name}*\n"
+"       | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Order date: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       | Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       | Your contact: ${object.validator.name} "
+"${object.validator.user_email and '<%s>'%(object.validator.user_email) or "
+"''}\n"
+"\n"
+"Du kan visa orderbekräftelsen och ladda ner det via följande länk:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"Om du har några frågor, tveka inte att kontakta oss.\n"
+"\n"
+"Tack!\n"
+"\n"
+"\n"
+"--\n"
+"${object.validator.name} ${object.validator.user_email and "
+"'<%s>'%(object.validator.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
-msgstr ""
+msgstr "Beställningar som är Utkast"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1878,7 +2001,7 @@ msgstr "År"
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 #: selection:purchase.order,invoice_method:0
 msgid "Based on Purchase Order lines"
-msgstr ""
+msgstr "Baserat på inköpsorderrader"
 
 #. module: purchase
 #: model:ir.actions.todo.category,name:purchase.category_purchase_config
@@ -1906,7 +2029,7 @@ msgstr "Ordrar"
 msgid ""
 "unique number of the purchase order,computed automatically when the purchase "
 "order is created"
-msgstr ""
+msgstr "Unikt inköpsordernummer, sätts automatiskt när inköpsordern skapas"
 
 #. module: purchase
 #: view:board.board:0
diff --git a/addons/purchase/i18n/th.po b/addons/purchase/i18n/th.po
index c61648bfa28..cb219f6d201 100644
--- a/addons/purchase/i18n/th.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1777,7 +1777,7 @@ msgstr ""
 "กรุณาเลือกก่อนที่จะเลือกสินค้า"
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/tlh.po b/addons/purchase/i18n/tlh.po
index 24a8e6af888..9993644f106 100644
--- a/addons/purchase/i18n/tlh.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1748,7 +1748,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index e8180e1e7ef..fcc6a30e190 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -542,6 +542,11 @@ msgid ""
 "supplier invoice, you can generate a draft supplier invoice based on the "
 "lines from this menu."
 msgstr ""
+"Bir satınalma siparişinin Fatura Kontrolünü \"Satınalma Siparişi Öğelerine "
+"Göre\" ayarlarsanız, henüz almadığınız tedarikçi faturalarının satınalma "
+"öğelerinintümünü buradan izleyebilirsiniz. Bir tedarikçi faturası alma "
+"durumuna gelmişseniz, bu menü öğelerine göre bir taslak tedarikçi faturası "
+"oluşturabilirsiniz."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1161,6 +1166,9 @@ msgid ""
 "can import your existing partners by CSV spreadsheet from \"Import Data\" "
 "wizard"
 msgstr ""
+"Bu formdan elle Tedarikçileri ve kişilerini oluşturabilir ya da "
+"içeaktarabilirsiniz veya \"Veri İçeaktarma\" sihirbazından CSV çalışma "
+"sayfası olarak varolan paydaşlarınızı içeaktarabilirsiniz."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
@@ -1261,6 +1269,12 @@ msgid ""
 "Based on generated invoice: create a draft invoice you can validate later.\n"
 "Based on receptions: let you create an invoice when receptions are validated."
 msgstr ""
+"Satınalma Sipariş satırlarına dayalı: seçerek fatura oluşturacağınız 'Fatura "
+"Kontrolü > S.S. satırlarına dayalı'nın içine tek satırları yerleştirin.\n"
+"Oluşturulan faturaya dayalı: daha sonra doğrulayabileceğiniz bir taslak "
+"fatura oluşturun.\n"
+"Kabullere dayanarak: kabuller doğrulandığında fatura oluşturmanıza izin "
+"verir."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
@@ -1684,6 +1698,9 @@ msgid ""
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
 msgstr ""
+"Satınalma siparişlerinin Fatura Kontrolünü \"Kabullere Dayanarak\" "
+"ayarlarsanız, burada tüm ürün kabullerini izleyebilir ve bu kabuller için "
+"faturalar oluşturabilirsiniz."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1838,7 +1855,7 @@ msgstr ""
 "Lütfen bir ürün seçmeden önce birini belirtin."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po
index 7691c36b3d8..eb0da389943 100644
--- a/addons/purchase/i18n/uk.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1756,7 +1756,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/vi.po b/addons/purchase/i18n/vi.po
index b26c44842d5..1f9ee993aad 100644
--- a/addons/purchase/i18n/vi.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index d950f429261..e010694db60 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1772,7 +1772,7 @@ msgid ""
 msgstr "请在采购界面选择价格表或供应商！然后再选择产品。"
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/zh_TW.po b/addons/purchase/i18n/zh_TW.po
index 148ee88a7b2..dae81c1827c 100644
--- a/addons/purchase/i18n/zh_TW.po
+++ b/addons/purchase/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: 2012-08-28 06:01+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1748,7 +1748,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po
index 684963d5bde..812f921b85f 100644
--- a/addons/sale/i18n/ar.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1121,7 +1121,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "وثيقة الانتقال الى الخروج او اللى العميل."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index 1441f8a5120..571dde6252f 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1101,7 +1101,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index 06cc830bf41..a41483e0a3d 100644
--- a/addons/sale/i18n/bs.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1095,7 +1095,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index 14e3c3acd52..88360a3ac56 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1141,7 +1141,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Document del moviment a la sortida o al client."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po
index 7e6739338f0..4164a564d77 100644
--- a/addons/sale/i18n/cs.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: sale
@@ -1103,7 +1103,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokument přesunu na výstup nebo k zákazníkovi"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/da.po b/addons/sale/i18n/da.po
index 158b9dcefe0..b368a2a0fa8 100644
--- a/addons/sale/i18n/da.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1102,7 +1102,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index 74faa4a11ea..ccc728a1bb6 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -338,6 +338,19 @@ msgid ""
 "  - The 'Invoice based on deliveries' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"Die Regeln zur Rechnungserstellung stimmen Rechnungs- und "
+"Lieferscheinerstellung ab.\n"
+"  - \"Zahlung vor Auslieferung\" erstellt zuerst die Rechnung. Der "
+"Lieferschein, und damit die Kommissionierung, erfolgen erst nach "
+"Zahlungseingang.\n"
+"  - \"Kommissionierung & Rechnung aus Abruf\" erstellt sofort einen "
+"Lieferschein zur (Vor-)Kommissionierung. Danach wird auf den manuellen "
+"Rechnungsentwurf gemäss Verkaufsauftrag oder Auftragspositionen gewartet.\n"
+"  - Bei \"Rechnungserstellung nach Auslieferung\" erfolgt die "
+"Rechnungsstellung erst nach erfolgreicher Auslieferung aller "
+"Teillieferungen.\n"
+"  - \"Rechnung bei Kommissionierung\" erstellt im Moment der "
+"Kommissionierung eine zugehörige Rechnung."
 
 #. module: sale
 #: code:addons/sale/sale.py:1171
@@ -898,6 +911,14 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the order date."
 msgstr ""
+"Liefert den Status der Angebotsanfrage oder der Verkaufsauftrags.\n"
+"Der Ausnahme-Status wird bei Abbruch eines Vorgangs automatisch gesetzt. Bei "
+"Rechnungsprüfung wird einem Rechnungsabbruch folgend und bei "
+"Kommissionierungsfehlern oder Auslieferungsfehlern der Lieferungsabbruch zu "
+"dieser Ausnahme führen.\n"
+"Der Zustand \"Warte auf Terminierung\" wird erreicht, wenn eine Rechnung "
+"zwar erstellt und bestätigt wurde, aber die Auftrags-Terminierung diesen "
+"Auftrag noch nicht abgearbeitet hat."
 
 #. module: sale
 #: code:addons/sale/sale.py:1272
@@ -1163,7 +1184,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Beleg für Warenversand oder Auslieferung"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
@@ -1299,6 +1320,9 @@ msgid ""
 "create a task, purchase order or manufacturing order linked to this sale "
 "order line."
 msgstr ""
+"Wenn \"Auf Abruf\", so wird eine Beschaffung ausgelöst sobald der "
+"Verkaufsauftrag bestätigt wurde. Somit wird eine Anforderung zum Einkauf "
+"oder eine Fertigung erzeugt."
 
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
@@ -1450,6 +1474,10 @@ msgid ""
 "Here is a proposition of quantities according to the packaging:\n"
 "EAN: %s Quantity: %s Type of ul: %s"
 msgstr ""
+"Sie haben die Anzahl von %d Einheiten gewählt.\n"
+"Dies ist mit der ausgewählten Verpackung nicht vereinbar.\n"
+"Ein Vorschlag der Verpackung entsprechend wäre:\n"
+"EAN: %s  Anzahl: %s  Art: %s"
 
 #. module: sale
 #: view:sale.order:0
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index 4a0eedb91c0..54ce749d11e 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1108,7 +1108,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index ea9898a9759..969fff34188 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1149,7 +1149,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documento del movimiento a la salida o al cliente."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index 77d5671b509..79290addc6c 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/i18n/es_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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1095,7 +1095,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/es_CL.po b/addons/sale/i18n/es_CL.po
index ce1098e192e..ef73d4445ad 100644
--- a/addons/sale/i18n/es_CL.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1144,7 +1144,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documento del movimiento a la salida o al cliente."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/es_CR.po b/addons/sale/i18n/es_CR.po
index df804d6d213..c50f084e181 100644
--- a/addons/sale/i18n/es_CR.po
+++ b/addons/sale/i18n/es_CR.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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "Language: \n"
 
 #. module: sale
@@ -1176,7 +1176,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documento del movimiento a la salida o al cliente."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/es_EC.po b/addons/sale/i18n/es_EC.po
index a1d8996de8c..836615b8649 100644
--- a/addons/sale/i18n/es_EC.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1110,7 +1110,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documento del movimiento de la salida o del cliente."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po
index a6b0cd9a6b3..f30ef9345e7 100644
--- a/addons/sale/i18n/et.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
@@ -1135,7 +1135,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index ceb1570a393..79e723a5861 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1137,7 +1137,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokumentti siirrosta kohdepaikkaan tai asiakkalle."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index 1fe8249abe5..2b4f026b882 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: code:addons/sale/sale.py:655
@@ -1206,7 +1206,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Document du mouvement vers la sortie ou vers le client."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/gl.po b/addons/sale/i18n/gl.po
index 060cad40618..112ba8ea10c 100644
--- a/addons/sale/i18n/gl.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1099,7 +1099,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index ea5059ef463..d1f6b210386 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "Language: hr\n"
 
 #. module: sale
@@ -1127,7 +1127,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokument premještaja na izlaz ili kod kupca."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index f9f62d36f15..6e5538893ba 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1145,7 +1145,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokumentum a gyártásnak vagy a vevőnek irányuló árumozgásról."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po
index f75b1f5a764..221dc70c76a 100644
--- a/addons/sale/i18n/id.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1137,7 +1137,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokumen pindah ke output atau kepada pelanggan"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/is.po b/addons/sale/i18n/is.po
index 2b28148be9c..c75b587321a 100644
--- a/addons/sale/i18n/is.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1109,7 +1109,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index 675c45f3262..e45c3253c23 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1142,7 +1142,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documento del movimento verso area di uscita o verso area cliente."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po
index 94f46d419ea..c774975f3a7 100644
--- a/addons/sale/i18n/ja.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1116,7 +1116,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "製造品へのあるいは顧客への移動のドキュメント"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po
index 0bfbbefbbf9..ca5a6f9641b 100644
--- a/addons/sale/i18n/ko.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1094,7 +1094,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/lo.po b/addons/sale/i18n/lo.po
index a02f0e850f3..ce13dc2f73b 100644
--- a/addons/sale/i18n/lo.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1094,7 +1094,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po
index e38dd23f746..b4a73722c78 100644
--- a/addons/sale/i18n/lt.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1116,7 +1116,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/lv.po b/addons/sale/i18n/lv.po
index a7db8d69dd9..2fc27ce217e 100644
--- a/addons/sale/i18n/lv.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1094,7 +1094,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index a16728c99b5..b1de7eb2e73 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1156,7 +1156,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Гарах байрлал эсвэл захиалагч руу хөдөлгөөний баримт"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/nb.po b/addons/sale/i18n/nb.po
index 66c4a397314..5ad4b51a646 100644
--- a/addons/sale/i18n/nb.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -505,6 +505,8 @@ msgid ""
 "Select a product of type service which is called 'Advance Product'. You may "
 "have to create it and set it as a default value on this field."
 msgstr ""
+"Velg et produkt av typen tjeneste som kalles 'Forhånsfakturert produkt'. Du "
+"må kanskje opprette den og sette den som en standar verdi på dette feltet."
 
 #. module: sale
 #: report:sale.order:0
@@ -518,6 +520,8 @@ msgid ""
 "You cannot make an advance on a sales order                              "
 "that is defined as 'Automatic Invoice after delivery'."
 msgstr ""
+"Du kan ikke lage et forskudd på en salgsordre som er definert som "
+"'Automatisk faktura etter levering'."
 
 #. module: sale
 #: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
@@ -856,6 +860,8 @@ msgid ""
 "It indicates that the sales order has been delivered. This field is updated "
 "only after the scheduler(s) have been launched."
 msgstr ""
+"Den indikerer at salgsordren har blitt levert. Dette feltet blir oppdatert "
+"kun etter at planleggeren(e) har blitt lansert."
 
 #. module: sale
 #: field:sale.order,date_order:0
@@ -887,6 +893,11 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the order date."
 msgstr ""
+"Viser status for forespørsel eller salgsordre.\n"
+"Statusen 'Unntak' settes automatisk når det skjer en avbrytelse ved "
+"fakturering (faktureringsunntak) eller plukking (forsendelsesunntak).\n"
+"Statusen 'Avventer planlegging' settes når faktura er bekreftet men ordren "
+"venter på kjøring av planleggeren."
 
 #. module: sale
 #: code:addons/sale/sale.py:1272
@@ -1003,7 +1014,7 @@ msgstr "Åpne faktura"
 #. module: sale
 #: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
 msgid "Auto-email confirmed sale orders"
-msgstr ""
+msgstr "Auto e-post bekreftede salgsordre"
 
 #. module: sale
 #: code:addons/sale/sale.py:413
@@ -1144,10 +1155,10 @@ msgstr "Sett til forslag"
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Document of the move to the output or to the customer."
-msgstr ""
+msgstr "Dokumentering av bevegelse til utgående lokasjon eller kunde."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
@@ -1405,7 +1416,7 @@ msgstr ""
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
-msgstr ""
+msgstr "Sale OrderLine Make_invoice"
 
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.report,state:0
@@ -1445,7 +1456,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Packing"
-msgstr ""
+msgstr "Gjenskap pakking"
 
 #. module: sale
 #: view:sale.order:0 field:sale.order.line,property_ids:0
@@ -1537,7 +1548,7 @@ msgstr "Regler for plukking"
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Document of the move to the customer."
-msgstr ""
+msgstr "Dokument av forsendelsen til kunden."
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
@@ -1830,6 +1841,9 @@ msgid ""
 "parts to the sales order. There is 1 pick list by sales order line which "
 "evolves with the availability of parts."
 msgstr ""
+"Plukklisten dannes umiddelbart når en salgsordre bekreftes, samtidig med "
+"anskaffelsesordren. Den tilordner varer til salgsordren. Det dannes en "
+"plukkliste til salgsordren som utvides løpende med tilgjengelige produkter."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1909,7 +1923,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
-msgstr ""
+msgstr "Salgsordrelinjer ferdig"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
@@ -1939,6 +1953,9 @@ msgid ""
 "production of products regarding to the rules and to the sales order's "
 "parameters. "
 msgstr ""
+"En anskaffelsesordre dannes automatisk når en salgsordre bekreftes eller "
+"faktura er betalt. Denne driver innkjøp og/eller produksjon av produktet i "
+"henhold til anskaffelsesregler og parametere på salgsordren. "
 
 #. module: sale
 #: view:sale.order.line:0
@@ -2008,7 +2025,7 @@ msgstr "MVA beløp."
 #. module: sale
 #: view:sale.order:0
 msgid "Packings"
-msgstr ""
+msgstr "Pakkinger"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -2035,7 +2052,7 @@ msgstr "Salgsordre"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sales Shop"
-msgstr ""
+msgstr "Butikk"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2045,7 +2062,7 @@ msgstr "November"
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
-msgstr ""
+msgstr "Forhåndsfakturert produkt"
 
 #. module: sale
 #: view:sale.order:0
@@ -2073,16 +2090,17 @@ msgstr "Salgsordre i arbeid"
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
+"Referanse til dokumentet som genererte denne salgsordreforespørselen."
 
 #. module: sale
 #: view:sale.report:0 field:sale.report,delay:0
 msgid "Commitment Delay"
-msgstr ""
+msgstr "Bekreftelsesforsinkelse"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Deliver & invoice on demand"
-msgstr ""
+msgstr "Lever og fakturer på etterspørsel"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
@@ -2090,6 +2108,7 @@ msgid ""
 "One Procurement order for each sales order line and for each of the "
 "components."
 msgstr ""
+"En anskaffelsesordre for hver salgsordrelinje og for hver av komponentene."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
@@ -2228,6 +2247,11 @@ msgid ""
 "having invoiced yet. If you want to analyse your turnover, you should use "
 "the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Denne rapporten analyserer dine sitater og salgsordrer. Analysen sjekker "
+"salgsinntekter og sorterer de ved annen gruppe kriterier (selger, partner, "
+"produkt, etc.) Bruk denne rapporten til å utføre analyser på salg du ikke "
+"har fakturert enda. Hvis du ønsker å analysere din omsetning, bør du bruke "
+"fakturaen analyserapporten i Regnskap søknaden."
 
 #. module: sale
 #: report:sale.order:0
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index 3c9dba18e1e..0a443827877 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1172,7 +1172,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Document van de mutatie naar de expeditie of naar de klant."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/nl_BE.po b/addons/sale/i18n/nl_BE.po
index d20fb064414..8e13f94c004 100644
--- a/addons/sale/i18n/nl_BE.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1165,7 +1165,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Document van de verplaatsing naar de verzendzone of naar de klant."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/oc.po b/addons/sale/i18n/oc.po
index f9a2e950bff..bf3da283f04 100644
--- a/addons/sale/i18n/oc.po
+++ b/addons/sale/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1094,7 +1094,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index 0ca3e71eab5..fb7a4b602ff 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1157,7 +1157,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokument przesunięcia do klienta."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index 0cc88911287..b01e36597d4 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1165,7 +1165,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documento do movimento para a saída ou para o cliente."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index ccb754d681f..eea6b03757e 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1171,7 +1171,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documento de movimento para a saída ou para o cliente."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/ro.po b/addons/sale/i18n/ro.po
index bacd919cb9c..b8aa0abdf93 100644
--- a/addons/sale/i18n/ro.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1173,7 +1173,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documentul miscarii catre iesire sau catre client."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 2070d48b0e5..6b4294b5c3c 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1136,7 +1136,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Документ перемещения на выход или заказчику."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/sk.po b/addons/sale/i18n/sk.po
index 16f7fd7b29d..2f4b6c6c332 100644
--- a/addons/sale/i18n/sk.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1105,7 +1105,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index db9e7b82d87..138e96fd061 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1107,7 +1107,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokument pemika za izhod ali za stranko"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/sq.po b/addons/sale/i18n/sq.po
index c5151572329..32ddc7f40d5 100644
--- a/addons/sale/i18n/sq.po
+++ b/addons/sale/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: 2012-08-28 06:16+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1094,7 +1094,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index c77248dae6d..bfb6ce674ce 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1108,7 +1108,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokumenat za pomeranje na izlaz ili za kupca."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/sr@latin.po b/addons/sale/i18n/sr@latin.po
index e46bd400565..ea9e5039c37 100644
--- a/addons/sale/i18n/sr@latin.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1108,7 +1108,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokumenat za pomeranje na izlaz ili za kupca."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index f8d8a9df3ce..1197192d3fe 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1159,7 +1159,7 @@ msgstr ""
 "Dokumentation av bokföringstransaktionen till utleveransen eller till kunden"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/th.po b/addons/sale/i18n/th.po
index 8bf634b9aab..dcc9781fa1e 100644
--- a/addons/sale/i18n/th.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1094,7 +1094,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/tlh.po b/addons/sale/i18n/tlh.po
index 0d19af4e8bd..dc69b3b07c6 100644
--- a/addons/sale/i18n/tlh.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1093,7 +1093,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 9ced9b50ae6..b7578a31a2a 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -328,6 +328,17 @@ msgid ""
 "  - The 'Invoice based on deliveries' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"Fatura Politikası fatura ve teslimat işlemlerini senkronize etmek için "
+"kullanılır.\n"
+"  - 'Teslimattan önce öde' seçimi önce faturayı oluşturur ve sonra faturanın "
+"ödenmesi üzerine toplama emrini oluşturur.\n"
+"  - 'Teslim et & istenirse Fatura kes' toplama emrini doğrudan oluşturacak "
+"ve kullanıcının elle 'Fatura' düğmesini tıklayarak satış siparişine ve satış "
+"siparişi satırlarına göre fatura oluşturmasını bekleyecek.\n"
+"  - 'Sipariş tesliminde sonra Fatura' seçimi bütün toplama listeleri "
+"tamamlandıktan sonra satış siparişine göre taslak fatura oluşturacaktır.\n"
+"  - 'Teslimata dayalı fatura' seçimi toplama işlemi sırasında fatura "
+"oluşturmak için kullanılır."
 
 #. module: sale
 #: code:addons/sale/sale.py:1171
@@ -882,6 +893,12 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the order date."
 msgstr ""
+"Teklifin ya da satış siparişinin durumunu verir. \n"
+"İstisna durumu fatura doğrulamasında (Fatura İstisnası) iptal işlemi "
+"oluşursa otomatikman ayarlanır ya da toplama listesi işleminde (Naklie "
+"İstisnası). \n"
+"'Bekleyen Program) durumu fatura onaylandığında ama programcının sipariş "
+"tarihini çalıştırmasının beklendiğinde ayarlanır."
 
 #. module: sale
 #: code:addons/sale/sale.py:1272
@@ -1142,7 +1159,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Çıkışa ya da müşteriyeyapılan hareket belgesi."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
@@ -1219,6 +1236,80 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Merhaba${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Bu siparişiniz için onay ${object.partner_id.name}:\n"
+"       | Sipariş numarası: *${object.name}*\n"
+"       | Sipariş toplamı: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Sipariş tarihi: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Sipariş referansı: ${object.origin}\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       | Referansınız: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       | İlgili Kişiniz: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"Aşağıdaki linkten sipariş onayınızı izleyebilir, indirebilir ve hatta "
+"çevrimiçi ödeme yapabilirsiniz:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+"             "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"Paypal ile doğrudan ödemeniz de olasıdır:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"Eğer bir sorunuz olursa bize danışmakta tereddüt etmeyin.\n"
+"\n"
+"\n"
+"Firmamız ${object.company_id.name} seçtiğiniz için teşekkür ederiz!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Telefon: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -1278,6 +1369,9 @@ msgid ""
 "create a task, purchase order or manufacturing order linked to this sale "
 "order line."
 msgstr ""
+"Eğer 'siparişte' ise, satış siparişi bir görev oluşturmak üzere onaylanırsa "
+"bir satınalmayı başlatır, satınalma siparişi ya da üretim emri bu satış "
+"siparişi öğesine bağlantılıdır."
 
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
@@ -1685,6 +1779,8 @@ msgid ""
 "output area and the customer is done through the Delivery Order manually or "
 "automatically."
 msgstr ""
+"Çıkış konumunun yapılandırmasına bağlı olarak, müşteri ile çıkış konumu "
+"arasındaki hareket Teslimat Emri yoluyla elle ya da otomatik olarak yapılır."
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -1742,6 +1838,8 @@ msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
+"Bu ürün ve miktarla eşleşen bir fiyat listesi bulunamadı.\n"
+"Hem ürünü hem de miktarı ya da fiyat listesini değiştirmelisiniz."
 
 #. module: sale
 #: help:sale.order,picking_ids:0
@@ -2096,7 +2194,7 @@ msgstr "İstek üzerine teslimat & fatura"
 msgid ""
 "One Procurement order for each sales order line and for each of the "
 "components."
-msgstr ""
+msgstr "Her satış siparişi öğesi ve her bileşen için bir Satınalma İşlemi."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
@@ -2217,7 +2315,7 @@ msgstr "Satış Siparişi İsteği"
 #: code:addons/sale/sale.py:1255
 #, python-format
 msgid "Not enough stock ! : "
-msgstr ""
+msgstr "Yeterli stok yok !: "
 
 #. module: sale
 #: report:sale.order:0 field:sale.order,payment_term:0
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index e0e7bbc086a..886bab6fdab 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1093,7 +1093,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index f8f1c71ec94..982941dc7fa 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1108,7 +1108,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 5b2e6724958..3ce545e9056 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1110,7 +1110,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "调拨出去或调拨给客户的单据"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po
index c8d4a2f28d0..241b0bf84f4 100644
--- a/addons/sale/i18n/zh_TW.po
+++ b/addons/sale/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: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1093,7 +1093,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/web_calendar/i18n/hu.po b/addons/web_calendar/i18n/hu.po
new file mode 100644
index 00000000000..f825870d50b
--- /dev/null
+++ b/addons/web_calendar/i18n/hu.po
@@ -0,0 +1,144 @@
+# Hungarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-09-06 08:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@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: 2012-09-07 05:05+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:11
+msgid "Calendar"
+msgstr "Naptár"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:70
+msgid "Filter"
+msgstr "Szűrő"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:144
+msgid "Today"
+msgstr "Ma"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:145
+msgid "Day"
+msgstr "Nap"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:146
+msgid "Week"
+msgstr "Hét"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:147
+msgid "Month"
+msgstr "Hó"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:148
+msgid "New event"
+msgstr "Új esemény"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:149
+msgid "Save"
+msgstr "Mentés"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:150
+msgid "Cancel"
+msgstr "Mégsem"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:151
+msgid "Details"
+msgstr "Részletek"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:152
+msgid "Edit"
+msgstr "Szerkesztés"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:153
+msgid "Delete"
+msgstr "Törlés"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:155
+msgid "Event will be deleted permanently, are you sure?"
+msgstr "Az esemény véglegesen törlődik, biztos benne?"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:156
+#: addons/web_calendar/static/src/js/calendar.js:169
+msgid "Description"
+msgstr "Leírás"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:157
+msgid "Time period"
+msgstr "Időintervallum"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:158
+msgid "Full day"
+msgstr "Egész nap"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:161
+msgid "Do you want to edit the whole set of repeated events?"
+msgstr "Az összes ismétlődő eseményt szerkeszteni akarja?"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:162
+msgid "Repeat event"
+msgstr "Esemény ismétlése"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:163
+msgid "Disabled"
+msgstr "Tiltva"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:164
+msgid "Enabled"
+msgstr "Engedélyezve"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:167
+#: addons/web_calendar/static/src/js/calendar.js:175
+msgid "Agenda"
+msgstr "Napirend"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:168
+msgid "Date"
+msgstr "Dátum"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:172
+msgid "Year"
+msgstr "Év"
+
+#. openerp-web
+#: addons/web_calendar/static/src/xml/web_calendar.xml:5
+#: addons/web_calendar/static/src/xml/web_calendar.xml:6
+msgid "&nbsp;"
+msgstr "&nbsp;"
+
+#~ msgid "Navigator"
+#~ msgstr "Navigátor"

From 6fe350a21b457503e83b63eabf5c4fd57132423b Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 7 Sep 2012 09:29:49 +0200
Subject: [PATCH 920/999] [FIX] crm kanban

bzr revid: al@openerp.com-20120907072949-vt87yih1mo1voazb
---
 addons/crm/crm_lead_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3546d641184..29299373d91 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -297,6 +297,7 @@
                     <field name="message_summary"/>
                     <field name="message_unread"/>
                     <templates>
+                        <field name="date_deadline"/>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">

From 59aac0beb4ca281790722269dcfa2b25b8477a41 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 7 Sep 2012 14:13:10 +0530
Subject: [PATCH 921/999] [IMP]:improved code

bzr revid: apa@tinyerp.com-20120907084310-nl68lqrpf7exzjls
---
 addons/hr_contract/hr_contract_view.xml               | 2 +-
 addons/hr_holidays/hr_holidays_view.xml               | 2 +-
 addons/hr_payroll/hr_payroll_view.xml                 | 2 +-
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 0c48abbebc0..92ae2524921 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -21,7 +21,7 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//div[@name='button_box']" position="inside">
-                        <button name="%(act_hr_employee_2_hr_contract)d" string="Contracts" type="action" class="oe_inline oe_right"/>
+                        <button name="%(act_hr_employee_2_hr_contract)d" string="Contracts" type="action"/>
                     </xpath>
                     <xpath expr="//field[@name='coach_id']" position="after">
                         <field name="manager"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 2e988192241..5a2e0603b88 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -522,7 +522,7 @@
                     </group>
                 </xpath>
                 <xpath expr="//div[@name='button_box']" position="inside">
-                    <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline oe_right"/>
+                    <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f485943d2e4..58484a91567 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -386,7 +386,7 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//div[@name='button_box']" position="inside">
-                        <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action" class="oe_inline oe_right"/>
+                        <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 31f9e073d23..6c4ee63cbe6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -350,7 +350,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_employee_extd_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='button_box']" position="inside">
-                    <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action" class="oe_inline oe_right"/>
+                    <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
                 </xpath>
             </field>
         </record>

From cbed185b6063914e3bb5f250cefa070edc3fb9ad Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 7 Sep 2012 14:17:36 +0530
Subject: [PATCH 922/999] [IMP]:indentation

bzr revid: apa@tinyerp.com-20120907084736-a5tctj9nnn8og1u5
---
 addons/portal_event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal_event/event_view.xml b/addons/portal_event/event_view.xml
index 656a2a97a54..675bddbc42e 100644
--- a/addons/portal_event/event_view.xml
+++ b/addons/portal_event/event_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//page[last()]" position="after">
                     <page string="Portal Settings">
-                       <group>
+                        <group>
                             <field name="visibility"/>
                         </group>
                     </page>

From 171533d8dc457c83d6593d20b6f5e84f741e56a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 7 Sep 2012 11:22:06 +0200
Subject: [PATCH 923/999] [IMP] res_partner: moved the avatar colorize part of
 the image code to tools/image.py, where it should have been placed at revs
 4373-4375.

bzr revid: tde@openerp.com-20120907092206-1pgbcvt8tn23m114
---
 openerp/addons/base/res/res_partner.py | 74 +++++++++++---------------
 openerp/addons/base/res/res_users.py   |  6 +--
 openerp/tools/image.py                 | 44 ++++++++++++---
 3 files changed, 69 insertions(+), 55 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 1609fa2a16f..c1f0b2f6b54 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -21,7 +21,6 @@
 
 import math
 import openerp
-import os
 from osv import osv, fields
 import re
 import tools
@@ -58,20 +57,20 @@ class res_partner_category(osv.osv):
             return super(res_partner_category, self).name_get(cr, uid, ids, context=context)
         if isinstance(ids, (int, long)):
             ids = [ids]
-        reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
+        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context=context)
         res = []
         for record in reads:
             name = record['name']
             if record['parent_id']:
-                name = record['parent_id'][1]+' / '+name
+                name = record['parent_id'][1] + ' / ' + name
             res.append((record['id'], name))
         return res
 
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
-            args=[]
+            args = []
         if not context:
-            context={}
+            context = {}
         if name:
             # Be sure name_search is symetric to name_get
             name = name.split(' / ')[-1]
@@ -85,23 +84,23 @@ class res_partner_category(osv.osv):
         res = self.name_get(cr, uid, ids, context=context)
         return dict(res)
 
-    _description='Partner Categories'
+    _description = 'Partner Categories'
     _name = 'res.partner.category'
     _columns = {
         'name': fields.char('Category Name', required=True, size=64, translate=True),
         'parent_id': fields.many2one('res.partner.category', 'Parent Category', select=True, ondelete='cascade'),
         'complete_name': fields.function(_name_get_fnc, type="char", string='Full Name'),
         'child_ids': fields.one2many('res.partner.category', 'parent_id', 'Child Categories'),
-        'active' : fields.boolean('Active', help="The active field allows you to hide the category without removing it."),
-        'parent_left' : fields.integer('Left parent', select=True),
-        'parent_right' : fields.integer('Right parent', select=True),
+        'active': fields.boolean('Active', help="The active field allows you to hide the category without removing it."),
+        'parent_left': fields.integer('Left parent', select=True),
+        'parent_right': fields.integer('Right parent', select=True),
         'partner_ids': fields.many2many('res.partner', id1='category_id', id2='partner_id', string='Partners'),
     }
     _constraints = [
         (osv.osv._check_recursion, 'Error ! You can not create recursive categories.', ['parent_id'])
     ]
     _defaults = {
-        'active' : lambda *a: 1,
+        'active': lambda *a: 1,
     }
     _parent_store = True
     _parent_order = 'name'
@@ -113,7 +112,7 @@ class res_partner_title(osv.osv):
     _columns = {
         'name': fields.char('Title', required=True, size=46, translate=True),
         'shortcut': fields.char('Abbreviation', size=16, translate=True),
-        'domain': fields.selection([('partner','Partner'),('contact','Contact')], 'Domain', required=True, size=24)
+        'domain': fields.selection([('partner', 'Partner'), ('contact', 'Contact')], 'Domain', required=True, size=24)
     }
     _defaults = {
         'domain': 'contact',
@@ -129,13 +128,13 @@ POSTAL_ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'countr
 ADDRESS_FIELDS = POSTAL_ADDRESS_FIELDS + ('email', 'phone', 'fax', 'mobile', 'website', 'ref', 'lang')
 
 class res_partner(osv.osv):
-    _description='Partner'
+    _description = 'Partner'
     _name = "res.partner"
 
     def _address_display(self, cr, uid, ids, name, args, context=None):
-        res={}
+        res = {}
         for partner in self.browse(cr, uid, ids, context=context):
-            res[partner.id] =self._display_address(cr, uid, partner, context=context)
+            res[partner.id] = self._display_address(cr, uid, partner, context=context)
         return res
 
     def _get_image(self, cr, uid, ids, name, args, context=None):
@@ -143,7 +142,7 @@ class res_partner(osv.osv):
         for obj in self.browse(cr, uid, ids, context=context):
             result[obj.id] = tools.image_get_resized_images(obj.image)
         return result
-    
+
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
 
@@ -151,7 +150,7 @@ class res_partner(osv.osv):
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
         'date': fields.date('Date', select=1),
-        'title': fields.many2one('res.partner.title','Title'),
+        'title': fields.many2one('res.partner.title', 'Title'),
         'parent_id': fields.many2one('res.partner', 'Owned by'),
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
         'ref': fields.char('Reference', size=64, select=1),
@@ -162,9 +161,9 @@ class res_partner(osv.osv):
                  "It is important to set a value for this field. You should use the same timezone "
                  "that is otherwise used to pick and render date and time values: your computer's timezone."),
         'user_id': fields.many2one('res.users', 'Salesperson', help='The internal user that is in charge of communicating with this partner if any.'),
-        'vat': fields.char('TIN',size=32 ,help="Tax Identification Number. Check the box if the partner is subjected to taxes. Used by the some of the legal statements."),
+        'vat': fields.char('TIN', size=32, help="Tax Identification Number. Check the box if the partner is subjected to taxes. Used by the some of the legal statements."),
         'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
-        'website': fields.char('Website',size=64, help="Website of Partner or Company"),
+        'website': fields.char('Website', size=64, help="Website of Partner or Company"),
         'comment': fields.text('Notes'),
         'address': fields.one2many('res.partner.address', 'partner_id', 'Contacts'),   # should be removed in version 7, but kept until then for backward compatibility
         'category_id': fields.many2many('res.partner.category', id1='partner_id', id2='category_id', string='Tags'),
@@ -175,8 +174,8 @@ class res_partner(osv.osv):
         'supplier': fields.boolean('Supplier', help="Check this box if the partner is a supplier. If it's not checked, purchase people will not see it when encoding a purchase order."),
         'employee': fields.boolean('Employee', help="Check this box if the partner is an Employee."),
         'function': fields.char('Job Position', size=128),
-        'type': fields.selection( [('default','Default'), ('invoice','Invoice'),
-                                   ('delivery','Delivery'), ('contact','Contact'),
+        'type': fields.selection([('default', 'Default'), ('invoice', 'Invoice'),
+                                   ('delivery', 'Delivery'), ('contact', 'Contact'),
                                    ('other', 'Other')], 'Address Type',
             help="Used to select automatically the right address according to the context in sales and purchases documents."),
         'street': fields.char('Street', size=128),
@@ -193,13 +192,12 @@ class res_partner(osv.osv):
         'birthdate': fields.char('Birthdate', size=64),
         'is_company': fields.boolean('Company', help="Check if the contact is a company, otherwise it is a person"),
         'use_parent_address': fields.boolean('Use Company Address', help="Select this if you want to set company's address information  for this contact"),
+        # image: all image fields are base64 encoded and PIL-supported
         'image': fields.binary("Image",
-            help="This field holds the image used as avatar for the "\
-                 "partner. The image is base64 encoded, and PIL-supported. "\
-                 "It is limited to a 1024x1024 px image."),
+            help="This field holds the image used as avatar for the partner, limited to 1024x1024px"),
         'image_medium': fields.function(_get_image, fnct_inv=_set_image,
             string="Medium-sized image", type="binary", multi="_get_image",
-            store = {
+            store={
                 'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized image of the partner. It is automatically "\
@@ -207,7 +205,7 @@ class res_partner(osv.osv):
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Small-sized image", type="binary", multi="_get_image",
-            store = {
+            store={
                 'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized image of the partner. It is automatically "\
@@ -230,40 +228,28 @@ class res_partner(osv.osv):
         if is_company:
             image = open(openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')).read()
         else:
-            from PIL import Image
-            from StringIO import StringIO
-            color = (255,255,255)
-            if colorize:
-                from random import random
-                color = (int(random() * 192 + 32), int(random() * 192 + 32), int(random() * 192 + 32))
-            face = Image.open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png'))
-            avatar = Image.new('RGB', face.size)
-            avatar.paste(color)
-            avatar.paste(face, mask=face)
-            buffer = StringIO()
-            avatar.save(buffer, 'PNG')
-            image = buffer.getvalue()
-        return image.encode('base64')
+            image = tools.image_colorize(open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png')).read())
+        return tools.image_resize_image_big(image.encode('base64'))
 
     _defaults = {
         'active': True,
-        'lang': lambda self, cr, uid, context: context.get('lang', 'en_US'),
-        'tz': lambda self, cr, uid, context: context.get('tz', False),
+        'lang': lambda self, cr, uid, ctx: ctx.get('lang', 'en_US'),
+        'tz': lambda self, cr, uid, ctx: ctx.get('tz', False),
         'customer': True,
         'category_id': _default_category,
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c),
+        'company_id': lambda self, cr, uid, ctx: self.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=ctx),
         'color': 0,
         'is_company': False,
         'type': 'default',
         'use_parent_address': True,
-        'image': lambda self, cr, uid, context: self._get_default_image(cr, uid, context.get('default_is_company', False), context),
+        'image': lambda self, cr, uid, ctx: self._get_default_image(cr, uid, ctx.get('default_is_company', False), ctx),
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
         name = self.read(cr, uid, [id], ['name'], context)[0]['name']
-        default.update({'name': _('%s (copy)')%(name)})
+        default.update({'name': _('%s (copy)') % (name)})
         return super(res_partner, self).copy(cr, uid, id, default, context)
 
     def onchange_type(self, cr, uid, ids, is_company, context=None):
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index d0f07daa004..5e1ea88f5ac 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -244,14 +244,14 @@ class res_users(osv.osv):
         return result
 
     _defaults = {
-        'password' : '',
-        'active' : True,
+        'password': '',
+        'active': True,
         'customer': False,
         'menu_id': _get_menu,
         'company_id': _get_company,
         'company_ids': _get_companies,
         'groups_id': _get_group,
-        'image': lambda self, cr, uid, context: self.pool.get('res.partner')._get_default_image(cr, uid, False, context, colorize=True),
+        'image': lambda self, cr, uid, ctx={}: self.pool.get('res.partner')._get_default_image(cr, uid, False, ctx, colorize=True),
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/openerp/tools/image.py b/openerp/tools/image.py
index 8f018f22ab8..fa65296b4ed 100644
--- a/openerp/tools/image.py
+++ b/openerp/tools/image.py
@@ -20,9 +20,11 @@
 ##############################################################################
 
 import io
+import StringIO
+
 from PIL import Image
 from PIL import ImageFilter
-import StringIO
+from random import random
 
 # ----------------------------------------
 # Image resizing
@@ -48,7 +50,7 @@ def image_resize_image(base64_source, size=(1024, 1024), encoding='base64', file
           image.
         - past the thumbnail on the transparent background and center
           it.
-        
+
         :param base64_source: base64-encoded version of the source
             image
         :param size: tuple(height, width)
@@ -93,7 +95,7 @@ def image_resize_image_medium(base64_source, size=(180, 180), encoding='base64',
     if not base64_source:
         return False
     return image_resize_image(base64_source, size, encoding, filetype)
-    
+
 def image_resize_image_small(base64_source, size=(50, 50), encoding='base64', filetype='PNG'):
     """ Wrapper on image_resize_image, to resize to the standard 'small' image
         size: 50x50.
@@ -104,6 +106,29 @@ def image_resize_image_small(base64_source, size=(50, 50), encoding='base64', fi
         return False
     return image_resize_image(base64_source, size, encoding, filetype)
 
+# ----------------------------------------
+# Colors
+# ---------------------------------------
+
+def image_colorize(original, randomize=True, color=(255, 255, 255)):
+    """ Add a color to the transparent background of an image.
+        :param original: file object on the original image file
+        :param randomize: randomize the background color
+        :param color: background-color, if not randomize
+    """
+    # create a new image, based on the original one
+    original = Image.open(io.BytesIO(original))
+    image = Image.new('RGB', original.size)
+    # generate the background color, past it as background
+    if randomize:
+        color = (int(random() * 192 + 32), int(random() * 192 + 32), int(random() * 192 + 32))
+    image.paste(color)
+    image.paste(original, mask=original)
+    # return the new image
+    buffer = StringIO.StringIO()
+    image.save(buffer, 'PNG')
+    return buffer.getvalue()
+
 # ----------------------------------------
 # Misc image tools
 # ---------------------------------------
@@ -118,7 +143,7 @@ def image_get_resized_images(base64_source, return_big=False, return_medium=True
         Default parameters are given to be used for the getter of functional
         image fields,  for example with res.users or res.partner. It returns
         only image_medium and image_small values, to update those fields.
-        
+
         :param base64_source: if set to False, other values are set to False
             also. The purpose is to be linked to the fields that hold images in
             OpenERP and that are binary fields.
@@ -135,7 +160,10 @@ def image_get_resized_images(base64_source, return_big=False, return_medium=True
             previous parameters.
     """
     return_dict = dict()
-    if return_big: return_dict[big_name] = image_resize_image_big(base64_source)
-    if return_medium: return_dict[medium_name] = image_resize_image_medium(base64_source)
-    if return_small: return_dict[small_name] = image_resize_image_small(base64_source)
-    return return_dict
\ No newline at end of file
+    if return_big:
+        return_dict[big_name] = image_resize_image_big(base64_source)
+    if return_medium:
+        return_dict[medium_name] = image_resize_image_medium(base64_source)
+    if return_small:
+        return_dict[small_name] = image_resize_image_small(base64_source)
+    return return_dict

From b086b8a5843dca5c151f1ec8a152b4978483afe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 7 Sep 2012 11:23:33 +0200
Subject: [PATCH 924/999] [CLEAN] mail_group, product, point_of_sale, hr:
 cleaned help of image, because it was too technical-related. Added a comment
 in code instead about PIL and base64. By the way, small cleaning of the white
 spaces.

bzr revid: tde@openerp.com-20120907092333-9f745210yr3p22ay
---
 addons/hr/hr.py                       |  5 ++---
 addons/mail/mail_group.py             |  9 ++++-----
 addons/point_of_sale/point_of_sale.py | 14 ++++++--------
 addons/product/product.py             |  9 ++++-----
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 3c307b9fee8..239c6777e69 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -180,10 +180,9 @@ class hr_employee(osv.osv):
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True),
         'coach_id': fields.many2one('hr.employee', 'Coach'),
         'job_id': fields.many2one('hr.job', 'Job'),
+        # image: all image fields are base64 encoded and PIL-supported
         'image': fields.binary("Photo",
-            help="This field holds the image used as a photo for the "\
-                 "employee. The image is base64 encoded, and PIL-supported. "\
-                 "It is limited to a 1024x1024 px image."),
+            help="This field holds the image used as photo for the employee, limited to 1024x1024px."),
         'image_medium': fields.function(_get_image, fnct_inv=_set_image,
             string="Medium-sized photo", type="binary", multi="_get_image",
             store = {
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index fdfeafd4afe..28e62c3b374 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -56,13 +56,12 @@ class mail_group(osv.Model):
             help="Members of those groups will automatically added as followers. "\
                  "Note that they will be able to manage their subscription manually "\
                  "if necessary."),
+        # image: all image fields are base64 encoded and PIL-supported
         'image': fields.binary("Photo",
-            help="This field holds the image used as photo for the "\
-                 "user. The image is base64 encoded, and PIL-supported. "\
-                 "It is limited to a 1024x1024 px image."),
+            help="This field holds the image used as photo for the group, limited to 1024x1024px."),
         'image_medium': fields.function(_get_image, fnct_inv=_set_image,
             string="Medium-sized photo", type="binary", multi="_get_image",
-            store = {
+            store={
                 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized photo of the group. It is automatically "\
@@ -70,7 +69,7 @@ class mail_group(osv.Model):
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Small-sized photo", type="binary", multi="_get_image",
-            store = {
+            store={
                 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized photo of the group. It is automatically "\
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 2d6d8b92da1..65abde1f617 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1211,17 +1211,15 @@ class pos_category(osv.osv):
         'child_id': fields.one2many('pos.category', 'parent_id', string='Children Categories'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."),
         
-        # NOTE:  there is no 'default image', because by default we don't show thumbnails for categories. However if we have a thumbnail
+        # NOTE: there is no 'default image', because by default we don't show thumbnails for categories. However if we have a thumbnail
         # for at least one category, then we display a default image on the other, so that the buttons have consistent styling.
-        # In this case, the default image is set by the js code. 
-
+        # In this case, the default image is set by the js code.
+        # NOTE2: image: all image fields are base64 encoded and PIL-supported
         'image': fields.binary("Image",
-            help="This field holds the image used for the category. "\
-                 "The image is base64 encoded, and PIL-supported. "\
-                 "It is limited to a 1024x1024 px image."),
+            help="This field holds the image used as image for the cateogry, limited to 1024x1024px."),
         'image_medium': fields.function(_get_image, fnct_inv=_set_image,
             string="Medium-sized image", type="binary", multi="_get_image",
-            store = {
+            store={
                 'pos.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized image of the category. It is automatically "\
@@ -1229,7 +1227,7 @@ class pos_category(osv.osv):
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Smal-sized image", type="binary", multi="_get_image",
-            store = {
+            store={
                 'pos.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized image of the category. It is automatically "\
diff --git a/addons/product/product.py b/addons/product/product.py
index 16b08e67cee..5ee37c5db64 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -548,13 +548,12 @@ class product_product(osv.osv):
         'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
         'name_template': fields.related('product_tmpl_id', 'name', string="Name", type='char', size=128, store=True, select=True),
         'color': fields.integer('Color Index'),
+        # image: all image fields are base64 encoded and PIL-supported
         'image': fields.binary("Image",
-            help="This field holds the image used for the product. "\
-                 "The image is base64 encoded, and PIL-supported. "\
-                 "It is limited to a 1024x1024 px image."),
+            help="This field holds the image used as image for the product, limited to 1024x1024px."),
         'image_medium': fields.function(_get_image, fnct_inv=_set_image,
             string="Medium-sized image", type="binary", multi="_get_image",
-            store = {
+            store={
                 'product.product': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized image of the product. It is automatically "\
@@ -562,7 +561,7 @@ class product_product(osv.osv):
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Small-sized image", type="binary", multi="_get_image",
-            store = {
+            store={
                 'product.product': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized image of the product. It is automatically "\

From 8c8e128d2193027facc881d3135c02d6fcda99b7 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 7 Sep 2012 11:33:37 +0200
Subject: [PATCH 925/999] [FIX] orm: fix wrong method name

bzr revid: rco@openerp.com-20120907093337-jvg72kp572dj110z
---
 openerp/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index a6233a8bb46..889230759d2 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -5058,7 +5058,7 @@ class BaseModel(object):
         return result
 
     # for backward compatibility
-    def resolve_2many_commands(self, cr, uid, field_name, o2m_commands, fields=None, context=None):
+    def resolve_o2m_commands_to_record_dicts(self, cr, uid, field_name, o2m_commands, fields=None, context=None):
         return self.resolve_2many_commands(cr, uid, field_name, o2m_commands, fields, context)
 
 # keep this import here, at top it will cause dependency cycle errors

From 329b7cdcfee6052e2060fff010a2e3157e6ff049 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 7 Sep 2012 11:36:43 +0200
Subject: [PATCH 926/999] [FIX] res_company: fix method _get_rml_footer_by_line
 when rml_footer is empty

bzr revid: rco@openerp.com-20120907093643-wec8s0wvmvc68rj4
---
 openerp/addons/base/res/res_company.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index a51f37af1f4..7e6f3f0093a 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -168,8 +168,8 @@ class res_company(osv.osv):
         return {'value': {'rml_footer': res, 'rml_footer_readonly': res}}
 
     def _get_rml_footer_by_line(self, cr, uid, ids, rml_footer, line, context=None):
-        rml_footer_lines = rml_footer.split('\n')
-        return rml_footer_lines[line] if line < len(rml_footer_lines) else ""
+        rml_footer_lines = (rml_footer or '').split('\n')
+        return rml_footer_lines[line] if line < len(rml_footer_lines) else ''
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False, access_rights_uid=None):

From 02c14543daaa2f1b4b5bd39f783d56c6cc99bf6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 7 Sep 2012 11:49:57 +0200
Subject: [PATCH 927/999] [IMP] tools: image: added the option to choose
 whether to upsize or not images when resizing them. Also cleaned a bit the
 comments and overall code. small and medium images are nos 64x64 ans 128x128,
 to be closer to iamge sized used through OpenERP.

bzr revid: tde@openerp.com-20120907094957-clozwgu5qd3jh42h
---
 openerp/addons/base/res/res_partner.py |  4 +-
 openerp/tools/image.py                 | 59 +++++++++++---------------
 2 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index c1f0b2f6b54..906f4b2b6c6 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -201,7 +201,7 @@ class res_partner(osv.osv):
                 'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized image of the partner. It is automatically "\
-                 "resized as a 180x180 px image, with aspect ratio preserved. "\
+                 "resized as a 128x128px image, with aspect ratio preserved. "\
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Small-sized image", type="binary", multi="_get_image",
@@ -209,7 +209,7 @@ class res_partner(osv.osv):
                 'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized image of the partner. It is automatically "\
-                 "resized as a 50x50 px image, with aspect ratio preserved. "\
+                 "resized as a 64x64px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
         'company_id': fields.many2one('res.company', 'Company', select=1),
         'color': fields.integer('Color Index'),
diff --git a/openerp/tools/image.py b/openerp/tools/image.py
index fa65296b4ed..f673906f328 100644
--- a/openerp/tools/image.py
+++ b/openerp/tools/image.py
@@ -52,13 +52,15 @@ def image_resize_image(base64_source, size=(1024, 1024), encoding='base64', file
           it.
 
         :param base64_source: base64-encoded version of the source
-            image
+            image; if False, returns False
         :param size: tuple(height, width)
         :param encoding: the output encoding
         :param filetype: the output filetype
         :param avoid_if_small: do not resize if image height and width
             are smaller than the expected size.
     """
+    if not base64_source:
+        return False
     image_stream = io.BytesIO(base64_source.decode(encoding))
     image = Image.open(image_stream)
     # check image size: do not create a thumbnail if avoiding smaller images
@@ -76,35 +78,26 @@ def image_resize_image(base64_source, size=(1024, 1024), encoding='base64', file
     background.save(background_stream, filetype)
     return background_stream.getvalue().encode(encoding)
 
-def image_resize_image_big(base64_source, size=(1204, 1204), encoding='base64', filetype='PNG'):
+def image_resize_image_big(base64_source, size=(1204, 1204), encoding='base64', filetype='PNG', avoid_if_small=True):
     """ Wrapper on image_resize_image, to resize images larger than the standard
         'big' image size: 1024x1024px.
-        :param base64_source: base64 encoded source image. If False,
-            the function returns False.
+        :param size, encoding, filetype, avoid_if_small: refer to image_resize_image
     """
-    if not base64_source:
-        return False
-    return image_resize_image(base64_source, size, encoding, filetype, True)
+    return image_resize_image(base64_source, size, encoding, filetype, avoid_if_small)
 
-def image_resize_image_medium(base64_source, size=(180, 180), encoding='base64', filetype='PNG'):
+def image_resize_image_medium(base64_source, size=(128, 128), encoding='base64', filetype='PNG', avoid_if_small=False):
     """ Wrapper on image_resize_image, to resize to the standard 'medium'
         image size: 180x180.
-        :param base64_source: base64 encoded source image. If False,
-            the function returns False.
+        :param size, encoding, filetype, avoid_if_small: refer to image_resize_image
     """
-    if not base64_source:
-        return False
-    return image_resize_image(base64_source, size, encoding, filetype)
+    return image_resize_image(base64_source, size, encoding, filetype, avoid_if_small)
 
-def image_resize_image_small(base64_source, size=(50, 50), encoding='base64', filetype='PNG'):
+def image_resize_image_small(base64_source, size=(64, 64), encoding='base64', filetype='PNG', avoid_if_small=False):
     """ Wrapper on image_resize_image, to resize to the standard 'small' image
         size: 50x50.
-        :param base64_source: base64 encoded source image. If False,
-            the function returns False.
+        :param size, encoding, filetype, avoid_if_small: refer to image_resize_image
     """
-    if not base64_source:
-        return False
-    return image_resize_image(base64_source, size, encoding, filetype)
+    return image_resize_image(base64_source, size, encoding, filetype, avoid_if_small)
 
 # ----------------------------------------
 # Colors
@@ -134,7 +127,8 @@ def image_colorize(original, randomize=True, color=(255, 255, 255)):
 # ---------------------------------------
 
 def image_get_resized_images(base64_source, return_big=False, return_medium=True, return_small=True,
-    big_name='image', medium_name='image_medium', small_name='image_small'):
+    big_name='image', medium_name='image_medium', small_name='image_small',
+    avoid_resize_big=True, avoid_resize_medium=False, avoid_resize_small=False):
     """ Standard tool function that returns a dictionary containing the
         big, medium and small versions of the source image. This function
         is meant to be used for the methods of functional fields for
@@ -144,26 +138,21 @@ def image_get_resized_images(base64_source, return_big=False, return_medium=True
         image fields,  for example with res.users or res.partner. It returns
         only image_medium and image_small values, to update those fields.
 
-        :param base64_source: if set to False, other values are set to False
-            also. The purpose is to be linked to the fields that hold images in
-            OpenERP and that are binary fields.
-        :param return_big: if set, return_dict contains the 'big_name' entry
-        :param return_medium: if set, return_dict contains the 'medium_name' entry
-        :param return_small: if set, return_dict contains the 'small_name' entry
-        :param big_name: name related to the big version of the image;
-            'image' by default.
-        :param medium_name: name related to the medium version of the
-            image; 'image_medium' by default.
-        :param small_name: name related to the small version of the
-            image; 'image_small' by default.
+        :param base64_source: base64-encoded version of the source
+            image; if False, all returnes values will be False
+        :param return_{..}: if set, computes and return the related resizing
+            of the image
+        :param {..}_name: key of the resized image in the return dictionary;
+            'image', 'image_medium' and 'image_small' by default.
+        :param avoid_resize_[..]: see avoid_if_small parameter
         :return return_dict: dictionary with resized images, depending on
             previous parameters.
     """
     return_dict = dict()
     if return_big:
-        return_dict[big_name] = image_resize_image_big(base64_source)
+        return_dict[big_name] = image_resize_image_big(base64_source, avoid_if_small=avoid_resize_big)
     if return_medium:
-        return_dict[medium_name] = image_resize_image_medium(base64_source)
+        return_dict[medium_name] = image_resize_image_medium(base64_source, avoid_if_small=avoid_resize_medium)
     if return_small:
-        return_dict[small_name] = image_resize_image_small(base64_source)
+        return_dict[small_name] = image_resize_image_small(base64_source, avoid_if_small=avoid_resize_small)
     return return_dict

From 3982e5ba7ac15c7bc5848f1a982c05b800be440c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 7 Sep 2012 11:51:55 +0200
Subject: [PATCH 928/999] [IMP] mail_group, point of sale, hr: updated image
 fields help, as small and medium sizes are now 64x64 ans 128x128, to match
 more closely OpenERP image sizes. product: image_medium are not up-sized when
 resizing them. This means that images smaller than 128x128 won't be resized
 in image_medium. The purpose is to avoid having unwanted blank frame around
 images in POS.

bzr revid: tde@openerp.com-20120907095155-i5hlmidnkq7r2r7b
---
 addons/hr/hr.py                       | 4 ++--
 addons/mail/mail_group.py             | 4 ++--
 addons/point_of_sale/point_of_sale.py | 4 ++--
 addons/product/product.py             | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 239c6777e69..271b2e5e9c5 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -189,7 +189,7 @@ class hr_employee(osv.osv):
                 'hr.employee': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized photo of the employee. It is automatically "\
-                 "resized as a 180x180 px image, with aspect ratio preserved. "\
+                 "resized as a 128x128px image, with aspect ratio preserved. "\
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Smal-sized photo", type="binary", multi="_get_image",
@@ -197,7 +197,7 @@ class hr_employee(osv.osv):
                 'hr.employee': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized photo of the employee. It is automatically "\
-                 "resized as a 50x50 px image, with aspect ratio preserved. "\
+                 "resized as a 64x64px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
         'passport_id':fields.char('Passport No', size=64),
         'color': fields.integer('Color Index'),
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 28e62c3b374..175ce650f06 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -65,7 +65,7 @@ class mail_group(osv.Model):
                 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized photo of the group. It is automatically "\
-                 "resized as a 180x180px image, with aspect ratio preserved. "\
+                 "resized as a 128x128px image, with aspect ratio preserved. "\
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Small-sized photo", type="binary", multi="_get_image",
@@ -73,7 +73,7 @@ class mail_group(osv.Model):
                 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized photo of the group. It is automatically "\
-                 "resized as a 50x50px image, with aspect ratio preserved. "\
+                 "resized as a 64x64px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
             help="The email address associated with this group. New emails received will automatically "
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 65abde1f617..df0dd74b4ae 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1223,7 +1223,7 @@ class pos_category(osv.osv):
                 'pos.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized image of the category. It is automatically "\
-                 "resized as a 180x180 px image, with aspect ratio preserved. "\
+                 "resized as a 128x128px image, with aspect ratio preserved. "\
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Smal-sized image", type="binary", multi="_get_image",
@@ -1231,7 +1231,7 @@ class pos_category(osv.osv):
                 'pos.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized image of the category. It is automatically "\
-                 "resized as a 50x50 px image, with aspect ratio preserved. "\
+                 "resized as a 64x64px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
     }
 
diff --git a/addons/product/product.py b/addons/product/product.py
index 5ee37c5db64..c9345a22103 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -509,7 +509,7 @@ class product_product(osv.osv):
     def _get_image(self, cr, uid, ids, name, args, context=None):
         result = dict.fromkeys(ids, False)
         for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = tools.image_get_resized_images(obj.image)
+            result[obj.id] = tools.image_get_resized_images(obj.image, avoid_resize_medium=True)
         return result
     
     def _set_image(self, cr, uid, id, name, value, args, context=None):
@@ -557,15 +557,15 @@ class product_product(osv.osv):
                 'product.product': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized image of the product. It is automatically "\
-                 "resized as a 180x180 px image, with aspect ratio preserved. "\
-                 "Use this field in form views or some kanban views."),
+                 "resized as a 128x128px image, with aspect ratio preserved, "\
+                 "only when the image exceeds one of those sizes. Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Small-sized image", type="binary", multi="_get_image",
             store={
                 'product.product': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized image of the product. It is automatically "\
-                 "resized as a 50x50 px image, with aspect ratio preserved. "\
+                 "resized as a 64x64px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
         'seller_info_id': fields.function(_calc_seller, type='many2one', relation="product.supplierinfo", multi="seller_info"),
         'seller_delay': fields.function(_calc_seller, type='integer', string='Supplier Lead Time', multi="seller_info", help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),

From 2716c0e06364ff6333e8493ede859ecee2172947 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 7 Sep 2012 12:00:30 +0200
Subject: [PATCH 929/999] [IMP] company rml template: add greyed 'produced by
 OpenERP' in the left margin

bzr revid: rco@openerp.com-20120907100030-1ss6k27t7vrncntb
---
 openerp/addons/base/res/res_company.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 7e6f3f0093a..60fa72eff54 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -300,11 +300,10 @@ class res_company(osv.osv):
             <setFont name="DejaVu Sans" size="8"/>
             <fill color="black"/>
             <stroke color="black"/>
+
+            <!-- page header -->
             <lines>1.3cm %s 20cm %s</lines>
-
             <drawRightString x="20cm" y="%s">[[ company.rml_header1 ]]</drawRightString>
-
-
             <drawString x="1.3cm" y="%s">[[ company.partner_id.name ]]</drawString>
             <drawString x="1.3cm" y="%s">[[ company.partner_id.street or  '' ]]</drawString>
             <drawString x="1.3cm" y="%s">[[ company.partner_id.city or '' ]] - [[ company.partner_id.country_id and company.partner_id.country_id.name  or '']]</drawString>
@@ -314,8 +313,14 @@ class res_company(osv.osv):
             <drawRightString x="7cm" y="%s">[[ company.partner_id.email or '' ]]</drawRightString>
             <lines>1.3cm %s 7cm %s</lines>
 
-            <!--page bottom-->
+            <!-- left margin -->
+            <rotate degrees="90"/>
+            <fill color="grey"/>
+            <drawCentredString x="14cm" y="-0.7cm">produced by OpenERP - www.openerp.com</drawCentredString>
+            <fill color="black"/>
+            <rotate degrees="-90"/>
 
+            <!--page bottom-->
             <lines>1.2cm 2.65cm 19.9cm 2.65cm</lines>
             <drawCentredString x="10.5cm" y="2.3cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=0) ]]</drawCentredString>
             <drawCentredString x="10.5cm" y="1.8cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=1) ]]</drawCentredString>

From 1a6aaed52abf583440b44adee3b7391b42b13d7f Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 7 Sep 2012 12:17:07 +0200
Subject: [PATCH 930/999] [IMP] res_company: make report flag on bank accounts
 visible only from the company form

bzr revid: rco@openerp.com-20120907101707-f2jiszy90yojbihf
---
 openerp/addons/base/res/res_bank_view.xml    | 5 +++--
 openerp/addons/base/res/res_company_view.xml | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml
index 0c88ceeff7c..2b4a1f3e562 100644
--- a/openerp/addons/base/res/res_bank_view.xml
+++ b/openerp/addons/base/res/res_bank_view.xml
@@ -91,8 +91,9 @@
                     <group col="4">
                         <field name="state"/>
                         <field name="acc_number"/>
-                        <field name="company_id" on_change="onchange_company_id(company_id)" invisible="context.get('company_hide', True)" widget="selection"/>
-                        <field name="footer" attrs="{'invisible': [('company_id','=',False)]}"/>
+                        <field name="company_id" on_change="onchange_company_id(company_id)"
+                            invisible="context.get('company_hide', True)" widget="selection"/>
+                        <field name="footer" invisible="context.get('footer_hide', True)"/>
                     </group>
                     <group>
                         <group name="owner" string="Bank Account Owner">
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 556ab4511f3..1833036add3 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -66,7 +66,8 @@
                                 </group>
                             </group>
                             <group string="Bank Accounts">
-                                <field name="bank_ids" nolabel="1" context="{'default_company_id': active_id}"
+                                <field name="bank_ids" nolabel="1"
+                                    context="{'default_company_id': active_id, 'footer_hide': False}"
                                     on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
                             </group>
                             <group string="Report Footer Configuration">

From 3b3279c77e2b656422d55216429439bd1de15b3b Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 7 Sep 2012 12:44:48 +0200
Subject: [PATCH 931/999] [FIX] orm: adapt tests of method
 resolve_2many_commands

bzr revid: rco@openerp.com-20120907104448-9b9aeenmqz5m5du2
---
 openerp/tests/test_orm.py | 40 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/openerp/tests/test_orm.py b/openerp/tests/test_orm.py
index 8c7043a5ff0..f04b9d77747 100644
--- a/openerp/tests/test_orm.py
+++ b/openerp/tests/test_orm.py
@@ -93,6 +93,23 @@ class TestO2MSerialization(common.TransactionCase):
             {'id': id_baz, 'name': 'quux', 'city': 'tag'}
         ])
 
+    def test_DELETE_command(self):
+        " deleted records are not returned at all. "
+        ids = [
+            self.partner.create(self.cr, UID, {'name': 'foo'}),
+            self.partner.create(self.cr, UID, {'name': 'bar'}),
+            self.partner.create(self.cr, UID, {'name': 'baz'})
+        ]
+        commands = [DELETE(ids[0]), DELETE(ids[1]), DELETE(ids[2])]
+
+        results = self.partner.resolve_2many_commands(
+            self.cr, UID, 'address', commands, ['name'])
+
+        self.assertEqual(results, [
+            {'id': ids[0], 'name': 'foo'},
+            {'id': ids[2], 'name': 'baz'}
+        ])
+
     def test_mixed_commands(self):
         ids = [
             self.partner.create(self.cr, UID, {'name': name})
@@ -104,7 +121,7 @@ class TestO2MSerialization(common.TransactionCase):
                 CREATE({'name': 'foo'}),
                 UPDATE(ids[0], {'name': 'bar'}),
                 LINK_TO(ids[1]),
-                LINK_TO(ids[2]),
+                DELETE(ids[2]),
                 UPDATE(ids[3], {'name': 'quux',}),
                 UPDATE(ids[4], {'name': 'corge'}),
                 CREATE({'name': 'grault'}),
@@ -115,7 +132,6 @@ class TestO2MSerialization(common.TransactionCase):
             {'name': 'foo'},
             {'id': ids[0], 'name': 'bar'},
             {'id': ids[1], 'name': 'baz'},
-            {'id': ids[2], 'name': 'qux'},
             {'id': ids[3], 'name': 'quux'},
             {'id': ids[4], 'name': 'corge'},
             {'name': 'grault'},
@@ -150,24 +166,4 @@ class TestO2MSerialization(common.TransactionCase):
             # 5 should fail with an assert error, but not e.g. a ValueError
             pass
 
-    def test_invalid_commands(self):
-        "Commands with uncertain semantics in this context should be forbidden"
-
-        with self.assertRaises(AssertionError):
-            self.partner.resolve_2many_commands(
-                self.cr, UID, 'address', [DELETE(42)], ['name'])
-
-        with self.assertRaises(AssertionError):
-            self.partner.resolve_2many_commands(
-                self.cr, UID, 'address', [FORGET(42)], ['name'])
-
-        with self.assertRaises(AssertionError):
-            self.partner.resolve_2many_commands(
-                self.cr, UID, 'address', [DELETE_ALL()], ['name'])
-
-        with self.assertRaises(AssertionError):
-            self.partner.resolve_2many_commands(
-                self.cr, UID, 'address', [REPLACE_WITH([42])], ['name'])
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 60bbe365ec6e3fe47bd807404ee2bd336eec8331 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 7 Sep 2012 16:57:45 +0530
Subject: [PATCH 932/999] [IMP]:typo

bzr revid: apa@tinyerp.com-20120907112745-w5usrzo3lrtqeglv
---
 addons/hr/hr_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 565ca4e4a79..00ed2afbef2 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -56,7 +56,7 @@
                             </page>
                             <page string="Personal Information" groups="base.group_hr_user">
                                 <group>
-                                    <group string="Citizenship &amp; other info">
+                                    <group string="Citizenship &amp; Other Info">
                                         <field name="country_id" options='{"no_open": true}'/>
                                         <field name="identification_id" groups="base.group_hr_user"/>
                                         <field name="passport_id" groups="base.group_hr_user"/>

From 2698e6dd276279903ea00a5b85afafb646d4a360 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 7 Sep 2012 13:51:20 +0200
Subject: [PATCH 933/999] [IMP] hr_attendance: Changed style of sign in/sign
 out

bzr revid: nicolas.vanhoren@openerp.com-20120907115120-dg8xn97oh9pek7k5
---
 addons/hr_attendance/static/src/css/slider.css    |  6 +++---
 addons/hr_attendance/static/src/js/attendance.js  | 15 +++++++++------
 .../hr_attendance/static/src/xml/attendance.xml   |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/addons/hr_attendance/static/src/css/slider.css b/addons/hr_attendance/static/src/css/slider.css
index 9e0252156b2..0fde21dc727 100644
--- a/addons/hr_attendance/static/src/css/slider.css
+++ b/addons/hr_attendance/static/src/css/slider.css
@@ -1,7 +1,7 @@
 
 .openerp .oe_attendance_status {
     height: 32px;
-    width: 32px;
+    width: 64px;
     display: inline-block;
 }
 .openerp .oe_attendance_signin {
@@ -12,7 +12,7 @@
     cursor: pointer;
 }
 .openerp .oe_attendance_status.oe_attendance_signed .oe_attendance_signin {
-    display: none;
+    background: url(/hr_attendance/static/src/img/emp-in-disable32.png);
 }
 
 .openerp .oe_attendance_signout {
@@ -23,5 +23,5 @@
     cursor: pointer;
 }
 .openerp .oe_attendance_status.oe_attendance_nosigned .oe_attendance_signout {
-    display: none;
+    background: url(/hr_attendance/static/src/img/emp-out-disable32.png);
 }
diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index f6a4c15268a..f05cef2e001 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -4,11 +4,6 @@ openerp.hr_attendance = function (instance) {
     var QWeb = instance.web.qweb;
     var _t = instance.web._t;
     var _lt = instance.web._lt;
-    
-    var tips = {
-        "true": _lt("You are currently signed in. Click here to sign out."),
-        "false": _lt("You are currently signed out. Click here to sign in."),
-    }
 
     instance.hr_attendance.AttendanceSlider = instance.web.Widget.extend({
         template: 'AttendanceSlider',
@@ -21,7 +16,6 @@ openerp.hr_attendance = function (instance) {
             var tmp = function() {
                 this.$el.toggleClass("oe_attendance_nosigned", ! this.get("signed_in"));
                 this.$el.toggleClass("oe_attendance_signed", this.get("signed_in"));
-                this.$el.attr("title", tips["" + this.get("signed_in")].toString());
             };
             this.on("change:signed_in", this, tmp);
             _.bind(tmp, this)();
@@ -31,6 +25,15 @@ openerp.hr_attendance = function (instance) {
             this.$(".oe_attendance_signout").click(function() {
                 self.do_update_attendance();
             });
+            this.$el.tipsy({
+                title: function() {
+                    if (self.get("signed_in")) {
+                        return _t("You are currently signed in. Click here to sign out.");
+                    } else {
+                        return _t("You are currently signed out. Click here to sign in.");
+                    }
+                }
+            });
             return this.check_attendance();
         },
         do_update_attendance: function () {
diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml
index 6896086440f..3fd9bcf2798 100644
--- a/addons/hr_attendance/static/src/xml/attendance.xml
+++ b/addons/hr_attendance/static/src/xml/attendance.xml
@@ -1,6 +1,6 @@
 <template>
     <t t-name="AttendanceSlider">
-        <div class="oe_attendance_status oe_attendance_nosigned" title=" ">
+        <div class="oe_attendance_status oe_attendance_nosigned" data-tipsy="true">
              <div class="oe_attendance_signin"></div>
              <div class="oe_attendance_signout"></div>
         </div>

From 280d9e426d3e8e778ed6d1f5c97d4a7d42bfce31 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 7 Sep 2012 14:23:37 +0200
Subject: [PATCH 934/999] [IMP] changed tooltip

bzr revid: nicolas.vanhoren@openerp.com-20120907122337-pb8pia5e753zzi32
---
 addons/hr_attendance/hr_attendance.py            | 14 ++++++++++++++
 addons/hr_attendance/static/src/js/attendance.js | 14 ++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index ae05a6143fd..d3bc79bda1a 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -112,9 +112,23 @@ class hr_employee(osv.osv):
         for res in cr.fetchall():
             result[res[1]] = res[0] == 'sign_in' and 'present' or 'absent'
         return result
+    
+    def _last_sign(self, cr, uid, ids, name, args, context=None):
+        result = {}
+        if not ids:
+            return result
+        for id in ids:
+            result[id] = False
+            cr.execute("""select max(name) as name
+                        from hr_attendance
+                        where action in ('sign_in', 'sign_out') and employee_id = %s""",(id,))
+            for res in cr.fetchall():
+                result[id] = res[0]
+        return result
 
     _columns = {
        'state': fields.function(_state, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
+       'last_sign': fields.function(_last_sign, type='datetime', string='Last Sign'),
     }
 
     def _action_check(self, cr, uid, emp_id, dt=False, context=None):
diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index f05cef2e001..0366fa47c6c 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -27,12 +27,16 @@ openerp.hr_attendance = function (instance) {
             });
             this.$el.tipsy({
                 title: function() {
+                    var last_text = instance.web.format_value(self.last_sign, {type: "datetime"});
+                    var current_text = instance.web.format_value(new Date(), {type: "datetime"});
+                    var duration = $.timeago(self.last_sign);
                     if (self.get("signed_in")) {
-                        return _t("You are currently signed in. Click here to sign out.");
+                        return _.str.sprintf(_t("Last sign in: %s,<br />%s.<br />Click to sign out."), last_text, duration);
                     } else {
-                        return _t("You are currently signed out. Click here to sign in.");
+                        return _.str.sprintf(_t("Click to Sign In at %s."), current_text);
                     }
-                }
+                },
+                html: true,
             });
             return this.check_attendance();
         },
@@ -42,6 +46,7 @@ openerp.hr_attendance = function (instance) {
             hr_employee.call('attendance_action_change', [
                 [self.employee.id]
             ]).done(function (result) {
+                self.last_sign = new Date();
                 self.set({"signed_in": ! self.get("signed_in")});
             });
         },
@@ -52,11 +57,12 @@ openerp.hr_attendance = function (instance) {
             var employee = new instance.web.DataSetSearch(self, 'hr.employee', self.session.user_context, [
                 ['user_id', '=', self.session.uid]
             ]);
-            return employee.read_slice(['id', 'name', 'state']).pipe(function (res) {
+            return employee.read_slice(['id', 'name', 'state', 'last_sign']).pipe(function (res) {
                 if (_.isEmpty(res))
                     return;
                 self.$el.show();
                 self.employee = res[0];
+                self.last_sign = instance.web.str_to_datetime(self.employee.last_sign);
                 self.set({"signed_in": self.employee.state !== "absent"});
             });
         },

From 67003bd76fdbc89f9d4b6367c1414fbb8846f0b5 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 7 Sep 2012 14:28:57 +0200
Subject: [PATCH 935/999] [FIX] method resolve_2many_commands and its tests

bzr revid: rco@openerp.com-20120907122857-4dro8up51ypx0cr5
---
 openerp/osv/orm.py        | 12 +++++-----
 openerp/tests/test_orm.py | 49 ++++++++++++++++++---------------------
 2 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 889230759d2..79ea88e84f3 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -5029,21 +5029,21 @@ class BaseModel(object):
             :rtype: list(dict)
         """
         result = []             # result (list of dict)
-        record_ids = set()      # ids of records to read
+        record_ids = []         # ids of records to read
         updates = {}            # {id: dict} of updates on particular records
 
         for command in commands:
             if not isinstance(command, (list, tuple)):
-                record_ids.add(command)
+                record_ids.append(command)
             elif command[0] == 0:
                 result.append(command[2])
             elif command[0] == 1:
-                record_ids.add(command[1])
+                record_ids.append(command[1])
                 updates.setdefault(command[1], {}).update(command[2])
             elif command[0] in (2, 3):
-                record_ids.discard(command[1])
+                record_ids = [id for id in record_ids if id != command[1]]
             elif command[0] == 4:
-                record_ids.add(command[1])
+                record_ids.append(command[1])
             elif command[0] == 5:
                 result, record_ids = [], []
             elif command[0] == 6:
@@ -5051,7 +5051,7 @@ class BaseModel(object):
 
         # read the records and apply the updates
         other_model = self.pool.get(self._all_columns[field_name].column._obj)
-        for record in other_model.read(cr, uid, list(record_ids), fields=fields, context=context):
+        for record in other_model.read(cr, uid, record_ids, fields=fields, context=context):
             record.update(updates.get(record['id'], {}))
             result.append(record)
 
diff --git a/openerp/tests/test_orm.py b/openerp/tests/test_orm.py
index f04b9d77747..fd033316e62 100644
--- a/openerp/tests/test_orm.py
+++ b/openerp/tests/test_orm.py
@@ -15,6 +15,10 @@ LINK_TO = lambda id: (4, id, False)
 DELETE_ALL = lambda: (5, False, False)
 REPLACE_WITH = lambda ids: (6, False, ids)
 
+def sorted_by_id(list_of_dicts):
+    "sort dictionaries by their 'id' field; useful for comparisons"
+    return sorted(list_of_dicts, key=lambda d: d.get('id'))
+
 class TestO2MSerialization(common.TransactionCase):
 
     def setUp(self):
@@ -30,14 +34,11 @@ class TestO2MSerialization(common.TransactionCase):
 
     def test_CREATE_commands(self):
         " returns the VALUES dict as-is "
+        values = [{'foo': 'bar'}, {'foo': 'baz'}, {'foo': 'baq'}]
         results = self.partner.resolve_2many_commands(
-            self.cr, UID, 'address',
-            map(CREATE, [{'foo': 'bar'}, {'foo': 'baz'}, {'foo': 'baq'}]))
-        self.assertEqual(results, [
-            {'foo': 'bar'},
-            {'foo': 'baz'},
-            {'foo': 'baq'}
-        ])
+            self.cr, UID, 'address', map(CREATE, values))
+
+        self.assertEqual(results, values)
 
     def test_LINK_TO_command(self):
         " reads the records from the database, records are returned with their ids. "
@@ -51,11 +52,11 @@ class TestO2MSerialization(common.TransactionCase):
         results = self.partner.resolve_2many_commands(
             self.cr, UID, 'address', commands, ['name'])
 
-        self.assertEqual(results, [
+        self.assertEqual(sorted_by_id(results), sorted_by_id([
             {'id': ids[0], 'name': 'foo'},
             {'id': ids[1], 'name': 'bar'},
             {'id': ids[2], 'name': 'baz'}
-        ])
+        ]))
 
     def test_bare_ids_command(self):
         " same as the equivalent LINK_TO commands "
@@ -68,11 +69,11 @@ class TestO2MSerialization(common.TransactionCase):
         results = self.partner.resolve_2many_commands(
             self.cr, UID, 'address', ids, ['name'])
 
-        self.assertEqual(results, [
+        self.assertEqual(sorted_by_id(results), sorted_by_id([
             {'id': ids[0], 'name': 'foo'},
             {'id': ids[1], 'name': 'bar'},
             {'id': ids[2], 'name': 'baz'}
-        ])
+        ]))
 
     def test_UPDATE_command(self):
         " take the in-db records and merge the provided information in "
@@ -87,11 +88,11 @@ class TestO2MSerialization(common.TransactionCase):
                 UPDATE(id_baz, {'name': 'quux'})
             ], ['name', 'city'])
 
-        self.assertEqual(results, [
+        self.assertEqual(sorted_by_id(results), sorted_by_id([
             {'id': id_foo, 'name': 'foo', 'city': False},
             {'id': id_bar, 'name': 'qux', 'city': 'tagtag'},
             {'id': id_baz, 'name': 'quux', 'city': 'tag'}
-        ])
+        ]))
 
     def test_DELETE_command(self):
         " deleted records are not returned at all. "
@@ -105,10 +106,7 @@ class TestO2MSerialization(common.TransactionCase):
         results = self.partner.resolve_2many_commands(
             self.cr, UID, 'address', commands, ['name'])
 
-        self.assertEqual(results, [
-            {'id': ids[0], 'name': 'foo'},
-            {'id': ids[2], 'name': 'baz'}
-        ])
+        self.assertEqual(results, [])
 
     def test_mixed_commands(self):
         ids = [
@@ -128,7 +126,7 @@ class TestO2MSerialization(common.TransactionCase):
                 LINK_TO(ids[5])
             ], ['name'])
 
-        self.assertEqual(results, [
+        self.assertEqual(sorted_by_id(results), sorted_by_id([
             {'name': 'foo'},
             {'id': ids[0], 'name': 'bar'},
             {'id': ids[1], 'name': 'baz'},
@@ -136,7 +134,7 @@ class TestO2MSerialization(common.TransactionCase):
             {'id': ids[4], 'name': 'corge'},
             {'name': 'grault'},
             {'id': ids[5], 'name': 'garply'}
-        ])
+        ]))
 
     def test_LINK_TO_pairs(self):
         "LINK_TO commands can be written as pairs, instead of triplets"
@@ -150,20 +148,17 @@ class TestO2MSerialization(common.TransactionCase):
         results = self.partner.resolve_2many_commands(
             self.cr, UID, 'address', commands, ['name'])
 
-        self.assertEqual(results, [
+        self.assertEqual(sorted_by_id(results), sorted_by_id([
             {'id': ids[0], 'name': 'foo'},
             {'id': ids[1], 'name': 'bar'},
             {'id': ids[2], 'name': 'baz'}
-        ])
+        ]))
 
     def test_singleton_commands(self):
         "DELETE_ALL can appear as a singleton"
+        results = self.partner.resolve_2many_commands(
+            self.cr, UID, 'address', [DELETE_ALL()], ['name'])
 
-        try:
-            self.partner.resolve_2many_commands(
-                self.cr, UID, 'address', [(5,)], ['name'])
-        except AssertionError:
-            # 5 should fail with an assert error, but not e.g. a ValueError
-            pass
+        self.assertEqual(results, [])
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 6b5a32c3c67d5ca19529b44e5387beaaf26d2bdb Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 7 Sep 2012 16:19:35 +0200
Subject: [PATCH 936/999] [IMP] rml footer: small fixes in view and report
 template

bzr revid: rco@openerp.com-20120907141935-gvy69gr2ms7avf3m
---
 openerp/addons/base/res/res_bank_view.xml | 2 +-
 openerp/addons/base/res/res_company.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml
index 2b4a1f3e562..8a8fa0e2922 100644
--- a/openerp/addons/base/res/res_bank_view.xml
+++ b/openerp/addons/base/res/res_bank_view.xml
@@ -129,7 +129,7 @@
                     <field name="acc_number"/>
                     <field name="bank_name"/>
                     <field name="company_id" invisible="context.get('company_hide', True)"/>
-                    <field name="footer" invisible="context.get('company_hide', True)"/>
+                    <field name="footer" invisible="context.get('footer_hide', True)"/>
                     <field name="partner_id"/>
                 </tree>
             </field>
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 60fa72eff54..f8b61aacb76 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -316,7 +316,7 @@ class res_company(osv.osv):
             <!-- left margin -->
             <rotate degrees="90"/>
             <fill color="grey"/>
-            <drawCentredString x="14cm" y="-0.7cm">produced by OpenERP - www.openerp.com</drawCentredString>
+            <drawString x="2.65cm" y="-0.4cm">produced by OpenERP.com</drawString>
             <fill color="black"/>
             <rotate degrees="-90"/>
 

From 84ce8fa76cccf907ddb45a213129be9375478c2d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 7 Sep 2012 16:31:09 +0200
Subject: [PATCH 937/999] [IMP] hr_attendance: more visual improvements

bzr revid: nicolas.vanhoren@openerp.com-20120907143109-n7dw17g6ogtk2grj
---
 addons/hr_attendance/static/src/css/slider.css | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/hr_attendance/static/src/css/slider.css b/addons/hr_attendance/static/src/css/slider.css
index 0fde21dc727..664d4f96e41 100644
--- a/addons/hr_attendance/static/src/css/slider.css
+++ b/addons/hr_attendance/static/src/css/slider.css
@@ -1,27 +1,33 @@
 
 .openerp .oe_attendance_status {
     height: 32px;
-    width: 64px;
+    width: 32px;
     display: inline-block;
 }
 .openerp .oe_attendance_signin {
     float:left;
     height: 32px;
     width: 32px;
-    background: url(/hr_attendance/static/src/img/emp-in32.png);
+    background: url(/hr_attendance/static/src/img/emp-out32.png);
     cursor: pointer;
 }
+.openerp .oe_attendance_signin:hover {
+    background: url(/hr_attendance/static/src/img/emp-out-disable32.png);
+}
 .openerp .oe_attendance_status.oe_attendance_signed .oe_attendance_signin {
-    background: url(/hr_attendance/static/src/img/emp-in-disable32.png);
+    display: none;
 }
 
 .openerp .oe_attendance_signout {
     float:right;
     height: 32px;
     width: 32px;
-    background: url(/hr_attendance/static/src/img/emp-out32.png);
+    background: url(/hr_attendance/static/src/img/emp-in32.png);
     cursor: pointer;
 }
-.openerp .oe_attendance_status.oe_attendance_nosigned .oe_attendance_signout {
-    background: url(/hr_attendance/static/src/img/emp-out-disable32.png);
+.openerp .oe_attendance_signout:hover {
+    background: url(/hr_attendance/static/src/img/emp-in-disable32.png);
+}
+.openerp .oe_attendance_status.oe_attendance_nosigned .oe_attendance_signout {
+    display: none;
 }

From 99612b95c0f013439033165558addf58f0890cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 7 Sep 2012 16:40:13 +0200
Subject: [PATCH 938/999] [FIX] mail.js: fixed wrong res_id passed into
 subthreads; fixed message_post using a wrong dataset; fixed message_post
 calling message_fetch after posting with a proxy that gave default values,
 use a then without args instead.

bzr revid: tde@openerp.com-20120907144013-k7dfq1otoykuth96
---
 addons/mail/static/src/js/mail.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index a5a64a59a8b..20218a2bb88 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -411,7 +411,7 @@ openerp.mail = function(session) {
                     self.thread = new mail.Thread(self, {
                         'context': {
                             'default_model': record.model,
-                            'default_id': record.res_id,
+                            'default_res_id': record.res_id,
                             'default_parent_id': record.id },
                         'message_data': record.child_ids, 'thread_level': self.options.thread_level-1,
                         'show_header_compose': false, 'show_reply': self.options.thread_level > 1,
@@ -484,9 +484,9 @@ openerp.mail = function(session) {
                 var body = comment_node.val();
                 comment_node.val('');
             }
-            return this.ds_post.call('message_post', [
-                [this.options.context.res_id], body, false, 'comment', this.options.context.parent_id]
-                ).then(this.proxy('message_fetch'));
+            return this.ds_thread.call('message_post', [
+                [this.options.context.default_res_id], body, false, 'comment', this.options.context.default_parent_id, undefined]
+                ).then(self.message_fetch());
         },
 
         /** Action: 'shows more' to fetch new messages */

From 9a53893dbfd8d649503790cbba9ecffa1f832514 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 7 Sep 2012 16:43:15 +0200
Subject: [PATCH 939/999] [DUMMY] spaces

bzr revid: rco@openerp.com-20120907144315-4hg1u16ineujjupp
---
 openerp/addons/base/base_data.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 2df3979c0de..14f69f37150 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -113,7 +113,7 @@
         <record id="be" model="res.country">
             <field name="name">Belgium</field>
             <field name="code">be</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
         </record>
         <record id="bf" model="res.country">
             <field name="name">Burkina Faso</field>
@@ -158,7 +158,7 @@
         <record id="br" model="res.country">
             <field name="name">Brazil</field>
             <field name="code">br</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s\n%(zip)s%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s\n%(zip)s%(country_name)s'" />            
         </record>
         <record id="bs" model="res.country">
             <field name="name">Bahamas</field>
@@ -264,7 +264,7 @@
         <record id="de" model="res.country">
             <field name="name">Germany</field>
             <field name="code">de</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'"/>
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
         </record>
         <record id="dj" model="res.country">
             <field name="name">Djibouti</field>
@@ -309,7 +309,7 @@
         <record id="es" model="res.country">
             <field name="name">Spain</field>
             <field name="code">es</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
         </record>
         <record id="et" model="res.country">
             <field name="name">Ethiopia</field>
@@ -338,7 +338,7 @@
         <record id="fr" model="res.country">
             <field name="name">France</field>
             <field name="code">fr</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
         </record>
         <record id="ga" model="res.country">
             <field name="name">Gabon</field>
@@ -455,7 +455,7 @@
         <record id="in" model="res.country">
             <field name="name">India</field>
             <field name="code">in</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(zip)s\n%(state_name)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(zip)s\n%(state_name)s\n%(country_name)s'" />            
         </record>
         <record id="io" model="res.country">
             <field name="name">British Indian Ocean Territory</field>
@@ -700,7 +700,7 @@
         <record id="nl" model="res.country">
             <field name="name">Netherlands</field>
             <field name="code">nl</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'"/>
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
         </record>
         <record id="no" model="res.country">
             <field name="name">Norway</field>
@@ -968,7 +968,7 @@
         </record>
         <record id="uk" model="res.country">
             <field name="name">United Kingdom</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(state_name)s\n%(zip)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(state_name)s\n%(zip)s\n%(country_name)s'" />            
             <field name="code">gb</field>
         </record>
         <record id="um" model="res.country">
@@ -978,7 +978,7 @@
         <record id="us" model="res.country">
             <field name="name">United States</field>
             <field name="code">us</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />            
         </record>
         <record id="uy" model="res.country">
             <field name="name">Uruguay</field>

From 294f18f611196f3d37cbe3dafb9f3759b41013e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 7 Sep 2012 17:06:29 +0200
Subject: [PATCH 940/999] [IMP] mail: res_users: added a hook so that already
 existing users follow themselves when installing Social.

bzr revid: tde@openerp.com-20120907150629-tme3hyijuzohy0r4
---
 addons/mail/res_users.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 1bc193051a1..254d29aaad4 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -56,8 +56,11 @@ class res_users(osv.Model):
 
     def _auto_init(self, cr, context=None):
         """Installation hook to create aliases for all users and avoid constraint errors."""
-        self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(res_users,self)._auto_init,
+        self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(res_users, self)._auto_init,
             self._columns['alias_id'], 'login', alias_force_key='id', context=context)
+        # make already existing users follow themselves
+        for user in self.browse(cr, SUPERUSER_ID, self.search(cr, SUPERUSER_ID, [], context=context), context=context):
+            self.pool.get('res.partner').message_subscribe(cr, SUPERUSER_ID, [user.partner_id.id], [user.partner_id.id], context=context)
 
     def create(self, cr, uid, data, context=None):
         # create default alias same as the login

From dcc971af069e2173a304f52163b77acc5d0f4f9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 7 Sep 2012 17:08:20 +0200
Subject: [PATCH 941/999] [IMP] mail: css: removed dead CSS code; pre is now
 displayed using the regular fonts.

bzr revid: tde@openerp.com-20120907150820-kw3c5vj99mcpffzg
---
 addons/mail/static/src/css/mail.css | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 240627c9e6c..815f0ec92c4 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -322,11 +322,7 @@
     text-decoration: none;
 }
 
-.openerp .oe_mail_msg_subtitle {
-    margin: 0 0 .5em 0;
-}
-.openerp .oe_mail_msg_footer,
-.openerp .oe_mail_msg_subtitle {
+.openerp .oe_mail_msg_footer {
     color: #888;
 }
 
@@ -340,12 +336,13 @@
     text-align: justify;
 }
 
-.openerp .oe_mail_msg_body span.oe_mail_msg_tail {
-    display: inline;
+.openerp .oe_mail_msg_record_body pre {
+    font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
+    margin: 0px;
 }
 
-.openerp .oe_mail_oe_bold {
-    font-weight: bold;
+.openerp .oe_mail_msg_body span.oe_mail_msg_tail {
+    display: inline;
 }
 
 /* Read more/less link */

From cbcfe238022b5deb92b6898730e318ec0ca485ad Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 7 Sep 2012 17:10:16 +0200
Subject: [PATCH 942/999] [IMP] orm: simplify method definition

bzr revid: rco@openerp.com-20120907151016-fj7l6nt6uffxmdgh
---
 openerp/osv/orm.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 3cacab0615e..9d3b92a3d31 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -5062,8 +5062,7 @@ class BaseModel(object):
         return result
 
     # for backward compatibility
-    def resolve_o2m_commands_to_record_dicts(self, cr, uid, field_name, o2m_commands, fields=None, context=None):
-        return self.resolve_2many_commands(cr, uid, field_name, o2m_commands, fields, context)
+    resolve_o2m_commands_to_record_dicts = resolve_2many_commands
 
 # keep this import here, at top it will cause dependency cycle errors
 import expression

From 83fe265fbaf1ab728d678e56bd6a9c64eae236b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 7 Sep 2012 17:17:19 +0200
Subject: [PATCH 943/999] [FIX] mail.js: fixed issue with user avatars.

bzr revid: tde@openerp.com-20120907151719-suopvkfbyzbb06ig
---
 addons/mail/static/src/js/mail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 20218a2bb88..cf9a98d17b6 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -473,7 +473,7 @@ openerp.mail = function(session) {
         },
 
         display_user_avatar: function () {
-            var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.options.uid);
+            var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.session.uid);
             return this.$el.find('img.oe_mail_icon').attr('src', avatar);
         },
         

From 63fbe72b9cc8f5a2552c24d86e91ec13e1cf7eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 7 Sep 2012 18:08:41 +0200
Subject: [PATCH 944/999] [FIX] mail: res_users: fixed the previous hook, done
 directly in SQL, to avoid doing sunversive things in _auto_init.

bzr revid: tde@openerp.com-20120907160841-f5ej19t7cdml10pr
---
 addons/mail/res_users.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 254d29aaad4..a5aea54bf9b 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -58,9 +58,16 @@ class res_users(osv.Model):
         """Installation hook to create aliases for all users and avoid constraint errors."""
         self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(res_users, self)._auto_init,
             self._columns['alias_id'], 'login', alias_force_key='id', context=context)
-        # make already existing users follow themselves
-        for user in self.browse(cr, SUPERUSER_ID, self.search(cr, SUPERUSER_ID, [], context=context), context=context):
-            self.pool.get('res.partner').message_subscribe(cr, SUPERUSER_ID, [user.partner_id.id], [user.partner_id.id], context=context)
+        # make already existing users follow themselves, using read to avoid unprefetched fields browse failure
+        cr.execute("""  SELECT p.id FROM res_partner p
+                        LEFT JOIN mail_followers n
+                        ON (n.partner_id = p.id AND n.res_model = 'res.partner' AND n.res_id = p.id)
+                        WHERE n.id IS NULL
+                    """)
+        params = [(res[0], res[0]) for res in cr.fetchall()]
+        cr.executemany("""  INSERT INTO mail_followers (partner_id, res_model, res_id)
+                            VALUES (%s, 'res.partner', %s)
+                        """, params)
 
     def create(self, cr, uid, data, context=None):
         # create default alias same as the login

From bc619a3e5301ad0f41588d003cc2ffdaa1f03ecb Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 9 Sep 2012 04:53:00 +0000
Subject: [PATCH 945/999] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120908045428-bfzum7jcffa1r8rd
bzr revid: launchpad_translations_on_behalf_of_openerp-20120909045300-ks25sg9ymy0igkrw
---
 addons/base_vat/i18n/es_MX.po         |   2 +-
 addons/document_webdav/i18n/nb.po     | 197 ++++++++++++
 addons/edi/i18n/nb.po                 | 411 ++++++++++++++++++++++++++
 addons/event_project/i18n/nb.po       | 114 +++++++
 addons/fetchmail/i18n/nb.po           | 335 +++++++++++++++++++++
 addons/google_base_account/i18n/nb.po | 122 ++++++++
 addons/hr_contract/i18n/nb.po         | 270 +++++++++++++++++
 addons/hr_payroll_account/i18n/nb.po  | 141 +++++++++
 addons/import_base/i18n/nb.po         | 105 +++++++
 addons/l10n_cn/i18n/nb.po             |  66 +++++
 addons/l10n_de/i18n/nb.po             |  66 +++++
 addons/pad_project/i18n/tr.po         |  38 +++
 12 files changed, 1866 insertions(+), 1 deletion(-)
 create mode 100644 addons/document_webdav/i18n/nb.po
 create mode 100644 addons/edi/i18n/nb.po
 create mode 100644 addons/event_project/i18n/nb.po
 create mode 100644 addons/fetchmail/i18n/nb.po
 create mode 100644 addons/google_base_account/i18n/nb.po
 create mode 100644 addons/hr_contract/i18n/nb.po
 create mode 100644 addons/hr_payroll_account/i18n/nb.po
 create mode 100644 addons/import_base/i18n/nb.po
 create mode 100644 addons/l10n_cn/i18n/nb.po
 create mode 100644 addons/l10n_de/i18n/nb.po
 create mode 100644 addons/pad_project/i18n/tr.po

diff --git a/addons/base_vat/i18n/es_MX.po b/addons/base_vat/i18n/es_MX.po
index c3b0b12b4b7..cd511c528b0 100644
--- a/addons/base_vat/i18n/es_MX.po
+++ b/addons/base_vat/i18n/es_MX.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: 2012-09-07 04:57+0000\n"
+"X-Launchpad-Export-Date: 2012-09-08 04:54+0000\n"
 "X-Generator: Launchpad (build 15914)\n"
 
 #. module: base_vat
diff --git a/addons/document_webdav/i18n/nb.po b/addons/document_webdav/i18n/nb.po
new file mode 100644
index 00000000000..d51ade795b3
--- /dev/null
+++ b/addons/document_webdav/i18n/nb.po
@@ -0,0 +1,197 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 17:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-08 04:54+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr "Dato opprettet"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_document_props
+msgid "Documents"
+msgstr "Dokumenter"
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Feil! Du kan opprette rekursive kataloger."
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr "Søk Dokumentegenskaper."
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: field:document.webdav.dir.property,namespace:0
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,namespace:0
+msgid "Namespace"
+msgstr "Navnerom"
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr "DAV egenskaper"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_file_property
+msgid "document.webdav.file.property"
+msgstr "Dokumentet.WebDAV.fil.egenskap"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr "Disse egenskapene vil bli lagt til WebDAV-forespørsler"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
+msgid "DAV Properties for Documents"
+msgstr "DAV Eiendommer for Dokumenter."
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr "PyWebDAV importere Feil!"
+
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+msgstr "Dokument"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_folder_props
+msgid "Folders"
+msgstr "Mapper"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "Katalogen kan ikke være overordnede av seg selv!"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dynamisk sammenheng"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr "WebDAV egenskaper."
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "Katalogen Navnet må være unikt!"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid ""
+"Please install PyWebDAV from "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+msgstr ""
+"Vennligst installer PyWebDAV fra "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
+msgid "DAV Properties for Folders"
+msgstr "DAV egenskaper for mapper."
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Properties"
+msgstr "Egenskaper"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr "Dokumentet.WebDAV.dir.eiendom"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
+msgid "Value"
+msgstr "Verdi"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "Katalog"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr "Siste endring Bruker"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "Retn"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr "Dato endret"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr "Opprettet av"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_properties
+msgid "DAV Properties"
+msgstr "DAV Egenskaper."
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "Katalog må ha en overordnede eller en lagringsplass."
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
+msgid "Substitute"
+msgstr "Erstatte"
diff --git a/addons/edi/i18n/nb.po b/addons/edi/i18n/nb.po
new file mode 100644
index 00000000000..bc8add1e6e9
--- /dev/null
+++ b/addons/edi/i18n/nb.po
@@ -0,0 +1,411 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-09-08 19:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: edi
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr "Valutakode må være unik pr. firma!"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Partner adresser"
+
+#. module: edi
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Firmanavn må være unikt !"
+
+#. module: edi
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
+
+#. module: edi
+#: field:edi.document,name:0
+msgid "EDI token"
+msgstr "EDI tegn."
+
+#. module: edi
+#: help:edi.document,name:0
+msgid "Unique identifier for retrieving an EDI document."
+msgstr "Unik identifikator for å hente en EDI dokument."
+
+#. module: edi
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr "Firmaer"
+
+#. module: edi
+#: sql_constraint:edi.document:0
+msgid "EDI Tokens must be unique!"
+msgstr "EDI tegnet må være unikt!"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:153
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+"Dokumentet du prøver å importere krever OpenERP `% s` søknad. Du kan "
+"installere det ved å koble som administrator og åpne konfigurasjonen "
+"assistent."
+
+#. module: edi
+#: help:edi.document,document:0
+msgid "EDI document content"
+msgstr "EDI dokumentinnhold"
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_document
+msgid "EDI Document"
+msgstr "EDI dokument."
+
+#. module: edi
+#: code:addons/edi/models/edi.py:48
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr "'% s' er en ugyldig ekstern ID."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:152
+#, python-format
+msgid "Missing Application"
+msgstr "Manglende Søknad."
+
+#. module: edi
+#: field:edi.document,document:0
+msgid "Document"
+msgstr "Dokument"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
+msgid "View/Print"
+msgstr "Vis / Skriv ut"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
+msgid "Import this document"
+msgstr "Importer dette dokumentet."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
+msgid "Import it into an existing OpenERP instance"
+msgstr "Importere den inn i en eksisterende OpenERP eksempel."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
+msgid "OpenERP instance address:"
+msgstr "OpenERP eksempel adresse:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
+msgid "Import"
+msgstr "Import"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44
+msgid "Import it into a new OpenERP Online instance"
+msgstr "Importere den til en ny OpenERP Online eksempel."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
+msgid "Create my new OpenERP instance"
+msgstr "Opprett min nye OpenERP eksempel."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
+msgid "Import into another application"
+msgstr "Importere til et annet program."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
+msgid ""
+"OpenERP's Electronic Data Interchange documents are based on a generic and "
+"language\n"
+"                            independent"
+msgstr ""
+"OpenERP's elektronisk Data utveksler dokumentene er basert på en generisk og "
+"språk.\n"
+"                                                                             "
+"                                                                 uavhengig."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid "JSON"
+msgstr "JSON"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid ""
+"serialization of the document's attribute.\n"
+"                            It is usually very quick and straightforward to "
+"create a small plug-in for your preferred\n"
+"                            application that will be capable of importing "
+"any OpenERP EDI document.\n"
+"                            You can find out more details about how to do "
+"this and what the content of OpenERP EDI documents\n"
+"                            is like in the"
+msgstr ""
+"Serialisering av dokumentets attributtet.\n"
+"                             Det er vanligvis svært rask og grei å lage en "
+"liten plug-in for din foretrukne.\n"
+"                             program som vil være i stand til å importere "
+"noen OpenERP EDI dokument.\n"
+"                             Du kan finne ut mer informasjon om hvordan du "
+"gjør dette og hva innholdet i OpenERP EDI dokumenter\n"
+"                             er som i."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
+msgid "OpenERP documentation"
+msgstr "OpenERP dokumentasjon."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
+msgid "To get started immediately,"
+msgstr "Å komme i gang umiddelbart,"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62
+msgid "see is all it takes to use this EDI document in Python"
+msgstr "Se er alt som trengs for å bruke denne EDI dokumentet i Python."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70
+msgid "You can download the raw EDI document here:"
+msgstr "Du kan laste ned den rå EDI dokumentet her:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73
+msgid "Download"
+msgstr "Nedlastning"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "Powered by"
+msgstr "Drevet av."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
+msgid "Invoice"
+msgstr "Faktura"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41
+msgid "Date"
+msgstr "Dato"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40
+msgid "Your Reference"
+msgstr "Din referanse."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57
+msgid "Product Description"
+msgstr "Produktbeskrivelse"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58
+msgid "Quantity"
+msgstr "Antall"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
+msgid "Unit Price"
+msgstr "Enhetspris"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
+msgid "Discount"
+msgstr "Rabatt"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
+msgid "Price"
+msgstr "Pris"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81
+msgid "Net Total:"
+msgstr "Netto total:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92
+msgid "Taxes:"
+msgstr "Avgifter:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103
+msgid "Total:"
+msgstr "Totalt:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106
+msgid "Tax"
+msgstr "Skatt"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
+msgid "Base Amount"
+msgstr "Grunnbeløp"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
+msgid "Amount"
+msgstr "Beløp"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113
+msgid "Notes:"
+msgstr "Notater:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
+msgid "Pay Online"
+msgstr "Betal online."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
+msgid "Paypal"
+msgstr "Paypal"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
+msgid ""
+"You may directly pay this invoice online via Paypal's secure payment gateway:"
+msgstr ""
+"Du kan betale direkte denne fakturaen online via Paypal er sikker betaling "
+"gateway:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
+msgid "Bank Wire Transfer"
+msgstr "Bank Tråd overføring."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
+msgid "Please transfer"
+msgstr "Vennligst overfør."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140
+msgid "to"
+msgstr "til"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149
+msgid ""
+"(postal address on the invoice header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the invoice\n"
+"                     reference"
+msgstr ""
+"(postadresse på fakturaen header)\n"
+"Ved hjelp av en av følgende bankkontoer. Sørg for å nevne faktura.\n"
+"Referanse."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
+msgid "on the transfer:"
+msgstr "På overføring:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
+msgid "Order"
+msgstr "Ordre"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42
+msgid "Salesman"
+msgstr "Selger"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
+msgid "Payment terms"
+msgstr "Betalingsbetingelser"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
+msgid "Discount(%)"
+msgstr "Raball(%)"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
+msgid ""
+"You may directly pay this order online via Paypal's secure payment gateway:"
+msgstr ""
+"Du kan betale direkte i denne rekkefølgen online via Paypal's sikker "
+"betaling gateway."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
+msgid ""
+"(postal address on the order header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the document\n"
+"                     reference"
+msgstr ""
+"Ostal adresse på bestillingen topp)\n"
+"Ved hjelp av en av følgende bankkontoer. Sørg for å nevne dokumentet.\n"
+"Referanse."
diff --git a/addons/event_project/i18n/nb.po b/addons/event_project/i18n/nb.po
new file mode 100644
index 00000000000..ea1485578a7
--- /dev/null
+++ b/addons/event_project/i18n/nb.po
@@ -0,0 +1,114 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 17:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-08 04:54+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: event_project
+#: model:ir.model,name:event_project.model_event_project
+msgid "Event Project"
+msgstr "Arrangement Prosjekt"
+
+#. module: event_project
+#: field:event.project,date:0
+msgid "Date End"
+msgstr "Sluttdato"
+
+#. module: event_project
+#: view:event.project:0
+msgid "Ok"
+msgstr "Ok"
+
+#. module: event_project
+#: help:event.project,project_id:0
+msgid ""
+"This is Template Project. Project of event is a duplicate of this Template. "
+"After click on  'Create Retro-planning', New Project will be duplicated from "
+"this template project."
+msgstr ""
+"Dette er ett mal Prosjekt. Prosjektet av arrangementet er en dublett av "
+"denne malen. Etter klikk på \"Create Retro-planlegging\", vil New Project "
+"dupliseres fra denne malen prosjektet."
+
+#. module: event_project
+#: view:event.project:0
+#: model:ir.actions.act_window,name:event_project.action_event_project
+msgid "Retro-Planning"
+msgstr "Retro-Planlegging"
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr "Feil ! Sluttdato kan ikke settes før startdato."
+
+#. module: event_project
+#: field:event.event,project_id:0
+msgid "Project"
+msgstr "Prosjekt"
+
+#. module: event_project
+#: field:event.project,project_id:0
+msgid "Template of Project"
+msgstr "Mal av prosjekt"
+
+#. module: event_project
+#: view:event.event:0
+msgid "All tasks"
+msgstr "Alle oppgaver"
+
+#. module: event_project
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event_project.act_event_task
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr "Feil! Du kan ikke opprette rekursive hendelse."
+
+#. module: event_project
+#: field:event.event,task_ids:0
+msgid "Project tasks"
+msgstr "Prosjektoppgaver"
+
+#. module: event_project
+#: view:event.project:0
+msgid "Close"
+msgstr "Lukke"
+
+#. module: event_project
+#: field:event.project,date_start:0
+msgid "Date Start"
+msgstr "Startdato"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Create Retro-Planning"
+msgstr "Opprett Retro - planlegging."
+
+#. module: event_project
+#: model:ir.model,name:event_project.model_event_event
+msgid "Event"
+msgstr "Arrangement"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Tasks Management"
+msgstr ""
+
+#~ msgid "Tasks management"
+#~ msgstr "Oppgaver ledelse"
diff --git a/addons/fetchmail/i18n/nb.po b/addons/fetchmail/i18n/nb.po
new file mode 100644
index 00000000000..b5a6c409b79
--- /dev/null
+++ b/addons/fetchmail/i18n/nb.po
@@ -0,0 +1,335 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-08 18:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-09 04:52+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Bekreftet"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr "Tjener navn"
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Manus"
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+"Definerer rekkefølgen av behandlingen, lavere verdier betyr høyere prioritet."
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
+msgid ""
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
+msgstr ""
+"Tilkoblinger er kryptert med SSL / TLS gjennom en egen port (standard: IMAPS "
+"= 993, POP3S = 995)"
+
+#. module: fetchmail
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr "Hold Vedlegg"
+
+#. module: fetchmail
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
+"Om en full original kopi av hver e-post bør holdes for referenceand festet "
+"til hver bearbeidet melding. Dette vil vanligvis doble størrelsen på "
+"meldingen database."
+
+#. module: fetchmail
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Tjener prioritet."
+
+#. module: fetchmail
+#: field:fetchmail.server,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr "Hente nå."
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr "Innkommende Mail Tjenere."
+
+#. module: fetchmail
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP tjenere."
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr "Lokal tjener."
+
+#. module: fetchmail
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr "Brukernavn:"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Tjener."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
+msgstr "Tilbakestille Bekreftelse."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr "E-post Melding."
+
+#. module: fetchmail
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr "Siste Hente Dato."
+
+#. module: fetchmail
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
+"Ekstra tilpasset server tiltak for å utløse for hver innkommende e-post, på "
+"plata som ble opprettet eller oppdatert i denne posten."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "# Av e-post."
+
+#. module: fetchmail
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr "Hold Original"
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
+"Her er hva vi fikk i stedet:\n"
+"  % s"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr "Innkommende E-post tjener."
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr "Tilkoblingen var mislykket!"
+
+#. module: fetchmail
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr "Vertsnavn eller IP for e-postserveren."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr "Tjener type IMAP."
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: fetchmail
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr "Test & Bekreft"
+
+#. module: fetchmail
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr "Tjenerhandling"
+
+#. module: fetchmail
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr "Inngående E-post tjener."
+
+#. module: fetchmail
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "Meldinger"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr "Søk innkommende post tjenere."
+
+#. module: fetchmail
+#: field:fetchmail.server,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: fetchmail
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
+"Om vedlegg skal lastes ned. Hvis ikke er aktivert, vil innkommende e-post "
+"blir fratatt eventuelle vedlegg før de behandles."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced Options"
+msgstr ""
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "IMAP Server"
+msgstr "IMAP-tjener"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr "Tjener type POP."
+
+#. module: fetchmail
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Passord:"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr "Tiltak for å utføre på innkommende post."
+
+#. module: fetchmail
+#: field:fetchmail.server,type:0
+msgid "Server Type"
+msgstr "Tjener Type."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Login Information"
+msgstr "Inn loggings informasjon."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server Information"
+msgstr "Tjenerinformasjon"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr "Hvis SSL nødvendig."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr "Avansert"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Tjener og Logg inn."
+
+#. module: fetchmail
+#: help:fetchmail.server,object_id:0
+msgid ""
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
+msgstr ""
+"Behandle hver innkommende post som del av en samtale tilsvarende denne "
+"dokumenttypen. Dette vil skape nye dokumenter for nye samtaler, eller legge "
+"oppfølging e-post til de eksisterende samtaler (dokumenter)."
+
+#. module: fetchmail
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr "Oppretter en ny oppføring."
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Ikke bekreftet."
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP tjener."
+
+#. module: fetchmail
+#: view:mail.message:0
+msgid "Mail Server"
+msgstr "E-posttjener"
+
+#~ msgid "Advanced options"
+#~ msgstr "Avanserte alternativer"
diff --git a/addons/google_base_account/i18n/nb.po b/addons/google_base_account/i18n/nb.po
new file mode 100644
index 00000000000..7b14c1d29b4
--- /dev/null
+++ b/addons/google_base_account/i18n/nb.po
@@ -0,0 +1,122 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 19:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-08 04:54+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "Brukernavn:"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr "Google Logg inn"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Google kontakter Import Feil!"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr " Synkronisering "
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan ikke ha to brukere med samme login!"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "Feil"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr "Google Logg Inn."
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "res.Brukere."
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr "Google passord."
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr "Google-konto"
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr "Google Brukernavn."
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Vennligst Installer gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr "Google kontakt"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr "_Logg inn"
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Det valgte firmaet er ikke i listen over tillatte firmaer for denne brukeren"
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr "Passord:"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr "Autentisering mislykkes sjekk brukernavn og passord!"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "Ex:Bruker@gmail.com"
diff --git a/addons/hr_contract/i18n/nb.po b/addons/hr_contract/i18n/nb.po
new file mode 100644
index 00000000000..9d1886e3ed4
--- /dev/null
+++ b/addons/hr_contract/i18n/nb.po
@@ -0,0 +1,270 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-08 18:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-09 04:52+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: hr_contract
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Lønn"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Information"
+msgstr "Informasjon"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Trial Period"
+msgstr "Prøveperiode"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "Prøve Startdato"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Medical Examination"
+msgstr "Legeundersøkelse"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle:0
+msgid "Company Vehicle"
+msgstr "Selskapets Kjøretøy."
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Miscellaneous"
+msgstr "Diverse"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Current"
+msgstr "Nåværende"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: hr_contract
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "Avdeling"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Overpassed"
+msgstr "Overpassert"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,employee_id:0
+#: model:ir.model,name:hr_contract.model_hr_employee
+msgid "Employee"
+msgstr "Ansatt"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Search Contract"
+msgstr "Søk Kontrakt"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Contracts in progress"
+msgstr "Kontrakter i fremgang"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle_distance:0
+msgid "Home-Work Distance"
+msgstr "Hjem-arbeid Avstand."
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.employee,contract_ids:0
+#: model:ir.actions.act_window,name:hr_contract.act_hr_employee_2_hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract
+msgid "Contracts"
+msgstr "Kontrakter"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Personal Info"
+msgstr "Personlig Info"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Contracts whose end date already passed"
+msgstr "Kontrakter som sluttdato har allerede passert."
+
+#. module: hr_contract
+#: help:hr.employee,contract_id:0
+msgid "Latest contract of the employee"
+msgstr "Siste kontrakten av den ansatte"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Job"
+msgstr "Jobb"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,advantages:0
+msgid "Advantages"
+msgstr "Fordeler"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Valid for"
+msgstr "Gyldig for."
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Work Permit"
+msgstr "Arbeidstillatelse"
+
+#. module: hr_contract
+#: field:hr.employee,children:0
+msgid "Number of Children"
+msgstr "Antall barn"
+
+#. module: hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type
+msgid "Contract Types"
+msgstr "Kontrakt typer."
+
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Feil! Du kan ikke opprette rekursiv Hierarki av ansatte."
+
+#. module: hr_contract
+#: field:hr.contract,date_end:0
+msgid "End Date"
+msgstr "Sluttdato"
+
+#. module: hr_contract
+#: help:hr.contract,wage:0
+msgid "Basic Salary of the employee"
+msgstr "Grunnlønn for den ansatte."
+
+#. module: hr_contract
+#: field:hr.contract,name:0
+msgid "Contract Reference"
+msgstr "Kontrakt referanse."
+
+#. module: hr_contract
+#: help:hr.employee,vehicle_distance:0
+msgid "In kilometers"
+msgstr "I kilometer."
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,notes:0
+msgid "Notes"
+msgstr "Notater"
+
+#. module: hr_contract
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr "Arbeidstillatelse Ingen."
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.employee,contract_id:0
+#: model:ir.model,name:hr_contract.model_hr_contract
+#: model:ir.ui.menu,name:hr_contract.next_id_56
+msgid "Contract"
+msgstr "Kontrakt"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,type_id:0
+#: view:hr.contract.type:0
+#: field:hr.contract.type,name:0
+#: model:ir.model,name:hr_contract.model_hr_contract_type
+msgid "Contract Type"
+msgstr "Kontrakt type."
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr "Arbeidsplan"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Job Info"
+msgstr "Jobb informasjon."
+
+#. module: hr_contract
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr "Visa utløpsdato."
+
+#. module: hr_contract
+#: field:hr.contract,job_id:0
+msgid "Job Title"
+msgstr "Jobb Tittel"
+
+#. module: hr_contract
+#: field:hr.employee,manager:0
+msgid "Is a Manager"
+msgstr "Er en leder."
+
+#. module: hr_contract
+#: field:hr.contract,date_start:0
+msgid "Start Date"
+msgstr "Startdato"
+
+#. module: hr_contract
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr "Feil! Kontrakten startdato må være lavere enn kontrakt sluttdato."
+
+#. module: hr_contract
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr "Visa Nei."
+
+#. module: hr_contract
+#: field:hr.employee,place_of_birth:0
+msgid "Place of Birth"
+msgstr "Fødested"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Duration"
+msgstr "Varighet"
+
+#. module: hr_contract
+#: field:hr.employee,medic_exam:0
+msgid "Medical Examination Date"
+msgstr "Legeundersøkelse Dato"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_end:0
+msgid "Trial End Date"
+msgstr "Prøve Sluttdato ."
+
+#. module: hr_contract
+#: view:hr.contract.type:0
+msgid "Search Contract Type"
+msgstr "Søk Kontraktstype"
diff --git a/addons/hr_payroll_account/i18n/nb.po b/addons/hr_payroll_account/i18n/nb.po
new file mode 100644
index 00000000000..d1c0bf47a00
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/nb.po
@@ -0,0 +1,141 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 19:55+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-08 04:54+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_id:0
+msgid "Accounting Entry"
+msgstr "Regnskapsmessig oppføring"
+
+#. module: hr_payroll_account
+#: field:hr.salary.rule,account_tax_id:0
+msgid "Tax Code"
+msgstr "Skattekode"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,journal_id:0
+#: field:hr.payslip.run,journal_id:0
+msgid "Expense Journal"
+msgstr "Bekostning Journal"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:157
+#: code:addons/hr_payroll_account/hr_payroll_account.py:173
+#, python-format
+msgid "Adjustment Entry"
+msgstr "Justering oppføring"
+
+#. module: hr_payroll_account
+#: field:hr.contract,analytic_account_id:0
+#: field:hr.salary.rule,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Analytisk konto"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr "hr.salary.rule"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr "Lønnsslipp Batcher."
+
+#. module: hr_payroll_account
+#: field:hr.contract,journal_id:0
+msgid "Salary Journal"
+msgstr "lønn Journal"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr "Lønnslipp"
+
+#. module: hr_payroll_account
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr "Lønnslipp \" Dato fra \" må være før \" Dato Til \""
+
+#. module: hr_payroll_account
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr "Hold tom for å bruke tid på validering (lønnsslipp) dato."
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:171
+#, python-format
+msgid ""
+"The Expense Journal \"%s\" has not properly configured the Debit Account!"
+msgstr "Bekostning Journal \"% s\" har ikke riktig konfigurert Debet konto!"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:155
+#, python-format
+msgid ""
+"The Expense Journal \"%s\" has not properly configured the Credit Account!"
+msgstr ""
+"Bekostning Journal \"% s\" har ikke riktig konfigurert kreditt-konto!"
+
+#. module: hr_payroll_account
+#: field:hr.salary.rule,account_debit:0
+msgid "Debit Account"
+msgstr "Debetkonto"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:102
+#, python-format
+msgid "Payslip of %s"
+msgstr "Lønnslipp av %s."
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contract
+msgid "Contract"
+msgstr "Kontrakt"
+
+#. module: hr_payroll_account
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr "Feil! Kontrakten startdato må være lavere enn kontrakt sluttdato."
+
+#. module: hr_payroll_account
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr "Kraft Periode."
+
+#. module: hr_payroll_account
+#: field:hr.salary.rule,account_credit:0
+msgid "Credit Account"
+msgstr "Kredittkonto"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr "Generer lønnsslipper for alle utvalgte ansatte."
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:155
+#: code:addons/hr_payroll_account/hr_payroll_account.py:171
+#, python-format
+msgid "Configuration Error!"
+msgstr "Konfigurasjonsfeil!"
+
+#. module: hr_payroll_account
+#: view:hr.contract:0
+#: view:hr.salary.rule:0
+msgid "Accounting"
+msgstr "Regnskap"
diff --git a/addons/import_base/i18n/nb.po b/addons/import_base/i18n/nb.po
new file mode 100644
index 00000000000..62b30d04da6
--- /dev/null
+++ b/addons/import_base/i18n/nb.po
@@ -0,0 +1,105 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-08 19:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-09 04:52+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:434
+#, python-format
+msgid "Import failed due to an unexpected error"
+msgstr "Import mislyktes på grunn av en uventet feil."
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:461
+#, python-format
+msgid "started at %s and finished at %s \n"
+msgstr "Startet på% s og ferdig på% s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:448
+#, python-format
+msgid "Import of your data finished at %s"
+msgstr "Import av dine data ferdig på% s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:463
+#, python-format
+msgid ""
+"but failed, in consequence no data were imported to keep database "
+"consistency \n"
+" error : \n"
+msgstr ""
+"Men mislyktes, i følge ingen data ble importert for å holde databasen "
+"konsistens\n"
+"  feil: \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:477
+#, python-format
+msgid ""
+"The import of data \n"
+" instance name : %s \n"
+msgstr ""
+"Import av data\n"
+" Eksempel navn:% s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:470
+#, python-format
+msgid "%s has been successfully imported from %s %s, %s \n"
+msgstr "% s har blitt importert fra% s% s,% s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:447
+#, python-format
+msgid "Data Import failed at %s due to an unexpected error"
+msgstr "Dataimport mislyktes ved% s på grunn av en uventet feil."
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:436
+#, python-format
+msgid "Import finished, notification email sended"
+msgstr "Import ferdig,  e-postmelding sendt."
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:190
+#, python-format
+msgid "%s is not a valid model name"
+msgstr "% s er ikke en gyldig modellnavn."
+
+#. module: import_base
+#: model:ir.ui.menu,name:import_base.menu_import_crm
+msgid "Import"
+msgstr "Import"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:467
+#, python-format
+msgid "with no warning"
+msgstr "Uten advarsel."
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:469
+#, python-format
+msgid "with warning : %s"
+msgstr "Med advarsel :%s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:191
+#, python-format
+msgid " fields imported : "
+msgstr " Felt importert: "
diff --git a/addons/l10n_cn/i18n/nb.po b/addons/l10n_cn/i18n/nb.po
new file mode 100644
index 00000000000..cafcf30d8e8
--- /dev/null
+++ b/addons/l10n_cn/i18n/nb.po
@@ -0,0 +1,66 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-12-23 09:56+0000\n"
+"PO-Revision-Date: 2012-09-08 19:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-09 04:52+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
+msgid "损益类"
+msgstr "Gevinst eller tap kategori."
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_all
+msgid "所有科目"
+msgstr "Alle fag."
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_equity
+msgid "所有者权益类"
+msgstr "Eiernes egenkapital."
+
+#. module: l10n_cn
+#: model:ir.actions.todo,note:l10n_cn.config_call_account_template_cn_chart
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generere Kontoplan fra en diagrammal. Du vil bli bedt om å passere navnet på "
+"selskapet, diagrammal til følge, nei. sifre som skal generere koden for "
+"kontoene og bankkonto, valuta å skape Journals. Dermed er den rene kopi av "
+"diagrammal generert.\n"
+"\t Dette er den samme veiviser som går fra økonomistyring / konfigurasjon / "
+"finansiell Regnskap / finansregnskapet / Generer Kontoplan fra en diagrammal."
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_debt
+msgid "负债类"
+msgstr "Gjeld klasse."
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_cost
+msgid "成本类"
+msgstr "Kostnaden for klassen"
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_capital
+msgid "资产类"
+msgstr "Aktivaklasser"
diff --git a/addons/l10n_de/i18n/nb.po b/addons/l10n_de/i18n/nb.po
new file mode 100644
index 00000000000..b8ba51a6810
--- /dev/null
+++ b/addons/l10n_de/i18n/nb.po
@@ -0,0 +1,66 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-15 15:05+0000\n"
+"PO-Revision-Date: 2012-09-08 19:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-09 04:52+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr04
+msgid "Kunde Ausland"
+msgstr "Kunde Ausland"
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_sale_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_sale_skr04
+msgid "Kunde EU (ohne USt-ID)"
+msgstr "Kunde EU (ohne USt-ID)"
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_purchase_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_purchase_skr04
+msgid "Lieferant Ausland"
+msgstr ""
+
+#. module: l10n_de
+#: model:ir.module.module,shortdesc:l10n_de.module_meta_information
+msgid "Deutschland - SKR03 and SKR04"
+msgstr ""
+
+#. module: l10n_de
+#: model:ir.module.module,description:l10n_de.module_meta_information
+msgid ""
+"Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem "
+"SKR03."
+msgstr ""
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_purchase_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_purchase_skr04
+msgid "Lieferant EU Unternehmen (mit USt-ID)"
+msgstr ""
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_purchase_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_purchase_skr04
+msgid "Lieferant EU (ohne Ust-ID)"
+msgstr ""
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_sale_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_sale_skr04
+msgid "Kunde EU Unternehmen (mit USt-ID)"
+msgstr ""
diff --git a/addons/pad_project/i18n/tr.po b/addons/pad_project/i18n/tr.po
new file mode 100644
index 00000000000..a19889de838
--- /dev/null
+++ b/addons/pad_project/i18n/tr.po
@@ -0,0 +1,38 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 20:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-09-08 04:54+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Hata! görev bitiş tarihi başlangıç tarihinden sonra olmalı"
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Görev"
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr ""
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Hata ! Yinelenen görevler oluşturamazsınız."

From f2ddf0ea65f9bb722ba35d84da3f1e240887e1a4 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 9 Sep 2012 12:43:40 +0200
Subject: [PATCH 946/999] [FIX] document_page wiki

bzr revid: al@openerp.com-20120909104340-z4c85dcq6s11v83y
---
 addons/document_page/document_page.py         | 14 ++++++-----
 addons/document_page/document_page_view.xml   | 24 +++++++++----------
 .../static/src/css/document_page.css          | 13 +++++-----
 .../wizard/document_page_show_diff_view.xml   |  2 +-
 4 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/addons/document_page/document_page.py b/addons/document_page/document_page.py
index 7304e2e9075..092d39f22e9 100644
--- a/addons/document_page/document_page.py
+++ b/addons/document_page/document_page.py
@@ -29,11 +29,13 @@ class document_page(osv.osv):
     _description = "Document Page"
     _order = 'name'
 
-    def _get_page_index(self, cr, uid, page):
+    def _get_page_index(self, cr, uid, page, link=True):
         index = []
         for subpage in page.child_ids:
             index += ["<li>"+ self._get_page_index(cr, uid, subpage) +"</li>"]
-        r = '<a href="#id=%s">%s</a>'%(page.id,page.name)
+        r = ''
+        if link:
+            r = '<a href="#id=%s">%s</a>'%(page.id,page.name)
         if index:
             r += "<ul>" + "".join(index) + "</ul>"
         return r
@@ -42,7 +44,7 @@ class document_page(osv.osv):
         res = {}
         for page in self.browse(cr, uid, ids, context=context):
             if page.type == "category":
-               content = self._get_page_index(cr, uid, page)
+               content = self._get_page_index(cr, uid, page, link=False)
             else:
                content = page.content
             res[page.id] =  content
@@ -120,12 +122,12 @@ class document_page_history(osv.osv):
         text2 = history_pool.read(cr, uid, [v2], ['content'])[0]['content']
         line1 = line2 = ''
         if text1:
-            line1 = tools.ustr(text1.splitlines(1))
+            line1 = text1.splitlines(1)
         if text2:
-            line2=tools.ustr(text2.splitlines(1))
+            line2 = text2.splitlines(1)
         if (not line1 and not line2) or (line1 == line2):
             raise osv.except_osv(_('Warning!'), _('There are no changes in revisions.'))
         diff = difflib.HtmlDiff()
-        return diff.make_file(line1, line2, "Revision-%s" % (v1), "Revision-%s" % (v2), context=False)
+        return diff.make_table(line1, line2, "Revision-%s" % (v1), "Revision-%s" % (v2), context=True)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index fc3bd86fdaf..23c4b8f29c8 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -78,17 +78,6 @@
             </field>
         </record>
         <!-- page action -->
-        <record id="action_category" model="ir.actions.act_window">
-            <field name="name">Category</field>
-            <field name="res_model">document.page</field>
-            <field name="domain">[('type','=','category')]</field>
-            <field name="context">{'default_type': 'category'}</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_wiki_tree"/>
-            <field name="search_view_id" ref="view_wiki_filter"/>
-        </record>
-        <menuitem id="menu_category" parent="menu_wiki" name="Categories" action="action_category" sequence="10"/>
         <record id="action_page" model="ir.actions.act_window">
             <field name="name">Pages</field>
             <field name="res_model">document.page</field>
@@ -100,7 +89,18 @@
             <field name="search_view_id" ref="view_wiki_filter"/>
             <field name="help">Create web pages</field>
         </record>
-        <menuitem id="menu_page" parent="menu_wiki" name="Pages" action="action_page" sequence="20"/>
+        <menuitem id="menu_page" parent="menu_wiki" name="Pages" action="action_page" sequence="10"/>
+        <record id="action_category" model="ir.actions.act_window">
+            <field name="name">Category</field>
+            <field name="res_model">document.page</field>
+            <field name="domain">[('type','=','category')]</field>
+            <field name="context">{'default_type': 'category'}</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_wiki_tree"/>
+            <field name="search_view_id" ref="view_wiki_filter"/>
+        </record>
+        <menuitem id="menu_category" parent="menu_wiki" name="Categories" action="action_category" sequence="20"/>
 
         <!-- History Tree view -->
         <record model="ir.ui.view" id="view_wiki_history_tree">
diff --git a/addons/document_page/static/src/css/document_page.css b/addons/document_page/static/src/css/document_page.css
index 77597fb4281..ddbbcffd45b 100644
--- a/addons/document_page/static/src/css/document_page.css
+++ b/addons/document_page/static/src/css/document_page.css
@@ -1,11 +1,12 @@
-.oe_document_page ul, .oe_document_page li {
-    padding: 2px 8px;
-    margin: 2px 8px;
-    list-style-type: circle;
-}
-
 .oe_form_editable .oe_document_page {
     display: none;
 }
 
+table.diff {font-family:Courier; border:medium;}
+.diff_header {background-color:#e0e0e0}
+td.diff_header {text-align:right}
+.diff_next {background-color:#c0c0c0}
+.diff_add {background-color:#aaffaa}
+.diff_chg {background-color:#ffff77}
+.diff_sub {background-color:#ffaaaa}
 
diff --git a/addons/document_page/wizard/document_page_show_diff_view.xml b/addons/document_page/wizard/document_page_show_diff_view.xml
index f268db7ad2e..5bec49b1bcc 100644
--- a/addons/document_page/wizard/document_page_show_diff_view.xml
+++ b/addons/document_page/wizard/document_page_show_diff_view.xml
@@ -8,7 +8,7 @@
             <field name="model">wizard.document.page.history.show_diff</field>
             <field name="arch" type="xml">
                 <form string="Difference" version="7.0">
-                    <field name="diff"/>
+                    <field name="diff" widget="html"/>
                     <footer>
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>

From d0577ed3ac89cff9a5e1fc0743033d25a82fa9ef Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 10 Sep 2012 04:41:18 +0000
Subject: [PATCH 947/999] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120910044118-l9r2knhxlwtgg4eh
---
 addons/import_google/i18n/nb.po | 226 ++++++++++++++++++++++++++++++++
 addons/l10n_ca/i18n/nb.po       | 128 ++++++++++++++++++
 addons/l10n_th/i18n/nb.po       |  52 ++++++++
 3 files changed, 406 insertions(+)
 create mode 100644 addons/import_google/i18n/nb.po
 create mode 100644 addons/l10n_ca/i18n/nb.po
 create mode 100644 addons/l10n_th/i18n/nb.po

diff --git a/addons/import_google/i18n/nb.po b/addons/import_google/i18n/nb.po
new file mode 100644
index 00000000000..a6414341f8f
--- /dev/null
+++ b/addons/import_google/i18n/nb.po
@@ -0,0 +1,226 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-09 16:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-10 04:41+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
+
+#. module: import_google
+#: help:synchronize.google.import,group_name:0
+msgid "Choose which group to import, By default it takes all."
+msgstr "Velg hvilken gruppe du vil importere, standard tar alt."
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Google Calendar Events"
+msgstr "Importer Google Kalender Hendelser."
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Events"
+msgstr "_Importer hendelser."
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid ""
+"No Google Username or password Defined for user.\n"
+"Please define in user view"
+msgstr ""
+"Ingen Google-brukernavn eller passord definert for brukeren.\n"
+"Vennligst angi i brukerens visning."
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#, python-format
+msgid ""
+"Invalid login detail !\n"
+" Specify Username/Password."
+msgstr ""
+"Ugyldig pålogging detalj!\n"
+"  Angi brukernavn / passord."
+
+#. module: import_google
+#: field:synchronize.google.import,supplier:0
+msgid "Supplier"
+msgstr "Leverandør"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Options"
+msgstr "Alternativer for import"
+
+#. module: import_google
+#: field:synchronize.google.import,group_name:0
+msgid "Group Name"
+msgstr "Gruppe Navn"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_crm_case_categ
+msgid "Category of Case"
+msgstr "Kategori for hendelse"
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
+#: model:ir.ui.menu,name:import_google.menu_sync_contact
+msgid "Import Google Contacts"
+msgstr "Importer Google kontakter."
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "Import Google Data"
+msgstr "Importer Google data."
+
+#. module: import_google
+#: view:crm.meeting:0
+msgid "Meeting Type"
+msgstr "Møtetype"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Vennligst Installer gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_login
+msgid "Google Contact"
+msgstr "Google kontakt"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import contacts from a google account"
+msgstr "Importer kontakter fra en Google-konto"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Please specify correct user and password !"
+msgstr "Vennligst oppgi riktig bruker og passord!"
+
+#. module: import_google
+#: field:synchronize.google.import,customer:0
+msgid "Customer"
+msgstr "Kunde"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_synchronize_google_import
+msgid "synchronize.google.import"
+msgstr "Synkronisere.google.import"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Contacts"
+msgstr "_Importer kontakter."
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_form
+#: model:ir.ui.menu,name:import_google.menu_sync_calendar
+msgid "Import Google Calendar"
+msgstr "Importer Google kalender."
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:50
+#, python-format
+msgid "Import google"
+msgstr "Importer Google."
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Error"
+msgstr "Feil"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid "Warning !"
+msgstr "Advarsel !"
+
+#. module: import_google
+#: field:synchronize.google.import,create_partner:0
+msgid "Options"
+msgstr "Valg"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "_Ok"
+msgstr "_Ok"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Google kontakter Import Feil!"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_import_message
+msgid "Import Message"
+msgstr "Importer melding."
+
+#. module: import_google
+#: field:synchronize.google.import,calendar_name:0
+msgid "Calendar Name"
+msgstr "Kalendernavn"
+
+#. module: import_google
+#: help:synchronize.google.import,supplier:0
+msgid "Check this box to set newly created partner as Supplier."
+msgstr "Kryss av for å sette nyopprettede partner som leverandør."
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Import only address"
+msgstr "Importer bare adresse."
+
+#. module: import_google
+#: field:crm.case.categ,user_id:0
+msgid "User"
+msgstr "Bruker"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Partner Status for this Group:"
+msgstr ""
+
+#. module: import_google
+#: field:google.import.message,name:0
+msgid "Message"
+msgstr "Melding"
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Create partner for each contact"
+msgstr "Opprett partner for hver kontakt."
+
+#. module: import_google
+#: help:synchronize.google.import,customer:0
+msgid "Check this box to set newly created partner as Customer."
+msgstr "Kryss av for å sette nyopprettede partner som Kunden."
+
+#~ msgid "Partner status for this group:"
+#~ msgstr "Partner status for denne gruppen."
diff --git a/addons/l10n_ca/i18n/nb.po b/addons/l10n_ca/i18n/nb.po
new file mode 100644
index 00000000000..47276cdded2
--- /dev/null
+++ b/addons/l10n_ca/i18n/nb.po
@@ -0,0 +1,128 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-02 21:08+0000\n"
+"PO-Revision-Date: 2012-09-09 16:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-10 04:41+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_receivable
+msgid "Receivable"
+msgstr "Fordring"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_asset_view
+msgid "Asset View"
+msgstr "Eiendel Vis"
+
+#. module: l10n_ca
+#: model:ir.module.module,description:l10n_ca.module_meta_information
+msgid ""
+"This is the module to manage the canadian accounting chart in OpenERP."
+msgstr ""
+"Dette er modulen for å administrere kanadiske regnskap diagrammet i OpenERP."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_expense_view
+msgid "Expense View"
+msgstr "Kostnad Vis"
+
+#. module: l10n_ca
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "Feil ! Du kan ikke opprette rekursive konto maler."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_income_view
+msgid "Income View"
+msgstr "Inntekt Vis"
+
+#. module: l10n_ca
+#: model:ir.module.module,shortdesc:l10n_ca.module_meta_information
+msgid "Canada - Chart of Accounts"
+msgstr "Canada - Kontoplan"
+
+#. module: l10n_ca
+#: constraint:account.account.type:0
+msgid "Error ! You can not create recursive types."
+msgstr "Feil ! Du kan ikke opprette rekursive typer."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_tax
+msgid "Tax"
+msgstr "Skatt"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_cash
+msgid "Cash"
+msgstr "Kontant"
+
+#. module: l10n_ca
+#: model:ir.actions.todo,note:l10n_ca.config_call_account_template_ca
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generere Kontoplan fra en diagrammal. Du vil bli bedt om å passere navnet på "
+"selskapet, diagrammal til følge, nei. sifre som skal generere koden for "
+"kontoene og bankkonto, valuta å skape Journals. Dermed er den rene kopi av "
+"diagrammal generert.\n"
+"\t Dette er den samme veiviser som går fra økonomistyring / konfigurasjon / "
+"finansiell Regnskap / finansregnskapet / Generer Kontoplan fra en diagrammal."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_payable
+msgid "Payable"
+msgstr "Utgift"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_asset
+msgid "Asset"
+msgstr "Eiendel"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_equity
+msgid "Equity"
+msgstr "Egenkapital"
+
+#. module: l10n_ca
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "Feil ! Du kan ikke opprette rekursive skatte koder."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_liability_view
+msgid "Liability View"
+msgstr "Ansvar Vis."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_expense
+msgid "Expense"
+msgstr "Utgift"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_income
+msgid "Income"
+msgstr "Inntekt"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_view
+msgid "View"
+msgstr "Vis"
diff --git a/addons/l10n_th/i18n/nb.po b/addons/l10n_th/i18n/nb.po
new file mode 100644
index 00000000000..8810993035f
--- /dev/null
+++ b/addons/l10n_th/i18n/nb.po
@@ -0,0 +1,52 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-12-23 09:56+0000\n"
+"PO-Revision-Date: 2012-09-09 16:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-10 04:41+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
+
+#. module: l10n_th
+#: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"This is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generere Kontoplan fra en diagrammal. Du vil bli bedt om å passere navnet på "
+"selskapet, diagrammal til følge, nei. Sifre som skal generere koden for "
+"kontoene og bankkonto, valuta å skape Journals. Dermed er den rene kopi av "
+"diagrammal generert.\n"
+"Dette er den samme veiviser som går fra økonomistyring / Configuration / "
+"Financial Accounting / finansregnskapet / Generer Kontoplan fra en "
+"diagrammal."
+
+#. module: l10n_th
+#: model:account.account.type,name:l10n_th.acc_type_other
+msgid "Other"
+msgstr "Annet"
+
+#. module: l10n_th
+#: model:account.account.type,name:l10n_th.acc_type_reconciled
+msgid "Reconciled"
+msgstr "Forsonet"
+
+#. module: l10n_th
+#: model:account.account.type,name:l10n_th.acc_type_view
+msgid "View"
+msgstr "Vis"

From 34d15bb862b67770f293c27d6ed1984f33ca69a8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 10 Sep 2012 09:20:32 +0200
Subject: [PATCH 948/999] [IMP] base_import: lexicographically sort fields in
 field-matching UI

bzr revid: xmo@openerp.com-20120910072032-wbgafg3z45z4l29a
---
 addons/base_import/static/src/js/import.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 947955d94af..63a266ef6c0 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -199,6 +199,12 @@ openerp.base_import = function (instance) {
                 traverse(field, []);
             });
 
+            var cmp = function (field1, field2) {
+                return field1.text.localeCompare(field2.text);
+
+            };
+            regulars.sort(cmp);
+            o2m.sort(cmp);
             return basic.concat([
                 { text: _t("Normal Fields"), children: regulars },
                 { text: _t("Relation Fields"), children: o2m }

From 41198901cd08a49c2236cb105ec322c8c1a962d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 10 Sep 2012 09:58:50 +0200
Subject: [PATCH 949/999] [FIX] Project: fixed a security rule based on
 follower_ids, that is now message_follower_ids.

bzr revid: tde@openerp.com-20120910075850-0b5sg1vljcc8gba9
---
 addons/project/security/project_security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 3afe0f14e7a..b499e682669 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -45,7 +45,7 @@
         <field name="name">public Members</field>
         <field name="model_id" ref="model_project_project"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|','|',('privacy_visibility','in',[False,'public']),('members','in',[user.id]),('follower_ids','in',[user.partner_id.id])]</field>
+        <field name="domain_force">['|','|',('privacy_visibility','in',[False,'public']),('members','in',[user.id]),('message_follower_ids','in',[user.partner_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="task_comp_rule">

From 61b8f19ba41688dba2e4601e4f47caadb3238c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 10 Sep 2012 10:31:35 +0200
Subject: [PATCH 950/999] [CLEAN] mail/res_users: cleaned comment in auto_init.

bzr revid: tde@openerp.com-20120910083135-2tef7mn01kujtyvj
---
 addons/mail/res_users.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index a5aea54bf9b..f9ca54c478d 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -55,10 +55,11 @@ class res_users(osv.Model):
         return init_res
 
     def _auto_init(self, cr, context=None):
-        """Installation hook to create aliases for all users and avoid constraint errors."""
+        """ Installation hook: aliases, partner following themselves """
+        # create aliases for all users and avoid constraint errors
         self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(res_users, self)._auto_init,
             self._columns['alias_id'], 'login', alias_force_key='id', context=context)
-        # make already existing users follow themselves, using read to avoid unprefetched fields browse failure
+        # make already existing users follow themselves, using SQL to avoid using the ORM during the auto_init
         cr.execute("""  SELECT p.id FROM res_partner p
                         LEFT JOIN mail_followers n
                         ON (n.partner_id = p.id AND n.res_model = 'res.partner' AND n.res_id = p.id)

From 871cd8ce33ee51b0d9f4e25211da94d68f6b2466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 10 Sep 2012 10:32:00 +0200
Subject: [PATCH 951/999] [FIX] mail.js: fixed links to related record in
 chatter, model and res_id were incorrect.

bzr revid: tde@openerp.com-20120910083200-iqq5m9l1jxghfpr9
---
 addons/mail/static/src/xml/mail.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f6be765c603..66b82d5a36c 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -118,15 +118,14 @@
                         <t t-raw="record.subject"/>
                     </h1>
                     <div class="oe_mail_msg_body">
-                        
                         <div class="oe_mail_msg_record_body">
-                            <a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}" t-if="(params.thread_level > 0) &amp; (!record.subject)"><t t-raw="record.record_name"/></a>
+                            <a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}" t-if="(params.thread_level > 0) &amp; (!record.subject)"><t t-raw="record.record_name"/></a>
                             <t t-raw="record.body"/>
                         </div>
                     </div>
                     <div class="oe_clear"/>
                     <ul class="oe_mail_msg_footer">
-                      <li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a></li>
+                      <li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}"><t t-raw="record.record_name"/></a></li>
                       <li><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>
                       <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
                       <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>

From a44699ca707afde741deec58d9e2e563d6b396c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 10 Sep 2012 10:36:24 +0200
Subject: [PATCH 952/999] [FIX] mail.js: RecordThread now really using
 message_ids field.

bzr revid: tde@openerp.com-20120910083624-wjdaqruoe42x33cq
---
 addons/mail/static/src/js/mail.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index cf9a98d17b6..e8d8e25e684 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -585,6 +585,7 @@ openerp.mail = function(session) {
             var thread = new mail.Thread(self, {
                 'context': this.options.context,
                 'thread_level': this.options.thread_level, 'show_header_compose': true,
+                'message_ids': this.get_value(),
                 'show_delete': true, 'composer': true });
             this.thread_list.push(thread);
             return thread.appendTo(this.$el.find('div.oe_mail_recthread_main'));

From 7c9b5c8e5b93bd39141afa729a2281c17e44de5b Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 10 Sep 2012 11:16:18 +0200
Subject: [PATCH 953/999] [IMP] point_of_sale: If there is no journals for the
 pos.config, select the cash journals

bzr revid: stw@openerp.com-20120910091618-nzv26m258xx64na5
---
 addons/point_of_sale/point_of_sale.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index df0dd74b4ae..95b54b6baed 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -314,10 +314,9 @@ class pos_session(osv.osv):
 
             # define some cash journal if no payment method exists
             if not pos_config.journal_ids:
-                cashids = self.pool.get('account.journal').search(cr, uid, [('journal_user','=',True)], context=context)
+                cashids = self.pool.get('account.journal').search(cr, uid, [('journal_user', '=', True), ('type','=','cash')], context=context)
                 if not cashids:
-                    cashids = self.pool.get('account.journal').search(cr, uid, [('type','=','cash')], context=context)
-                    self.pool.get('account.journal').write(cr, uid, cashids, {'journal_user': True})
+                    cashids = self.pool.get('account.journal').search(cr, uid, [('journal_user','=',True)], context=context)
                 jobj.write(cr, uid, [pos_config.id], {'journal_ids': [(6,0, cashids)]})
 
 

From dc6a6f793c87bacfb3873b9c27e360e784f3a8f6 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 10 Sep 2012 11:28:02 +0200
Subject: [PATCH 954/999] [FIX] Fix dashboard listview row click. Add support
 for kanban card click

bzr revid: fme@openerp.com-20120910092802-k15c57p9371946ft
---
 addons/board/static/src/js/dashboard.js | 33 ++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index 0333690aa57..8140ae4b91b 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -238,18 +238,39 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
             });
         }
         if (am.inner_widget) {
-            am.inner_widget.on_mode_switch.add(function(mode) {
+            var new_form_action = function(id, editable) {
                 var new_views = [];
                 _.each(action_orig.views, function(view) {
-                    new_views[view[1] === mode ? 'unshift' : 'push'](view);
+                    new_views[view[1] === 'form' ? 'unshift' : 'push'](view);
                 });
-                if (!new_views.length || new_views[0][1] !== mode) {
-                    new_views.unshift([false, mode]);
+                if (!new_views.length || new_views[0][1] !== 'form') {
+                    new_views.unshift([false, 'form']);
                 }
                 action_orig.views = new_views;
-                action_orig.res_id = am.inner_widget.dataset.ids[am.inner_widget.dataset.index];
+                action_orig.res_id = id;
+                action_orig.flags = {
+                    form: {
+                        "initial_mode": editable ? "edit" : "view",
+                    }
+                };
                 self.do_action(action_orig);
-            });
+            };
+            var list = am.inner_widget.views.list;
+            if (list) {
+                list.deferred.then(function() {
+                    $(list.controller.groups).off('row_link').on('row_link', function(e, id) {
+                        new_form_action(id);
+                    });
+                });
+            }
+            var kanban = am.inner_widget.views.kanban;
+            if (kanban) {
+                kanban.deferred.then(function() {
+                    kanban.controller.open_record = function(id, editable) {
+                        new_form_action(id, editable);
+                    };
+                });
+            }
         }
     },
     renderElement: function() {

From 585dce207d2b883f5a1fdf8ec3c7041686e20f1b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 10 Sep 2012 11:31:52 +0200
Subject: [PATCH 955/999] [REM] Dashboard: Removed creatable option (requested
 by fp)

bzr revid: fme@openerp.com-20120910093152-r14olqa181obp7f2
---
 addons/board/static/src/js/dashboard.js     | 17 -----------------
 addons/board/static/src/xml/board.xml       |  1 -
 addons/hr_expense/board_hr_expense_view.xml |  2 +-
 addons/purchase/board_purchase_view.xml     |  2 +-
 addons/sale/board_sale_view.xml             |  2 +-
 5 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index 8140ae4b91b..9c37924144d 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -220,23 +220,6 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         am.do_action = function (action) {
             self.do_action(action);
         };
-        if (action_attrs.creatable && action_attrs.creatable !== 'false') {
-            var action_id = parseInt(action_attrs.creatable, 10);
-            $action.parent().find('button.oe_dashboard_button_create').click(function() {
-                if (isNaN(action_id)) {
-                    action_orig.flags.default_view = 'form';
-                    self.do_action(action_orig);
-                } else {
-                    self.rpc('/web/action/load', {
-                        action_id: action_id
-                    }, function(result) {
-                        result.result.flags = result.result.flags || {};
-                        result.result.flags.default_view = 'form';
-                        self.do_action(result.result);
-                    });
-                }
-            });
-        }
         if (am.inner_widget) {
             var new_form_action = function(id, editable) {
                 var new_views = [];
diff --git a/addons/board/static/src/xml/board.xml b/addons/board/static/src/xml/board.xml
index b2363cafd53..e13fa707776 100644
--- a/addons/board/static/src/xml/board.xml
+++ b/addons/board/static/src/xml/board.xml
@@ -26,7 +26,6 @@
             <span class="oe_header_txt"> <t t-esc="action.attrs.string"/> </span>
             <input class = "oe_header_text" type="text"/>
             <t t-if="!action.attrs.string">&amp;nbsp;</t>
-            <button t-if="action.attrs.creatable and action.attrs.creatable !== 'false'" class="oe_button oe_button_create">Create</button>
             <span class='oe_icon oe_close'></span>
             <span class='oe_icon oe_minimize oe_fold' t-if="!action.attrs.fold"></span>
             <span class='oe_icon oe_maximize oe_fold' t-if="action.attrs.fold"></span>
diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml
index fe89a4afc7a..3f896a76fae 100644
--- a/addons/hr_expense/board_hr_expense_view.xml
+++ b/addons/hr_expense/board_hr_expense_view.xml
@@ -17,7 +17,7 @@
             <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/board/column[1]" position="inside">
-                     <action name="%(action_my_expense)d" string="My Expenses" creatable="true"/>
+                     <action name="%(action_my_expense)d" string="My Expenses"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 67c3981f383..894271e46ce 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -62,7 +62,7 @@
                 <form string="Purchase Dashboard" version="7.0">
                     <board style="2-1">
                         <column>
-                            <action name="%(purchase_draft)d" string="Request for Quotations" creatable="true"/>
+                            <action name="%(purchase_draft)d" string="Request for Quotations"/>
                         </column>
                         <column>
                             <action name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchases by Category"/>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 702bc0c61cc..4839744c6d2 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -51,7 +51,7 @@
                 <form string="Sales Dashboard" version="7.0">
                     <board style="2-1">
                         <column>
-                            <action name="%(action_quotation_for_sale)d" string="My Quotations" creatable="true"/>
+                            <action name="%(action_quotation_for_sale)d" string="My Quotations"/>
                         </column>
                         <column>
                             <action name="%(action_turnover_by_month)d" string="Monthly Turnover"/>

From a3abba201e7d684dcff673a077573b136a70463d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 10 Sep 2012 12:01:52 +0200
Subject: [PATCH 956/999] [FIX] hr_attendance: minor javascript bug

bzr revid: nicolas.vanhoren@openerp.com-20120910100152-eru3fdxalv4lhqek
---
 addons/hr_attendance/static/src/js/attendance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 0366fa47c6c..1b5e271b4ba 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -29,7 +29,7 @@ openerp.hr_attendance = function (instance) {
                 title: function() {
                     var last_text = instance.web.format_value(self.last_sign, {type: "datetime"});
                     var current_text = instance.web.format_value(new Date(), {type: "datetime"});
-                    var duration = $.timeago(self.last_sign);
+                    var duration = self.last_sign ? $.timeago(self.last_sign) : "none";
                     if (self.get("signed_in")) {
                         return _.str.sprintf(_t("Last sign in: %s,<br />%s.<br />Click to sign out."), last_text, duration);
                     } else {

From bf7f9a0ee71caf8170e430d6578b5a7538b950d5 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 10 Sep 2012 12:24:03 +0200
Subject: [PATCH 957/999] [FIX] problem with mime types of fonts

bzr revid: nicolas.vanhoren@openerp.com-20120910102403-qiazec8parg0i5gy
---
 addons/web/common/http.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 6dc99f2c997..2d3452556a8 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -420,7 +420,7 @@ def session_context(request, storage_path, session_cookie='httpsessionid'):
 #----------------------------------------------------------
 # OpenERP Web WSGI Application
 #----------------------------------------------------------
-class DisableCacheMiddleware(object):
+class CustomStaticMiddleware(object):
     def __init__(self, app):
         self.app = app
     def __call__(self, environ, start_response):
@@ -431,8 +431,11 @@ class DisableCacheMiddleware(object):
 
             new_headers = []
             unwanted_keys = ['Last-Modified']
+            if environ.get('PATH_INFO', '').endswith(".ttf"):
+                new_headers.append(("Content-Type", "application/x-font-ttf"))
+                unwanted_keys += ["Content-Type"]
             if debug:
-                new_headers = [('Cache-Control', 'no-cache')]
+                new_headers.append(('Cache-Control', 'no-cache'))
                 unwanted_keys += ['Expires', 'Etag', 'Cache-Control']
 
             for k, v in headers:
@@ -477,7 +480,7 @@ class Root(object):
         static_dirs = self._load_addons()
         if options.serve_static:
             app = werkzeug.wsgi.SharedDataMiddleware( self.dispatch, static_dirs)
-            self.dispatch = DisableCacheMiddleware(app)
+            self.dispatch = CustomStaticMiddleware(app)
 
         if options.session_storage:
             if not os.path.exists(options.session_storage):

From a933c17e54bb479b4c30da15e106a83dc300715a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 10 Sep 2012 12:51:29 +0200
Subject: [PATCH 958/999] [FIX] integrate web tests into buildbot runner, fix
 broken tests

* Remove deprecated tests and dead code
* Fix usage of mock
* Moar fixes

bzr revid: xmo@openerp.com-20120910105129-rxh3jqwkewh65rl3
---
 addons/web/controllers/main.py                |  31 +--
 addons/web/static/src/js/view_list.js         |   2 +-
 addons/web/static/test/list-editable.js       |   4 +-
 addons/web/test/__init__.py                   |   1 -
 addons/web/test/test_dataset.py               |  81 ------
 addons/web/test/test_view.py                  | 248 ------------------
 addons/web/tests/__init__.py                  |  10 +
 addons/web/tests/test_dataset.py              |  41 +++
 addons/web/{test => tests}/test_menu.py       |  70 +++--
 .../web/{test => tests}/test_serving_base.py  |   4 +-
 addons/web/tests/test_view.py                 | 128 +++++++++
 11 files changed, 231 insertions(+), 389 deletions(-)
 delete mode 100644 addons/web/test/__init__.py
 delete mode 100644 addons/web/test/test_dataset.py
 delete mode 100644 addons/web/test/test_view.py
 create mode 100644 addons/web/tests/__init__.py
 create mode 100644 addons/web/tests/test_dataset.py
 rename addons/web/{test => tests}/test_menu.py (65%)
 rename addons/web/{test => tests}/test_serving_base.py (90%)
 create mode 100644 addons/web/tests/test_view.py

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index cf7a7a06feb..b635f5abdcd 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -484,15 +484,13 @@ def fix_view_modes(action):
     if not action.get('views'):
         generate_views(action)
 
-    id_form = None
-    for index, (id, mode) in enumerate(action['views']):
-        if mode == 'form':
-            id_form = id
-            break
-
     if action.pop('view_type', 'form') != 'form':
         return action
 
+    if 'view_mode' in action:
+        action['view_mode'] = ','.join(
+            mode if mode != 'tree' else 'list'
+            for mode in action['view_mode'].split(','))
     action['views'] = [
         [id, mode if mode != 'tree' else 'list']
         for id, mode in action['views']
@@ -1351,27 +1349,6 @@ class View(openerpweb.Controller):
     def load(self, req, model, view_id, view_type, toolbar=False):
         return self.fields_view_get(req, model, view_id, view_type, toolbar=toolbar)
 
-class ListView(View):
-    _cp_path = "/web/listview"
-
-    def process_colors(self, view, row, context):
-        colors = view['arch']['attrs'].get('colors')
-
-        if not colors:
-            return None
-
-        color = [
-            pair.split(':')[0]
-            for pair in colors.split(';')
-            if eval(pair.split(':')[1], dict(context, **row))
-        ]
-
-        if not color:
-            return None
-        elif len(color) == 1:
-            return color[0]
-        return 'maroon'
-
 class TreeView(View):
     _cp_path = "/web/treeview"
 
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 22333898813..df61e9bd6bd 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -480,7 +480,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         if (this.embedded_view) {
             return $.Deferred().then(callback).resolve(this.embedded_view);
         } else {
-            return this.rpc('/web/listview/load', {
+            return this.rpc('/web/view/load', {
                 model: this.model,
                 view_id: this.view_id,
                 view_type: "tree",
diff --git a/addons/web/static/test/list-editable.js b/addons/web/static/test/list-editable.js
index 2a4dee3b6e7..0388e56048d 100644
--- a/addons/web/static/test/list-editable.js
+++ b/addons/web/static/test/list-editable.js
@@ -192,7 +192,7 @@ $(document).ready(function () {
 
             var records = {};
             _.extend(instance.session.responses, {
-                '/web/listview/load': function () {
+                '/web/view/load': function () {
                     return {result: {
                         type: 'tree',
                         fields: {
@@ -268,7 +268,7 @@ $(document).ready(function () {
         setup: function () {
             baseSetup();
             _.extend(instance.session.responses, {
-                '/web/listview/load': function () {
+                '/web/view/load': function () {
                     return {result: {
                         type: 'tree',
                         fields: {
diff --git a/addons/web/test/__init__.py b/addons/web/test/__init__.py
deleted file mode 100644
index 40a96afc6ff..00000000000
--- a/addons/web/test/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-
diff --git a/addons/web/test/test_dataset.py b/addons/web/test/test_dataset.py
deleted file mode 100644
index b9fe5a3cca2..00000000000
--- a/addons/web/test/test_dataset.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-import mock
-import unittest2
-import web.controllers.main
-
-class TestDataSetController(unittest2.TestCase):
-    def setUp(self):
-        self.dataset = web.controllers.main.DataSet()
-        self.request = mock.Mock()
-        self.read = self.request.session.model().read
-        self.search = self.request.session.model().search
-
-    @unittest2.skip
-    def test_empty_find(self):
-        self.search.return_value = []
-        self.read.return_value = []
-
-        self.assertFalse(self.dataset.do_search_read(self.request, 'fake.model'))
-        self.read.assert_called_once_with([], False, self.request.context)
-
-    @unittest2.skip
-    def test_regular_find(self):
-        self.search.return_value = [1, 2, 3]
-
-        self.dataset.do_search_read(self.request, 'fake.model')
-        self.read.assert_called_once_with([1, 2, 3], False,
-                                          self.request.context)
-
-    @unittest2.skip
-    def test_ids_shortcut(self):
-        self.search.return_value = [1, 2, 3]
-        self.read.return_value = [
-            {'id': 1, 'name': 'foo'},
-            {'id': 2, 'name': 'bar'},
-            {'id': 3, 'name': 'qux'}
-        ]
-
-        self.assertEqual(
-            self.dataset.do_search_read(self.request, 'fake.model', ['id']),
-            [{'id': 1}, {'id': 2}, {'id': 3}])
-        self.assertFalse(self.read.called)
-
-    @unittest2.skip
-    def test_get(self):
-        self.read.return_value = [
-            {'id': 1, 'name': 'baz'},
-            {'id': 3, 'name': 'foo'},
-            {'id': 2, 'name': 'bar'}
-        ]
-
-        result = self.dataset.do_get(
-            self.request, 'fake.model', [3, 2, 1])
-        self.read.assert_called_once_with(
-            [3, 2, 1], False)
-        self.assertFalse(self.search.called)
-
-        self.assertEqual(
-            result,
-            [
-                {'id': 3, 'name': 'foo'},
-                {'id': 2, 'name': 'bar'},
-                {'id': 1, 'name': 'baz'}
-            ]
-        )
-
-    def test_get_missing_result(self):
-        self.read.return_value = [
-            {'id': 1, 'name': 'baz'},
-            {'id': 2, 'name': 'bar'}
-        ]
-
-        result = self.dataset.do_get(
-            self.request, 'fake.model', [3, 2, 1])
-
-        self.assertEqual(
-            result,
-            [
-                {'id': 2, 'name': 'bar'},
-                {'id': 1, 'name': 'baz'}
-            ]
-        )
diff --git a/addons/web/test/test_view.py b/addons/web/test/test_view.py
deleted file mode 100644
index 0a778ccffd1..00000000000
--- a/addons/web/test/test_view.py
+++ /dev/null
@@ -1,248 +0,0 @@
-import copy
-import xml.etree.ElementTree
-import mock
-
-import unittest2
-import simplejson
-
-import web.controllers.main
-from ..common import nonliterals, session as s
-
-def field_attrs(fields_view_get, fieldname):
-    (field,) =  filter(lambda f: f['attrs'].get('name') == fieldname,
-                       fields_view_get['arch']['children'])
-    return field['attrs']
-
-#noinspection PyCompatibility
-class DomainsAndContextsTest(unittest2.TestCase):
-    def setUp(self):
-        self.view = web.controllers.main.View()
-
-    def test_convert_literal_domain(self):
-        e = xml.etree.ElementTree.Element(
-            'field', domain="  [('somefield', '=', 3)]  ")
-        self.view.parse_domains_and_contexts(e, None)
-
-        self.assertEqual(
-            e.get('domain'),
-            [('somefield', '=', 3)])
-
-    def test_convert_complex_domain(self):
-        e = xml.etree.ElementTree.Element(
-            'field',
-            domain="[('account_id.type','in',['receivable','payable']),"
-                   "('reconcile_id','=',False),"
-                   "('reconcile_partial_id','=',False),"
-                   "('state', '=', 'valid')]"
-        )
-        self.view.parse_domains_and_contexts(e, None)
-
-        self.assertEqual(
-            e.get('domain'),
-            [('account_id.type', 'in', ['receivable', 'payable']),
-             ('reconcile_id', '=', False),
-             ('reconcile_partial_id', '=', False),
-             ('state', '=', 'valid')]
-        )
-
-    def test_retrieve_nonliteral_domain(self):
-        session = mock.Mock(spec=s.OpenERPSession)
-        session.domains_store = {}
-        domain_string = ("[('month','=',(datetime.date.today() - "
-                         "datetime.timedelta(365/12)).strftime('%%m'))]")
-        e = xml.etree.ElementTree.Element(
-            'field', domain=domain_string)
-
-        self.view.parse_domains_and_contexts(e, session)
-
-        self.assertIsInstance(e.get('domain'), nonliterals.Domain)
-        self.assertEqual(
-            nonliterals.Domain(
-                session, key=e.get('domain').key).get_domain_string(),
-            domain_string)
-
-    def test_convert_literal_context(self):
-        e = xml.etree.ElementTree.Element(
-            'field', context="  {'some_prop':  3}  ")
-        self.view.parse_domains_and_contexts(e, None)
-
-        self.assertEqual(
-            e.get('context'),
-            {'some_prop': 3})
-
-    def test_convert_complex_context(self):
-        e = xml.etree.ElementTree.Element(
-            'field',
-            context="{'account_id.type': ['receivable','payable'],"
-                     "'reconcile_id': False,"
-                     "'reconcile_partial_id': False,"
-                     "'state': 'valid'}"
-        )
-        self.view.parse_domains_and_contexts(e, None)
-
-        self.assertEqual(
-            e.get('context'),
-            {'account_id.type': ['receivable', 'payable'],
-             'reconcile_id': False,
-             'reconcile_partial_id': False,
-             'state': 'valid'}
-        )
-
-    def test_retrieve_nonliteral_context(self):
-        session = mock.Mock(spec=s.OpenERPSession)
-        session.contexts_store = {}
-        context_string = ("{'month': (datetime.date.today() - "
-                         "datetime.timedelta(365/12)).strftime('%%m')}")
-        e = xml.etree.ElementTree.Element(
-            'field', context=context_string)
-
-        self.view.parse_domains_and_contexts(e, session)
-
-        self.assertIsInstance(e.get('context'), nonliterals.Context)
-        self.assertEqual(
-            nonliterals.Context(
-                session, key=e.get('context').key).get_context_string(),
-            context_string)
-
-class AttrsNormalizationTest(unittest2.TestCase):
-    def setUp(self):
-        self.view = web.controllers.main.View()
-
-    def test_identity(self):
-        web_view = """
-            <form string="Title">
-                <group>
-                    <field name="some_field"/>
-                    <field name="some_other_field"/>
-                </group>
-                <field name="stuff"/>
-            </form>
-        """
-
-        pristine = xml.etree.ElementTree.fromstring(web_view)
-        transformed = self.view.transform_view(web_view, None)
-
-        self.assertEqual(
-             xml.etree.ElementTree.tostring(transformed),
-             xml.etree.ElementTree.tostring(pristine)
-        )
-
-    @unittest2.skip
-    def test_transform_states(self):
-        element = xml.etree.ElementTree.Element(
-            'field', states="open,closed")
-        self.view.normalize_attrs(element, {})
-
-        self.assertIsNone(element.get('states'))
-        self.assertEqual(
-            simplejson.loads(element.get('attrs')),
-            {'invisible': [['state', 'not in', ['open', 'closed']]]})
-
-    @unittest2.skip
-    def test_transform_invisible(self):
-        element = xml.etree.ElementTree.Element(
-            'field', invisible="context.get('invisible_country', False)")
-
-        empty_context = copy.deepcopy(element)
-        self.view.normalize_attrs(empty_context, {})
-        self.assertEqual(empty_context.get('invisible'), None)
-
-        full_context = copy.deepcopy(element)
-        self.view.normalize_attrs(full_context, {'invisible_country': True})
-        self.assertEqual(full_context.get('invisible'), '1')
-
-    @unittest2.skip
-    def test_transform_invisible_list_column(self):
-        req = mock.Mock()
-        req.context =  {'set_editable':True, 'set_visible':True,
-                        'gtd_visible':True, 'user_invisible':True}
-        req.session.evaluation_context = \
-            s.OpenERPSession().evaluation_context
-        req.session.model('project.task').fields_view_get.return_value = {
-            'arch': '''
-            <tree colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
-                <field name="sequence" invisible="not context.get('seq_visible', False)"/>
-                <field name="user_id" invisible="context.get('user_invisible', False)"/>
-                <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
-                <field name="total_hours" invisible="1"/>
-                <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
-                <field name="type_id" invisible="context.get('set_visible',False)"/>
-            </tree>
-        '''}
-        parsed_view = web.controllers.main.View().fields_view_get(
-            req, 'project.task', 42, 'tree')
-
-        self.assertTrue(field_attrs(parsed_view, 'sequence')['invisible'])
-        self.assertTrue(field_attrs(parsed_view, 'user_id')['invisible'])
-        self.assertTrue(
-            field_attrs(parsed_view, 'delegated_user_id')['invisible'])
-        self.assertTrue(field_attrs(parsed_view, 'total_hours')['invisible'])
-        self.assertTrue(
-            field_attrs(parsed_view, 'date_deadline')['invisible'])
-        self.assertTrue(field_attrs(parsed_view, 'type_id')['invisible'])
-
-class ListViewTest(unittest2.TestCase):
-    def setUp(self):
-        self.view = web.controllers.main.ListView()
-        self.request = mock.Mock()
-        self.request.context = {'set_editable': True}
-
-    @unittest2.skip
-    def test_no_editable_editable_context(self):
-        self.request.session.model('fake').fields_view_get.return_value = \
-            {'arch': '<tree><field name="foo"/></tree>'}
-        view = self.view.fields_view_get(self.request, 'fake', False, False)
-
-        self.assertEqual(view['arch']['attrs']['editable'],
-                         'bottom')
-
-    @unittest2.skip
-    def test_editable_top_editable_context(self):
-        self.request.session.model('fake').fields_view_get.return_value = \
-            {'arch': '<tree editable="top"><field name="foo"/></tree>'}
-        view = self.view.fields_view_get(self.request, 'fake', False)
-
-        self.assertEqual(view['arch']['attrs']['editable'],
-                         'top')
-
-    @unittest2.skip
-    def test_editable_bottom_editable_context(self):
-        self.request.session.model('fake').fields_view_get.return_value = \
-            {'arch': '<tree editable="bottom"><field name="foo"/></tree>'}
-        view = self.view.fields_view_get(self.request, 'fake', False)
-
-        self.assertEqual(view['arch']['attrs']['editable'],
-                         'bottom')
-
-    def test_color_nocolor(self):
-        self.assertEqual(
-            self.view.process_colors(
-                {'arch': {'attrs': {}, 'children': []}}, {}, {}),
-            None)
-    def test_color_literal(self):
-        self.assertEqual(
-            self.view.process_colors(
-                {'arch': {'attrs': {'colors': 'black:1'}}, 'children': []},
-                {}, {}),
-            'black')
-    def test_color_miss(self):
-        self.assertEqual(
-            self.view.process_colors(
-                {'arch': {'attrs': {'colors': "grey:state in ('cancelled','done');blue:state in ('pending')"}},
-                 'children': []
-                }, {'state': 'open'}, {}),
-            None)
-    def test_color_compute(self):
-        self.assertEqual(
-            self.view.process_colors(
-                {'arch': {'attrs': {'colors': "grey:state in ('cancelled','done');blue:state in ('pending')"}},
-                 'children': []
-                }, {'state': 'done'}, {}),
-            'grey')
-    def test_color_multiple(self):
-        self.assertEqual(
-            self.view.process_colors(
-                {'arch': {'attrs': {'colors': "grey:state in ('cancelled','done');blue:state in ('done')"}},
-                 'children': []
-                }, {'state': 'done'}, {}),
-            'maroon')
diff --git a/addons/web/tests/__init__.py b/addons/web/tests/__init__.py
new file mode 100644
index 00000000000..fb1a593bc78
--- /dev/null
+++ b/addons/web/tests/__init__.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+from . import test_dataset, test_menu, test_serving_base, test_view
+
+fast_suite = []
+checks = [
+    test_dataset,
+    test_menu,
+    test_serving_base,
+    test_view,
+]
diff --git a/addons/web/tests/test_dataset.py b/addons/web/tests/test_dataset.py
new file mode 100644
index 00000000000..8cd9634d5bf
--- /dev/null
+++ b/addons/web/tests/test_dataset.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+import mock
+import unittest2
+import web.controllers.main
+
+class TestDataSetController(unittest2.TestCase):
+    def setUp(self):
+        self.dataset = web.controllers.main.DataSet()
+        self.request = mock.Mock()
+        self.read = self.request.session.model().read
+        self.search = self.request.session.model().search
+
+    def test_empty_find(self):
+        self.search.return_value = []
+        self.read.return_value = []
+
+        self.assertEqual(
+            self.dataset.do_search_read(self.request, 'fake.model'),
+            {'records': [], 'length': 0})
+        self.read.assert_called_once_with(
+            [], False, self.request.session.eval_context())
+
+    def test_regular_find(self):
+        self.search.return_value = [1, 2, 3]
+
+        self.dataset.do_search_read(self.request, 'fake.model')
+        self.read.assert_called_once_with(
+            [1, 2, 3], False,self.request.session.eval_context())
+
+    def test_ids_shortcut(self):
+        self.search.return_value = [1, 2, 3]
+        self.read.return_value = [
+            {'id': 1, 'name': 'foo'},
+            {'id': 2, 'name': 'bar'},
+            {'id': 3, 'name': 'qux'}
+        ]
+
+        self.assertEqual(
+            self.dataset.do_search_read(self.request, 'fake.model', ['id']),
+            {'records': [{'id': 1}, {'id': 2}, {'id': 3}], 'length': 3})
+        self.assertFalse(self.read.called)
diff --git a/addons/web/test/test_menu.py b/addons/web/tests/test_menu.py
similarity index 65%
rename from addons/web/test/test_menu.py
rename to addons/web/tests/test_menu.py
index 7e69442c4b8..1bfa89d9a64 100644
--- a/addons/web/test/test_menu.py
+++ b/addons/web/tests/test_menu.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import collections
 import mock
 import unittest2
 
@@ -13,42 +14,56 @@ class Placeholder(object):
 class LoadTest(unittest2.TestCase):
     def setUp(self):
         self.menu = main.Menu()
-        self.menus_mock = mock.Mock()
-        self.request = Placeholder(session=OpenERPSession())
+        self.request = mock.Mock()
+
+        # Have self.request.session.model() return a different mock object for
+        # each model (but always the same mock for a given model name)
+        models = collections.defaultdict(mock.Mock)
+        model = self.request.session.model.side_effect = \
+            lambda model_name: models[model_name]
+
+        self.MockMenus = model('ir.ui.menu')
+        # Mock the absence of custom menu
+        model('res.users').read.return_value = [{
+            'menu_id': False
+        }]
 
     def tearDown(self):
         del self.request
-        del self.menus_mock
+        del self.MockMenus
         del self.menu
 
-    @unittest2.skip
     def test_empty(self):
-        self.menus_mock.search = mock.Mock(return_value=[])
-        self.menus_mock.read = mock.Mock(return_value=[])
+        self.MockMenus.search.return_value = []
+        self.MockMenus.read.return_value = []
 
         root = self.menu.do_load(self.request)
 
-        self.menus_mock.search.assert_called_with([])
-        self.menus_mock.read.assert_called_with(
-            [], ['name', 'sequence', 'parent_id'])
+        self.MockMenus.search.assert_called_with(
+            [], 0, False, False, self.request.session.eval_context())
+        self.MockMenus.read.assert_called_with(
+            [], ['name', 'sequence', 'parent_id',
+                 'action', 'needaction_enabled', 'needaction_counter'],
+            self.request.session.eval_context())
 
         self.assertListEqual(
             root['children'],
             [])
 
-    @unittest2.skip
     def test_applications_sort(self):
-        self.menus_mock.search = mock.Mock(return_value=[1, 2, 3])
-        self.menus_mock.read = mock.Mock(return_value=[
-            {'id': 2, 'sequence': 3, 'parent_id': False},
-            {'id': 3, 'sequence': 2, 'parent_id': False},
+        self.MockMenus.search.return_value = [1, 2, 3]
+        self.MockMenus.read.side_effect = lambda *args: [
             {'id': 1, 'sequence': 1, 'parent_id': False},
-        ])
+            {'id': 3, 'sequence': 2, 'parent_id': False},
+            {'id': 2, 'sequence': 3, 'parent_id': False},
+        ]
 
         root = self.menu.do_load(self.request)
 
-        self.menus_mock.read.assert_called_with(
-            [1, 2, 3], ['name', 'sequence', 'parent_id'])
+        self.MockMenus.read.assert_called_with(
+            [1, 2, 3], ['name', 'sequence', 'parent_id',
+                        'action', 'needaction_enabled', 'needaction_counter'],
+            self.request.session.eval_context())
 
         self.assertEqual(
             root['children'],
@@ -63,15 +78,18 @@ class LoadTest(unittest2.TestCase):
                 'parent_id': False, 'children': []
             }])
 
-    @unittest2.skip
     def test_deep(self):
-        self.menus_mock.search = mock.Mock(return_value=[1, 2, 3, 4])
-        self.menus_mock.read = mock.Mock(return_value=[
-            {'id': 1, 'sequence': 1, 'parent_id': False},
-            {'id': 2, 'sequence': 2, 'parent_id': [1, '']},
-            {'id': 3, 'sequence': 1, 'parent_id': [2, '']},
-            {'id': 4, 'sequence': 2, 'parent_id': [2, '']},
-        ])
+        self.MockMenus.search.side_effect = lambda domain, *args: (
+            [1] if domain == [('parent_id', '=', False)] else [1, 2, 3, 4])
+
+        root = {'id': 1, 'sequence': 1, 'parent_id': False}
+        self.MockMenus.read.side_effect = lambda ids, *args: (
+            [root] if ids == [1] else [
+                {'id': 1, 'sequence': 1, 'parent_id': False},
+                {'id': 2, 'sequence': 2, 'parent_id': [1, '']},
+                {'id': 3, 'sequence': 1, 'parent_id': [2, '']},
+                {'id': 4, 'sequence': 2, 'parent_id': [2, '']},
+            ])
 
         root = self.menu.do_load(self.request)
 
@@ -117,7 +135,6 @@ class ActionMungerTest(unittest2.TestCase):
 
         self.assertEqual(changed, action)
 
-    @unittest2.skip
     def test_list_view(self):
         action = {
             "views": [[False, "tree"], [False, "form"],
@@ -135,7 +152,6 @@ class ActionMungerTest(unittest2.TestCase):
             "view_mode": "list,form,calendar"
         })
 
-    @unittest2.skip
     def test_redundant_views(self):
 
         action = {
diff --git a/addons/web/test/test_serving_base.py b/addons/web/tests/test_serving_base.py
similarity index 90%
rename from addons/web/test/test_serving_base.py
rename to addons/web/tests/test_serving_base.py
index 0bb7a83ac24..34cc7e10b62 100644
--- a/addons/web/test/test_serving_base.py
+++ b/addons/web/tests/test_serving_base.py
@@ -3,7 +3,7 @@
 import random
 import unittest2
 
-from ..controllers.main import topological_sort
+from ..controllers.main import module_topological_sort as sort
 
 def sample(population):
     return random.sample(
@@ -22,7 +22,7 @@ class TestModulesLoading(unittest2.TestCase):
         ms = dict(modules)
 
         seen = set()
-        sorted_modules = topological_sort(ms)
+        sorted_modules = sort(ms)
         for module in sorted_modules:
             deps = ms[module]
             self.assertGreaterEqual(
diff --git a/addons/web/tests/test_view.py b/addons/web/tests/test_view.py
new file mode 100644
index 00000000000..beb6996b8e2
--- /dev/null
+++ b/addons/web/tests/test_view.py
@@ -0,0 +1,128 @@
+import copy
+import xml.etree.ElementTree
+import mock
+
+import unittest2
+import simplejson
+
+import web.controllers.main
+from ..common import nonliterals, session as s
+
+def field_attrs(fields_view_get, fieldname):
+    (field,) =  filter(lambda f: f['attrs'].get('name') == fieldname,
+                       fields_view_get['arch']['children'])
+    return field['attrs']
+
+#noinspection PyCompatibility
+class DomainsAndContextsTest(unittest2.TestCase):
+    def setUp(self):
+        self.view = web.controllers.main.View()
+
+    def test_convert_literal_domain(self):
+        e = xml.etree.ElementTree.Element(
+            'field', domain="  [('somefield', '=', 3)]  ")
+        self.view.parse_domains_and_contexts(e, None)
+
+        self.assertEqual(
+            e.get('domain'),
+            [('somefield', '=', 3)])
+
+    def test_convert_complex_domain(self):
+        e = xml.etree.ElementTree.Element(
+            'field',
+            domain="[('account_id.type','in',['receivable','payable']),"
+                   "('reconcile_id','=',False),"
+                   "('reconcile_partial_id','=',False),"
+                   "('state', '=', 'valid')]"
+        )
+        self.view.parse_domains_and_contexts(e, None)
+
+        self.assertEqual(
+            e.get('domain'),
+            [('account_id.type', 'in', ['receivable', 'payable']),
+             ('reconcile_id', '=', False),
+             ('reconcile_partial_id', '=', False),
+             ('state', '=', 'valid')]
+        )
+
+    def test_retrieve_nonliteral_domain(self):
+        session = mock.Mock(spec=s.OpenERPSession)
+        session.domains_store = {}
+        domain_string = ("[('month','=',(datetime.date.today() - "
+                         "datetime.timedelta(365/12)).strftime('%%m'))]")
+        e = xml.etree.ElementTree.Element(
+            'field', domain=domain_string)
+
+        self.view.parse_domains_and_contexts(e, session)
+
+        self.assertIsInstance(e.get('domain'), nonliterals.Domain)
+        self.assertEqual(
+            nonliterals.Domain(
+                session, key=e.get('domain').key).get_domain_string(),
+            domain_string)
+
+    def test_convert_literal_context(self):
+        e = xml.etree.ElementTree.Element(
+            'field', context="  {'some_prop':  3}  ")
+        self.view.parse_domains_and_contexts(e, None)
+
+        self.assertEqual(
+            e.get('context'),
+            {'some_prop': 3})
+
+    def test_convert_complex_context(self):
+        e = xml.etree.ElementTree.Element(
+            'field',
+            context="{'account_id.type': ['receivable','payable'],"
+                     "'reconcile_id': False,"
+                     "'reconcile_partial_id': False,"
+                     "'state': 'valid'}"
+        )
+        self.view.parse_domains_and_contexts(e, None)
+
+        self.assertEqual(
+            e.get('context'),
+            {'account_id.type': ['receivable', 'payable'],
+             'reconcile_id': False,
+             'reconcile_partial_id': False,
+             'state': 'valid'}
+        )
+
+    def test_retrieve_nonliteral_context(self):
+        session = mock.Mock(spec=s.OpenERPSession)
+        session.contexts_store = {}
+        context_string = ("{'month': (datetime.date.today() - "
+                         "datetime.timedelta(365/12)).strftime('%%m')}")
+        e = xml.etree.ElementTree.Element(
+            'field', context=context_string)
+
+        self.view.parse_domains_and_contexts(e, session)
+
+        self.assertIsInstance(e.get('context'), nonliterals.Context)
+        self.assertEqual(
+            nonliterals.Context(
+                session, key=e.get('context').key).get_context_string(),
+            context_string)
+
+class AttrsNormalizationTest(unittest2.TestCase):
+    def setUp(self):
+        self.view = web.controllers.main.View()
+
+    def test_identity(self):
+        web_view = """
+            <form string="Title">
+                <group>
+                    <field name="some_field"/>
+                    <field name="some_other_field"/>
+                </group>
+                <field name="stuff"/>
+            </form>
+        """
+
+        pristine = xml.etree.ElementTree.fromstring(web_view)
+        transformed = self.view.transform_view(web_view, None)
+
+        self.assertEqual(
+             xml.etree.ElementTree.tostring(transformed),
+             xml.etree.ElementTree.tostring(pristine)
+        )

From 4c855040978e0d4d6bb38a1739975efada6ca583 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 10 Sep 2012 13:48:46 +0200
Subject: [PATCH 959/999] [IMP] better fixup to font mime types

bzr revid: xmo@openerp.com-20120910114846-tkfvhoxbbqtn842g
---
 addons/web/common/http.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 2d3452556a8..4955876894d 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -7,6 +7,7 @@ import cgi
 import contextlib
 import functools
 import logging
+import mimetypes
 import os
 import pprint
 import sys
@@ -420,7 +421,11 @@ def session_context(request, storage_path, session_cookie='httpsessionid'):
 #----------------------------------------------------------
 # OpenERP Web WSGI Application
 #----------------------------------------------------------
-class CustomStaticMiddleware(object):
+# Add potentially missing (older ubuntu) font mime types
+mimetypes.add_type('application/font-woff', '.woff')
+mimetypes.add_type('application/vnd.ms-fontobject', '.eot')
+mimetypes.add_type('application/x-font-ttf', '.ttf')
+class DisableCacheMiddleware(object):
     def __init__(self, app):
         self.app = app
     def __call__(self, environ, start_response):
@@ -431,11 +436,8 @@ class CustomStaticMiddleware(object):
 
             new_headers = []
             unwanted_keys = ['Last-Modified']
-            if environ.get('PATH_INFO', '').endswith(".ttf"):
-                new_headers.append(("Content-Type", "application/x-font-ttf"))
-                unwanted_keys += ["Content-Type"]
             if debug:
-                new_headers.append(('Cache-Control', 'no-cache'))
+                new_headers = [('Cache-Control', 'no-cache')]
                 unwanted_keys += ['Expires', 'Etag', 'Cache-Control']
 
             for k, v in headers:
@@ -480,7 +482,7 @@ class Root(object):
         static_dirs = self._load_addons()
         if options.serve_static:
             app = werkzeug.wsgi.SharedDataMiddleware( self.dispatch, static_dirs)
-            self.dispatch = CustomStaticMiddleware(app)
+            self.dispatch = DisableCacheMiddleware(app)
 
         if options.session_storage:
             if not os.path.exists(options.session_storage):

From 9c8b6653356b945b41002e2e84c9fc6da597b5a4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 10 Sep 2012 13:51:38 +0200
Subject: [PATCH 960/999] [FIX] Fixed dashboard layout selector styling

bzr revid: fme@openerp.com-20120910115138-wy8w2exdi18jb489
---
 addons/board/static/src/css/dashboard.css  | 19 ++++++++++++++-----
 addons/board/static/src/css/dashboard.sass | 17 ++++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/addons/board/static/src/css/dashboard.css b/addons/board/static/src/css/dashboard.css
index 38e224daf42..ed66e338c81 100644
--- a/addons/board/static/src/css/dashboard.css
+++ b/addons/board/static/src/css/dashboard.css
@@ -1,3 +1,17 @@
+.openerp .oe_dashboard_layout_selector ul {
+  white-space: nowrap;
+}
+.openerp .oe_dashboard_layout_selector li {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+  float: left;
+}
+.openerp .oe_dashboard_layout_selector li .oe_dashboard_selected_layout {
+  margin-left: -30px;
+  vertical-align: bottom;
+  margin-bottom: 10px;
+}
 .openerp .oe_dashboard_links {
   text-align: right;
   margin: 0 4px 6px 0;
@@ -5,11 +19,6 @@
 .openerp .oe_dashboard {
   width: 100%;
 }
-.openerp .oe_dashboard .oe_dashboard_layout_selector ul, .openerp .oe_dashboard .oe_dashboard_layout_selector li {
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-}
 .openerp .oe_dashboard .oe_action {
   margin: 0 8px 8px 0;
   background-color: white;
diff --git a/addons/board/static/src/css/dashboard.sass b/addons/board/static/src/css/dashboard.sass
index 1bfc01a3809..32f0e3b4f3a 100644
--- a/addons/board/static/src/css/dashboard.sass
+++ b/addons/board/static/src/css/dashboard.sass
@@ -9,16 +9,23 @@
   box-shadow: $bsval
 
 .openerp
+  .oe_dashboard_layout_selector
+    ul
+      white-space: nowrap
+    li
+      margin: 0
+      padding: 0
+      list-style-type: none
+      float: left
+      .oe_dashboard_selected_layout
+        margin-left: -30px
+        vertical-align: bottom
+        margin-bottom: 10px
   .oe_dashboard_links
     text-align: right
     margin: 0 4px 6px 0
   .oe_dashboard
     width: 100%
-    .oe_dashboard_layout_selector
-      ul, li
-        margin: 0
-        padding: 0
-        list-style-type: none
     .oe_action
       margin: 0 8px 8px 0
       background-color: white

From c55f59d06674b097855184bfdcd31f6d09ba8cfb Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 10 Sep 2012 13:56:20 +0200
Subject: [PATCH 961/999] [IMP] Improved kanban dropdown styling

bzr revid: fme@openerp.com-20120910115620-o05fm0nw743ax1vt
---
 addons/web_kanban/static/src/css/kanban.css  | 5 +++++
 addons/web_kanban/static/src/css/kanban.sass | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 0c1031e7607..f3be7a9a253 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,3 +1,4 @@
+@charset "utf-8";
 .openerp .oe_kanban_view {
   background: white;
   height: inherit;
@@ -472,6 +473,10 @@
   left: 0;
   top: 28px;
   min-width: 160px;
+  padding: 2px;
+}
+.openerp .oe_kanban_view .oe_dropdown_kanban .oe_dropdown_menu li {
+  padding: 3px;
 }
 .openerp .oe_kanban_view .oe_dropdown_kanban.oe_opened > span {
   visibility: visible;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 8678bc90254..382fea32d75 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -397,6 +397,9 @@
             left: 0
             top: 28px
             min-width: 160px
+            padding: 2px
+            li
+                padding: 3px
     .oe_dropdown_kanban
         &.oe_opened > span
             visibility: visible

From 6e20fde92b522ecb4719a3cce002ae8eb5714f63 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 10 Sep 2012 13:57:12 +0200
Subject: [PATCH 962/999] [IMP] Improve the previous improvement

bzr revid: fme@openerp.com-20120910115712-hdfs29wi8use3659
---
 addons/web_kanban/static/src/css/kanban.css  | 2 +-
 addons/web_kanban/static/src/css/kanban.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index f3be7a9a253..f63dd371604 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -475,7 +475,7 @@
   min-width: 160px;
   padding: 2px;
 }
-.openerp .oe_kanban_view .oe_dropdown_kanban .oe_dropdown_menu li {
+.openerp .oe_kanban_view .oe_dropdown_kanban .oe_dropdown_menu > li {
   padding: 3px;
 }
 .openerp .oe_kanban_view .oe_dropdown_kanban.oe_opened > span {
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 382fea32d75..ddafee12581 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -398,7 +398,7 @@
             top: 28px
             min-width: 160px
             padding: 2px
-            li
+            > li
                 padding: 3px
     .oe_dropdown_kanban
         &.oe_opened > span

From 111bcbb89207f88c4ce431fc8f513ea00b38ce27 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 10 Sep 2012 15:45:33 +0200
Subject: [PATCH 964/999] [IMP] res_company: compute footer in create/write
 (because it calls name_get on bank accounts)

bzr revid: rco@openerp.com-20120910134533-xeqor09qld1rzqnx
---
 openerp/addons/base/res/res_company.py       | 63 +++++++++++---------
 openerp/addons/base/res/res_company_view.xml | 25 ++++----
 2 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index d3d7392583b..489deead29b 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -102,11 +102,6 @@ class res_company(osv.osv):
                 part_obj.create(cr, uid, {name: value or False, 'parent_id': company.partner_id.id}, context=context)
         return True
 
-    def _get_rml_footer(self, cr, uid, ids, field_name, arg, context=None):
-        """ simply return the field 'rml_footer'; useful for the client """
-        companies = self.browse(cr, uid, ids, context=context)
-        return dict((company.id, company.rml_footer) for company in companies)
-
     _columns = {
         'name': fields.related('partner_id', 'name', string='Company Name', size=128, required=True, store=True, type='char'),
         'parent_id': fields.many2one('res.company', 'Parent Company', select=True),
@@ -117,7 +112,6 @@ class res_company(osv.osv):
         'rml_header2': fields.text('RML Internal Header', required=True),
         'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True),
         'rml_footer': fields.text('Report Footer'),
-        'rml_footer_readonly': fields.function(_get_rml_footer, type='text', string='Report Footer'),
         'custom_footer': fields.boolean('Custom Footer', help="Check this to define the report footer manually.  Otherwise it will be filled in automatically."),
         'logo': fields.related('partner_id', 'image', string="Logo", type="binary"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
@@ -143,29 +137,36 @@ class res_company(osv.osv):
         ('name_uniq', 'unique (name)', 'The company name must be unique !')
     ]
 
-    def on_change_footer(self, cr, uid, ids, custom_footer, phone, email, fax,
-                         website, vat, company_registry, bank_ids, context=None):
-        if custom_footer:
-            return {}
+    def onchange_footer(self, cr, uid, ids, context=None):
+        # when touched, the footer becomes custom
+        return {'value': {'custom_footer': True}}
 
-        # first line (notice that missing elements are filtered out before the join)
-        res = ' | '.join(filter(bool, [
-            phone            and '%s: %s' % (_('Phone'), phone),
-            fax              and '%s: %s' % (_('Fax'), fax),
-            email            and '%s: %s' % (_('Email'), email),
-            website          and '%s: %s' % (_('Website'), website),
-            vat              and '%s: %s' % (_('TIN'), vat),
-            company_registry and '%s: %s' % (_('Reg'), company_registry),
-        ]))
+    def set_auto_footer(self, cr, uid, ids, context=None):
+        # unset the flag 'custom_footer'; this will automatically compute the footer
+        return self.write(cr, uid, ids, {'custom_footer': False}, context=context)
 
-        # second line: bank accounts
-        accounts = self.resolve_2many_commands(cr, uid, 'bank_ids', bank_ids, context=context)
-        accounts_names = [('%(bank_name)s %(acc_number)s' % acc) for acc in accounts if acc['footer']]
-        if accounts_names:
-            title = _('Bank Accounts') if len(accounts_names) > 1 else _('Bank Account')
-            res += '\n%s: %s' % (title, ', '.join(accounts_names))
-
-        return {'value': {'rml_footer': res, 'rml_footer_readonly': res}}
+    def compute_footer(self, cr, uid, ids, context=None):
+        res_partner_bank = self.pool.get('res.partner.bank')
+        for company in self.browse(cr, uid, ids, context):
+            if not company.custom_footer:
+                # first line (notice that missing elements are filtered out before the join)
+                res = ' | '.join(filter(bool, [
+                    company.phone            and '%s: %s' % (_('Phone'), company.phone),
+                    company.fax              and '%s: %s' % (_('Fax'), company.fax),
+                    company.email            and '%s: %s' % (_('Email'), company.email),
+                    company.website          and '%s: %s' % (_('Website'), company.website),
+                    company.vat              and '%s: %s' % (_('TIN'), company.vat),
+                    company.company_registry and '%s: %s' % (_('Reg'), company.company_registry),
+                ]))
+                # second line: bank accounts
+                account_ids = [acc.id for acc in company.bank_ids if acc.footer]
+                account_names = res_partner_bank.name_get(cr, uid, account_ids, context=context)
+                if account_names:
+                    title = _('Bank Accounts') if len(account_names) > 1 else _('Bank Account')
+                    res += '\n%s: %s' % (title, ', '.join(name for id, name in account_names))
+                # update footer
+                self.write(cr, uid, [company.id], {'rml_footer': res}, context=context)
+        return True
 
     def _get_rml_footer_by_line(self, cr, uid, ids, rml_footer, line, context=None):
         rml_footer_lines = (rml_footer or '').split('\n')
@@ -250,11 +251,15 @@ class res_company(osv.osv):
         self.cache_restart(cr)
         company_id = super(res_company, self).create(cr, uid, vals, context=context)
         obj_partner.write(cr, uid, partner_id, {'company_id': company_id}, context=context)
+        self.compute_footer(cr, uid, [company_id], context=context)
         return company_id
 
-    def write(self, cr, *args, **argv):
+    def write(self, cr, uid, ids, values, context=None):
         self.cache_restart(cr)
-        return super(res_company, self).write(cr, *args, **argv)
+        super(res_company, self).write(cr, uid, ids, values, context=context)
+        if 'rml_footer' not in values:
+            self.compute_footer(cr, uid, ids, context=context)
+        return True
 
     def _get_euro(self, cr, uid, context=None):
         rate_obj = self.pool.get('res.currency.rate')
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index ec40189afc0..1980ef726d2 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -55,26 +55,29 @@
                                     <div>
                                         <field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
                                     </div>
-                                    <field name="website" on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)" widget="url" placeholder="e.g. www.openerp.com"/>
+                                    <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                                 </group>
                                 <group>
-                                    <field name="phone" on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
-                                    <field name="fax" on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
-                                    <field name="email" on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
-                                    <field name="vat" on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
-                                    <field name="company_registry" on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    <field name="phone"/>
+                                    <field name="fax"/>
+                                    <field name="email"/>
+                                    <field name="vat"/>
+                                    <field name="company_registry"/>
                                 </group>
                             </group>
                             <group string="Bank Accounts">
                                 <field name="bank_ids" nolabel="1"
-                                    context="{'default_company_id': active_id, 'footer_hide': False}"
-                                    on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
+                                    context="{'default_company_id': active_id, 'footer_hide': False}"/>
                             </group>
                             <group string="Report Footer Configuration">
                                 <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
-                                <field name="custom_footer" on_change="on_change_footer(custom_footer, phone, email, fax, website, vat, company_registry, bank_ids)"/>
-                                <field name="rml_footer" attrs="{'invisible': [('custom_footer','=',False)]}"/>
-                                <field name="rml_footer_readonly" attrs="{'invisible': [('custom_footer','=',True)]}"/>
+                                <field name="custom_footer" invisible="1"/>
+                                <label for="rml_footer"/>
+                                <div>
+                                    <field name="rml_footer" on_change="onchange_footer()"/>
+                                    <button string="Set Automatic Footer" type="object" name="set_auto_footer"
+                                        attrs="{'invisible': [('custom_footer','=',False)]}"/>
+                                </div>
                             </group>
                         </page>
                         <page string="Header/Footer" groups="base.group_no_one">

From 1c0dd3b01663e8fe587d7b515eaa33eb9885ce67 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 10 Sep 2012 15:57:08 +0200
Subject: [PATCH 965/999] [IMP] added arguments to widget html usage

bzr revid: nicolas.vanhoren@openerp.com-20120910135708-6wq2v7iet7i11624
---
 addons/document_page/wizard/document_page_show_diff_view.xml | 2 +-
 addons/email_template/wizard/email_template_preview_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/document_page/wizard/document_page_show_diff_view.xml b/addons/document_page/wizard/document_page_show_diff_view.xml
index 5bec49b1bcc..b1dfb536853 100644
--- a/addons/document_page/wizard/document_page_show_diff_view.xml
+++ b/addons/document_page/wizard/document_page_show_diff_view.xml
@@ -8,7 +8,7 @@
             <field name="model">wizard.document.page.history.show_diff</field>
             <field name="arch" type="xml">
                 <form string="Difference" version="7.0">
-                    <field name="diff" widget="html"/>
+                    <field name="diff" widget="html" options='{"safe": true}'/>
                     <footer>
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>
diff --git a/addons/email_template/wizard/email_template_preview_view.xml b/addons/email_template/wizard/email_template_preview_view.xml
index f4f75567a42..5e8eaa3a836 100644
--- a/addons/email_template/wizard/email_template_preview_view.xml
+++ b/addons/email_template/wizard/email_template_preview_view.xml
@@ -20,7 +20,7 @@
                       <field name="email_cc" readonly="1" attrs="{'invisible':[('email_cc','=',False)]}"/>
                       <field name="reply_to" readonly="1" attrs="{'invisible':[('reply_to','=',False)]}"/>
                       <field name="subject" readonly="1"/>
-                      <field name="body_html" widget="html" readonly="1"/>
+                      <field name="body_html" widget="html" readonly="1" options='{"safe": true}'/>
                     </group>
                 </form>
             </field>

From 8126882b0ea69504976b27ff70032341a1cf9a93 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 10 Sep 2012 15:57:47 +0200
Subject: [PATCH 966/999] [IMP] added arguments to widget html

bzr revid: nicolas.vanhoren@openerp.com-20120910135747-azld1lovg6d7w23c
---
 addons/web/static/src/js/view_form.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 744aa8d000d..08c9b96660e 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2398,6 +2398,13 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
  */
 instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldTextHtml',
+    init: function() {
+        this._super.apply(this, arguments);
+        if (this.field.type !== 'html' && ! this.options.safe) {
+            throw new Error(_.str.sprintf(
+                _t("Error with field %s, it is not allowed to use the widget 'html' with any other field type than 'html'"), this.string));
+        }
+    },
     initialize_content: function() {
         var self = this;
         if (! this.get("effective_readonly")) {

From 6408d275c2cab1213a85da56172cc7344aa69e2f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 10 Sep 2012 16:17:29 +0200
Subject: [PATCH 967/999] [IMP] res.company: support true multiline report
 footer using RML <place> and <para>

bzr revid: odo@openerp.com-20120910141729-22sk7ca5himljqni
---
 openerp/addons/base/res/res_company.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 489deead29b..2bdd59a7d66 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -168,10 +168,6 @@ class res_company(osv.osv):
                 self.write(cr, uid, [company.id], {'rml_footer': res}, context=context)
         return True
 
-    def _get_rml_footer_by_line(self, cr, uid, ids, rml_footer, line, context=None):
-        rml_footer_lines = (rml_footer or '').split('\n')
-        return rml_footer_lines[line] if line < len(rml_footer_lines) else ''
-
     def on_change_country(self, cr, uid, ids, country_id, context=None):
         currency_id = self._get_euro(cr, uid, context=context)
         if country_id:
@@ -304,6 +300,9 @@ class res_company(osv.osv):
 <header>
     <pageTemplate>
         <frame id="first" x1="1.3cm" y1="3.0cm" height="%s" width="19.0cm"/>
+         <stylesheet>
+            <paraStyle name="main_footer"  fontName="DejaVu Sans" fontSize="8.0" alignment="CENTER"/>
+         </stylesheet>
         <pageGraphics>
             <!-- You Logo - Change X,Y,Width and Height -->
             <image x="1.3cm" y="%s" height="40.0" >[[ company.logo or removeParentNode('image') ]]</image>
@@ -332,10 +331,10 @@ class res_company(osv.osv):
 
             <!--page bottom-->
             <lines>1.2cm 2.65cm 19.9cm 2.65cm</lines>
-            <drawCentredString x="10.5cm" y="2.3cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=0) ]]</drawCentredString>
-            <drawCentredString x="10.5cm" y="1.8cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=1) ]]</drawCentredString>
-            <drawCentredString x="10.5cm" y="1.3cm">[[ company._get_rml_footer_by_line(company.rml_footer,line=2) ]]</drawCentredString>
-            <drawCentredString x="10.5cm" y="0.8cm">Contact : [[ user.name ]] - Page: <pageNumber/></drawCentredString>
+            <place x="1.3cm" y="0cm" height="2cm" width="19.0cm">
+                <para style="main_footer">[[ company.rml_footer ]]</para>
+                <para style="main_footer">Contact : [[ user.name ]] - Page: <pageNumber/></para>
+            </place>
         </pageGraphics>
     </pageTemplate>
 </header>"""

From 0b892476bc2a3ebe6f40b61071579456c58fc9d0 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 10 Sep 2012 16:35:28 +0200
Subject: [PATCH 968/999] [FIX] res.company: make write() override support
 cases where ids is a single id (the usual dumb boilerplate code)

bzr revid: odo@openerp.com-20120910143528-g8dbt0l2rg2oq9sm
---
 openerp/addons/base/res/res_company.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 2bdd59a7d66..483e29990f5 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -252,6 +252,8 @@ class res_company(osv.osv):
 
     def write(self, cr, uid, ids, values, context=None):
         self.cache_restart(cr)
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         super(res_company, self).write(cr, uid, ids, values, context=context)
         if 'rml_footer' not in values:
             self.compute_footer(cr, uid, ids, context=context)

From 8fbd74d937848dd5c9922eca6ec5bd8d16de40d4 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 10 Sep 2012 16:42:32 +0200
Subject: [PATCH 969/999] [IMP] res.company: waste slightly less vertical space
 between bottom `horizontal rule` and footer content

bzr revid: odo@openerp.com-20120910144232-61kywu125umwk7al
---
 openerp/addons/base/res/res_company.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 483e29990f5..cc30ad3f036 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -333,7 +333,7 @@ class res_company(osv.osv):
 
             <!--page bottom-->
             <lines>1.2cm 2.65cm 19.9cm 2.65cm</lines>
-            <place x="1.3cm" y="0cm" height="2cm" width="19.0cm">
+            <place x="1.3cm" y="0cm" height="2.55cm" width="19.0cm">
                 <para style="main_footer">[[ company.rml_footer ]]</para>
                 <para style="main_footer">Contact : [[ user.name ]] - Page: <pageNumber/></para>
             </place>

From e958bdca80e6545c75fd25186eaed52a4cba3c6b Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 10 Sep 2012 17:07:10 +0200
Subject: [PATCH 970/999] [IMP] res.company: add tooltip for footer field +
 hide `auto` button in read-only mode

bzr revid: odo@openerp.com-20120910150710-rqflowp3leu3lvn1
---
 openerp/addons/base/res/res_company.py       | 3 ++-
 openerp/addons/base/res/res_company_view.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index cc30ad3f036..83b24b55a93 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -111,7 +111,8 @@ class res_company(osv.osv):
         'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
         'rml_header2': fields.text('RML Internal Header', required=True),
         'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True),
-        'rml_footer': fields.text('Report Footer'),
+        'rml_footer': fields.text('Report Footer', help="Footer text displayed at the bottom of all reports. Automatically set based on company details, "\
+                                  "but may also be customized by directly editing it."),
         'custom_footer': fields.boolean('Custom Footer', help="Check this to define the report footer manually.  Otherwise it will be filled in automatically."),
         'logo': fields.related('partner_id', 'image', string="Logo", type="binary"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 1980ef726d2..b92cfba19b6 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -76,7 +76,7 @@
                                 <div>
                                     <field name="rml_footer" on_change="onchange_footer()"/>
                                     <button string="Set Automatic Footer" type="object" name="set_auto_footer"
-                                        attrs="{'invisible': [('custom_footer','=',False)]}"/>
+                                        attrs="{'invisible': [('custom_footer','=',False)]}" class="oe_edit_only"/>
                                 </div>
                             </group>
                         </page>

From 05b2b751d1ef255ff59e9af6d509bc7b972665f1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 10 Sep 2012 23:55:16 +0200
Subject: [PATCH 971/999] [IMP] Survey forms

bzr revid: fp@tinyerp.com-20120910215516-8pbknwyk0ifeoku9
---
 addons/survey/static/src/css/survey.css |  7 ++++-
 addons/survey/survey_view.xml           | 38 +++++++++++--------------
 addons/survey/wizard/survey_answer.py   | 26 ++++++-----------
 3 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index 7a2174fda8c..34d686c6e77 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -1,6 +1,11 @@
-.oe_survey_title {
+.openerp .oe_survey_title {
     font-weight: bold;
     font-size: 19px;
     margin: 8px 0px 8px 0px;
     color: #5B5B5B;
 }
+
+.openerp .oe_kanban_survey {
+    width: 200px;
+
+}
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 5b71d70542b..8f855084069 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -28,6 +28,10 @@
                     <div class="oe_button_box oe_right">
                         <button name="test_survey" states="open,draft,close,cancel" string="Test Survey" type="object" icon="gtk-new" context="{'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
                         <button name="fill_survey" states="open" string="Answer Survey" type="object" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
+                        <button name="action_print_survey" states="open,draft,close,cancel" string="Print Answer" type="object"/>
+                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
+                            string="Edit Survey" type="action" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
+
                     </div>
                     <div class="oe_title">
                         <label for="title" class="oe_edit_only"/>
@@ -49,8 +53,6 @@
                      </group>
                      <notebook>
                         <page string="Survey Details">
-                            <field name="note" colspan="4" placeholder="Survey description..."/>
-                            <label for="page_ids"/>
                             <field name="page_ids" colspan="4" mode="tree">
                                 <form string="Survey Page" version="7.0">
                                     <sheet>
@@ -58,9 +60,7 @@
                                     <h1>
                                         <field name="title"/>
                                     </h1>
-                                    <group>
-                                        <field name="note" placeholder="Description on the survey page..." nolabel="1"/>
-                                    </group>
+                                    <field name="note" placeholder="Description on the survey page..."/>
                                     <newline/>
                                     <group>
                                         <label for="question_ids"/>
@@ -210,6 +210,7 @@
                                     </sheet>
                                     </form>
                                 </field>
+                            <field name="note" placeholder="Survey description..."/>
                         </page>
                         <page string="Invited User">
                             <field name="invited_user_ids" readonly="1"/>
@@ -293,10 +294,13 @@
                 <kanban>
                     <field name="title"/>
                     <field name="date_open"/>
+                    <field name="tot_comp_survey"/>
+                    <field name="max_response_limit"/>
+                    <field name="responsible_id"/>
                     <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_survey">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
@@ -307,21 +311,13 @@
                                 </div>
                                 <div class="oe_kanban_content">
                                     <h3 class="oe_kanban_ellipsis"><t t-esc="record.title.raw_value.toString()"></t></h3>
-                                    <div class="oe_survey_responsible">
-                                       <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
-                                   </div><br/>
-                                   <div class="oe_survey_start_date">
-                                       <t t-if="record.date_open.raw_value">
-                                           Opened at
-                                           <t t-esc="record.date_open.raw_value.getDate()"/>
-                                           <t t-esc="record.date_open.raw_value.toString('MMM')"/>,
-                                           <t t-esc="record.date_open.raw_value.getFullYear()"/>
-                                       </t>
-                                   </div><br/>
-                                   <div class="oe_survey_rate">
-                                       Rate:
-                                        <a name="fill_survey" type="object">Fill</a>
-                                   </div>
+                                    <div>
+                                        Answers: <field name="tot_comp_survey"/>
+                                        <t t-if="record.max_response_limit.raw_value > 0"> / <field name="max_response_limit"/></t>
+                                    </div>
+                                    <br/>
+                                    <a name="fill_survey" type="object">Answer Survey</a>
+                                    <img t-att-src="kanban_image('res.users', 'image_small', record.responsible_id.raw_value)" t-att-title="record.responsible_id.value" width="24" height="24" class="oe_kanban_avatar oe_right"/>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 7d16b88a4ef..2b774a22feb 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -146,14 +146,8 @@ class survey_question_wiz(osv.osv_memory):
                         pre_button = True
                 if flag:
                     pag_rec = page_obj.browse(cr, uid, p_id, context=context)
-                    xml_form = etree.Element('form', {'string': tools.ustr(sur_rec.title)})
-                    xml_header = etree.SubElement(xml_form, 'header', {'col': '6', 'colspan': '4' ,'class': 'oe_survey_title_height'})
-                    xml_header_title = etree.SubElement(xml_header, 'group', {'col': '6', 'colspan': '6'})
-
-                    etree.SubElement(xml_header_title, 'label', {'string': tools.ustr(pag_rec.title) ,'colspan': '2' ,'class' : 'oe_survey_title'})
-                    xml_header_group = etree.SubElement(xml_header_title, 'group', {'col': '4', 'colspan': '1'})
+                    xml_form = etree.Element('form', {'string': tools.ustr(pag_rec.title or sur_rec.title)})
                     if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
-                        etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
                         context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer})
                         xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'})
                         etree.SubElement(xml_group3, 'button', {'string' :'Add Page','icon': "gtk-new", 'type' :'object','name':"action_new_page", 'context' : tools.ustr(context)})
@@ -161,7 +155,9 @@ class survey_question_wiz(osv.osv_memory):
                         etree.SubElement(xml_group3, 'button', {'string' :'Delete Page','icon': "gtk-delete", 'type' :'object','name':"action_delete_page", 'context' : tools.ustr(context)})
                         etree.SubElement(xml_group3, 'button', {'string' :'Add Question','icon': "gtk-new", 'type' :'object','name':"action_new_question", 'context' : tools.ustr(context)})
 
-                    xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
+                    # FP Note
+                    xml_group = xml_form
+
                     if context.has_key('response_id') and context.get('response_id', False) \
                          and int(context.get('response_id',0)[0]) > 0:
                         # TODO: l10n, cleanup this code to make it readable. Or template?
@@ -179,9 +175,8 @@ class survey_question_wiz(osv.osv_memory):
                         etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0),'modifiers':'{"invisible":true}'})
 
                     if pag_rec.note:
-                        xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
                         for que_test in pag_rec.note.split('\n'):
-                            etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
+                            etree.SubElement(xml_form, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
                     que_ids = pag_rec.question_ids
                     qu_no = 0
 
@@ -194,19 +189,16 @@ class survey_question_wiz(osv.osv_memory):
                             star = '*'
                         else:
                             star = ''
-                        xml_group = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '4'})
-
                         if context.has_key('active') and context.get('active',False) and \
                                     context.has_key('edit'):
-                            xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '2'})
-                            etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '3'})
+                            etree.SubElement(xml_form, 'separator', {'string': star+to_xml(separator_string)})
+
                             xml_group1 = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '2'})
                             context.update({'question_id' : tools.ustr(que.id),'page_number': sur_name_rec.page_no , 'transfer' : sur_name_read.transfer, 'page_id' : p_id})
                             etree.SubElement(xml_group1, 'button', {'string':'','icon': "gtk-edit", 'type' :'object', 'name':"action_edit_question", 'context' : tools.ustr(context)})
                             etree.SubElement(xml_group1, 'button', {'string':'','icon': "gtk-delete", 'type' :'object','name':"action_delete_question", 'context' : tools.ustr(context)})
                         else:
-                            xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
-                            etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '4'})
+                            etree.SubElement(xml_form, 'separator', {'string': star+to_xml(separator_string)})
 
                         ans_ids = que_rec.answer_choice_ids
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
@@ -366,8 +358,6 @@ class survey_question_wiz(osv.osv_memory):
                                     etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_other", 'nolabel':"1" ,'colspan':"4"})
                                     fields[tools.ustr(que.id) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
 
-                    etree.SubElement(xml_form, 'separator', {'colspan': '4'})
- 
                     xml_footer = etree.SubElement(xml_form, 'footer', {'col': '8', 'colspan': '1', 'width':"100%"})
 
                     if pre_button:

From 0babae291cd3dc1990842fb17d80f93ace6a1a46 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 10 Sep 2012 23:58:41 +0200
Subject: [PATCH 972/999] [IMP] colors in survey

bzr revid: fp@tinyerp.com-20120910215841-upatvq46bx1b6k91
---
 addons/survey/survey_demo.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 3bfac20d44b..6f89095c699 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -13,6 +13,7 @@
             <field name="max_response_limit">20</field>
             <field name="type" ref="survey_type2"/>
             <field name="state">open</field>
+            <field name="color">5</field>
             <field name="tot_comp_survey">1</field>
             <field name="tot_start_survey">1</field>
             <field name="response_user">5</field>
@@ -1402,6 +1403,7 @@
         <record id="survey_0" model="survey">
             <field eval="&quot;&quot;&quot;OpenERP Feedback&quot;&quot;&quot;" name="title"/>
             <field name="responsible_id" ref="base.user_demo"/>
+            <field name="color">4</field>
             <field name="max_response_limit">20</field>
             <field name="type" ref="survey_type2"/>
             <field name="state">open</field>

From 56cef852f762f93adc0625b441edf77a74e211dc Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 11 Sep 2012 00:07:26 +0200
Subject: [PATCH 973/999] [IMP] demo data applicants

bzr revid: fp@tinyerp.com-20120910220726-luv89p96xhuwi6e4
---
 addons/hr_recruitment/hr_recruitment_demo.yml |  6 ++-
 addons/hr_recruitment/hr_recruitment_view.xml | 38 +++++++++----------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_demo.yml b/addons/hr_recruitment/hr_recruitment_demo.yml
index 59508b83c28..3f00c7e643b 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.yml
+++ b/addons/hr_recruitment/hr_recruitment_demo.yml
@@ -52,6 +52,7 @@
     partner_name: 'John Bruno'
     state: 'done'
     job_id: hr.job_developer
+    color: 5
     stage_id: stage_job5
     name: 'Marketing Job'
 -
@@ -100,6 +101,9 @@
     partner_name: 'David Armstrong'
     job_id: hr.job_developer
     stage_id: stage_job2
+    color: 4
     name: 'Advertisement'
     salary_expected: 11000.0
-
+-
+  !record {model: hr.job, id: hr.job_developer}:
+    survey_id: hr_recruitment.survey_job_0
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index d00fbc632be..d9618a72d99 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -115,13 +115,13 @@
             <sheet>
                 <div class="oe_right oe_button_box">
                     <button name="action_makeMeeting" type="object"
-                        string="Schedule Interview" icon="gtk-index" help="Schedule interview with this applicant"/>
+                        string="Schedule Interview" help="Schedule interview with this applicant"/>
                     <button name="%(survey.action_view_survey_question_message)d" type="action"
-                        string="Start Interview" icon="gtk-execute" help="Answer related job question"
+                        string="Start Interview" help="Answer related job question"
                         context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}"
                         attrs="{'invisible':[('survey','=',False)]}"/>
                     <button name="action_print_survey" type="object"
-                        string="Print Interview" icon="gtk-print" help="Print interview report"
+                        string="Print Interview" help="Print interview report"
                         attrs="{'invisible':[('survey','=',False)]}"/>
                 </div>
                 <div class="oe_title">
@@ -208,28 +208,28 @@
         <field name="arch" type="xml">
             <search string="Search Jobs">
                 <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
-                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                <filter string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <separator/>
-                <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
-                <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
-                <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Jobs"/>
+                <filter string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
+                <filter string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
+                <filter string="Pending" domain="[('state','=','pending')]" help="Pending Jobs"/>
                 <separator/>
-                <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-"/>
+                <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments"/>
                 <separator/>
-                <filter icon="terp-gtk-jump-to-ltr" string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
+                <filter string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
                     domain="[('date_action','&lt;&gt;',False)]" help="Filter and view on next actions and date"/>
                 <field name="job_id"/>
                 <field name="user_id"/>
                 <group expand="0" string="Group By...">
-                    <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
-                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                    <filter string="Degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
-                    <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'availability'}"/>
-                    <filter string="Appreciation" icon="terp-face-plain" domain="[]" context="{'group_by':'priority'}"/>
-                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="Source" icon="terp-face-plain" domain="[]" context="{'group_by':'source_id'}"/>
-                    <filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
+                    <filter string="Responsible" domain="[]"  context="{'group_by':'user_id'}"/>
+                    <filter string="Department" domain="[]" context="{'group_by':'department_id'}"/>
+                    <filter string="Job" domain="[]" context="{'group_by':'job_id'}"/>
+                    <filter string="Degree" domain="[]" context="{'group_by':'type_id'}"/>
+                    <filter string="Availability" domain="[]" context="{'group_by':'availability'}"/>
+                    <filter string="Appreciation" domain="[]" context="{'group_by':'priority'}"/>
+                    <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                    <filter string="Source" domain="[]" context="{'group_by':'source_id'}"/>
+                    <filter string="Creation Date" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
            </search>
         </field>
@@ -339,7 +339,7 @@
                 <div groups="base.group_user">
                     <field name="survey_id" class="oe_inline"/>
                     <button class="oe_inline"
-                        string="Interview" icon="gtk-print"
+                        string="Interview"
                         name="action_print_survey" type="object"
                         attrs="{'invisible':[('survey_id','=',False)]}"/>
                 </div>

From 1e3121482ec06c4d9ee6e8f5a21345ac19661887 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 11 Sep 2012 00:10:08 +0200
Subject: [PATCH 974/999] fix

bzr revid: fp@tinyerp.com-20120910221008-ri59mrpp269c6ia0
---
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index d9618a72d99..acb8e06cbdb 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -115,7 +115,7 @@
             <sheet>
                 <div class="oe_right oe_button_box">
                     <button name="action_makeMeeting" type="object"
-                        string="Schedule Interview" help="Schedule interview with this applicant"/>
+                        string="Schedule Meeting" help="Schedule interview with this applicant"/>
                     <button name="%(survey.action_view_survey_question_message)d" type="action"
                         string="Start Interview" help="Answer related job question"
                         context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}"

From b5c89ad4f4dde5c2bc583f2850de0d57181d9899 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 11 Sep 2012 04:50:31 +0000
Subject: [PATCH 975/999] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120911045031-7ucabtp4ssq4n5bk
---
 openerp/addons/base/i18n/ru.po | 58 +++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index 365f8db415a..92d742a292b 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-08-20 15:45+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-09-10 14:37+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
+"X-Launchpad-Export-Date: 2012-09-11 04:50+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -604,7 +604,7 @@ msgstr "Испанский (VE) / Español (VE)"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
 msgid "Invoice on Timesheets"
-msgstr ""
+msgstr "Счет по затратам времени"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -1269,7 +1269,7 @@ msgstr "Порт SMTP"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_import_sugarcrm
 msgid "SugarCRM Import"
-msgstr ""
+msgstr "Импорт SugarCRM"
 
 #. module: base
 #: view:res.lang:0
@@ -1374,7 +1374,7 @@ msgstr "Система управления документами"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_claim
 msgid "Claims Management"
-msgstr ""
+msgstr "Управление претензиями"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_purchase_root
@@ -1749,6 +1749,12 @@ msgid ""
 "    Apply Different Category for the product.\n"
 "    "
 msgstr ""
+"\n"
+"    Базовый модуль управления ланчами\n"
+"\n"
+"    Отслеживание заказов, движения средств, кассы, продукции.\n"
+"    Возможность разнесения продукции по категориям.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.kg
@@ -1862,7 +1868,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_html_view
 msgid "Html View"
-msgstr ""
+msgstr "Просмотр HTML"
 
 #. module: base
 #: field:res.currency,position:0
@@ -2533,7 +2539,7 @@ msgstr "Идеи"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_crm
 msgid "Opportunity to Quotation"
-msgstr ""
+msgstr "Предложение в Запрос цен"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_analytic_plans
@@ -2767,7 +2773,7 @@ msgstr "Словения"
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
-msgstr ""
+msgstr "Код валюты (ISO 4217)"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_log_act_window
@@ -3267,7 +3273,7 @@ msgstr "Режим SMTP-over-SSL недоступен"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_survey
 msgid "Survey"
-msgstr ""
+msgstr "Опрос"
 
 #. module: base
 #: view:base.language.import:0
@@ -3315,7 +3321,7 @@ msgstr "Уругвай"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail_crm
 msgid "eMail Gateway for Leads"
-msgstr ""
+msgstr "Шлюз эл.почты для кандидатов"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3530,7 +3536,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_webkit
 msgid "Webkit Report Engine"
-msgstr ""
+msgstr "Инструмент создания отчетов Webkit"
 
 #. module: base
 #: selection:publisher_warranty.contract,state:0
@@ -3557,7 +3563,7 @@ msgstr "Майотта"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_todo
 msgid "Tasks on CRM"
-msgstr ""
+msgstr "Задачи по CRM"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_generic_modules_accounting
@@ -3683,12 +3689,12 @@ msgstr "Обнаружена рекурсия."
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_webkit_sample
 msgid "Webkit Report Samples"
-msgstr ""
+msgstr "Примеры отчетов Webkit"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_point_of_sale
 msgid "Point Of Sale"
-msgstr ""
+msgstr "Точка продажи"
 
 #. module: base
 #: code:addons/base/module/module.py:302
@@ -3812,7 +3818,7 @@ msgstr "Проверка кода Ean"
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
-msgstr "ИНН"
+msgstr "НДС"
 
 #. module: base
 #: field:res.users,new_password:0
@@ -3945,7 +3951,7 @@ msgstr "Поддержка iCal"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail
 msgid "Email Gateway"
-msgstr ""
+msgstr "Шлюз эл.почты"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:439
@@ -4069,7 +4075,7 @@ msgstr "Португалия"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_share
 msgid "Share any Document"
-msgstr ""
+msgstr "Совместный доступ r любым документам"
 
 #. module: base
 #: field:ir.module.module,certificate:0
@@ -4407,7 +4413,7 @@ msgstr "Код должен быть уникальным"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_expense
 msgid "Expenses Management"
-msgstr ""
+msgstr "Управление расходами"
 
 #. module: base
 #: view:workflow.activity:0
@@ -4418,7 +4424,7 @@ msgstr "Входящие переходы"
 #. module: base
 #: field:ir.values,value_unpickle:0
 msgid "Default value or action reference"
-msgstr ""
+msgstr "Значение по умолчанию или ссылка на действие"
 
 #. module: base
 #: model:res.country,name:base.sr
@@ -4558,7 +4564,7 @@ msgstr "Экваториальная Гвинея"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_warning
 msgid "Warning Messages and Alerts"
-msgstr ""
+msgstr "Предупреждающие сообщения и оповещения"
 
 #. module: base
 #: view:base.module.import:0
@@ -4870,7 +4876,7 @@ msgstr "Договор уже зарегистрирован в системе."
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_type_form
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_typeform
 msgid "Bank Account Types"
-msgstr ""
+msgstr "Типы банковского счета"
 
 #. module: base
 #: help:ir.sequence,suffix:0
@@ -4880,7 +4886,7 @@ msgstr "Суффикс записи для нумерации"
 #. module: base
 #: help:ir.mail_server,smtp_user:0
 msgid "Optional username for SMTP authentication"
-msgstr ""
+msgstr "Необязательное имя пользователя для аутентификации SMTP"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_actions
@@ -4935,7 +4941,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_chat
 msgid "Web Chat"
-msgstr ""
+msgstr "Веб-чат"
 
 #. module: base
 #: field:res.company,rml_footer2:0
@@ -4966,7 +4972,7 @@ msgstr "Права доступа"
 #: code:addons/base/ir/ir_model.py:311
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
-msgstr ""
+msgstr "Изменение системы хранения для поля \"%s\" не допускается."
 
 #. module: base
 #: help:res.partner.bank,company_id:0

From 063c548209a9669fe05f494555521fc92bd51af0 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 11 Sep 2012 04:50:51 +0000
Subject: [PATCH 976/999] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120911045051-qhkumfcarekjpsm0
---
 addons/edi/i18n/ru.po                         | 390 ++++++++++++
 addons/hr_attendance/i18n/nb.po               | 576 ++++++++++++++++++
 addons/marketing_campaign_crm_demo/i18n/nb.po | 192 ++++++
 addons/mrp_subproduct/i18n/nb.po              | 132 ++++
 addons/pad/i18n/nb.po                         |  58 ++
 addons/pad_project/i18n/nb.po                 |  38 ++
 addons/plugin/i18n/nb.po                      |  23 +
 addons/plugin_outlook/i18n/nb.po              |  78 +++
 addons/plugin_thunderbird/i18n/nb.po          | 108 ++++
 addons/report_webkit_sample/i18n/ru.po        | 123 ++++
 addons/sale/i18n/ru.po                        | 139 +++--
 addons/share/i18n/ru.po                       |  98 +--
 addons/stock/i18n/ru.po                       |  61 +-
 13 files changed, 1885 insertions(+), 131 deletions(-)
 create mode 100644 addons/edi/i18n/ru.po
 create mode 100644 addons/hr_attendance/i18n/nb.po
 create mode 100644 addons/marketing_campaign_crm_demo/i18n/nb.po
 create mode 100644 addons/mrp_subproduct/i18n/nb.po
 create mode 100644 addons/pad/i18n/nb.po
 create mode 100644 addons/pad_project/i18n/nb.po
 create mode 100644 addons/plugin/i18n/nb.po
 create mode 100644 addons/plugin_outlook/i18n/nb.po
 create mode 100644 addons/plugin_thunderbird/i18n/nb.po
 create mode 100644 addons/report_webkit_sample/i18n/ru.po

diff --git a/addons/edi/i18n/ru.po b/addons/edi/i18n/ru.po
new file mode 100644
index 00000000000..92fba05f843
--- /dev/null
+++ b/addons/edi/i18n/ru.po
@@ -0,0 +1,390 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-09-10 15:12+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"Language-Team: Russian <ru@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: 2012-09-11 04:50+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
+
+#. module: edi
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr "Код валюты должен быть уникальным в компании!"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Адреса контрагентов"
+
+#. module: edi
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Название компании должно быть уникальным!"
+
+#. module: edi
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
+
+#. module: edi
+#: field:edi.document,name:0
+msgid "EDI token"
+msgstr ""
+
+#. module: edi
+#: help:edi.document,name:0
+msgid "Unique identifier for retrieving an EDI document."
+msgstr ""
+
+#. module: edi
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Ошибка ! Нельзя создать рекурсивные организации."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr "Компании"
+
+#. module: edi
+#: sql_constraint:edi.document:0
+msgid "EDI Tokens must be unique!"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "Валюта"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:153
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+
+#. module: edi
+#: help:edi.document,document:0
+msgid "EDI document content"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_document
+msgid "EDI Document"
+msgstr "EDI документ"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:48
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "Контрагент"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:152
+#, python-format
+msgid "Missing Application"
+msgstr "Отсутствие приложения"
+
+#. module: edi
+#: field:edi.document,document:0
+msgid "Document"
+msgstr "Документ"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
+msgid "View/Print"
+msgstr "Просмотр/Печать"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
+msgid "Import this document"
+msgstr "Импорт этого документа"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
+msgid "Import it into an existing OpenERP instance"
+msgstr "Импорт в существующую OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
+msgid "OpenERP instance address:"
+msgstr "Адрес этой OpenERP:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
+msgid "Import"
+msgstr "Импорт"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44
+msgid "Import it into a new OpenERP Online instance"
+msgstr "Импорт в новый онлайн экземпляр OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
+msgid "Create my new OpenERP instance"
+msgstr "Создать мой новый экземпляр OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
+msgid "Import into another application"
+msgstr "Импорт в другое приложение"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
+msgid ""
+"OpenERP's Electronic Data Interchange documents are based on a generic and "
+"language\n"
+"                            independent"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid "JSON"
+msgstr "JSON"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid ""
+"serialization of the document's attribute.\n"
+"                            It is usually very quick and straightforward to "
+"create a small plug-in for your preferred\n"
+"                            application that will be capable of importing "
+"any OpenERP EDI document.\n"
+"                            You can find out more details about how to do "
+"this and what the content of OpenERP EDI documents\n"
+"                            is like in the"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
+msgid "OpenERP documentation"
+msgstr "OpenERP документация"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
+msgid "To get started immediately,"
+msgstr "Чтобы приступить к работе немедленно,"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62
+msgid "see is all it takes to use this EDI document in Python"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70
+msgid "You can download the raw EDI document here:"
+msgstr "Вы можете скачать исходный документ EDI здесь:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73
+msgid "Download"
+msgstr "Скачать"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "Powered by"
+msgstr "На базе"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
+msgid "Invoice"
+msgstr "Счет"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37
+msgid "Description"
+msgstr "Описание"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41
+msgid "Date"
+msgstr "Дата"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40
+msgid "Your Reference"
+msgstr "Ваша ссылка"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57
+msgid "Product Description"
+msgstr "Описание товара"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58
+msgid "Quantity"
+msgstr "Количество"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
+msgid "Unit Price"
+msgstr "Цена за ед."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
+msgid "Discount"
+msgstr "Скидка"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
+msgid "Price"
+msgstr "Цена"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81
+msgid "Net Total:"
+msgstr "Чистый итог:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92
+msgid "Taxes:"
+msgstr "Налоги:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103
+msgid "Total:"
+msgstr "Итого:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106
+msgid "Tax"
+msgstr "Налог"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
+msgid "Base Amount"
+msgstr "Базовая сумма"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
+msgid "Amount"
+msgstr "Сумма"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113
+msgid "Notes:"
+msgstr "Примечания:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
+msgid "Pay Online"
+msgstr "Оплата онлайн"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
+msgid "Paypal"
+msgstr "Paypal"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
+msgid ""
+"You may directly pay this invoice online via Paypal's secure payment gateway:"
+msgstr ""
+"Вы можете напрямую оплатить этот счет в режиме онлайн через безопасный "
+"платежный шлюз PayPal:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
+msgid "Bank Wire Transfer"
+msgstr "Банковский перевод"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
+msgid "Please transfer"
+msgstr "Пожалуйста, переведите"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140
+msgid "to"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149
+msgid ""
+"(postal address on the invoice header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the invoice\n"
+"                     reference"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
+msgid "on the transfer:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
+msgid "Order"
+msgstr "Заказ"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42
+msgid "Salesman"
+msgstr "Менеджер продаж"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
+msgid "Payment terms"
+msgstr "Условия платежа"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
+msgid "Discount(%)"
+msgstr "Скидка ( %)"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
+msgid ""
+"You may directly pay this order online via Paypal's secure payment gateway:"
+msgstr ""
+"Вы можете напрямую оплатить этот заказ он-лайн через безопасный платежный "
+"шлюз PayPal:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
+msgid ""
+"(postal address on the order header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the document\n"
+"                     reference"
+msgstr ""
diff --git a/addons/hr_attendance/i18n/nb.po b/addons/hr_attendance/i18n/nb.po
new file mode 100644
index 00000000000..97c2618a419
--- /dev/null
+++ b/addons/hr_attendance/i18n/nb.po
@@ -0,0 +1,576 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-10 13:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-11 04:50+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
+
+#. module: hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
+msgid "Time Tracking"
+msgstr "Tid Sporing"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Today"
+msgstr "I dag"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid ""
+"You did not sign out the last time. Please enter the date and time you "
+"signed out."
+msgstr ""
+"Du logget ikke ut siste gang. Vennligst skriv inn datoen og klokkeslettet du "
+"logget ut."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Total period:"
+msgstr "Total periode:"
+
+#. module: hr_attendance
+#: field:hr.action.reason,name:0
+msgid "Reason"
+msgstr "Grunn"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Print Attendance Report Error"
+msgstr "Skriv ut Oppmøte Rapporter Feil."
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:161
+#, python-format
+msgid "The sign-out date must be in the past"
+msgstr "Logg - ut må være i fortiden."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr "Signeringsdato"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"The Time Tracking functionality aims to manage employee attendances from "
+"Sign in/Sign out actions. You can also link this feature to an attendance "
+"device using OpenERP's web service features."
+msgstr ""
+"Tid Sporing funksjonalitet mål er å forvalte de ansattes tilskuertall fra "
+"Logg inn / Logg ut handlinger. Du kan også koble denne funksjonen til en "
+"frammøte enheten ved hjelp OpenERP web-service funksjoner."
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Attendance reasons"
+msgstr "Oppmøte grunner"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: field:hr.attendance,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Present"
+msgstr "Presentere"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
+msgid "Ask for Sign In Out"
+msgstr "Spør for pålogging ut."
+
+#. module: hr_attendance
+#: field:hr.attendance,action_desc:0
+#: model:ir.model,name:hr_attendance.model_hr_action_reason
+msgid "Action Reason"
+msgstr "Handling grunn."
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Ok"
+msgstr "Ok"
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Define attendance reason"
+msgstr "Definer frammøte grunn."
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/report/attendance_by_month.py:184
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
+#, python-format
+msgid "Attendances By Month"
+msgstr "Tilskuertall Pr.mnd"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,name:0
+#: field:hr.sign.in.out.ask,name:0
+msgid "Employees name"
+msgstr "Ansattnavn"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
+#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason
+msgid "Attendance Reasons"
+msgstr "Oppmøte grunner"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:161
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:167
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:179
+#, python-format
+msgid "UserError"
+msgstr "Brukerfeil"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,end_date:0
+#: field:hr.attendance.week,end_date:0
+msgid "Ending Date"
+msgstr "Sluttdato"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:140
+#, python-format
+msgid "Warning"
+msgstr "Advarsel"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
+#, python-format
+msgid "The Sign-in date must be in the past"
+msgstr "Logg inn dato må være i fortiden."
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:167
+#, python-format
+msgid "A sign-in must be right after a sign-out !"
+msgstr "En pålogging må være rett etter en logg ut!"
+
+#. module: hr_attendance
+#: field:hr.employee,state:0
+#: model:ir.model,name:hr_attendance.model_hr_attendance
+msgid "Attendance"
+msgstr "Oppmøte"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,max_delay:0
+msgid "Max. Delay (Min)"
+msgstr "Maks. Forsinkelse (Min)"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+#: view:hr.attendance.week:0
+msgid "Print"
+msgstr "Skriv ut"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Hr Attendance Search"
+msgstr "Hr Oppmøte Søk."
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_week
+msgid "Attendances By Week"
+msgstr "Tilskuertall etter uke."
+
+#. module: hr_attendance
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr "Feil: Logg på (hhv. Logg ut) må følge Logg ut (hhv. Logg inn)"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "July"
+msgstr "juli"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_error
+#: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report
+msgid "Attendance Error Report"
+msgstr "Oppmøte Feilrapport"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,init_date:0
+#: field:hr.attendance.week,init_date:0
+msgid "Starting Date"
+msgstr "Startdato"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Min Delay"
+msgstr "Minimum forsinkelse."
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign In"
+msgstr "Logg Inn"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Operation"
+msgstr "Handling"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No Data Available"
+msgstr "Ingen informasjon tilgjengelig"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "September"
+msgstr "September"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "December"
+msgstr "Desember"
+
+#. module: hr_attendance
+#: field:hr.attendance.month,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: hr_attendance
+#: field:hr.action.reason,action_type:0
+msgid "Action Type"
+msgstr "Handlingstype"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A negative delay means that the employee worked more than encoded."
+msgstr ""
+"(*) En negativ forsinkelse innebærer at arbeidstakeren jobbet mer enn kodet."
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "My Attendance"
+msgstr "Min Oppmøte"
+
+#. module: hr_attendance
+#: help:hr.attendance,action_desc:0
+msgid ""
+"Specifies the reason for Signing In/Signing Out in case of extra hours."
+msgstr "Angir årsaken til pålogging / logge ut I tilfelle ekstra timer."
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_month
+msgid "Print Monthly Attendance Report"
+msgstr "Skriv ut månedlig Oppmøte Rapporter."
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out
+msgid "Sign In Sign Out"
+msgstr "Logg inn - Logg ut"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:105
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:129
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:146
+#: view:hr.sign.in.out:0
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_sigh_in_out
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_sigh_in_out
+#, python-format
+msgid "Sign in / Sign out"
+msgstr "Logg inn / Logg ut"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
+msgstr "hr.signere.ut.spør."
+
+#. module: hr_attendance
+#: view:hr.attendance.week:0
+msgid "Print Attendance Report Weekly"
+msgstr "Skriv ut Oppmøte Rapporter Ukentlig."
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "August"
+msgstr "August"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:179
+#, python-format
+msgid "A sign-out must be right after a sign-in !"
+msgstr "Et logg-ut må være rett etter en logg - inn!"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_error
+msgid "Print Error Attendance Report"
+msgstr "Print Feil Oppmøte Rapporter."
+
+#. module: hr_attendance
+#: field:hr.attendance,name:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "November"
+msgstr "November"
+
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Feil! Du kan ikke opprette rekursiv Hierarki av ansatte."
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: hr_attendance
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign in"
+msgstr "Logg inn"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Analysis Information"
+msgstr "Analyse Informasjon."
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Sign-out Entry Must Follow Sign-in."
+msgstr ""
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Attendance Errors"
+msgstr "Oppmøte feil"
+
+#. module: hr_attendance
+#: field:hr.attendance,action:0
+#: selection:hr.attendance,action:0
+msgid "Action"
+msgstr "Handling"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
+msgstr ""
+"Hvis du trenger dine ansatte til å logge på når de kommer på jobb og logge "
+"ut igjen på slutten av dagen, kan OpenERP tillate deg å administrere dette "
+"med dette verktøyet. Hvis hver ansatt har vært knyttet til et system bruker, "
+"så de kan kode sin tid med denne handlingen knappen."
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_week
+msgid "Print Week Attendance Report"
+msgstr "Skriv Ut Uke Oppmøte Rapporter."
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,emp_id:0
+#: field:hr.sign.in.out.ask,emp_id:0
+msgid "Empoyee ID"
+msgstr "Ansatt ID"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+#: view:hr.attendance.week:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: hr_attendance
+#: help:hr.action.reason,name:0
+msgid "Specifies the reason for Signing In/Signing Out."
+msgstr "Angir årsaken til pålogging / logger av."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A positive delay means that the employee worked less than recorded."
+msgstr ""
+"(*) En positiv forsinkelse innebærer at arbeidstakeren jobbet mindre enn "
+"registrert."
+
+#. module: hr_attendance
+#: view:hr.attendance.month:0
+msgid "Print Attendance Report Monthly"
+msgstr "Skriv ut Oppmøte Rapporter Månedlig."
+
+#. module: hr_attendance
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign out"
+msgstr "Logg av"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Delay"
+msgstr "Forsinkelse"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: model:ir.model,name:hr_attendance.model_hr_employee
+msgid "Employee"
+msgstr "Ansatt"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:140
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+"Du prøvde å% s med en dato fremre til en annen hendelse!\n"
+"Prøv å kontakte administrator for å rette tilskuertall."
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+#: field:hr.sign.in.out.ask,last_time:0
+msgid "Your last sign out"
+msgstr "Din siste Logg ut."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Recorded"
+msgstr "Dato Innspilt"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
+msgid "Attendances"
+msgstr "Tilskuertall"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "May"
+msgstr "Mai"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "Your last sign in"
+msgstr "Din siste logg inn."
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign Out"
+msgstr "Logg Ut"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+"Logg inn / Logg ut. I noen bedrifter, ansatte må logge inn når de kommer på "
+"jobb og Logg ut igjen på slutten av dagen. Hvis hver ansatt har vært knyttet "
+"til et system bruker, så de kan kode sin tid med denne handlingen knappen."
+
+#. module: hr_attendance
+#: field:hr.attendance,employee_id:0
+msgid "Employee's Name"
+msgstr "Ansatte's navn."
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Absent"
+msgstr "Fraværende"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Employee attendances"
+msgstr "Ansattes tilskuertall"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,state:0
+msgid "Current state"
+msgstr "Nåværende tilstand."
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "April"
+msgstr "April"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Bellow this delay, the error is considered to be voluntary"
+msgstr "Under denne forsinkelsen, er feilen anses å være frivillig."
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No records found for your selection!"
+msgstr "Ingen rader funnet med angitt utvalg!"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid ""
+"You did not sign in the last time. Please enter the date and time you signed "
+"in."
+msgstr ""
+"Du hadde ikke logget ut siste gang. Vennligst skriv inn datoen og "
+"klokkeslettet du logget."
+
+#. module: hr_attendance
+#: field:hr.attendance.month,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.in.out.ask"
+msgstr "hr.Logg.i.ut.spør"
+
+#~ msgid "Sign-Out Entry must follow Sign-In."
+#~ msgstr "Logg ut Entry må følge pålogging."
diff --git a/addons/marketing_campaign_crm_demo/i18n/nb.po b/addons/marketing_campaign_crm_demo/i18n/nb.po
new file mode 100644
index 00000000000..036051e492d
--- /dev/null
+++ b/addons/marketing_campaign_crm_demo/i18n/nb.po
@@ -0,0 +1,192 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-10 13:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-11 04:50+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
+msgid "Marketing campaign demo report"
+msgstr "Markedsføringskampanje demo rapport."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_1
+msgid ""
+"Hello,Thanks for generous interest you have shown in the "
+"openERP.Regards,OpenERP Team,"
+msgstr ""
+"Hei, Takk for sjenerøs interessen du har vist i openERP.Regards, OpenERP lag,"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Company :"
+msgstr "Firma :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_4
+msgid "Thanks for buying the OpenERP book"
+msgstr "Takk for at du kjøpte OpenERP boken."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on "
+"june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hei, Vi har veldig godt tilbud som kan passe for deg.\n"
+"             For våre sølv partnere, Vi betalte teknisk trening på juni "
+"2010.\n"
+"             Hvis noen ytterligere opplysninger som kreves ber gå tilbake.\n"
+"             Jeg setter pris på ditt samarbeid om dette.\n"
+"             Hilsen OpenERP Team,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_5
+msgid "Propose a free technical training to Gold partners"
+msgstr "Foreslå en gratis teknisk opplæring til Gold partnere."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr "Takk for at du  abonnerte på OpenERP Discovery dag."
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr "Dummy handling."
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr "Partner :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr "Takk for at du viser interesse for OpenERP."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr "Foreslår å abonnere på OpenERP Discovery Day mai 2010."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_7
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  offering Gold partnership.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hei, Vi har veldig godt tilbud som kan passe for deg.\n"
+"             For våre sølv partnere, tilbyr vi Gold partnerskap.\n"
+"             Hvis noen ytterligere opplysninger som kreves ber gå tilbake.\n"
+"             Jeg setter pris på ditt samarbeid om dette.\n"
+"             Hilsen OpenERP Team,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
+msgstr "Foreslå gull partnerskap til sølv partnere."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_4
+msgid ""
+"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hei, Takk for at du viser interesse og kjøpe OpenERP boken.\n"
+"             Hvis noen ytterligere opplysninger som kreves ber gå tilbake.\n"
+"             Jeg setter pris på ditt samarbeid om dette.\n"
+"             Hilsen OpenERP Team,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_5
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our gold partners,We are arranging free technical training "
+"on june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hei, Vi har veldig godt tilbud som kan passe for deg.\n"
+"             For våre gull partnere, Vi arrangerer gratis teknisk trening på "
+"juni 2010.\n"
+"             Hvis noen ytterligere opplysninger som kreves ber gå tilbake.\n"
+"             Jeg setter pris på ditt samarbeid om dette.\n"
+"             Hilsen OpenERP Team,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_3
+msgid ""
+"Hello,Thanks for showing intrest and for subscribing to the OpenERP "
+"Discovery Day.\n"
+"             If any further information required kindly revert back.\n"
+"             I really appreciate your co-operation on this.\n"
+"             Regards,OpenERP Team,"
+msgstr ""
+"Hei, Takk for at du viser interesse og for å abonnere på OpenERP Discovery "
+"Day.\n"
+"              Hvis noen ytterligere opplysninger som kreves ber gå tilbake.\n"
+"              Jeg setter pris på ditt samarbeid om dette.\n"
+"              Hilsen OpenERP Team,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr "Takk for at du abonnerte på teknisk trening."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_2
+msgid ""
+"Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May "
+"2010.\n"
+"            If any further information required kindly revert back.\n"
+"            We really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hei, Vi har veldig godt tilbud som kan passe for deg.\n"
+"             Vi foreslår at du abonnere på OpenERP Discovery Day mai 2010.\n"
+"             Hvis noen ytterligere opplysninger som kreves ber gå tilbake.\n"
+"             Vi setter pris på din samarbeid om dette.\n"
+"             Hilsen OpenERP Team,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_8
+msgid ""
+"Hello, Thanks for showing intrest and for subscribing to technical "
+"training.If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hei, Takk for at du viser interesse og for å abonnere på teknisk training.If "
+"ytterligere informasjon som kreves ber tilbake tilbake.Jeg virkelig setter "
+"pris på din samarbeid om dette.\n"
+"             Hilsen OpenERP Team,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
+msgstr "Foreslå betalt opplæring til Silver partnere."
diff --git a/addons/mrp_subproduct/i18n/nb.po b/addons/mrp_subproduct/i18n/nb.po
new file mode 100644
index 00000000000..49292481c49
--- /dev/null
+++ b/addons/mrp_subproduct/i18n/nb.po
@@ -0,0 +1,132 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-10 13:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-11 04:50+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fast"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Alle produktantall må være større en 0.\n"
+"Du bør installere modulen mrp:subproduct hvis du vil håndtere ekstra "
+"produkter på Materiallister !"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "Sub produkter"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Produksjonsordre"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr "Bom linje produktet bør ikke være det samme som BOM produkt."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub produkter."
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Antall Type."
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Materialliste"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Produkt Ant"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Produkt Enhet"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Materialliste"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "Referanse må være unik pr firma!"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "Sub_produkter."
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variabel"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sub produkt."
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "Ordrekvantum kan ikke være negativt eller null!"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+"Definere hvordan mengden av delkomponenter vil bli satt på produksjonsordrer "
+"ved hjelp av denne BOM. 'Fast' beskriver en situasjon der mengden av laget "
+"subproduct er alltid lik mengde sett på BOM, uavhengig av hvor mange som er "
+"skapt i produksjonen rekkefølge. Av motstand, 'variabel' betyr at mengden "
+"vil bli beregnet som '(mengde subproduct satt på BOM / mengde produsert "
+"produkt satt på BOM * mengde produsert produkt i produksjonen rekkefølge.)'"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr "Feil! Du kan ikke lage en rekursive BoM."
diff --git a/addons/pad/i18n/nb.po b/addons/pad/i18n/nb.po
new file mode 100644
index 00000000000..48977b7d1f8
--- /dev/null
+++ b/addons/pad/i18n/nb.po
@@ -0,0 +1,58 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-09-10 13:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-11 04:50+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
+
+#. module: pad
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Firmanavn må være unikt !"
+
+#. module: pad
+#: help:res.company,pad_url_template:0
+msgid "Template used to generate pad URL."
+msgstr "Mal som brukes til å generere pad URL."
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "Firmaer"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+
+#. module: pad
+#: model:ir.model,name:pad.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.vedlegg"
+
+#. module: pad
+#: view:res.company:0
+msgid "Pad"
+msgstr "Pad"
+
+#. module: pad
+#: field:res.company,pad_url_template:0
+msgid "Pad URL Template"
+msgstr "Pad URL Mal."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/pad/static/src/xml/pad.xml:9
+msgid "Add Pad"
+msgstr "Legg til Pad."
diff --git a/addons/pad_project/i18n/nb.po b/addons/pad_project/i18n/nb.po
new file mode 100644
index 00000000000..baa35cb2392
--- /dev/null
+++ b/addons/pad_project/i18n/nb.po
@@ -0,0 +1,38 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-10 13:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-11 04:50+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Feil! Oppgave sluttdato må være større enn oppgave startdato"
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Oppgave"
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr "Pad"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Feil! Du kan ikke lage en rekursive oppgaver."
diff --git a/addons/plugin/i18n/nb.po b/addons/plugin/i18n/nb.po
new file mode 100644
index 00000000000..0ef79314ec0
--- /dev/null
+++ b/addons/plugin/i18n/nb.po
@@ -0,0 +1,23 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-10 13:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-11 04:50+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "Plugg.behandleren"
diff --git a/addons/plugin_outlook/i18n/nb.po b/addons/plugin_outlook/i18n/nb.po
new file mode 100644
index 00000000000..0bb6f6bd40f
--- /dev/null
+++ b/addons/plugin_outlook/i18n/nb.po
@@ -0,0 +1,78 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2012-09-10 13:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-11 04:50+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
+
+#. module: plugin_outlook
+#: view:outlook.installer:0
+msgid ""
+"This plug-in allows you to create and link outlook emails with openerp "
+"objects."
+msgstr ""
+"Denne plug-in tillater deg å opprette og koble Outlook e-post med openerp "
+"objekter."
+
+#. module: plugin_outlook
+#: field:outlook.installer,name:0
+msgid "Outlook Plug-in"
+msgstr "Outlook Plugginn"
+
+#. module: plugin_outlook
+#: model:ir.actions.act_window,name:plugin_outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:plugin_outlook.action_outlook_wizard
+#: model:ir.ui.menu,name:plugin_outlook.menu_base_config_plugins_outlook
+#: view:outlook.installer:0
+msgid "Install Outlook Plug-In"
+msgstr "Installere Outlook Plugg-Inn."
+
+#. module: plugin_outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Bilde"
+
+#. module: plugin_outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr "tittel"
+
+#. module: plugin_outlook
+#: model:ir.model,name:plugin_outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr "outlook.installer"
+
+#. module: plugin_outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr "_Lukk"
+
+#. module: plugin_outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Installasjon og Konfigurasjon trinn"
+
+#. module: plugin_outlook
+#: help:outlook.installer,name:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+"Outlook pluginn-filen. Lagre som denne filen og installere denne plugin-"
+"modulen i outlook."
+
+#. module: plugin_outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Beskrivelse:"
diff --git a/addons/plugin_thunderbird/i18n/nb.po b/addons/plugin_thunderbird/i18n/nb.po
new file mode 100644
index 00000000000..c8dcc889c48
--- /dev/null
+++ b/addons/plugin_thunderbird/i18n/nb.po
@@ -0,0 +1,108 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2012-09-10 13:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-09-11 04:50+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,pdf_file:0
+msgid "Installation Manual"
+msgstr "Installasjons håndbok."
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,description:0
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "title"
+msgstr "tittel"
+
+#. module: plugin_thunderbird
+#: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
+msgid "plugin_thunderbird.installer"
+msgstr "plugin_thunderbird.installer"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,config_logo:0
+msgid "Image"
+msgstr "Bilde"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,plugin_file:0
+#: field:plugin_thunderbird.installer,thunderbird:0
+msgid "Thunderbird Plug-in"
+msgstr "Thunderbird Plug-in"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid ""
+"This plug-in allows you to link your email to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,thunderbird:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+"Lar deg velge et objekt som du ønsker å legge til din e-post og vedlegg."
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,pdf_file:0
+msgid "The documentation file :- how to install Thunderbird Plug-in."
+msgstr "Dokumentasjonen fil: - hvordan du installerer Thunderbird Plug-in."
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "_Close"
+msgstr "_Lukk"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Installasjon og Konfigurasjon trinn"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,name:0
+#: field:plugin_thunderbird.installer,pdf_name:0
+msgid "File name"
+msgstr "Filnavn"
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,plugin_file:0
+msgid ""
+"Thunderbird plug-in file. Save as this file and install this plug-in in "
+"thunderbird."
+msgstr ""
+"Thunderbird plug-in-filen. Lagre som denne filen og installere denne plugin-"
+"modulen i thunderbird."
+
+#. module: plugin_thunderbird
+#: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
+#: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Install Thunderbird Plug-In"
+msgstr "Installer Thunderbird Plug-in."
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Denne plug-in tillater deg å koble din e-post til OpenERP er dokumenter. Du "
+#~ "kan feste den til enhver eksisterende i OpenERP eller opprette en ny."
diff --git a/addons/report_webkit_sample/i18n/ru.po b/addons/report_webkit_sample/i18n/ru.po
new file mode 100644
index 00000000000..82fde059f51
--- /dev/null
+++ b/addons/report_webkit_sample/i18n/ru.po
@@ -0,0 +1,123 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-09-10 14:37+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"Language-Team: Russian <ru@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: 2012-09-11 04:50+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
+msgid "Refund"
+msgstr "Возврат"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
+msgid "Fax"
+msgstr "Факс"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Disc.(%)"
+msgstr "Дисконт (%)"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
+msgid "Tel"
+msgstr "Тел"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Description"
+msgstr "Описание"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
+msgid "Supplier Invoice"
+msgstr "Счет поставщика"
+
+#. module: report_webkit_sample
+#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
+msgid "WebKit invoice"
+msgstr "Счет Webkit"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Price"
+msgstr "Цена"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+msgid "Invoice Date"
+msgstr "Дата счёта"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Taxes"
+msgstr "Налоги"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "QTY"
+msgstr "Кол-во"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
+msgid "Email"
+msgstr "Эл. почта"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+msgid "Amount"
+msgstr "Сумма"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+msgid "Base"
+msgstr ""
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
+msgid "Invoice"
+msgstr "Счет"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
+msgid "Supplier Refund"
+msgstr "Возврат средств от поставщика"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+msgid "Document"
+msgstr "Документ"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Unit Price"
+msgstr "Цена за ед."
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+msgid "Partner Ref."
+msgstr "Ссылка на контрагента"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
+msgid "VAT"
+msgstr "НДС"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
+msgid "Total"
+msgstr "Всего"
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 6b4294b5c3c..2af399a3226 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:51+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-09-10 14:56+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15914)\n"
+"X-Launchpad-Export-Date: 2012-09-11 04:50+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
 msgid "Based on Timesheet"
-msgstr ""
+msgstr "Основано на затратах времени"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -27,6 +27,8 @@ msgid ""
 "Sale Order Lines that are confirmed, done or in exception state and haven't "
 "yet been invoiced"
 msgstr ""
+"Позиции заказа на продажу в состоянии \"Подтвержден\", \"Cделано\" или  "
+"\"Исключение\" и на которые не был выставлен счет"
 
 #. module: sale
 #: view:board.board:0
@@ -78,7 +80,7 @@ msgstr "Запрос цен '%s'  был преобразован в заказ
 #. module: sale
 #: view:sale.order:0
 msgid "Print Quotation"
-msgstr ""
+msgstr "Печать предложения цен"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice.py:42
@@ -89,7 +91,7 @@ msgstr "Внимание!"
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr ""
+msgstr "Налог"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -123,6 +125,9 @@ msgid ""
 "cancel a sale order, you must first cancel related picking or delivery "
 "orders."
 msgstr ""
+"Для удаления подтвержденного заказа на продажу надо сначала его отменить ! "
+"Для отмены заказа на продажу надо отменить его комплектование или заказ на "
+"доставку."
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
@@ -137,7 +142,7 @@ msgstr "Контрагент"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice based on deliveries"
-msgstr ""
+msgstr "Счет основанный на отгрузке"
 
 #. module: sale
 #: view:sale.order:0
@@ -187,12 +192,12 @@ msgstr "Условия платежа по умолчанию"
 #. module: sale
 #: field:sale.config.picking_policy,deli_orders:0
 msgid "Based on Delivery Orders"
-msgstr ""
+msgstr "Основанный на заказе на отгрузку"
 
 #. module: sale
 #: field:sale.config.picking_policy,time_unit:0
 msgid "Main Working Time Unit"
-msgstr ""
+msgstr "Основная единица рабочего времени"
 
 #. module: sale
 #: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
@@ -218,7 +223,7 @@ msgstr "Отметьте для группирования счетов по з
 #. module: sale
 #: view:sale.order:0
 msgid "My Sale Orders"
-msgstr ""
+msgstr "Мои заказы на продажу"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -267,7 +272,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 msgid "Quotations and Sales"
-msgstr ""
+msgstr "Предложения цен и продажи"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
@@ -278,7 +283,7 @@ msgstr "Продажи - создать счет"
 #: code:addons/sale/sale.py:330
 #, python-format
 msgid "Pricelist Warning!"
-msgstr ""
+msgstr "Предупреждение по прайс листу!"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -344,7 +349,7 @@ msgstr "Продажи в состоянии \"Исключение\""
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:70
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "Ошибка конфигурации !"
 
 #. module: sale
 #: view:sale.order:0
@@ -406,7 +411,7 @@ msgstr "Октябрь"
 #. module: sale
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка должна быть уникальна для каждой компании!"
 
 #. module: sale
 #: view:board.board:0 view:sale.order:0 view:sale.report:0
@@ -469,7 +474,7 @@ msgstr ""
 #: code:addons/sale/sale.py:1074
 #, python-format
 msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
+msgstr "Нельзя отменить позицию заказа на продажу, которая уже в счете!"
 
 #. module: sale
 #: code:addons/sale/sale.py:1079
@@ -519,7 +524,7 @@ msgstr "Примечания"
 #. module: sale
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Название компании должно быть уникальным!"
 
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
@@ -529,12 +534,12 @@ msgstr "Адрес счета для текущего заказа на прод
 #. module: sale
 #: view:sale.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Месяц-1"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered month of the sales order"
-msgstr ""
+msgstr "Месяц заказа в заказе на продажу"
 
 #. module: sale
 #: code:addons/sale/sale.py:504
@@ -542,11 +547,12 @@ msgstr ""
 msgid ""
 "You cannot group sales having different currencies for the same partner."
 msgstr ""
+"Нельзя сгруппировать продажи в разных валютах для одного контрагента."
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Deliver each product when available"
-msgstr ""
+msgstr "Отгрузка каждого товара по готовности."
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
@@ -581,12 +587,12 @@ msgstr "Март"
 #. module: sale
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Нельзя переместить ТМЦ в/из место хранения типа вид."
 
 #. module: sale
 #: field:sale.config.picking_policy,sale_orders:0
 msgid "Based on Sales Orders"
-msgstr ""
+msgstr "Основанный на заказах на продажу"
 
 #. module: sale
 #: help:sale.order,amount_total:0
@@ -606,7 +612,7 @@ msgstr "Адрес счета:"
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Line Sequence"
-msgstr ""
+msgstr "Последовательность"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleorderprocurement0
@@ -697,7 +703,7 @@ msgstr "Дата создания"
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Прочее"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -741,7 +747,7 @@ msgstr "Кол-во"
 #: code:addons/sale/sale.py:1327
 #, python-format
 msgid "Hour"
-msgstr ""
+msgstr "Час"
 
 #. module: sale
 #: view:sale.order:0
@@ -762,7 +768,7 @@ msgstr "Все предложения"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Options"
-msgstr ""
+msgstr "Настройки"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -773,7 +779,7 @@ msgstr "Сентябрь"
 #: code:addons/sale/sale.py:632
 #, python-format
 msgid "You cannot confirm a sale order which has no line."
-msgstr ""
+msgstr "Нельзя подтвердить заказ на продажу без товара"
 
 #. module: sale
 #: code:addons/sale/sale.py:1259
@@ -782,6 +788,8 @@ msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"Перед выбором ТМЦ, \n"
+"вы должны выбрать прайс-лист или заказчика в форме ввода продаж !"
 
 #. module: sale
 #: view:sale.report:0 field:sale.report,categ_id:0
@@ -851,7 +859,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
 #. module: sale
 #: view:sale.report:0
@@ -883,7 +891,7 @@ msgstr ""
 #: code:addons/sale/sale.py:1272
 #, python-format
 msgid "No valid pricelist line found ! :"
-msgstr ""
+msgstr "Нет верной позиции в прайс листе ! :"
 
 #. module: sale
 #: view:sale.order:0
@@ -893,7 +901,7 @@ msgstr "Журнал"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice on order after delivery"
-msgstr ""
+msgstr "Счет на заказ после отгрузки"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -935,7 +943,7 @@ msgstr "Ссылки"
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
-msgstr ""
+msgstr "Мои позиции заказов на продажу"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -949,7 +957,7 @@ msgstr "Отмена"
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
@@ -967,7 +975,7 @@ msgstr "Всего без налогов"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
-msgstr ""
+msgstr "Ссылка на заказ"
 
 #. module: sale
 #: view:sale.open.invoice:0
@@ -1019,7 +1027,7 @@ msgstr "На основании отгруженного или заказанн
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Deliver all products at once"
-msgstr ""
+msgstr "Отгрузка всех товаров за раз"
 
 #. module: sale
 #: field:sale.order,picking_ids:0
@@ -1056,7 +1064,7 @@ msgstr "Создать заказ на доставку"
 #: code:addons/sale/sale.py:1303
 #, python-format
 msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
+msgstr "Нельзя удалить позицию заказа на продажу со статусом '%s'!"
 
 #. module: sale
 #: view:sale.order:0
@@ -1076,7 +1084,7 @@ msgstr "Создать комплектовочный лист"
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered date of the sales order"
-msgstr ""
+msgstr "Дата заказа в заказе на продажу"
 
 #. module: sale
 #: view:sale.report:0
@@ -1238,7 +1246,7 @@ msgstr "Налоги"
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order ready to be invoiced"
-msgstr ""
+msgstr "Заказ на продажу готов к выставлению счета"
 
 #. module: sale
 #: help:sale.order,create_date:0
@@ -1258,7 +1266,7 @@ msgstr "Создать счета"
 #. module: sale
 #: view:sale.report:0
 msgid "Sales order created in current month"
-msgstr ""
+msgstr "Заказы на продажу, созданные в этом месяце"
 
 #. module: sale
 #: report:sale.order:0
@@ -1300,6 +1308,8 @@ msgid ""
 "If you change the pricelist of this order (and eventually the currency), "
 "prices of existing order lines will not be updated."
 msgstr ""
+"Даже если вы измените прайс-лист этого заказа (и даже валюту), то цена "
+"позиции заказа не обновиться."
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_picking
@@ -1323,12 +1333,12 @@ msgstr "Нельзя отменить заказ на продажу !"
 #. module: sale
 #: view:sale.order:0
 msgid "Qty(UoM)"
-msgstr ""
+msgstr "Кол-во(Ед.изм)"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered Year of the sales order"
-msgstr ""
+msgstr "Год заказа в заказе на продажу"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1349,7 +1359,7 @@ msgstr "Исключение при доставке"
 #: code:addons/sale/sale.py:1156
 #, python-format
 msgid "Picking Information ! : "
-msgstr ""
+msgstr "Информация по комплектованию ! : "
 
 #. module: sale
 #: field:sale.make.invoice,grouped:0
@@ -1359,13 +1369,13 @@ msgstr "Сгруппировать счета"
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Invoice Policy"
-msgstr ""
+msgstr "Политика выставления счета"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 #: view:sale.config.picking_policy:0
 msgid "Setup your Invoicing Method"
-msgstr ""
+msgstr "Настройка способа выставления счета"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
@@ -1383,6 +1393,9 @@ msgid ""
 "This tool will help you to install the right module and configure the system "
 "according to the method you use to invoice your customers."
 msgstr ""
+"Этот инструмент поможет вам установить правильный модуль и настроить систему "
+"в соответствии с методом который вы используете для выставления счетов своим "
+"клиентам."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
@@ -1457,13 +1470,13 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
+msgstr "Не доставленные подтвержденные позиции заказа на продажу"
 
 #. module: sale
 #: code:addons/sale/sale.py:473
 #, python-format
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Счета заказчику"
 
 #. module: sale
 #: model:process.process,name:sale.process_process_salesprocess0
@@ -1544,7 +1557,7 @@ msgstr "Месяц"
 #. module: sale
 #: model:email.template,subject:sale.email_template_edi_sale
 msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} Заказ (Ссылка ${object.name or 'n/a' })"
 
 #. module: sale
 #: view:sale.order.line:0 field:sale.order.line,product_id:0
@@ -1566,7 +1579,7 @@ msgstr "sale.config.picking_policy"
 #: view:account.invoice.report:0 view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_turnover_by_month
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Ежемесячный оборот"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
@@ -1677,12 +1690,12 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Pay before delivery"
-msgstr ""
+msgstr "Оплата перед отгрузкой"
 
 #. module: sale
 #: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Панель продаж"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1730,6 +1743,8 @@ msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
+"Не удалось найти позицию в прайс-листе для этого товара и этого количества.\n"
+"Вы должны изменить товар, количество или прайс-лист."
 
 #. module: sale
 #: help:sale.order,picking_ids:0
@@ -1756,7 +1771,7 @@ msgstr "Отменено"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
+msgstr "Позиции заказа на продажу относящиеся к моим заказам"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
@@ -1799,7 +1814,7 @@ msgstr "Количество (UoS)"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
+msgstr "Позиции заказа на продажу  в состоянии «Сделано»"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_packing0
@@ -1823,7 +1838,7 @@ msgstr "Подтвержден"
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
 msgid "Main Method Based On"
-msgstr ""
+msgstr "Основной метод основан на"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
@@ -1871,12 +1886,12 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Print Order"
-msgstr ""
+msgstr "Печать заказа"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales order created in current year"
-msgstr ""
+msgstr "Заказы на продажу созданные в этом году"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:113
@@ -1894,7 +1909,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
-msgstr ""
+msgstr "Позиции заказа на продажу сделаны"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
@@ -2003,18 +2018,18 @@ msgstr "Упаковки"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
+msgstr "Позиции заказа на продажу готовы к выставлению счета"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales order created in last month"
-msgstr ""
+msgstr "Заказы на продажу созданные в прошлом месяце"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
 #: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "Шаблоны писем"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
@@ -2072,7 +2087,7 @@ msgstr "Задержка по обязательствам"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Deliver & invoice on demand"
-msgstr ""
+msgstr "Доставка и счета по требованию"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
@@ -2101,7 +2116,7 @@ msgstr "Подтвержденный заказ на продажу в счет"
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
+msgstr "Заказы на продажу, которые еще не были подтверждены"
 
 #. module: sale
 #: code:addons/sale/sale.py:322
@@ -2123,7 +2138,7 @@ msgstr "Закрыть"
 #: code:addons/sale/sale.py:1261
 #, python-format
 msgid "No Pricelist ! : "
-msgstr ""
+msgstr "Нет прайс листа ! : "
 
 #. module: sale
 #: field:sale.order,shipped:0
@@ -2204,7 +2219,7 @@ msgstr "Запрос заказа на продажу"
 #: code:addons/sale/sale.py:1255
 #, python-format
 msgid "Not enough stock ! : "
-msgstr ""
+msgstr "Не достаточно запасов ! : "
 
 #. module: sale
 #: report:sale.order:0 field:sale.order,payment_term:0
diff --git a/addons/share/i18n/ru.po b/addons/share/i18n/ru.po
index effec5d5f99..5e430205ec4 100644
--- a/addons/share/i18n/ru.po
+++ b/addons/share/i18n/ru.po
@@ -8,39 +8,39 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-04-26 05:57+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-09-10 14:15+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-11 04:50+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
 msgid "Display title"
-msgstr ""
+msgstr "Название отображения"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Access granted!"
-msgstr ""
+msgstr "Access granted!"
 
 #. module: share
 #: field:share.wizard,user_type:0
 msgid "Sharing method"
-msgstr ""
+msgstr "Метод совместного доступа"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Share with these People (one email per line)"
-msgstr ""
+msgstr "Совместный доступ с этими людьми (один эл.адрес в строке)"
 
 #. module: share
 #: field:share.wizard,name:0
 msgid "Share Title"
-msgstr ""
+msgstr "Название совместного доступа"
 
 #. module: share
 #: model:ir.module.category,name:share.module_category_share
@@ -50,19 +50,20 @@ msgstr "Совместный доступ"
 #. module: share
 #: field:share.wizard,share_root_url:0
 msgid "Share Access URL"
-msgstr ""
+msgstr "Адрес(URL) совместного доступа"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:782
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
+"Вы можете использовать ваш текущий логин (%s) и пароль, для их просмотра.\n"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:601
 #, python-format
 msgid "(Modified)"
-msgstr ""
+msgstr "(Изменено)"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:769
@@ -71,6 +72,7 @@ msgid ""
 "The documents are not attached, you can view them online directly on my "
 "OpenERP server at:"
 msgstr ""
+"Документы не вложены, их можно просмотреть онлайн на OpenERP сервере:"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:579
@@ -88,7 +90,7 @@ msgstr "Адрес совместного доступа"
 #: code:addons/share/wizard/share_wizard.py:776
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
-msgstr ""
+msgstr "Это ваши учетные данные для доступа с защищенной области:\n"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:643
@@ -110,7 +112,7 @@ msgstr "Совместный доступ"
 #: code:addons/share/wizard/share_wizard.py:551
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
-msgstr ""
+msgstr "(Дублирован для измененных прав совместного доступа)"
 
 #. module: share
 #: help:share.wizard,domain:0
@@ -125,7 +127,7 @@ msgstr "Вы не можете иметь двух одинаковых поль
 #. module: share
 #: model:ir.model,name:share.model_ir_model_access
 msgid "ir.model.access"
-msgstr ""
+msgstr "ir.model.access"
 
 #. module: share
 #: view:share.wizard:0
@@ -141,13 +143,13 @@ msgstr "Пользователь"
 #. module: share
 #: view:share.wizard:0
 msgid "Sharing Options"
-msgstr ""
+msgstr "Параметры общего доступа"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:765
 #, python-format
 msgid "Hello,"
-msgstr ""
+msgstr "Здравствуйте,"
 
 #. module: share
 #: view:share.wizard:0
@@ -158,7 +160,7 @@ msgstr "Закрыть"
 #: code:addons/share/wizard/share_wizard.py:640
 #, python-format
 msgid "Action and Access Mode are required to create a shared access"
-msgstr ""
+msgstr "Действие и режим доступа необходимы для создания общего доступа"
 
 #. module: share
 #: view:share.wizard:0
@@ -176,6 +178,7 @@ msgid ""
 "The documents have been automatically added to your current OpenERP "
 "documents.\n"
 msgstr ""
+"Документы были автоматически добавлены к вашим текущим документам OpenERP .\n"
 
 #. module: share
 #: view:share.wizard:0
@@ -206,11 +209,13 @@ msgstr ""
 #: help:share.wizard,name:0
 msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr ""
+"Название для общего доступа (выводится пользователям как меню и название "
+"закладки)"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Options"
-msgstr ""
+msgstr "Настройки"
 
 #. module: share
 #: view:res.groups:0
@@ -225,6 +230,9 @@ msgid ""
 "Sales, HR, etc.)\n"
 "It is open source and can be found on http://www.openerp.com."
 msgstr ""
+"OpenERP является мощным и удобным набором бизнес-приложений (CRM, продажи, "
+"кадры и т.д.)\n"
+"с открытым исходным кодом. Сайт: www.openerp.com ."
 
 #. module: share
 #: field:share.wizard,action_id:0
@@ -234,7 +242,7 @@ msgstr "Действие совместного доступа"
 #. module: share
 #: view:share.wizard:0
 msgid "Optional: include a personal message"
-msgstr ""
+msgstr "Дополнительно: включить личное сообщение"
 
 #. module: share
 #: field:res.users,share:0
@@ -246,11 +254,13 @@ msgstr "Совместный доступ с пользователем"
 #, python-format
 msgid "Please indicate the emails of the persons to share with, one per line"
 msgstr ""
+"Пожалуйста, укажите эл.адреса лиц для совместного доступа, один адрес в "
+"строке"
 
 #. module: share
 #: field:share.wizard,embed_code:0 field:share.wizard.result.line,user_id:0
 msgid "unknown"
-msgstr ""
+msgstr "неизвесно"
 
 #. module: share
 #: help:res.groups,share:0
@@ -295,12 +305,14 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:767
 #, python-format
 msgid "I've shared %s with you!"
-msgstr ""
+msgstr "Я предоставил вам доступ к %s !"
 
 #. module: share
 #: help:share.wizard,share_root_url:0
 msgid "Main access page for users that are granted shared access"
 msgstr ""
+"Главная страница доступа для пользователей, которым предоставляется "
+"совместный доступ"
 
 #. module: share
 #: sql_constraint:res.groups:0
@@ -310,7 +322,7 @@ msgstr "Название группы должно быть уникальным
 #. module: share
 #: model:res.groups,name:share.group_share_user
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: share
 #: view:res.groups:0
@@ -333,7 +345,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid "Use this Link"
-msgstr ""
+msgstr "Используйте эту ссылку"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:779
@@ -360,12 +372,13 @@ msgstr "Скопированы права совместного доступа"
 #. module: share
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 msgid "Share your documents"
-msgstr ""
+msgstr "Поделитесь своими документами"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
+"Или вставьте следующий код туда, где вы хотите вставить ваши документы"
 
 #. module: share
 #: view:share.wizard:0
@@ -373,6 +386,7 @@ msgid ""
 "An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
+"Уведомление с инструкциями было отправлено по эл.почте следующим людям:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -389,23 +403,23 @@ msgstr ""
 #. module: share
 #: field:share.wizard,view_type:0
 msgid "Current View Type"
-msgstr ""
+msgstr "Тип этого вида"
 
 #. module: share
 #: selection:share.wizard,access_mode:0
 msgid "Can view"
-msgstr ""
+msgstr "Можно просматривать"
 
 #. module: share
 #: selection:share.wizard,access_mode:0
 msgid "Can edit"
-msgstr ""
+msgstr "Можно редактировать"
 
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
 "An optional personal message, to be included in the email notification."
-msgstr ""
+msgstr "Персональное сообщение, которое может быть включено в эл.письмо."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -417,7 +431,7 @@ msgstr "res.users"
 #: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Sharing access could not be created"
-msgstr ""
+msgstr "Общий доступ не был создан"
 
 #. module: share
 #: help:res.users,share:0
@@ -439,7 +453,7 @@ msgstr "Мастер совместного доступа"
 #: code:addons/share/wizard/share_wizard.py:740
 #, python-format
 msgid "Shared access created!"
-msgstr ""
+msgstr "Общий доступ создан!"
 
 #. module: share
 #: model:res.groups,comment:share.group_share_user
@@ -448,6 +462,10 @@ msgid ""
 "Members of this groups have access to the sharing wizard, which allows them "
 "to invite external users to view or edit some of their documents."
 msgstr ""
+"\n"
+"Члены этой группы имеют доступ к мастеру совместного доступа , который "
+"позволяет им приглашать внешних пользователей, для просмотра или изменения "
+"некоторых своих документов."
 
 #. module: share
 #: model:ir.model,name:share.model_res_groups
@@ -464,23 +482,23 @@ msgstr "Пароль"
 #. module: share
 #: field:share.wizard,new_users:0
 msgid "Emails"
-msgstr ""
+msgstr "Эл.почта"
 
 #. module: share
 #: field:share.wizard,embed_option_search:0
 msgid "Display search view"
-msgstr ""
+msgstr "Показать поиск"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
 msgid "No email address configured"
-msgstr ""
+msgstr "Не настроен адрес эл.почты"
 
 #. module: share
 #: field:share.wizard,message:0
 msgid "Personal Message"
-msgstr ""
+msgstr "Личное сообщение"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:763
@@ -495,7 +513,7 @@ msgstr ""
 #. module: share
 #: field:share.wizard.result.line,login:0
 msgid "Login"
-msgstr ""
+msgstr "Имя пользователя"
 
 #. module: share
 #: view:res.users:0
@@ -510,7 +528,7 @@ msgstr "Режим доступа"
 #. module: share
 #: view:share.wizard:0
 msgid "Sharing: preparation"
-msgstr ""
+msgstr "Совместный доступ: подготовка"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:198
@@ -519,21 +537,23 @@ msgid ""
 "You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
+"Вы должны настроить ваш адрес электронной почты в настройках пользователя, "
+"прежде чем использовать кнопку \"Совместный доступ\"."
 
 #. module: share
 #: help:share.wizard,access_mode:0
 msgid "Access rights to be granted on the shared documents."
-msgstr ""
+msgstr "Права доступа будут предоставлены на документы совместного доступа"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:8
 msgid "Link or embed..."
-msgstr ""
+msgstr "Ссылка или встроить ..."
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:9
 msgid "Share with..."
-msgstr ""
+msgstr "Совместный доступ с..."
 
 #, python-format
 #~ msgid ""
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 65846a6b84d..09143eebcef 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.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-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:04+0000\n"
+"PO-Revision-Date: 2012-09-10 11:41+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-11 04:50+0000\n"
+"X-Generator: Launchpad (build 15924)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -698,6 +698,7 @@ msgid ""
 "There is no inventory Valuation account defined on the product category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Не определен счет оценки запасов для категории продукта: \"%s\" (id: %d)"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1059,7 +1060,7 @@ msgstr ""
 #. module: stock
 #: field:product.category,property_stock_valuation_account_id:0
 msgid "Stock Valuation Account"
-msgstr ""
+msgstr "Счет складских запасов"
 
 #. module: stock
 #: code:addons/stock/stock.py:1349
@@ -1529,7 +1530,7 @@ msgstr "Общая информация"
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Analysis including future moves (similar to virtual stock)"
-msgstr ""
+msgstr "Анализ включающий будущие перемещения (подобно виртуальным остаткам)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0
@@ -1929,7 +1930,7 @@ msgstr "Оценка запасов"
 #. module: stock
 #: view:stock.move:0
 msgid "Orders planned for today"
-msgstr ""
+msgstr "Документы запланированные на сегодня"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -2078,7 +2079,7 @@ msgstr "Логистическая единица: поддон, ящик, уп
 #. module: stock
 #: view:stock.location:0
 msgid "Customer Locations"
-msgstr ""
+msgstr "Места хранения заказчиков"
 
 #. module: stock
 #: view:stock.change.product.qty:0 view:stock.change.standard.price:0
@@ -2289,7 +2290,7 @@ msgstr "Тип поставки"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that are Confirmed, Available or Waiting"
-msgstr ""
+msgstr "Перемещения которые подтверждены, доступны или в ожидании"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_location_open
@@ -2553,7 +2554,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.location_opening
 msgid "opening"
-msgstr ""
+msgstr "открытие"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -2638,7 +2639,7 @@ msgstr "Ваша компания"
 #. module: stock
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Нельзя переместить ТМЦ в/из место хранения типа вид."
 
 #. module: stock
 #: help:stock.tracking,active:0
@@ -2974,7 +2975,7 @@ msgstr "Продукция"
 #. module: stock
 #: view:stock.return.picking:0
 msgid "Return"
-msgstr ""
+msgstr "Возврат"
 
 #. module: stock
 #: field:stock.return.picking,invoice_state:0
@@ -2984,7 +2985,7 @@ msgstr "Выставление счета"
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Internal Moves"
-msgstr ""
+msgstr "Назначенные внутренние перемещения"
 
 #. module: stock
 #: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
@@ -3053,12 +3054,12 @@ msgstr "ТМЦ по категориям"
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Waiting Another Operation"
-msgstr ""
+msgstr "Ожидание другой операции"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Supplier Locations"
-msgstr ""
+msgstr "Места хранения поставщиков"
 
 #. module: stock
 #: field:stock.partial.move.line,wizard_id:0
@@ -3070,7 +3071,7 @@ msgstr "Мастер"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Completed Stock-Moves"
-msgstr ""
+msgstr "Вычисленные перемещения"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -3124,7 +3125,7 @@ msgstr "Место хранения источника"
 #. module: stock
 #: view:stock.move:0
 msgid " Waiting"
-msgstr ""
+msgstr " Ожидание"
 
 #. module: stock
 #: view:product.template:0
@@ -3134,7 +3135,7 @@ msgstr "Бухгалтерские проводки"
 #. module: stock
 #: model:res.groups,name:stock.group_stock_manager
 msgid "Manager"
-msgstr ""
+msgstr "Менеджер"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -3242,12 +3243,12 @@ msgstr "Причина"
 #. module: stock
 #: model:product.template,name:stock.product_icecream_product_template
 msgid "Ice Cream"
-msgstr ""
+msgstr "Мороженое"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Запуск мастера частичного комплектования"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_production_lot_form
@@ -3527,7 +3528,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
@@ -3584,7 +3585,7 @@ msgstr "Клиенты"
 #. module: stock
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "Waiting Availability"
-msgstr ""
+msgstr "Ожидание поступления"
 
 #. module: stock
 #: code:addons/stock/stock.py:1347
@@ -3600,7 +3601,7 @@ msgstr "Позиции инвентаризации склада"
 #. module: stock
 #: view:stock.move:0
 msgid "Waiting "
-msgstr ""
+msgstr "Ожидание "
 
 #. module: stock
 #: code:addons/stock/product.py:427
@@ -3646,7 +3647,7 @@ msgstr "Декабрь"
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Available Product Lots"
-msgstr ""
+msgstr "Партии доступных ТМЦ"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_move_form2
@@ -3789,7 +3790,7 @@ msgstr "Обнулить"
 #. module: stock
 #: model:res.groups,name:stock.group_stock_user
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
@@ -4001,7 +4002,7 @@ msgstr ""
 #. module: stock
 #: view:report.stock.move:0
 msgid "Future Stock-Moves"
-msgstr ""
+msgstr "Будущие перемещения"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split
@@ -4012,7 +4013,7 @@ msgstr "Разбиение в партиях изделий"
 #: code:addons/stock/wizard/stock_move.py:213
 #, python-format
 msgid "Processing Error"
-msgstr ""
+msgstr "Ошибка обработки"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -4085,12 +4086,12 @@ msgstr "Идентификация партии изделий"
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator_small
 msgid "Small Refrigerator"
-msgstr ""
+msgstr "Маленький холодильник"
 
 #. module: stock
 #: model:stock.location,name:stock.location_convenience_shop
 msgid "Convenient Store"
-msgstr ""
+msgstr "Удобный магазин"
 
 #. module: stock
 #: field:stock.location,scrap_location:0 view:stock.move.scrap:0
@@ -4140,7 +4141,7 @@ msgstr ""
 #. module: stock
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:159
@@ -4161,7 +4162,7 @@ msgstr ""
 #. module: stock
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Ошибка ! Нельзя создавать рекурсивные категории."
 
 #. module: stock
 #: help:stock.move,move_dest_id:0

From 5848e72d421d0c63a0a9bd3b254b6e4aa35d5cb6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 11 Sep 2012 08:36:07 +0200
Subject: [PATCH 977/999] [REM] import from core, moving to module

bzr revid: xmo@openerp.com-20120911063607-xvhyjqohptynro30
---
 addons/web/__openerp__.py                 |   2 -
 addons/web/static/src/css/base.css        |   8 +-
 addons/web/static/src/css/base.sass       |   6 +-
 addons/web/static/src/css/data_import.css |  46 ---
 addons/web/static/src/js/data_import.js   | 393 ----------------------
 addons/web/static/src/js/view_list.js     |   9 +-
 addons/web/static/src/js/views.js         |   3 -
 addons/web/static/src/xml/base.xml        |  10 +-
 8 files changed, 17 insertions(+), 460 deletions(-)
 delete mode 100644 addons/web/static/src/css/data_import.css
 delete mode 100644 addons/web/static/src/js/data_import.js

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 44a3caaf8ec..fcfdca60a2a 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -48,7 +48,6 @@ This module provides the core of the OpenERP Web Client.
         "static/src/js/views.js",
         "static/src/js/data.js",
         "static/src/js/data_export.js",
-        "static/src/js/data_import.js",
         "static/src/js/search.js",
         "static/src/js/view_form.js",
         "static/src/js/view_list.js",
@@ -63,7 +62,6 @@ This module provides the core of the OpenERP Web Client.
         "static/lib/jquery.textext/jquery.textext.css",
         "static/src/css/base.css",
         "static/src/css/data_export.css",
-        "static/src/css/data_import.css",
         "static/lib/cleditor/jquery.cleditor.css",
     ],
     'qweb' : [
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 73457e2bc19..f952dd298fd 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2574,10 +2574,13 @@
 .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page {
   display: none;
 }
+.openerp .oe_list_buttons .oe_alternative {
+  visibility: hidden;
+}
 .openerp .oe_list_buttons .oe_list_save, .openerp .oe_list_buttons .oe_list_discard {
   display: none;
 }
-.openerp .oe_list_buttons.oe_editing .oe_list_add, .openerp .oe_list_buttons.oe_editing .oe_list_button_import {
+.openerp .oe_list_buttons.oe_editing .oe_list_add {
   display: none;
 }
 .openerp .oe_list_buttons.oe_editing .oe_list_save {
@@ -2586,6 +2589,9 @@
 .openerp .oe_list_buttons.oe_editing .oe_list_discard {
   display: inline;
 }
+.openerp .oe_list_buttons.oe_editing .oe_alternative {
+  visibility: visible;
+}
 .openerp .oe_list {
   position: relative;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5e346b32df2..1f332756cf7 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1971,15 +1971,19 @@ $sheet-max-width: 860px
     // }}}
     // ListView {{{
     .oe_list_buttons
+        .oe_alternative
+            visibility: hidden
         .oe_list_save, .oe_list_discard
             display: none
         &.oe_editing
-            .oe_list_add, .oe_list_button_import
+            .oe_list_add
                 display: none
             .oe_list_save
                 display: inline-block
             .oe_list_discard
                 display: inline
+            .oe_alternative
+                visibility: visible
 
     .oe_list
         position: relative
diff --git a/addons/web/static/src/css/data_import.css b/addons/web/static/src/css/data_import.css
deleted file mode 100644
index 47cd52aa081..00000000000
--- a/addons/web/static/src/css/data_import.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.openerp .oe_import_grid {
-    border: none;
-    border-collapse: collapse;
-}
-.openerp .oe_import_grid-header .oe_import_grid-cell {
-    background: url(../img/gradientlinebg.gif) repeat-x #CCCCCC;
-    border-bottom: 1px solid #E3E3E3;
-    font-weight: bold;
-    text-align: left;
-}
-.openerp .oe_import_grid-row .oe_import_grid-cell {
-    border-bottom: 1px solid #E3E3E3;
-}
-
-.openerp .oe_import_no_result .oe_import_result {
-    display: none;
-}
-.openerp .oe_import fieldset {
-    cursor: pointer;
-}
-.openerp .oe_import fieldset legend:before {
-    content: '\25BC  ';
-}
-.openerp .oe_import fieldset.oe_closed legend:before {
-    content: '\25B6  ';
-}
-.openerp .oe_import fieldset.oe_closed table {
-    display: none;
-}
-.openerp .oe_import .separator.horizontal {
-    font-weight: bold;
-    border-bottom-width: 1px;
-    margin: 6px 4px 6px 1px;
-    height: 20px;
-}
-.openerp .duplicate_fld{
-    background-color:#FF6666;
-}
-.openerp .select_fld{
-    background: none repeat scroll 0 0 white;
-}
-.openerp .ui-autocomplete {
-    max-height: 300px;
-    overflow-y: auto;
-    padding-right: 20px;
-}
diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
deleted file mode 100644
index 3c677b0ec26..00000000000
--- a/addons/web/static/src/js/data_import.js
+++ /dev/null
@@ -1,393 +0,0 @@
-openerp.web.data_import = function(instance) {
-var QWeb = instance.web.qweb,
-    _t = instance.web._t;
-/**
- * Safari does not deal well at all with raw JSON data being returned. As a
- * result, we're going to cheat by using a pseudo-jsonp: instead of getting
- * JSON data in the iframe, we're getting a ``script`` tag which consists of a
- * function call and the returned data (the json dump).
- *
- * The function is an auto-generated name bound to ``window``, which calls
- * back into the callback provided here.
- *
- * @param {Object} form the form element (DOM or jQuery) to use in the call
- * @param {Object} attributes jquery.form attributes object
- * @param {Function} callback function to call with the returned data
- */
-function jsonp(form, attributes, callback) {
-    attributes = attributes || {};
-    var options = {jsonp: _.uniqueId('import_callback_')};
-    window[options.jsonp] = function () {
-        delete window[options.jsonp];
-        callback.apply(null, arguments);
-    };
-    if ('data' in attributes) {
-        _.extend(attributes.data, options);
-    } else {
-        _.extend(attributes, {data: options});
-    }
-    $(form).ajaxSubmit(attributes);
-}
-
-instance.web.DataImport = instance.web.Dialog.extend({
-    template: 'ImportDataView',
-    dialog_title: {toString: function () { return _t("Import Data"); }},
-    init: function(parent, dataset){
-        var self = this;
-        this._super(parent, {});
-        this.model = parent.model;
-        this.fields = [];
-        this.all_fields = [];
-        this.fields_with_defaults = [];
-        this.required_fields = null;
-
-        var convert_fields = function (root, prefix) {
-            prefix = prefix || '';
-            _(root.fields).each(function (f) {
-                self.all_fields.push(prefix + f.name);
-                if (f.fields) {
-                    convert_fields(f, prefix + f.id + '/');
-                }
-            });
-        };
-        this.ready  = $.Deferred.queue().then(function () {
-            self.required_fields = _(self.fields).chain()
-                .filter(function (field) {
-                    return field.required &&
-                           !_.include(self.fields_with_defaults, field.id); })
-                .pluck('id')
-                .uniq()
-                .value();
-            convert_fields(self);
-            self.all_fields.sort();
-        });
-    },
-    start: function() {
-        var self = this;
-        this._super();
-        this.open({
-            buttons: [
-                {text: _t("Close"), click: function() { self.destroy(); }},
-                {text: _t("Import File"), click: function() { self.do_import(); }, 'class': 'oe_import_dialog_button'}
-            ],
-            close: function(event, ui) {
-                self.destroy();
-            }
-        });
-        this.toggle_import_button(false);
-        this.$el.find('#csvfile').change(this.on_autodetect_data);
-        this.$el.find('fieldset').change(this.on_autodetect_data);
-        this.$el.delegate('fieldset legend', 'click', function() {
-            $(this).parent().toggleClass('oe_closed');
-        });
-        this.ready.push(new instance.web.DataSet(this, this.model).call(
-            'fields_get', [], function (fields) {
-                self.graft_fields(fields);
-                self.ready.push(new instance.web.DataSet(self, self.model)
-                        .default_get(_.pluck(self.fields, 'id')).then(function (fields) {
-                    _.each(fields, function(val, key) {
-                        if (val) {
-                            self.fields_with_defaults.push(key);
-                        }
-                    });
-                })
-            )
-        }));
-    },
-    graft_fields: function (fields, parent, level) {
-        parent = parent || this;
-        level = level || 0;
-
-        var self = this;
-        if (level === 0) {
-            parent.fields.push({
-                id: 'id',
-                name: 'id',
-                string: _t('External ID'),
-                required: false
-            });
-        }
-        _(fields).each(function (field, field_name) {
-            // Ignore spec for id field
-            // Don't import function fields (function and related)
-            if (field_name === 'id') {
-                return;
-            }
-            // Skip if there's no state which could disable @readonly,
-            // if a field is ever always readonly we can't import it
-            if (field.readonly) {
-                // no states at all
-                if (_.isEmpty(field.states)) { return; }
-                // no state altering @readonly
-                if (!_.any(field.states, function (modifiers) {
-                    return _(modifiers).chain().pluck(0).contains('readonly').value();
-                })) { return; }
-            }
-
-            var f = {
-                id: field_name,
-                name: field_name,
-                string: field.string,
-                required: field.required
-            };
-
-            switch (field.type) {
-            case 'many2many':
-            case 'many2one':
-                // push a copy for the bare many2one field, to allow importing
-                // using name_search too - even if we default to exporting the XML ID
-                var many2one_field = _.extend({}, f)
-                parent.fields.push(many2one_field);
-                f.name += '/id';
-                break;
-            case 'one2many':
-                f.name += '/id';
-                f.fields = [];
-                // only fetch sub-fields to a depth of 2 levels
-                if (level < 2) {
-                    self.ready.push(new instance.web.DataSet(self, field.relation).call(
-                        'fields_get', [], function (fields) {
-                            self.graft_fields(fields, f, level+1);
-                    }));
-                }
-                break;
-            }
-            parent.fields.push(f);
-        });
-    },
-    toggle_import_button: function (newstate) {
-        instance.web.dialog(this.$el, 'widget')
-                .find('.oe_import_dialog_button')
-                .button('option', 'disabled', !newstate);
-    },
-    do_import: function() {
-        if(!this.$el.find('#csvfile').val()) { return; }
-        var lines_to_skip = parseInt(this.$el.find('#csv_skip').val(), 10);
-        var with_headers = this.$el.find('#file_has_headers').prop('checked');
-        if (!lines_to_skip && with_headers) {
-            lines_to_skip = 1;
-        }
-        var indices = [], fields = [];
-        this.$el.find(".sel_fields").each(function(index, element) {
-            var val = element.value;
-            if (!val) {
-                return;
-            }
-            indices.push(index);
-            fields.push(val);
-        });
-
-        jsonp(this.$el.find('#import_data'), {
-            url: '/web/import/import_data',
-            data: {
-                model: this.model,
-                meta: JSON.stringify({
-                    skip: lines_to_skip,
-                    indices: indices,
-                    fields: fields
-                })
-            }
-        }, this.on_import_results);
-    },
-    on_autodetect_data: function() {
-        if(!this.$el.find('#csvfile').val()) { return; }
-        jsonp(this.$el.find('#import_data'), {
-            url: '/web/import/detect_data'
-        }, this.on_import_results);
-    },
-    on_import_results: function(results) {
-        this.$el.find('#result').empty();
-        var headers, result_node = this.$el.find("#result");
-
-        if (results['error']) {
-            result_node.append(QWeb.render('ImportView.error', {
-                'error': results['error']}));
-            this.$el.find('fieldset').removeClass('oe_closed');
-            return;
-        }
-        if (results['success']) {
-            if (this.getParent().getParent().active_view == "list") {
-                this.getParent().reload_content();
-            }
-            this.destroy();
-            return;
-        }
-
-        if (results['records']) {
-            var lines_to_skip = parseInt(this.$el.find('#csv_skip').val(), 10),
-                with_headers = this.$el.find('#file_has_headers').prop('checked');
-            headers = with_headers ? results.records[0] : null;
-
-            result_node.append(QWeb.render('ImportView.result', {
-                'headers': headers,
-                'records': lines_to_skip ? results.records.slice(lines_to_skip)
-                          : with_headers ? results.records.slice(1)
-                          : results.records
-            }));
-            this.$el.find('fieldset').addClass('oe_closed');
-        }
-        this.$el.find('form').removeClass('oe_import_no_result');
-
-        this.$el.delegate('.oe_m2o_drop_down_button', 'click', function () {
-            $(this).prev('input').focus();
-        });
-
-        var self = this;
-        this.ready.then(function () {
-            var $fields = self.$el.find('.sel_fields').bind('blur', function () {
-                if (this.value && !_(self.all_fields).contains(this.value)) {
-                    this.value = '';
-                }
-            }).autocomplete({
-                minLength: 0,
-                source: self.all_fields,
-                change: self.on_check_field_values
-            }).focus(function () {
-                $(this).autocomplete('search');
-            });
-            // Column auto-detection
-            _(headers).each(function (header, index) {
-                var field_name = self.match_column_to_field(header);
-                if (field_name) {
-                    $fields.eq(index).val(field_name);
-                }
-            });
-            self.on_check_field_values();
-        });
-    },
-    /**
-     * Returns the name of the field (nested) matching the provided column name
-     *
-     * @param {String} name column name to look for
-     * @param {Array} [fields] fields to look into for the provided name
-     * @returns {String|undefined}
-     */
-    match_column_to_field: function (name, fields) {
-        fields = fields || this.fields;
-        var f;
-        f = _(fields).detect(function (field) {
-            return field.name === name
-        });
-        if (!f) {
-            f = _(fields).detect(function (field) {
-                // TODO: levenshtein between header and field.string
-                return field.string.toLowerCase() === name.toLowerCase();
-            });
-        }
-        if (f) { return f.name; }
-
-        // if ``name`` is a path (o2m), we need to recurse through its .fields
-        var index = name.indexOf('/');
-        if (index === -1) { return undefined; }
-        // Get the first path section, try to find the matching field
-        var column_name = name.substring(0, index);
-        f = _(fields).detect(function (field) {
-            // field.name for o2m is $foo/id, so we want to match on id
-            return field.id === column_name;
-        });
-        if (!f) {
-            f = _(fields).detect(function (field) {
-                return field.string.toLowerCase() === column_name.toLowerCase();
-            });
-        }
-        if (!f) { return undefined; }
-
-        // if we found a matching field for the first path section, recurse in
-        // its own .fields to try and get the rest of the path matched
-        var rest = this.match_column_to_field(
-                name.substring(index+1), f.fields);
-        if (!rest) { return undefined; }
-        return f.id + '/' + rest;
-    },
-    /**
-     * Looks through all the field selections, and tries to find if two
-     * (or more) columns were matched to the same model field.
-     *
-     * Returns a map of the multiply-mapped fields to an array of offending
-     * columns (not actually columns, but the inputs containing the same field
-     * names).
-     *
-     * Also has the side-effect of marking the discovered inputs with the class
-     * ``duplicate_fld``.
-     *
-     * @returns {Object<String, Array<String>>} map of duplicate field matches to same-valued inputs
-     */
-    find_duplicate_fields: function() {
-        // Maps values to DOM nodes, in order to discover duplicates
-        var values = {}, duplicates = {};
-        this.$el.find(".sel_fields").each(function(index, element) {
-            var value = element.value;
-            var $el = $(element).removeClass('duplicate_fld');
-            if (!value) { return; }
-
-            if (!(value in values)) {
-                values[value] = element;
-            } else {
-                var same_valued_field = values[value];
-                if (value in duplicates) {
-                    duplicates[value].push(element);
-                } else {
-                    duplicates[value] = [same_valued_field, element];
-                }
-                $el.add(same_valued_field).addClass('duplicate_fld');
-            }
-        });
-        return duplicates;
-    },
-    on_check_field_values: function () {
-        this.$el.find("#message, #msg").remove();
-
-        var required_valid = this.check_required();
-
-        var duplicates = this.find_duplicate_fields();
-        if (_.isEmpty(duplicates)) {
-            this.toggle_import_button(required_valid);
-        } else {
-            var $err = $('<div id="msg" style="color: red;">'+_t("Destination fields should only be selected once, some fields are selected more than once:")+'</div>').insertBefore(this.$el.find('#result'));
-            var $dupes = $('<dl>').appendTo($err);
-            _(duplicates).each(function(elements, value) {
-                $('<dt>').text(value).appendTo($dupes);
-                _(elements).each(function(element) {
-                    var cell = $(element).closest('td');
-                    $('<dd>').text(cell.parent().children().index(cell)).appendTo($dupes);
-                });
-            });
-            this.toggle_import_button(false);
-        }
-
-    },
-    check_required: function() {
-        var self = this;
-        if (!self.required_fields.length) { return true; }
-
-        // Resolve field id based on column name, as there may be
-        // several ways to provide the value for a given field and
-        // thus satisfy the requirement. 
-        // (e.g. m2o_id or m2o_id/id columns may be provided)
-        var resolve_field_id = function(column_name) {
-            var f = _.detect(self.fields, function(field) {
-                return field.name === column_name;
-            });
-            if (!f) { return column_name; };
-            return f.id;
-        };
-
-        var selected_fields = _(this.$el.find('.sel_fields').get()).chain()
-            .pluck('value')
-            .compact()
-            .map(resolve_field_id)
-            .value();
-
-        var missing_fields = _.difference(this.required_fields, selected_fields);
-        if (missing_fields.length) {
-            this.$el.find("#result").before('<div id="message" style="color:red">' + _t("*Required Fields are not selected :") + missing_fields + '.</div>');
-            return false;
-        }
-        return true;
-    },
-    destroy: function() {
-        this.$el.remove();
-        this._super();
-    }
-});
-};
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index df61e9bd6bd..015cd1636f1 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -21,8 +21,6 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         // whether the view rows can be reordered (via vertical drag & drop)
         'reorderable': true,
         'action_buttons': true,
-        // if true, the 'Import', 'Export', etc... buttons will be shown
-        'import_enabled': true,
     },
     /**
      * Core class for list-type displays.
@@ -281,7 +279,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
             self.reload_content();
         });
 
-        // Add button and Import link
+        // Add button
         if (!this.$buttons) {
             this.$buttons = $(QWeb.render("ListView.buttons", {'widget':self}));
             if (this.options.$buttons) {
@@ -292,10 +290,6 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
             this.$buttons.find('.oe_list_add')
                     .click(this.proxy('do_add_record'))
                     .prop('disabled', grouped);
-            this.$buttons.on('click', '.oe_list_button_import', function() {
-                self.on_sidebar_import();
-                return false;
-            });
         }
 
         // Pager
@@ -358,7 +352,6 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
             this.sidebar = new instance.web.Sidebar(this);
             this.sidebar.appendTo(this.options.$sidebar);
             this.sidebar.add_items('other', _.compact([
-                self.is_action_enabled('create') && { label: _t("Import"), callback: this.on_sidebar_import },
                 { label: _t("Export"), callback: this.on_sidebar_export },
                 self.is_action_enabled('delete') && { label: _t('Delete'), callback: this.do_delete_selected }
             ]));
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 90709276bdf..2dffe9520a1 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1249,9 +1249,6 @@ instance.web.View = instance.web.Widget.extend({
     },
     do_search: function(view) {
     },
-    on_sidebar_import: function() {
-        new instance.web.DataImport(this, this.dataset).open();
-    },
     on_sidebar_export: function() {
         new instance.web.DataExport(this, this.dataset).open();
     },
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index d067b7586fb..a595bb9e495 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -652,9 +652,6 @@
         <button type="button" class="oe_button oe_list_add oe_highlight">
             <t t-esc="widget.options.addable"/>
         </button>
-        <span class="oe_alternative" t-if="widget.options.import_enabled">
-            <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_list_button_import">Import</a>
-        </span>
     </t>
 </div>
 <t t-name="ListView.pager">
@@ -698,9 +695,10 @@
     <t t-jquery="button.oe_list_add" t-operation="after">
         <button class="oe_button oe_list_save oe_highlight"
                 type="button">Save</button>
-    </t>
-    <t t-jquery="a.oe_list_button_import" t-operation="after">
-        <a href="#" class="oe_bold oe_list_discard">Discard</a>
+        <span class="oe_alternative">
+            <span class="oe_fade">or</span>
+            <a href="#" class="oe_bold oe_list_discard">Discard</a>
+        </span>
     </t>
 </t>
 <t t-extend="ListView.row">

From e401ca9d69a5a4f76bad7b21a6c9882f97cdfbef Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 11 Sep 2012 08:38:49 +0200
Subject: [PATCH 978/999] [IMP] re-introduce Import button/link when
 base_import is installed

bzr revid: xmo@openerp.com-20120911063849-xqw380wglzxviojf
---
 addons/base_import/static/src/css/import.css |  7 +++++++
 addons/base_import/static/src/js/import.js   | 19 +++++++++++++++++++
 addons/base_import/static/src/xml/import.xml |  8 ++++++++
 3 files changed, 34 insertions(+)

diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css
index 6f4770ce34c..f6258f5aa50 100644
--- a/addons/base_import/static/src/css/import.css
+++ b/addons/base_import/static/src/css/import.css
@@ -1,3 +1,10 @@
+.openerp .oe_list_buttons .oe_alternative {
+    visibility: visible;
+}
+.openerp .oe_list_buttons.oe_editing .oe_list_button_import {
+    display: none;
+}
+
 .oe_import dd,
 .oe_import .oe_import_toggled,
 .oe_import .oe_import_grid,
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 63a266ef6c0..c2deb660ff2 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -35,6 +35,25 @@ openerp.base_import = function (instance) {
         $(form).ajaxSubmit(attributes);
     }
 
+    // if true, the 'Import', 'Export', etc... buttons will be shown
+    instance.web.ListView.prototype.defaults.import_enabled = true;
+    instance.web.ListView.include({
+        on_loaded: function () {
+            var self = this;
+            var add_button = false;
+            if (!this.$buttons) {
+                add_button = true;
+            }
+            this._super.apply(this, arguments);
+            if(add_button) {
+                this.$buttons.on('click', '.oe_list_button_import', function() {
+                    new instance.web.DataImport(self, self.dataset).open();
+                    return false;
+                });
+            }
+        }
+    });
+
     instance.web.DataImport = instance.web.Dialog.extend({
         template: 'ImportView',
         dialog_title: _lt("Import Data"),
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index 733a93fd104..386348bea4b 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -92,4 +92,12 @@
             <t t-esc="error.message"/>
         </li>
     </ul>
+    <t t-extend="ListView.buttons">
+        <t t-jquery="span.oe_alternative">
+            this.attr('t-if', 'widget.options.import_enabled');
+        </t>
+        <t t-jquery="span.oe_alternative" t-operation="append">
+            <a href="#" class="oe_bold oe_list_button_import">Import</a>
+        </t>
+    </t>
 </templates>

From 7bde4ab749e81b0010a552fa5d005a6d40c8757d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 11 Sep 2012 09:08:58 +0200
Subject: [PATCH 979/999] [IMP] add base_import to configurator

bzr revid: xmo@openerp.com-20120911070858-3eb3ny4ts05togk2
---
 addons/base_setup/res_config.py       | 1 +
 addons/base_setup/res_config_view.xml | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 4826a50400d..e1920fc05d9 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -35,6 +35,7 @@ class base_config_settings(osv.osv_memory):
         'module_auth_anonymous': fields.boolean('activate the public portal',
             help="""Enable the public part of openerp, openerp becomes a public website."""),
         'module_auth_oauth': fields.boolean('use external authentication providers, sign in with google, facebook, ...'),
+        'module_base_import': fields.boolean("Allow users to import data from CSV files"),
     }
 
     def open_company(self, cr, uid, ids, context=None):
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 512c0a3f52e..3852ca03a05 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -59,6 +59,15 @@
                             </div>
                         </div>
                     </group>
+                    <group>
+                        <label for="id" string="Import / Export"/>
+                        <div>
+                            <div>
+                                <field name="module_base_import" class="oe_inline"/>
+                                <label for="module_base_import"/>
+                            </div>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>

From d8998dd2d46be98fa142314f2d7cf1993a82424f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 11 Sep 2012 10:42:15 +0200
Subject: [PATCH 980/999] [IMP] better views

bzr revid: fp@tinyerp.com-20120911084215-1er8vwxc9zadiksf
---
 addons/account/account_view.xml               | 32 ++++++-------------
 .../board_mrp_procurement_view.xml            |  4 +--
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5a3fd6b748a..8c0de73ef8c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2369,22 +2369,15 @@
                 <group string="res_config_contents" position="replace">
                     <field name="only_one_chart_template" invisible="1"/>
                     <field name="complete_tax_set" invisible="1"/>
-                    <div groups="base.group_multi_company">
-                        <label for="company_id"/>
-                        <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
-                    </div>
-                    <label for="currency_id"/>
-                    <field name="currency_id" />
-                    <group>
-                        <div attrs="{'invisible': [('only_one_chart_template','=',True)]}">
-                            <label for="chart_template_id"/>
+                    <group col="1">
+                        <group attrs="{'invisible': [('only_one_chart_template','=',True)]}">
                             <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
-                        </div>
-                        <newline/>
-                        <group groups="account.group_account_user">
-                            <field name="code_digits"/>
+                        </group>
+                        <group groups="base.group_multi_company">
+                            <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                         </group>
                         <group>
+                            <field name="currency_id" class="oe_inline"/>
                             <field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
                             <label for="sale_tax_rate" string="Sale Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
                             <div attrs="{'invisible': [('complete_tax_set', '=', True)]}">
@@ -2396,17 +2389,10 @@
                                 <field name="purchase_tax_rate" class="oe_inline"/> %%
                             </div>
                         </group>
+                        <group groups="account.group_account_user">
+                            <field name="code_digits"/>
+                        </group>
                     </group>
-                    <div groups="account.group_account_user">
-                        <label for="bank_accounts_id" string="Bank Information"/>
-                        <field name="bank_accounts_id">
-                            <tree editable="bottom">
-                                <field name="acc_name"/>
-                                <field name="account_type"/>
-                                <field name="currency_id" widget="selection" groups="base.group_multi_currency"/>
-                            </tree>
-                        </field>
-                    </div>
                 </group>
             </field>
         </record>
diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml
index a01ec168efa..f30ea629d5e 100644
--- a/addons/procurement/board_mrp_procurement_view.xml
+++ b/addons/procurement/board_mrp_procurement_view.xml
@@ -15,9 +15,9 @@
             <field name="model">board.board</field>
             <field name="inherit_id" ref="stock.board_warehouse_form"/>
             <field name="arch" type="xml">
-              <xpath expr="/form/board/column/action[@string='Incoming Shipments']" position="before">
+              <xpath expr="//column" position="inside">
                 <action name="%(procurement_action_board)d" string="Procurements in Exception"/>
-            </xpath>
+              </xpath>
             </field>
         </record>
     </data>

From 208dcc534f7f43dcfef0f30f7975f9f1bc647b35 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 11 Sep 2012 11:40:02 +0200
Subject: [PATCH 981/999] [FIX] web_linkedin: unbreak config settings layout

bzr revid: odo@openerp.com-20120911094002-teg65gi2csps8f72
---
 addons/web_linkedin/web_linkedin_view.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/web_linkedin/web_linkedin_view.xml b/addons/web_linkedin/web_linkedin_view.xml
index 8b4fa617bf3..05a5e32e41a 100644
--- a/addons/web_linkedin/web_linkedin_view.xml
+++ b/addons/web_linkedin/web_linkedin_view.xml
@@ -18,8 +18,8 @@
             <field name="model">sale.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <div name="linkedin" position="inside">
-                    <form string="Configure Linkedin" version="7.0" class="oe_form_configuration">
+                <div name="LinkedIn" position="inside">
+                    <div attrs="{'invisible':[('module_web_linkedin','=',False)]}">
                         <p>
                             To use the LinkedIn module with this database, an API Key is required. Please follow this procedure:
                         </p>
@@ -34,12 +34,11 @@
                                     <li>The programming tool is Javascript</li>
                                 </ul>
                             </li>
-                            <li>Copy the API key down here:</li>
+                            <li>Copy the <strong>API key</strong> here:
+                                <field name="api_key" attrs="{'required':[('module_web_linkedin','=',True)]}" class="oe_inline"/>
+                            </li>
                         </ul>
-                        <group>
-                            <field name="api_key"/>
-                        </group>
-                    </form>
+                    </div>
                 </div>
             </field>
         </record>

From e089d497031aefcc32b225a6958dda9812daf71b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 11:40:07 +0200
Subject: [PATCH 982/999] [FIX] sale, mail: fixed Send by email, back to a
 wizard. Cleaned a bit some code related to that action.

bzr revid: tde@openerp.com-20120911094007-svlzik5kgmp4nuvy
---
 .../wizard/mail_compose_message.py            |  6 +++--
 addons/mail/static/src/js/mail.js             | 24 +++++++++----------
 addons/sale/sale.py                           | 11 ++++++---
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 2baef6e6c90..c0cb7fc92e5 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -51,9 +51,11 @@ class mail_compose_message(osv.osv_memory):
             context = {}
         result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
         result['template_id'] = context.get('default_template_id', context.get('mail.compose.template_id', False))
-        # force html when using templates
+        # pre-render the template if any
         if result.get('use_template'):
-            result['content_subtype'] = 'html'
+            onchange_res = self.onchange_use_template(cr, uid, [], result.get('use_template'), result.get('template_id'),
+                result.get('composition_mode'), result.get('model'), result.get('res_id'), context=context)
+            result.update(onchange_res['value'])
         return result
 
     _columns = {
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e8d8e25e684..3f23e65f00d 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -17,19 +17,15 @@ openerp.mail = function(session) {
      */
 
     session.web.FormView = session.web.FormView.extend({
-        // TDE FIXME TODO: CHECK WITH NEW BRANCH
         do_action: function(action, on_close) {
             if (action.res_model == 'mail.compose.message' &&
+                action.context && action.context.redirect == true &&
                 this.fields && this.fields.message_ids &&
                 this.fields.message_ids.view.get("actual_mode") != 'create') {
-                // debug
-                console.groupCollapsed('FormView do_action on mail.compose.message');
-                console.log('message_ids field:', this.fields.message_ids);
-                console.groupEnd();
                 var record_thread = this.fields.message_ids;
                 var thread = record_thread.thread;
-                thread.instantiate_composition_form('comment', true, false, 0, action.context);
-                return false;
+                thread.refresh_composition_form(action.context);
+                return true;
             }
             else {
                 return this._super(action, on_close);
@@ -174,7 +170,7 @@ openerp.mail = function(session) {
             this.ds_compose.context = _.extend(this.ds_compose.context, this.options.context);
             return this.ds_compose.call('default_get', [
                 ['subject', 'body_text', 'body', 'attachment_ids', 'partner_ids', 'composition_mode',
-                    'model', 'res_id', 'parent_id', 'content_subtype'],
+                    'use_template', 'template_id', 'model', 'res_id', 'parent_id', 'content_subtype'],
                 this.ds_compose.get_context(),
             ]).then( function (result) { self.form_view.on_processed_onchange({'value': result}, []); });
         },
@@ -365,6 +361,11 @@ openerp.mail = function(session) {
             return compose_done;
         },
 
+        refresh_composition_form: function (context) {
+            if (! this.compose_message_widget) return;
+            return this.compose_message_widget.refresh(context);
+        },
+
         /** Clean the thread */
         message_clean: function() {
             this.$el.find('div.oe_mail_thread_display').empty();
@@ -548,7 +549,6 @@ openerp.mail = function(session) {
             this.options.domain = this.options.domain || [];
             this.options.context = {'default_model': 'mail.thread', 'default_res_id': false};
             this.options.thread_level = this.options.thread_level || 0;
-            this.thread_list = [];
         },
 
         start: function() {
@@ -564,7 +564,7 @@ openerp.mail = function(session) {
         },
 
         destroy: function() {
-            for (var i in this.thread_list) { this.thread_list[i].destroy(); }
+            if (this.thread) { this.thread.destroy(); }
             this._super.apply(this, arguments);
         },
 
@@ -581,13 +581,13 @@ openerp.mail = function(session) {
                 default_model: this.view.model });
             // create and render Thread widget
             this.$el.find('div.oe_mail_recthread_main').empty();
-            for (var i in this.thread_list) { this.thread_list[i].destroy(); }
+            if (this.thread) { this.thread.destroy(); }
             var thread = new mail.Thread(self, {
                 'context': this.options.context,
                 'thread_level': this.options.thread_level, 'show_header_compose': true,
                 'message_ids': this.get_value(),
                 'show_delete': true, 'composer': true });
-            this.thread_list.push(thread);
+            this.thread = thread;
             return thread.appendTo(this.$el.find('div.oe_mail_recthread_main'));
         },
     });
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6a6678d6163..553b8993ab8 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -769,13 +769,18 @@ class sale_order(osv.osv):
         template_id = template and template[1] or False
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
-        ctx = dict(context, active_model='sale.order', active_id=ids[0])
-        ctx.update({'mail.compose.template_id': template_id})
+        ctx = dict(context)
+        ctx.update({
+            'default_model': 'sale.order',
+            'default_res_id': ids[0],
+            'default_use_template': True,
+            'default_template_id': template_id,
+            })
         return {
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'mail.compose.message',
-            'views': [(res_id,'form')],
+            'views': [(res_id, 'form')],
             'view_id': res_id,
             'type': 'ir.actions.act_window',
             'target': 'new',

From 4bcdcf66c83c944cf3e9b0c426a935120cf5acb9 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 11 Sep 2012 11:57:58 +0200
Subject: [PATCH 983/999] [IMP] base_setup: make first label wrap

bzr revid: odo@openerp.com-20120911095758-dyedax6zcddgokx4
---
 addons/base_setup/res_config_view.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 512c0a3f52e..4b333d939d6 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -14,9 +14,10 @@
                     </header>
                     <separator string="General Settings"/>
                     <div>
-                        <label string="You will also find several configuration options on your company data:
-                            address for the header and footer, overdue payments texts, etc."/>
-                        <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_inline oe_link"/>
+                        <p>
+                            <label string="You will find more options in your company details: address for the header and footer, overdue payments texts, etc."/>
+                            <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_inline oe_link"/>
+                        </p>
                     </div>
                     <group>
                         <label for="id" string="Options"/>

From 5ff696b299b500013225637f48d9e669f1f735d0 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 11 Sep 2012 11:58:34 +0200
Subject: [PATCH 984/999] [FIX] account: fix configuration settings for bank
 accounts footer

bzr revid: odo@openerp.com-20120911095834-gt7ajdis4h6rsc59
---
 addons/account/res_config.py       | 2 +-
 addons/account/res_config_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index bb5dcedd0ee..df22008861c 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -44,7 +44,7 @@ class account_config_settings(osv.osv_memory):
         'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
             string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer  will be able to pay your invoices or quotations with a button \"Pay with  Paypal\" in automated emails or through the OpenERP portal."),
         'company_footer': fields.related('company_id', 'rml_footer', type='text', readonly=True,
-            string='Bank accounts on reports will displayed as followed', help="Bank accounts as printed in the footer of each customer's document. This is for information purpose only, you should configure these bank accounts through the above button \"Configure Bank Accounts\"."),
+            string='Bank accounts footer preview', help="Bank accounts as printed in the footer of each printed document"),
 
         'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
         'chart_template_id': fields.many2one('account.chart.template', 'Template', domain="[('visible','=', True)]"),
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 79a65f70414..2ea4431d478 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -219,12 +219,12 @@
                         <label for="id" string="Configuration"/>
                         <div>
                             <div>
+                                <label for="company_footer"/>
                                 <button name="%(action_bank_tree)d"
                                     string="Configure your bank accounts"
                                     icon="gtk-go-forward"
                                     type="action"
                                     class="oe_inline oe_link"/>
-                                <label for="company_footer"/>
                                 <field name="company_footer"/>
                             </div>
                             <div>

From d4f5572d3046f3dce330e3ad4b67edd64fc7a6f2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 11 Sep 2012 12:05:24 +0200
Subject: [PATCH 985/999] [IMP] clean address formatting per countries

bzr revid: fp@tinyerp.com-20120911100524-adug0sjlfri2zcla
---
 openerp/addons/base/base_data.xml      | 1025 ------------------------
 openerp/addons/base/country_data.xml   |   21 +-
 openerp/addons/base/res/res_country.py |    2 +-
 3 files changed, 12 insertions(+), 1036 deletions(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 37c360b5cd8..2fa9910758d 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -29,1031 +29,6 @@
 
         <function name="install_lang" model="res.lang"/>
 
-        <record id="ad" model="res.country">
-            <field name="name">Andorra, Principality of</field>
-            <field name="code">ad</field>
-        </record>
-        <record id="ae" model="res.country">
-            <field name="name">United Arab Emirates</field>
-            <field name="code">ae</field>
-        </record>
-        <record id="af" model="res.country">
-            <field name="name">Afghanistan, Islamic State of</field>
-            <field name="code">af</field>
-        </record>
-        <record id="ag" model="res.country">
-            <field name="name">Antigua and Barbuda</field>
-            <field name="code">ag</field>
-        </record>
-        <record id="ai" model="res.country">
-            <field name="name">Anguilla</field>
-            <field name="code">ai</field>
-        </record>
-        <record id="al" model="res.country">
-            <field name="name">Albania</field>
-            <field name="code">al</field>
-        </record>
-        <record id="am" model="res.country">
-            <field name="name">Armenia</field>
-            <field name="code">am</field>
-        </record>
-        <record id="an" model="res.country">
-            <field name="name">Netherlands Antilles</field>
-            <field name="code">an</field>
-        </record>
-        <record id="ao" model="res.country">
-            <field name="name">Angola</field>
-            <field name="code">ao</field>
-        </record>
-        <record id="aq" model="res.country">
-            <field name="name">Antarctica</field>
-            <field name="code">aq</field>
-        </record>
-        <record id="ar" model="res.country">
-            <field name="name">Argentina</field>
-            <field name="code">ar</field>
-        </record>
-        <record id="as" model="res.country">
-            <field name="name">American Samoa</field>
-            <field name="code">as</field>
-        </record>
-        <record id="at" model="res.country">
-            <field name="name">Austria</field>
-            <field name="code">at</field>
-        </record>
-        <record id="au" model="res.country">
-            <field name="name">Australia</field>
-            <field name="code">au</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />
-        </record>
-        <record id="aw" model="res.country">
-            <field name="name">Aruba</field>
-            <field name="code">aw</field>
-        </record>
-        <record id="ax" model="res.country">
-            <field name="name">Åland Islands</field>
-            <field name="code">ax</field>
-        </record>
-        <record id="az" model="res.country">
-            <field name="name">Azerbaijan</field>
-            <field name="code">az</field>
-        </record>
-        <record id="ba" model="res.country">
-            <field name="name">Bosnia-Herzegovina</field>
-            <field name="code">ba</field>
-        </record>
-        <record id="bb" model="res.country">
-            <field name="name">Barbados</field>
-            <field name="code">bb</field>
-        </record>
-        <record id="bd" model="res.country">
-            <field name="name">Bangladesh</field>
-            <field name="code">bd</field>
-        </record>
-        <record id="be" model="res.country">
-            <field name="name">Belgium</field>
-            <field name="code">be</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
-        </record>
-        <record id="bf" model="res.country">
-            <field name="name">Burkina Faso</field>
-            <field name="code">bf</field>
-        </record>
-        <record id="bg" model="res.country">
-            <field name="name">Bulgaria</field>
-            <field name="code">bg</field>
-        </record>
-        <record id="bh" model="res.country">
-            <field name="name">Bahrain</field>
-            <field name="code">bh</field>
-        </record>
-        <record id="bi" model="res.country">
-            <field name="name">Burundi</field>
-            <field name="code">bi</field>
-        </record>
-        <record id="bj" model="res.country">
-            <field name="name">Benin</field>
-            <field name="code">bj</field>
-        </record>
-        <record id="bl" model="res.country">
-            <field name="name">Saint Barthélémy</field>
-            <field name="code">bl</field>
-        </record>
-        <record id="bm" model="res.country">
-            <field name="name">Bermuda</field>
-            <field name="code">bm</field>
-        </record>
-        <record id="bn" model="res.country">
-            <field name="name">Brunei Darussalam</field>
-            <field name="code">bn</field>
-        </record>
-        <record id="bo" model="res.country">
-            <field name="name">Bolivia</field>
-            <field name="code">bo</field>
-        </record>
-        <record id="bq" model="res.country">
-            <field name="name">Bonaire, Sint Eustatius and Saba</field>
-            <field name="code">bq</field>
-        </record>
-        <record id="br" model="res.country">
-            <field name="name">Brazil</field>
-            <field name="code">br</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s\n%(zip)s%(country_name)s'" />            
-        </record>
-        <record id="bs" model="res.country">
-            <field name="name">Bahamas</field>
-            <field name="code">bs</field>
-        </record>
-        <record id="bt" model="res.country">
-            <field name="name">Bhutan</field>
-            <field name="code">bt</field>
-        </record>
-        <record id="bv" model="res.country">
-            <field name="name">Bouvet Island</field>
-            <field name="code">bv</field>
-        </record>
-        <record id="bw" model="res.country">
-            <field name="name">Botswana</field>
-            <field name="code">bw</field>
-        </record>
-        <record id="by" model="res.country">
-            <field name="name">Belarus</field>
-            <field name="code">by</field>
-        </record>
-        <record id="bz" model="res.country">
-            <field name="name">Belize</field>
-            <field name="code">bz</field>
-        </record>
-        <record id="ca" model="res.country">
-            <field name="name">Canada</field>
-            <field name="code">ca</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />
-        </record>
-        <record id="cc" model="res.country">
-            <field name="name">Cocos (Keeling) Islands</field>
-            <field name="code">cc</field>
-        </record>
-        <record id="cf" model="res.country">
-            <field name="name">Central African Republic</field>
-            <field name="code">cf</field>
-        </record>
-        <record id="cd" model="res.country">
-            <field name="name">Congo, Democratic Republic of the</field>
-            <field name="code">cd</field>
-        </record>
-        <record id="cg" model="res.country">
-            <field name="name">Congo</field>
-            <field name="code">cg</field>
-        </record>
-        <record id="ch" model="res.country">
-            <field name="name">Switzerland</field>
-            <field name="code">ch</field>
-        </record>
-        <record id="ci" model="res.country">
-            <field name="name">Ivory Coast (Cote D'Ivoire)</field>
-            <field name="code">ci</field>
-        </record>
-        <record id="ck" model="res.country">
-            <field name="name">Cook Islands</field>
-            <field name="code">ck</field>
-        </record>
-        <record id="cl" model="res.country">
-            <field name="name">Chile</field>
-            <field name="code">cl</field>
-        </record>
-        <record id="cm" model="res.country">
-            <field name="name">Cameroon</field>
-            <field name="code">cm</field>
-        </record>
-        <record id="cn" model="res.country">
-            <field name="name">China</field>
-            <field name="code">cn</field>
-        </record>
-        <record id="co" model="res.country">
-            <field name="name">Colombia</field>
-            <field name="code">co</field>
-        </record>
-        <record id="cr" model="res.country">
-            <field name="name">Costa Rica</field>
-            <field name="code">cr</field>
-        </record>
-        <record id="cu" model="res.country">
-            <field name="name">Cuba</field>
-            <field name="code">cu</field>
-        </record>
-        <record id="cv" model="res.country">
-            <field name="name">Cape Verde</field>
-            <field name="code">cv</field>
-        </record>
-        <record id="cw" model="res.country">
-            <field name="name">Curaçao</field>
-            <field name="code">cw</field>
-        </record>
-        <record id="cx" model="res.country">
-            <field name="name">Christmas Island</field>
-            <field name="code">cx</field>
-        </record>
-        <record id="cy" model="res.country">
-            <field name="name">Cyprus</field>
-            <field name="code">cy</field>
-        </record>
-        <record id="cz" model="res.country">
-            <field name="name">Czech Republic</field>
-            <field name="code">cz</field>
-        </record>
-        <record id="de" model="res.country">
-            <field name="name">Germany</field>
-            <field name="code">de</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
-        </record>
-        <record id="dj" model="res.country">
-            <field name="name">Djibouti</field>
-            <field name="code">dj</field>
-        </record>
-        <record id="dk" model="res.country">
-            <field name="name">Denmark</field>
-            <field name="code">dk</field>
-        </record>
-        <record id="dm" model="res.country">
-            <field name="name">Dominica</field>
-            <field name="code">dm</field>
-        </record>
-        <record id="do" model="res.country">
-            <field name="name">Dominican Republic</field>
-            <field name="code">do</field>
-        </record>
-        <record id="dz" model="res.country">
-            <field name="name">Algeria</field>
-            <field name="code">dz</field>
-        </record>
-        <record id="ec" model="res.country">
-            <field name="name">Ecuador</field>
-            <field name="code">ec</field>
-        </record>
-        <record id="ee" model="res.country">
-            <field name="name">Estonia</field>
-            <field name="code">ee</field>
-        </record>
-        <record id="eg" model="res.country">
-            <field name="name">Egypt</field>
-            <field name="code">eg</field>
-        </record>
-        <record id="eh" model="res.country">
-            <field name="name">Western Sahara</field>
-            <field name="code">eh</field>
-        </record>
-        <record id="er" model="res.country">
-            <field name="name">Eritrea</field>
-            <field name="code">er</field>
-        </record>
-        <record id="es" model="res.country">
-            <field name="name">Spain</field>
-            <field name="code">es</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
-        </record>
-        <record id="et" model="res.country">
-            <field name="name">Ethiopia</field>
-            <field name="code">et</field>
-        </record>
-        <record id="fi" model="res.country">
-            <field name="name">Finland</field>
-            <field name="code">fi</field>
-        </record>
-        <record id="fj" model="res.country">
-            <field name="name">Fiji</field>
-            <field name="code">fj</field>
-        </record>
-        <record id="fk" model="res.country">
-            <field name="name">Falkland Islands</field>
-            <field name="code">fk</field>
-        </record>
-        <record id="fm" model="res.country">
-            <field name="name">Micronesia</field>
-            <field name="code">fm</field>
-        </record>
-        <record id="fo" model="res.country">
-            <field name="name">Faroe Islands</field>
-            <field name="code">fo</field>
-        </record>
-        <record id="fr" model="res.country">
-            <field name="name">France</field>
-            <field name="code">fr</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
-        </record>
-        <record id="ga" model="res.country">
-            <field name="name">Gabon</field>
-            <field name="code">ga</field>
-        </record>
-        <record id="gd" model="res.country">
-            <field name="name">Grenada</field>
-            <field name="code">gd</field>
-        </record>
-        <record id="ge" model="res.country">
-            <field name="name">Georgia</field>
-            <field name="code">ge</field>
-        </record>
-        <record id="gf" model="res.country">
-            <field name="name">French Guyana</field>
-            <field name="code">gf</field>
-        </record>
-        <record id="gh" model="res.country">
-            <field name="name">Ghana</field>
-            <field name="code">gh</field>
-        </record>
-        <record id="gi" model="res.country">
-            <field name="name">Gibraltar</field>
-            <field name="code">gi</field>
-        </record>
-        <record id="gg" model="res.country">
-            <field name="name">Guernsey</field>
-            <field name="code">gg</field>
-        </record>
-        <record id="gl" model="res.country">
-            <field name="name">Greenland</field>
-            <field name="code">gl</field>
-        </record>
-        <record id="gm" model="res.country">
-            <field name="name">Gambia</field>
-            <field name="code">gm</field>
-        </record>
-        <record id="gn" model="res.country">
-            <field name="name">Guinea</field>
-            <field name="code">gn</field>
-        </record>
-        <record id="gp" model="res.country">
-            <field name="name">Guadeloupe (French)</field>
-            <field name="code">gp</field>
-        </record>
-        <record id="gq" model="res.country">
-            <field name="name">Equatorial Guinea</field>
-            <field name="code">gq</field>
-        </record>
-        <record id="gr" model="res.country">
-            <field name="name">Greece</field>
-            <field name="code">gr</field>
-        </record>
-        <record id="gs" model="res.country">
-            <field name="name">South Georgia and the South Sandwich Islands</field>
-            <field name="code">gs</field>
-        </record>
-        <record id="gt" model="res.country">
-            <field name="name">Guatemala</field>
-            <field name="code">gt</field>
-        </record>
-        <record id="gu" model="res.country">
-            <field name="name">Guam (USA)</field>
-            <field name="code">gu</field>
-        </record>
-        <record id="gw" model="res.country">
-            <field name="name">Guinea Bissau</field>
-            <field name="code">gw</field>
-        </record>
-        <record id="gy" model="res.country">
-            <field name="name">Guyana</field>
-            <field name="code">gy</field>
-        </record>
-        <record id="hk" model="res.country">
-            <field name="name">Hong Kong</field>
-            <field name="code">hk</field>
-        </record>
-        <record id="hm" model="res.country">
-            <field name="name">Heard and McDonald Islands</field>
-            <field name="code">hm</field>
-        </record>
-        <record id="hn" model="res.country">
-            <field name="name">Honduras</field>
-            <field name="code">hn</field>
-        </record>
-        <record id="hr" model="res.country">
-            <field name="name">Croatia</field>
-            <field name="code">hr</field>
-        </record>
-        <record id="ht" model="res.country">
-            <field name="name">Haiti</field>
-            <field name="code">ht</field>
-        </record>
-        <record id="hu" model="res.country">
-            <field name="name">Hungary</field>
-            <field name="code">hu</field>
-        </record>
-        <record id="id" model="res.country">
-            <field name="name">Indonesia</field>
-            <field name="code">id</field>
-        </record>
-        <record id="ie" model="res.country">
-            <field name="name">Ireland</field>
-            <field name="code">ie</field>
-        </record>
-        <record id="il" model="res.country">
-            <field name="name">Israel</field>
-            <field name="code">il</field>
-        </record>
-        <record id="im" model="res.country">
-            <field name="name">Isle of Man</field>
-            <field name="code">im</field>
-        </record>
-        <record id="in" model="res.country">
-            <field name="name">India</field>
-            <field name="code">in</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(zip)s\n%(state_name)s\n%(country_name)s'" />            
-        </record>
-        <record id="io" model="res.country">
-            <field name="name">British Indian Ocean Territory</field>
-            <field name="code">io</field>
-        </record>
-        <record id="iq" model="res.country">
-            <field name="name">Iraq</field>
-            <field name="code">iq</field>
-        </record>
-        <record id="ir" model="res.country">
-            <field name="name">Iran</field>
-            <field name="code">ir</field>
-        </record>
-        <record id="is" model="res.country">
-            <field name="name">Iceland</field>
-            <field name="code">is</field>
-        </record>
-        <record id="it" model="res.country">
-            <field name="name">Italy</field>
-            <field name="code">it</field>
-        </record>
-        <record id="je" model="res.country">
-            <field name="name">Jersey</field>
-            <field name="code">je</field>
-        </record>
-        <record id="jm" model="res.country">
-            <field name="name">Jamaica</field>
-            <field name="code">jm</field>
-        </record>
-        <record id="jo" model="res.country">
-            <field name="name">Jordan</field>
-            <field name="code">jo</field>
-        </record>
-        <record id="jp" model="res.country">
-            <field name="name">Japan</field>
-            <field name="code">jp</field>
-        </record>
-        <record id="ke" model="res.country">
-            <field name="name">Kenya</field>
-            <field name="code">ke</field>
-        </record>
-        <record id="kg" model="res.country">
-            <field name="name">Kyrgyz Republic (Kyrgyzstan)</field>
-            <field name="code">kg</field>
-        </record>
-        <record id="kh" model="res.country">
-            <field name="name">Cambodia, Kingdom of</field>
-            <field name="code">kh</field>
-        </record>
-        <record id="ki" model="res.country">
-            <field name="name">Kiribati</field>
-            <field name="code">ki</field>
-        </record>
-        <record id="km" model="res.country">
-            <field name="name">Comoros</field>
-            <field name="code">km</field>
-        </record>
-        <record id="kn" model="res.country">
-            <field name="name">Saint Kitts &amp; Nevis Anguilla</field>
-            <field name="code">kn</field>
-        </record>
-        <record id="kp" model="res.country">
-            <field name="name">North Korea</field>
-            <field name="code">kp</field>
-        </record>
-        <record id="kr" model="res.country">
-            <field name="name">South Korea</field>
-            <field name="code">kr</field>
-        </record>
-        <record id="kw" model="res.country">
-            <field name="name">Kuwait</field>
-            <field name="code">kw</field>
-        </record>
-        <record id="ky" model="res.country">
-            <field name="name">Cayman Islands</field>
-            <field name="code">ky</field>
-        </record>
-        <record id="kz" model="res.country">
-            <field name="name">Kazakhstan</field>
-            <field name="code">kz</field>
-        </record>
-        <record id="la" model="res.country">
-            <field name="name">Laos</field>
-            <field name="code">la</field>
-        </record>
-        <record id="lb" model="res.country">
-            <field name="name">Lebanon</field>
-            <field name="code">lb</field>
-        </record>
-        <record id="lc" model="res.country">
-            <field name="name">Saint Lucia</field>
-            <field name="code">lc</field>
-        </record>
-        <record id="li" model="res.country">
-            <field name="name">Liechtenstein</field>
-            <field name="code">li</field>
-        </record>
-        <record id="lk" model="res.country">
-            <field name="name">Sri Lanka</field>
-            <field name="code">lk</field>
-        </record>
-        <record id="lr" model="res.country">
-            <field name="name">Liberia</field>
-            <field name="code">lr</field>
-        </record>
-        <record id="ls" model="res.country">
-            <field name="name">Lesotho</field>
-            <field name="code">ls</field>
-        </record>
-        <record id="lt" model="res.country">
-            <field name="name">Lithuania</field>
-            <field name="code">lt</field>
-        </record>
-        <record id="lu" model="res.country">
-            <field name="name">Luxembourg</field>
-            <field name="code">lu</field>
-        </record>
-        <record id="lv" model="res.country">
-            <field name="name">Latvia</field>
-            <field name="code">lv</field>
-        </record>
-        <record id="ly" model="res.country">
-            <field name="name">Libya</field>
-            <field name="code">ly</field>
-        </record>
-        <record id="ma" model="res.country">
-            <field name="name">Morocco</field>
-            <field name="code">ma</field>
-        </record>
-        <record id="mc" model="res.country">
-            <field name="name">Monaco</field>
-            <field name="code">mc</field>
-        </record>
-        <record id="md" model="res.country">
-            <field name="name">Moldavia</field>
-            <field name="code">md</field>
-        </record>
-        <record id="me" model="res.country">
-            <field name="name">Montenegro</field>
-            <field name="code">me</field>
-        </record>
-        <record id="mf" model="res.country">
-            <field name="name">Saint Martin (French part)</field>
-            <field name="code">mf</field>
-        </record>
-        <record id="mg" model="res.country">
-            <field name="name">Madagascar</field>
-            <field name="code">mg</field>
-        </record>
-        <record id="mh" model="res.country">
-            <field name="name">Marshall Islands</field>
-            <field name="code">mh</field>
-        </record>
-        <record id="mk" model="res.country">
-            <field name="name">Macedonia, the former Yugoslav Republic of</field>
-            <field name="code">mk</field>
-        </record>
-        <record id="ml" model="res.country">
-            <field name="name">Mali</field>
-            <field name="code">ml</field>
-        </record>
-        <record id="mm" model="res.country">
-            <field name="name">Myanmar</field>
-            <field name="code">mm</field>
-        </record>
-        <record id="mn" model="res.country">
-            <field name="name">Mongolia</field>
-            <field name="code">mn</field>
-        </record>
-        <record id="mo" model="res.country">
-            <field name="name">Macau</field>
-            <field name="code">mo</field>
-        </record>
-        <record id="mp" model="res.country">
-            <field name="name">Northern Mariana Islands</field>
-            <field name="code">mp</field>
-        </record>
-        <record id="mq" model="res.country">
-            <field name="name">Martinique (French)</field>
-            <field name="code">mq</field>
-        </record>
-        <record id="mr" model="res.country">
-            <field name="name">Mauritania</field>
-            <field name="code">mr</field>
-        </record>
-        <record id="ms" model="res.country">
-            <field name="name">Montserrat</field>
-            <field name="code">ms</field>
-        </record>
-        <record id="mt" model="res.country">
-            <field name="name">Malta</field>
-            <field name="code">mt</field>
-        </record>
-        <record id="mu" model="res.country">
-            <field name="name">Mauritius</field>
-            <field name="code">mu</field>
-        </record>
-        <record id="mv" model="res.country">
-            <field name="name">Maldives</field>
-            <field name="code">mv</field>
-        </record>
-        <record id="mw" model="res.country">
-            <field name="name">Malawi</field>
-            <field name="code">mw</field>
-        </record>
-        <record id="mx" model="res.country">
-            <field name="name">Mexico</field>
-            <field name="code">mx</field>
-        </record>
-        <record id="my" model="res.country">
-            <field name="name">Malaysia</field>
-            <field name="code">my</field>
-        </record>
-        <record id="mz" model="res.country">
-            <field name="name">Mozambique</field>
-            <field name="code">mz</field>
-        </record>
-        <record id="na" model="res.country">
-            <field name="name">Namibia</field>
-            <field name="code">na</field>
-        </record>
-        <record id="nc" model="res.country">
-            <field name="name">New Caledonia (French)</field>
-            <field name="code">nc</field>
-        </record>
-        <record id="ne" model="res.country">
-            <field name="name">Niger</field>
-            <field name="code">ne</field>
-        </record>
-        <record id="nf" model="res.country">
-            <field name="name">Norfolk Island</field>
-            <field name="code">nf</field>
-        </record>
-        <record id="ng" model="res.country">
-            <field name="name">Nigeria</field>
-            <field name="code">ng</field>
-        </record>
-        <record id="ni" model="res.country">
-            <field name="name">Nicaragua</field>
-            <field name="code">ni</field>
-        </record>
-        <record id="nl" model="res.country">
-            <field name="name">Netherlands</field>
-            <field name="code">nl</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
-        </record>
-        <record id="no" model="res.country">
-            <field name="name">Norway</field>
-            <field name="code">no</field>
-        </record>
-        <record id="np" model="res.country">
-            <field name="name">Nepal</field>
-            <field name="code">np</field>
-        </record>
-        <record id="nr" model="res.country">
-            <field name="name">Nauru</field>
-            <field name="code">nr</field>
-        </record>
-        <record id="nt" model="res.country">
-            <field name="name">Neutral Zone</field>
-            <field name="code">nt</field>
-        </record>
-        <record id="nu" model="res.country">
-            <field name="name">Niue</field>
-            <field name="code">nu</field>
-        </record>
-        <record id="nz" model="res.country">
-            <field name="name">New Zealand</field>
-            <field name="code">nz</field>
-        </record>
-        <record id="om" model="res.country">
-            <field name="name">Oman</field>
-            <field name="code">om</field>
-        </record>
-        <record id="pa" model="res.country">
-            <field name="name">Panama</field>
-            <field name="code">pa</field>
-        </record>
-        <record id="pe" model="res.country">
-            <field name="name">Peru</field>
-            <field name="code">pe</field>
-        </record>
-        <record id="pf" model="res.country">
-            <field name="name">Polynesia (French)</field>
-            <field name="code">pf</field>
-        </record>
-        <record id="pg" model="res.country">
-            <field name="name">Papua New Guinea</field>
-            <field name="code">pg</field>
-        </record>
-        <record id="ph" model="res.country">
-            <field name="name">Philippines</field>
-            <field name="code">ph</field>
-        </record>
-        <record id="pk" model="res.country">
-            <field name="name">Pakistan</field>
-            <field name="code">pk</field>
-        </record>
-        <record id="pl" model="res.country">
-            <field name="name">Poland</field>
-            <field name="code">pl</field>
-        </record>
-        <record id="pm" model="res.country">
-            <field name="name">Saint Pierre and Miquelon</field>
-            <field name="code">pm</field>
-        </record>
-        <record id="pn" model="res.country">
-            <field name="name">Pitcairn Island</field>
-            <field name="code">pn</field>
-        </record>
-        <record id="pr" model="res.country">
-            <field name="name">Puerto Rico</field>
-            <field name="code">pr</field>
-        </record>
-        <record id="ps" model="res.country">
-            <field name="name">Palestinian Territory, Occupied</field>
-            <field name="code">ps</field>
-        </record>
-        <record id="pt" model="res.country">
-            <field name="name">Portugal</field>
-            <field name="code">pt</field>
-        </record>
-        <record id="pw" model="res.country">
-            <field name="name">Palau</field>
-            <field name="code">pw</field>
-        </record>
-        <record id="py" model="res.country">
-            <field name="name">Paraguay</field>
-            <field name="code">py</field>
-        </record>
-        <record id="qa" model="res.country">
-            <field name="name">Qatar</field>
-            <field name="code">qa</field>
-        </record>
-        <record id="re" model="res.country">
-            <field name="name">Reunion (French)</field>
-            <field name="code">re</field>
-        </record>
-        <record id="ro" model="res.country">
-            <field name="name">Romania</field>
-            <field name="code">ro</field>
-        </record>
-        <record id="rs" model="res.country">
-            <field name="name">Serbia</field>
-            <field name="code">rs</field>
-        </record>
-        <record id="ru" model="res.country">
-            <field name="name">Russian Federation</field>
-            <field name="code">ru</field>
-        </record>
-        <record id="rw" model="res.country">
-            <field name="name">Rwanda</field>
-            <field name="code">rw</field>
-        </record>
-        <record id="sa" model="res.country">
-            <field name="name">Saudi Arabia</field>
-            <field name="code">sa</field>
-        </record>
-        <record id="sb" model="res.country">
-            <field name="name">Solomon Islands</field>
-            <field name="code">sb</field>
-        </record>
-        <record id="sc" model="res.country">
-            <field name="name">Seychelles</field>
-            <field name="code">sc</field>
-        </record>
-        <record id="sd" model="res.country">
-            <field name="name">Sudan</field>
-            <field name="code">sd</field>
-        </record>
-        <record id="se" model="res.country">
-            <field name="name">Sweden</field>
-            <field name="code">se</field>
-        </record>
-        <record id="sg" model="res.country">
-            <field name="name">Singapore</field>
-            <field name="code">sg</field>
-        </record>
-        <record id="sh" model="res.country">
-            <field name="name">Saint Helena</field>
-            <field name="code">sh</field>
-        </record>
-        <record id="si" model="res.country">
-            <field name="name">Slovenia</field>
-            <field name="code">si</field>
-        </record>
-        <record id="sj" model="res.country">
-            <field name="name">Svalbard and Jan Mayen Islands</field>
-            <field name="code">sj</field>
-        </record>
-        <record id="sk" model="res.country">
-            <field name="name">Slovakia</field>
-            <field name="code">sk</field>
-        </record>
-        <record id="sl" model="res.country">
-            <field name="name">Sierra Leone</field>
-            <field name="code">sl</field>
-        </record>
-        <record id="sm" model="res.country">
-            <field name="name">San Marino</field>
-            <field name="code">sm</field>
-        </record>
-        <record id="sn" model="res.country">
-            <field name="name">Senegal</field>
-            <field name="code">sn</field>
-        </record>
-        <record id="so" model="res.country">
-            <field name="name">Somalia</field>
-            <field name="code">so</field>
-        </record>
-        <record id="sr" model="res.country">
-            <field name="name">Suriname</field>
-            <field name="code">sr</field>
-        </record>
-        <record id="ss" model="res.country">
-            <field name="name">South Sudan</field>
-            <field name="code">ss</field>
-        </record>
-        <record id="st" model="res.country">
-            <field name="name">Saint Tome (Sao Tome) and Principe</field>
-            <field name="code">st</field>
-        </record>
-        <record id="sv" model="res.country">
-            <field name="name">El Salvador</field>
-            <field name="code">sv</field>
-        </record>
-        <record id="sx" model="res.country">
-            <field name="name">Sint Maarten (Dutch part)</field>
-            <field name="code">sx</field>
-        </record>
-        <record id="sy" model="res.country">
-            <field name="name">Syria</field>
-            <field name="code">sy</field>
-        </record>
-        <record id="sz" model="res.country">
-            <field name="name">Swaziland</field>
-            <field name="code">sz</field>
-        </record>
-        <record id="tc" model="res.country">
-            <field name="name">Turks and Caicos Islands</field>
-            <field name="code">tc</field>
-        </record>
-        <record id="td" model="res.country">
-            <field name="name">Chad</field>
-            <field name="code">td</field>
-        </record>
-        <record id="tf" model="res.country">
-            <field name="name">French Southern Territories</field>
-            <field name="code">tf</field>
-        </record>
-        <record id="tg" model="res.country">
-            <field name="name">Togo</field>
-            <field name="code">tg</field>
-        </record>
-        <record id="th" model="res.country">
-            <field name="name">Thailand</field>
-            <field name="code">th</field>
-        </record>
-        <record id="tj" model="res.country">
-            <field name="name">Tajikistan</field>
-            <field name="code">tj</field>
-        </record>
-        <record id="tk" model="res.country">
-            <field name="name">Tokelau</field>
-            <field name="code">tk</field>
-        </record>
-        <record id="tm" model="res.country">
-            <field name="name">Turkmenistan</field>
-            <field name="code">tm</field>
-        </record>
-        <record id="tn" model="res.country">
-            <field name="name">Tunisia</field>
-            <field name="code">tn</field>
-        </record>
-        <record id="to" model="res.country">
-            <field name="name">Tonga</field>
-            <field name="code">to</field>
-        </record>
-        <record id="tp" model="res.country">
-            <field name="name">East Timor</field>
-            <field name="code">tp</field>
-        </record>
-        <record id="tr" model="res.country">
-            <field name="name">Turkey</field>
-            <field name="code">tr</field>
-        </record>
-        <record id="tt" model="res.country">
-            <field name="name">Trinidad and Tobago</field>
-            <field name="code">tt</field>
-        </record>
-        <record id="tv" model="res.country">
-            <field name="name">Tuvalu</field>
-            <field name="code">tv</field>
-        </record>
-        <record id="tw" model="res.country">
-            <field name="name">Taiwan</field>
-            <field name="code">tw</field>
-        </record>
-        <record id="tz" model="res.country">
-            <field name="name">Tanzania</field>
-            <field name="code">tz</field>
-        </record>
-        <record id="ua" model="res.country">
-            <field name="name">Ukraine</field>
-            <field name="code">ua</field>
-        </record>
-        <record id="ug" model="res.country">
-            <field name="name">Uganda</field>
-            <field name="code">ug</field>
-        </record>
-        <record id="uk" model="res.country">
-            <field name="name">United Kingdom</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(state_name)s\n%(zip)s\n%(country_name)s'" />            
-            <field name="code">gb</field>
-        </record>
-        <record id="um" model="res.country">
-            <field name="name">USA Minor Outlying Islands</field>
-            <field name="code">um</field>
-        </record>
-        <record id="us" model="res.country">
-            <field name="name">United States</field>
-            <field name="code">us</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />            
-        </record>
-        <record id="uy" model="res.country">
-            <field name="name">Uruguay</field>
-            <field name="code">uy</field>
-        </record>
-        <record id="uz" model="res.country">
-            <field name="name">Uzbekistan</field>
-            <field name="code">uz</field>
-        </record>
-        <record id="va" model="res.country">
-            <field name="name">Holy See (Vatican City State)</field>
-            <field name="code">va</field>
-        </record>
-        <record id="vc" model="res.country">
-            <field name="name">Saint Vincent &amp; Grenadines</field>
-            <field name="code">vc</field>
-        </record>
-        <record id="ve" model="res.country">
-            <field name="name">Venezuela</field>
-            <field name="code">ve</field>
-        </record>
-        <record id="vg" model="res.country">
-            <field name="name">Virgin Islands (British)</field>
-            <field name="code">vg</field>
-        </record>
-        <record id="vi" model="res.country">
-            <field name="name">Virgin Islands (USA)</field>
-            <field name="code">vi</field>
-        </record>
-        <record id="vn" model="res.country">
-            <field name="name">Vietnam</field>
-            <field name="code">vn</field>
-        </record>
-        <record id="vu" model="res.country">
-            <field name="name">Vanuatu</field>
-            <field name="code">vu</field>
-        </record>
-        <record id="wf" model="res.country">
-            <field name="name">Wallis and Futuna Islands</field>
-            <field name="code">wf</field>
-        </record>
-        <record id="ws" model="res.country">
-            <field name="name">Samoa</field>
-            <field name="code">ws</field>
-        </record>
-        <record id="ye" model="res.country">
-            <field name="name">Yemen</field>
-            <field name="code">ye</field>
-        </record>
-        <record id="yt" model="res.country">
-            <field name="name">Mayotte</field>
-            <field name="code">yt</field>
-        </record>
-        <record id="yu" model="res.country">
-            <field name="name">Yugoslavia</field>
-            <field name="code">yu</field>
-        </record>
-        <record id="za" model="res.country">
-            <field name="name">South Africa</field>
-            <field name="code">za</field>
-        </record>
-        <record id="zm" model="res.country">
-            <field name="name">Zambia</field>
-            <field name="code">zm</field>
-        </record>
-        <!-- DEPRECATED, New name of Zaire is Democratic Republic of the Congo ! -->
-        <record id="zr" model="res.country">
-            <field name="name">Zaire</field>
-            <field name="code">zr</field>
-        </record>
-        <record id="zw" model="res.country">
-            <field name="name">Zimbabwe</field>
-            <field name="code">zw</field>
-        </record>
-
         <record id="main_partner" model="res.partner" context="{'default_is_company': True}">
             <field name="name">Your Company</field>
             <field name="company_id" eval="None"/>
diff --git a/openerp/addons/base/country_data.xml b/openerp/addons/base/country_data.xml
index 5731b37f382..d4d880cb8ed 100644
--- a/openerp/addons/base/country_data.xml
+++ b/openerp/addons/base/country_data.xml
@@ -70,7 +70,7 @@
         <record id="au" model="res.country">
             <field name="name">Australia</field>
             <field name="code">au</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s %(state_code)s %(zip)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />
             <field name="currency_id" ref="AUD"/>
         </record>
         <record id="aw" model="res.country">
@@ -106,7 +106,7 @@
         <record id="be" model="res.country">
             <field name="name">Belgium</field>
             <field name="code">be</field>
-            <field name="address_format" eval="'%(street)s\n%(zip)s, %(city)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="bf" model="res.country">
@@ -162,7 +162,7 @@
         <record id="br" model="res.country">
             <field name="name">Brazil</field>
             <field name="code">br</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s\n%(zip)s\n%(country_name)s'" />
             <field name="currency_id" ref="BRL"/>
         </record>
         <record id="bs" model="res.country">
@@ -198,7 +198,7 @@
         <record id="ca" model="res.country">
             <field name="name">Canada</field>
             <field name="code">ca</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />
             <field name="currency_id" ref="CAD"/>
         </record>
         <record id="cc" model="res.country">
@@ -350,7 +350,7 @@
         <record id="es" model="res.country">
             <field name="name">Spain</field>
             <field name="code">es</field>
-            <field name="address_format" eval="'%(street)s\n%(zip)s %(city)s,%(state_name)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="et" model="res.country">
@@ -386,7 +386,7 @@
         <record id="fr" model="res.country">
             <field name="name">France</field>
             <field name="code">fr</field>
-            <field name="address_format" eval="'%(street)s\n%(zip)s %(city)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="ga" model="res.country">
@@ -532,7 +532,7 @@
         <record id="in" model="res.country">
             <field name="name">India</field>
             <field name="code">in</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(zip)s\n%(state_name)s%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(zip)s\n%(state_name)s\n%(country_name)s'" />            
             <field name="currency_id" ref="INR"/>
         </record>
         <record id="io" model="res.country">
@@ -838,7 +838,7 @@
         <record id="nl" model="res.country">
             <field name="name">Netherlands</field>
             <field name="code">nl</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="no" model="res.country">
@@ -1174,7 +1174,7 @@
         </record>
         <record id="uk" model="res.country">
             <field name="name">United Kingdom</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(country_name)s\n%(zip)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(state_name)s\n%(zip)s\n%(country_name)s'" />            
             <field name="code">gb</field>
             <field name="currency_id" ref="GBP"/>
         </record>
@@ -1186,7 +1186,7 @@
         <record id="us" model="res.country">
             <field name="name">United States</field>
             <field name="code">us</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />            
             <field name="currency_id" ref="USD"/>
         </record>
         <record id="uy" model="res.country">
@@ -1269,6 +1269,7 @@
             <field name="code">zm</field>
             <field name="currency_id" ref="ZMK"/>
         </record>
+
         <!-- DEPRECATED, New name of Zaire is Democratic Republic of the Congo ! -->
         <record id="zr" model="res.country">
             <field name="name">Zaire</field>
diff --git a/openerp/addons/base/res/res_country.py b/openerp/addons/base/res/res_country.py
index f1321605e5f..29e72cf82e4 100644
--- a/openerp/addons/base/res/res_country.py
+++ b/openerp/addons/base/res/res_country.py
@@ -64,7 +64,7 @@ addresses belonging to this country.\n\nYou can use the python-style string pate
             'The code of the country must be unique !')
     ]
     _defaults = {
-        'address_format': "%(company_name)s\n%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s\n%(country_name)s",
+        'address_format': "%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s",
     }
     _order='name'
 

From e5b0cd2091e53c5e0e08fc94461ebfb1797ce7dd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 11 Sep 2012 12:17:29 +0200
Subject: [PATCH 986/999] [IMP] Address Format in Reports

bzr revid: fp@tinyerp.com-20120911101729-iv79hos2mwxopitq
---
 openerp/addons/base/res/res_partner.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 906f4b2b6c6..c5dbd53a15e 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -498,7 +498,7 @@ class res_partner(osv.osv):
         # get the information that will be injected into the display format
         # get the address format
         address_format = address.country_id and address.country_id.address_format or \
-                                         '%(company_name)s\n%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s'
+              "%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s"
         args = {
             'state_code': address.state_id and address.state_id.code or '',
             'state_name': address.state_id and address.state_id.name or '',
@@ -511,10 +511,10 @@ class res_partner(osv.osv):
             args[field] = getattr(address, field) or ''
         if without_company:
             args['company_name'] = ''
+        elif address.parent_id:
+            address_format = '%(company_name)s\n' + address_format
         return address_format % args
 
-
-
 # res.partner.address is deprecated; it is still there for backward compability only and will be removed in next version
 class res_partner_address(osv.osv):
     _table = "res_partner"

From de5c80fb902c2992665d2011bf45f45ae8f4db26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 13:52:38 +0200
Subject: [PATCH 987/999] [FIX] sale.order: fixed a typo in template, leading
 to the company not being displayed.

bzr revid: tde@openerp.com-20120911115238-4r0oq2g5x4ffurde
---
 addons/sale/edi/sale_order_action_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index 49ebe6053e6..c818a3a22ab 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -47,7 +47,7 @@
 
     <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
     
-    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from {$object.company_id.name}: </p>
+    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}: </p>
 
     <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
        &nbsp;&nbsp;<strong>REFERENCES</strong><br />

From 2a317c55fbada71e0f28f9ffc99a41d6780c0d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 13:59:47 +0200
Subject: [PATCH 988/999] [IMP] mail.compose.message wizard form view: put
 template field, and template buttons, as invisible.

bzr revid: tde@openerp.com-20120911115947-rfjr8scrq06ni01s
---
 addons/email_template/wizard/mail_compose_message_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index 96aaa1cfaae..8d5bc26b213 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -11,14 +11,14 @@
                     <xpath expr="//form/footer/button" position="before">
                         <field name="use_template" invisible="1"/>
                         <button icon="gtk-paste" type="object" name="toggle_template"
-                                string="" help="Use a message template" />
+                                string="" help="Use a message template" invisible="1"/>
                         <button icon="gtk-save" type="object" name="save_as_template"
-                                string="" help="Save as a new template"/>
+                                string="" help="Save as a new template" invisible="1"/>
                     </xpath>
                     <xpath expr="//form/notebook" position="after">
                         <group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4">
                             <field name="use_template" invisible="1"/>
-                            <field name="template_id" colspan="3"
+                            <field name="template_id" colspan="3" invisible="1"
                                 on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
                         </group>
                     </xpath>

From 4ecf30824ec4e5deb3661e6b65c3d0be5827edee Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 11 Sep 2012 15:07:01 +0200
Subject: [PATCH 989/999] [IMP] fix needaction for SO/PO, using domain instead
 of defautl searches

bzr revid: fp@tinyerp.com-20120911130701-1jplopfxlmd2hm7r
---
 addons/purchase/purchase_view.xml | 4 +++-
 addons/sale/sale_view.xml         | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ab5df67f52d..5d6f6c34b3b 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -347,6 +347,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="context">{'search_default_draft': 1}</field>
+            <field name="domain">[('state','in',('draft','sent','confirmed'))]</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help" type="html">
@@ -371,7 +372,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_mode">tree,form,graph,calendar</field>
-            <field name="context">{'search_default_approved': 1}</field>
+            <field name="context">{}</field>
+            <field name="domain">[('state','not in',('draft','sent','confirmed'))]</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2c2acff227e..1f077f6601d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -404,7 +404,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
-            <field name="context">{"search_default_sales":1}</field>
+            <field name="context">{}</field>
+            <field name="domain">[('state','not in',('draft','sent','cancel'))]</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to create a quotation that can be converted into a sale
@@ -445,7 +446,8 @@
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="context">{"search_default_draft":1}</field>
+            <field name="context">{}</field>
+            <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">

From 9b0f10af1231a622ae79b0b97d26cd2af73891b4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 11 Sep 2012 15:24:46 +0200
Subject: [PATCH 990/999] [FIX] base_import: just loading module should not
 require unittest2. Reported by M.Taylor

bzr revid: xmo@openerp.com-20120911132446-u1yd48tsfd7km6hn
---
 addons/base_import/__init__.py                         | 2 +-
 addons/base_import/{tests/models.py => test_models.py} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename addons/base_import/{tests/models.py => test_models.py} (100%)

diff --git a/addons/base_import/__init__.py b/addons/base_import/__init__.py
index ab0a528f1f1..939a8173e38 100644
--- a/addons/base_import/__init__.py
+++ b/addons/base_import/__init__.py
@@ -1,3 +1,3 @@
 import controllers
 import models
-import tests.models
+import test_models
diff --git a/addons/base_import/tests/models.py b/addons/base_import/test_models.py
similarity index 100%
rename from addons/base_import/tests/models.py
rename to addons/base_import/test_models.py

From b0e6046f73d616fb8b940773afd15319c9b78cce Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 11 Sep 2012 16:01:33 +0200
Subject: [PATCH 991/999] [IMP] whitespaces

bzr revid: abo@openerp.com-20120911140133-usu2dsg2xjiythvj
---
 addons/procurement/procurement.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index e76f6216155..c5ba1ba7ce5 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -80,7 +80,7 @@ class procurement_order(osv.osv):
     """
     _name = "procurement.order"
     _description = "Procurement"
-    _order ='priority desc,date_planned'
+    _order = 'priority desc,date_planned'
     _inherit = ['mail.thread']
     _log_create = False
     _columns = {
@@ -166,7 +166,7 @@ class procurement_order(osv.osv):
         """
         return all(procurement.move_id.state == 'cancel' for procurement in self.browse(cr, uid, ids, context=context))
 
-    #This Function is create to avoid  a server side Error Like 'ERROR:tests.mrp:name 'check_move' is not defined' 
+    #This Function is create to avoid  a server side Error Like 'ERROR:tests.mrp:name 'check_move' is not defined'
     def check_move(self, cr, uid, ids, context=None):
         pass
 
@@ -277,7 +277,7 @@ class procurement_order(osv.osv):
             if not res:
                 return False
         return True
-    
+
     def check_buy(self, cr, uid, ids):
         """ Checks product type.
         @return: True or Product Id.
@@ -359,7 +359,7 @@ class procurement_order(osv.osv):
         message = _('From stock: products assigned.')
         self.write(cr, uid, ids, {'state': 'running',
                 'message': message}, context=context)
-        self.message_append_note(cr, uid, ids, body=message, context=context)                  
+        self.message_append_note(cr, uid, ids, body=message, context=context)
         self.running_send_note(cr, uid, ids, context=context)
         return True
 
@@ -392,7 +392,7 @@ class procurement_order(osv.osv):
                 if message:
                     message = _("Procurement '%s' is in exception: ") % (procurement.name) + message
                     cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
-                    self.message_append_note(cr, uid, [procurement.id], body=message, context=context)   
+                    self.message_append_note(cr, uid, [procurement.id], body=message, context=context)
         return ok
 
     def action_produce_assign_service(self, cr, uid, ids, context=None):
@@ -607,7 +607,7 @@ class stock_warehouse_orderpoint(osv.osv):
             v = {'product_uom': prod.uom_id.id}
             return {'value': v}
         return {}
-    
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
@@ -615,7 +615,7 @@ class stock_warehouse_orderpoint(osv.osv):
             'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.orderpoint') or '',
         })
         return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context)
-    
+
 stock_warehouse_orderpoint()
 
 class product_product(osv.osv):

From 0b15180d4990709ac20557c3cb016b3cd24c1c79 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 11 Sep 2012 16:17:38 +0200
Subject: [PATCH 992/999] [FIX] css

bzr revid: al@openerp.com-20120911141738-0vl1lnen5zwp546s
---
 addons/web/static/src/css/base.css  | 387 +++++++++++-----------------
 addons/web/static/src/css/base.sass | 197 +++++++-------
 addons/web/static/src/xml/base.xml  |   2 +-
 3 files changed, 233 insertions(+), 353 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index f952dd298fd..3c3be4bd2ea 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -111,28 +111,6 @@
 .openerp h4 {
   margin: 4px 0;
 }
-.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_semantic_html_override ul ul, .openerp .oe_semantic_html_override ul ol, .openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol ul, .openerp .oe_semantic_html_override ol ol, .openerp .oe_semantic_html_override ol li {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li {
-  list-style-type: none;
-}
-.openerp ul.oe_semantic_html_override {
-  margin: 0;
-  padding: 0;
-}
-.openerp ul.oe_semantic_html_override ul, .openerp ul.oe_semantic_html_override ol, .openerp ul.oe_semantic_html_override li {
-  margin: 0;
-  padding: 0;
-}
-.openerp ul.oe_semantic_html_override li {
-  list-style-type: none;
-}
 .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
   display: inline-block;
   border: 1px solid #ababab;
@@ -602,26 +580,6 @@
   padding: 0 16px;
   list-style: none;
   zoom: 1;
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_notebook ul, .openerp .oe_notebook ol, .openerp .oe_notebook li {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_notebook li {
-  list-style-type: none;
-}
-.openerp .oe_notebook ul, .openerp .oe_notebook ol {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_notebook ul ul, .openerp .oe_notebook ul ol, .openerp .oe_notebook ul li, .openerp .oe_notebook ol ul, .openerp .oe_notebook ol ol, .openerp .oe_notebook ol li {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_notebook ul li, .openerp .oe_notebook ol li {
-  list-style-type: none;
 }
 .openerp .oe_notebook.ui-corner-all {
   -moz-border-radius: 0;
@@ -697,6 +655,8 @@
   top: 26px;
   left: 0;
   z-index: 1;
+  margin: 0;
+  padding: 0;
   border: 1px solid #afafb6;
   background: white;
   padding: 4px 0;
@@ -714,6 +674,7 @@
   float: none;
   display: block;
   position: relative;
+  margin: 0;
   padding: 2px 8px;
 }
 .openerp .oe_dropdown_menu > li:hover {
@@ -926,17 +887,6 @@
   -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
   box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
 }
-.openerp .oe_login .oe_login_pane ul, .openerp .oe_login .oe_login_pane ol {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_login .oe_login_pane ul ul, .openerp .oe_login .oe_login_pane ul ol, .openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol ul, .openerp .oe_login .oe_login_pane ol ol, .openerp .oe_login .oe_login_pane ol li {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li {
-  list-style-type: none;
-}
 .openerp .oe_login .oe_login_pane h2 {
   margin-top: 0;
   font-size: 18px;
@@ -1015,17 +965,6 @@
   background-image: -o-linear-gradient(top, #646060, #262626);
   background-image: linear-gradient(to bottom, #646060, #262626);
 }
-.openerp .oe_topbar ul, .openerp .oe_topbar ol {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_topbar ul ul, .openerp .oe_topbar ul ol, .openerp .oe_topbar ul li, .openerp .oe_topbar ol ul, .openerp .oe_topbar ol ol, .openerp .oe_topbar ol li {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_topbar ul li, .openerp .oe_topbar ol li {
-  list-style-type: none;
-}
 .openerp .oe_topbar .oe_topbar_item {
   display: block;
   padding: 5px 10px 7px;
@@ -1098,17 +1037,6 @@
   text-shadow: 0 1px 1px white;
   padding-bottom: 16px;
 }
-.openerp .oe_leftbar ul, .openerp .oe_leftbar ol {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_leftbar ul ul, .openerp .oe_leftbar ul ol, .openerp .oe_leftbar ul li, .openerp .oe_leftbar ol ul, .openerp .oe_leftbar ol ol, .openerp .oe_leftbar ol li {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li {
-  list-style-type: none;
-}
 .openerp a.oe_logo {
   width: 220px;
   display: block;
@@ -1164,6 +1092,9 @@
   margin: 0;
 }
 .openerp .oe_menu > li {
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
   float: left;
 }
 .openerp .oe_menu > li > a {
@@ -1203,7 +1134,9 @@
 }
 .openerp .oe_secondary_submenu li {
   position: relative;
+  margin: 0;
   padding: 1px 0 1px 20px !important;
+  list-style-type: none;
 }
 .openerp .oe_secondary_submenu li a {
   display: block;
@@ -1316,16 +1249,6 @@
   width: 100%;
   table-layout: fixed;
 }
-.openerp .oe_view_manager table.oe_view_manager_header ul {
-  padding: 0;
-  margin-right: 0;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-.openerp .oe_view_manager table.oe_view_manager_header ul li {
-  list-style-type: none;
-  margin: 0;
-}
 .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row {
   clear: both;
   text-shadow: 0 1px 1px white;
@@ -1397,6 +1320,10 @@
   float: left;
   margin-right: 8px;
 }
+.openerp .oe_view_manager ul.oe_pager_group {
+  padding: 0;
+  margin: 0;
+}
 .openerp .oe_view_manager .oe_pager_group {
   float: left;
   height: 24px;
@@ -1412,6 +1339,8 @@
   height: 24px;
   line-height: 24px;
   padding: 0;
+  margin: 0;
+  list-style-type: none;
   float: left;
   border-right: 1px solid #ababab;
 }
@@ -1436,14 +1365,17 @@
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
 }
 .openerp .oe_view_manager .oe_view_manager_switch {
-  margin-left: 8px;
+  padding: 0;
+  margin: 0 0 0 8px;
 }
 .openerp .oe_view_manager .oe_view_manager_switch li {
-  text-align: center;
+  margin: 0;
   width: 24px;
   height: 24px;
   line-height: 16px;
   padding: 0;
+  text-align: center;
+  list-style-type: none;
 }
 .openerp .oe_view_manager .oe_view_manager_switch li a {
   position: relative;
@@ -2047,135 +1979,6 @@
 .openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div {
   padding: 1px 0;
 }
-.openerp .oe_form ul.oe_form_steps, .openerp .oe_form ul.oe_form_steps_clickable {
-  display: inline-block;
-  padding-right: 18px;
-}
-.openerp .oe_form ul.oe_form_steps li, .openerp .oe_form ul.oe_form_steps_clickable li {
-  display: inline-block;
-  margin-right: -20px;
-  background-color: #fcfcfc;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
-  background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: -moz-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
-}
-.openerp .oe_form ul.oe_form_steps li:first-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:first-child .label {
-  border-left: 1px solid #cacaca;
-  padding-left: 14px;
-}
-.openerp .oe_form ul.oe_form_steps li:last-child, .openerp .oe_form ul.oe_form_steps_clickable li:last-child {
-  border-right: 1px solid #cacaca;
-}
-.openerp .oe_form ul.oe_form_steps li:last-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .label {
-  padding-right: 14px;
-}
-.openerp .oe_form ul.oe_form_steps li:last-child .arrow, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .arrow {
-  display: none;
-}
-.openerp .oe_form ul.oe_form_steps li .label, .openerp .oe_form ul.oe_form_steps_clickable li .label {
-  color: #4c4c4c;
-  text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede;
-  padding: 7px;
-  display: inline-block;
-  padding-left: 24px;
-  margin: 0;
-  position: relative;
-}
-.openerp .oe_form ul.oe_form_steps li .arrow, .openerp .oe_form ul.oe_form_steps_clickable li .arrow {
-  width: 17px;
-  display: inline-block;
-  vertical-align: top;
-  overflow: hidden;
-  margin-left: -5px;
-}
-.openerp .oe_form ul.oe_form_steps li .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li .arrow span {
-  position: relative;
-  width: 24px;
-  height: 24px;
-  display: inline-block;
-  margin-left: -12px;
-  margin-top: 3px;
-  box-shadow: -1px 1px 2px rgba(255, 255, 255, 0.2), inset -1px 1px 1px rgba(0, 0, 0, 0.2);
-  background-color: #dedede;
-  background: -moz-linear-gradient(135deg, #dedede, #fcfcfc);
-  background: -o-linear-gradient(135deg, #fcfcfc, #dedede);
-  background: -webkit-gradient(linear, left top, right bottom, from(#fcfcfc), to(#dedede));
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-  -webkit-transform: rotate(45deg);
-  -moz-transform: rotate(45deg);
-  -ms-transform: rotate(45deg);
-  -o-transform: rotate(45deg);
-  transform: rotate(45deg);
-}
-.openerp .oe_form ul.oe_form_steps li.oe_active, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active {
-  background-color: #729fcf;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4));
-  background-image: -webkit-linear-gradient(top, #729fcf, #3465a4);
-  background-image: -moz-linear-gradient(top, #729fcf, #3465a4);
-  background-image: -ms-linear-gradient(top, #729fcf, #3465a4);
-  background-image: -o-linear-gradient(top, #729fcf, #3465a4);
-  background-image: linear-gradient(to bottom, #729fcf, #3465a4);
-}
-.openerp .oe_form ul.oe_form_steps li.oe_active .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .arrow span {
-  background-color: #3465a4;
-  background: -moz-linear-gradient(135deg, #3465a4, #729fcf);
-  background: -o-linear-gradient(135deg, #729fcf, #3465a4);
-  background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4));
-}
-.openerp .oe_form ul.oe_form_steps li.oe_active .label, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .label {
-  color: white;
-  text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4;
-}
-.openerp .oe_form ul.oe_form_steps_clickable li {
-  cursor: pointer;
-}
-.openerp .oe_form ul.oe_form_steps_clickable li:hover {
-  background-color: #e8e8e8;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca));
-  background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca);
-  background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca);
-  background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca);
-  background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
-  background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
-}
-.openerp .oe_form ul.oe_form_steps_clickable li:hover .label {
-  text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede;
-}
-.openerp .oe_form ul.oe_form_steps_clickable li:hover .arrow span {
-  background-color: #e8e8e8;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca));
-  background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca);
-  background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca);
-  background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca);
-  background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
-  background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
-}
-.openerp .oe_form ul.oe_form_steps_clickable li .label {
-  color: #7c7bad;
-}
-.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover {
-  background-color: #4c85c2;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d));
-  background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d);
-  background-image: -moz-linear-gradient(top, #4c85c2, #284d7d);
-  background-image: -ms-linear-gradient(top, #4c85c2, #284d7d);
-  background-image: -o-linear-gradient(top, #4c85c2, #284d7d);
-  background-image: linear-gradient(to bottom, #4c85c2, #284d7d);
-}
-.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .label {
-  text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4;
-}
-.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .arrow span {
-  background-color: #284d7d;
-  background: -moz-linear-gradient(135deg, #284d7d, #4c85c2);
-  background: -o-linear-gradient(135deg, #4c85c2, #284d7d);
-  background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d));
-}
 .openerp .oe_form .oe_subtotal_footer {
   width: 1% !important;
 }
@@ -2463,27 +2266,137 @@
 .openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option {
   margin-top: 10px;
 }
-.openerp .oe_form_field_status {
+.openerp ul.oe_form_status, .openerp ul.oe_form_status_clickable {
+  display: inline-block;
   margin: 0;
-  padding: 0;
+  padding: 0 18px 0 0;
 }
-.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_form_field_status ul ul, .openerp .oe_form_field_status ul ol, .openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol ul, .openerp .oe_form_field_status ol ol, .openerp .oe_form_field_status ol li {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li {
+.openerp ul.oe_form_status li, .openerp ul.oe_form_status_clickable li {
+  display: inline-block;
   list-style-type: none;
-}
-.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol, .openerp .oe_form_field_status li {
-  margin: 0;
+  margin: 0 -20px 0 0;
   padding: 0;
+  background-color: #fcfcfc;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
+  background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -moz-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
 }
-.openerp .oe_form_field_status li {
-  list-style-type: none;
+.openerp ul.oe_form_status li:first-child .label, .openerp ul.oe_form_status_clickable li:first-child .label {
+  border-left: 1px solid #cacaca;
+  padding-left: 14px;
+}
+.openerp ul.oe_form_status li:last-child, .openerp ul.oe_form_status_clickable li:last-child {
+  border-right: 1px solid #cacaca;
+}
+.openerp ul.oe_form_status li:last-child .label, .openerp ul.oe_form_status_clickable li:last-child .label {
+  padding-right: 14px;
+}
+.openerp ul.oe_form_status li:last-child .arrow, .openerp ul.oe_form_status_clickable li:last-child .arrow {
+  display: none;
+}
+.openerp ul.oe_form_status li .label, .openerp ul.oe_form_status_clickable li .label {
+  color: #4c4c4c;
+  text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede;
+  padding: 7px;
+  display: inline-block;
+  padding-left: 24px;
+  margin: 0;
+  position: relative;
+}
+.openerp ul.oe_form_status li .arrow, .openerp ul.oe_form_status_clickable li .arrow {
+  width: 17px;
+  display: inline-block;
+  vertical-align: top;
+  overflow: hidden;
+  margin-left: -5px;
+}
+.openerp ul.oe_form_status li .arrow span, .openerp ul.oe_form_status_clickable li .arrow span {
+  position: relative;
+  width: 24px;
+  height: 24px;
+  display: inline-block;
+  margin-left: -12px;
+  margin-top: 3px;
+  box-shadow: -1px 1px 2px rgba(255, 255, 255, 0.2), inset -1px 1px 1px rgba(0, 0, 0, 0.2);
+  background-color: #dedede;
+  background: -moz-linear-gradient(135deg, #dedede, #fcfcfc);
+  background: -o-linear-gradient(135deg, #fcfcfc, #dedede);
+  background: -webkit-gradient(linear, left top, right bottom, from(#fcfcfc), to(#dedede));
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-transform: rotate(45deg);
+  -moz-transform: rotate(45deg);
+  -ms-transform: rotate(45deg);
+  -o-transform: rotate(45deg);
+  transform: rotate(45deg);
+}
+.openerp ul.oe_form_status li.oe_active, .openerp ul.oe_form_status_clickable li.oe_active {
+  background-color: #729fcf;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4));
+  background-image: -webkit-linear-gradient(top, #729fcf, #3465a4);
+  background-image: -moz-linear-gradient(top, #729fcf, #3465a4);
+  background-image: -ms-linear-gradient(top, #729fcf, #3465a4);
+  background-image: -o-linear-gradient(top, #729fcf, #3465a4);
+  background-image: linear-gradient(to bottom, #729fcf, #3465a4);
+}
+.openerp ul.oe_form_status li.oe_active .arrow span, .openerp ul.oe_form_status_clickable li.oe_active .arrow span {
+  background-color: #3465a4;
+  background: -moz-linear-gradient(135deg, #3465a4, #729fcf);
+  background: -o-linear-gradient(135deg, #729fcf, #3465a4);
+  background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4));
+}
+.openerp ul.oe_form_status li.oe_active .label, .openerp ul.oe_form_status_clickable li.oe_active .label {
+  color: white;
+  text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4;
+}
+.openerp ul.oe_form_status_clickable li {
+  cursor: pointer;
+}
+.openerp ul.oe_form_status_clickable li:hover {
+  background-color: #e8e8e8;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca));
+  background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
+}
+.openerp ul.oe_form_status_clickable li:hover .label {
+  text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede;
+}
+.openerp ul.oe_form_status_clickable li:hover .arrow span {
+  background-color: #e8e8e8;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca));
+  background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
+  background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
+}
+.openerp ul.oe_form_status_clickable li .label {
+  color: #7c7bad;
+}
+.openerp ul.oe_form_status_clickable li.oe_active:hover {
+  background-color: #4c85c2;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d));
+  background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d);
+  background-image: -moz-linear-gradient(top, #4c85c2, #284d7d);
+  background-image: -ms-linear-gradient(top, #4c85c2, #284d7d);
+  background-image: -o-linear-gradient(top, #4c85c2, #284d7d);
+  background-image: linear-gradient(to bottom, #4c85c2, #284d7d);
+}
+.openerp ul.oe_form_status_clickable li.oe_active:hover .label {
+  text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4;
+}
+.openerp ul.oe_form_status_clickable li.oe_active:hover .arrow span {
+  background-color: #284d7d;
+  background: -moz-linear-gradient(135deg, #284d7d, #4c85c2);
+  background: -o-linear-gradient(135deg, #4c85c2, #284d7d);
+  background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d));
 }
 .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
   display: none;
@@ -2832,16 +2745,6 @@
   float: right;
   color: #333333;
 }
-.openerp .oe_semantic_html li {
-  list-style-type: disc;
-  display: list-item;
-}
-.openerp .oe_semantic_html ul {
-  padding-left: 1em;
-}
-.openerp .oe_semantic_html p {
-  color: #4c4c4c !important;
-}
 
 .kitten-mode-activated {
   background-image: url(http://placekitten.com/g/1365/769);
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 1f332756cf7..4bf122c6146 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -124,19 +124,6 @@ $sheet-max-width: 860px
         content: $icon-name
         color: $color
 
-@mixin ul-html-override()
-    margin: 0
-    padding: 0
-    ul, ol, li
-        margin: 0
-        padding: 0
-    li
-        list-style-type: none
-
-@mixin semantic-html-override()
-    ul, ol
-        @include ul-html-override()
-
 // }}}
 
 @media print
@@ -200,10 +187,6 @@ $sheet-max-width: 860px
         vertical-align: middle
     h4
         margin: 4px 0
-    .oe_semantic_html_override
-        @include semantic-html-override
-    ul.oe_semantic_html_override
-        @include ul-html-override
     // }}}
     // Button style {{{
     a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
@@ -509,8 +492,6 @@ $sheet-max-width: 860px
         padding: 0 16px
         list-style: none
         zoom: 1
-        @include ul-html-override
-        @include semantic-html-override
     .oe_notebook.ui-corner-all
         @include radius(0)
     .oe_notebook:before, .oe_notebook:after
@@ -567,6 +548,8 @@ $sheet-max-width: 860px
         top: 26px
         left: 0
         z-index: 1
+        margin: 0
+        padding: 0
         border: 1px solid $tag-border
         background: white
         padding: 4px 0
@@ -582,6 +565,7 @@ $sheet-max-width: 860px
             float: none
             display: block
             position: relative
+            margin: 0
             padding: 2px 8px
             > a
                 white-space: nowrap
@@ -730,7 +714,6 @@ $sheet-max-width: 860px
             text-align: left
             @include radius(8px)
             @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9))
-            @include semantic-html-override
             h2
                 margin-top: 0
                 font-size: 18px
@@ -795,7 +778,6 @@ $sheet-max-width: 860px
         width: 100%
         height: 31px
         @include vertical-gradient(#646060, #262626)
-        @include semantic-html-override
         .oe_topbar_item
             display: block
             padding: 5px 10px 7px
@@ -846,7 +828,6 @@ $sheet-max-width: 860px
         border-right: 1px solid $tag-border
         text-shadow: 0 1px 1px white
         padding-bottom: 16px
-        @include semantic-html-override
     a.oe_logo
         width: 220px
         display: block
@@ -897,6 +878,9 @@ $sheet-max-width: 860px
         padding: 0
         margin: 0
         > li
+            list-style-type: none
+            padding: 0
+            margin: 0
             float: left
             > a
                 display: block
@@ -926,7 +910,9 @@ $sheet-max-width: 860px
         display: inline-block
         li
             position: relative
+            margin: 0
             padding: 1px 0 1px 20px !important
+            list-style-type: none
             a
                 display: block
                 color: #4c4c4c
@@ -1012,14 +998,6 @@ $sheet-max-width: 860px
         table.oe_view_manager_header
             width: 100%
             table-layout: fixed
-            ul
-                padding: 0
-                margin-right: 0
-                margin-top: 0
-                margin-bottom: 0
-                li
-                    list-style-type: none
-                    margin: 0
             .oe_header_row
                 //min-height: 26px
                 //line-height: 26px
@@ -1074,6 +1052,9 @@ $sheet-max-width: 860px
         .oe_pager_value
             float: left
             margin-right: 8px
+        ul.oe_pager_group
+            padding: 0
+            margin: 0
         .oe_pager_group
             float: left
             height: 24px
@@ -1086,6 +1067,8 @@ $sheet-max-width: 860px
                 height: 24px
                 line-height: 24px
                 padding: 0
+                margin: 0
+                list-style-type: none
                 float: left
                 border-right: 1px solid #ababab
                 &:last-child
@@ -1104,13 +1087,16 @@ $sheet-max-width: 860px
         // }}}
         // ViewManager.switches {{{
         .oe_view_manager_switch
-            margin-left: 8px
+            padding: 0
+            margin: 0 0 0 8px
             li
-                text-align: center
+                margin: 0
                 width: 24px
                 height: 24px
                 line-height: 16px
                 padding: 0
+                text-align: center
+                list-style-type: none
                 a
                     position: relative
             .oe_vm_switch_list:after, .oe_vm_switch_tree:after
@@ -1571,72 +1557,6 @@ $sheet-max-width: 860px
                 padding: 1px 0
             .oe_form_group_cell div div
                 padding: 1px 0
-        ul.oe_form_steps, ul.oe_form_steps_clickable
-            display: inline-block
-            padding-right: 18px
-            li 
-                display: inline-block
-                margin-right: -20px
-                @include vertical-gradient(#fcfcfc, #dedede)
-                &:first-child .label
-                    border-left: 1px solid #cacaca
-                    padding-left: 14px
-                &:last-child
-                    border-right: 1px solid #cacaca
-                    .label
-                        padding-right: 14px
-                    .arrow
-                        display: none
-                .label 
-                    color: #4c4c4c
-                    text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede
-                    padding: 7px
-                    display: inline-block
-                    padding-left: 24px
-                    margin: 0
-                    position: relative
-                .arrow
-                    width: 17px
-                    display: inline-block
-                    vertical-align: top
-                    overflow: hidden
-                    margin-left: -5px
-                    span 
-                        position: relative
-                        width: 24px
-                        height: 24px
-                        display: inline-block
-                        margin-left: -12px
-                        margin-top: 3px
-                        box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2)
-                        @include skew-gradient(#fcfcfc, #dedede)
-                        @include radius(3px)
-                        @include transform(rotate(45deg))
-            li.oe_active
-                @include vertical-gradient(#729fcf, #3465a4)
-                .arrow span 
-                    @include skew-gradient(#729fcf, #3465a4)
-                .label
-                    color: white
-                    text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4
-        ul.oe_form_steps_clickable
-            li
-                cursor: pointer
-                &:hover 
-                    @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
-                    .label
-                        text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede
-                    .arrow span 
-                        @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
-                .label
-                    color: $link-color
-            li.oe_active
-                &:hover 
-                    @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
-                    .label
-                        text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4
-                    .arrow span 
-                        @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
         .oe_subtotal_footer
             width: 1% !important
             td.oe_form_group_cell
@@ -1878,9 +1798,75 @@ $sheet-max-width: 860px
             margin-top: 10px
     // }}}
     // FormView.fieldstatus {{{
-    .oe_form_field_status
-        @include semantic-html-override
-        @include ul-html-override
+    ul.oe_form_status, ul.oe_form_status_clickable
+        display: inline-block
+        margin: 0
+        padding: 0 18px 0 0
+        li 
+            display: inline-block
+            list-style-type: none
+            margin: 0 -20px 0 0
+            padding: 0
+            @include vertical-gradient(#fcfcfc, #dedede)
+            &:first-child .label
+                border-left: 1px solid #cacaca
+                padding-left: 14px
+            &:last-child
+                border-right: 1px solid #cacaca
+                .label
+                    padding-right: 14px
+                .arrow
+                    display: none
+            .label
+                color: #4c4c4c
+                text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede
+                padding: 7px
+                display: inline-block
+                padding-left: 24px
+                margin: 0
+                position: relative
+            .arrow
+                width: 17px
+                display: inline-block
+                vertical-align: top
+                overflow: hidden
+                margin-left: -5px
+                span 
+                    position: relative
+                    width: 24px
+                    height: 24px
+                    display: inline-block
+                    margin-left: -12px
+                    margin-top: 3px
+                    box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2)
+                    @include skew-gradient(#fcfcfc, #dedede)
+                    @include radius(3px)
+                    @include transform(rotate(45deg))
+        li.oe_active
+            @include vertical-gradient(#729fcf, #3465a4)
+            .arrow span 
+                @include skew-gradient(#729fcf, #3465a4)
+            .label
+                color: white
+                text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4
+    ul.oe_form_status_clickable
+        li
+            cursor: pointer
+            &:hover 
+                @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
+                .label
+                    text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede
+                .arrow span 
+                    @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
+            .label
+                color: $link-color
+        li.oe_active
+            &:hover 
+                @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
+                .label
+                    text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4
+                .arrow span 
+                    @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
     // }}}
     // FormView.one2many {{{
     .oe_form .oe_form_field_one2many > .oe_view_manager
@@ -2170,15 +2156,6 @@ $sheet-max-width: 860px
         float: right
         color: #333
     // }}}
-    .oe_semantic_html // a style to use normal html
-        li
-            list-style-type: disc
-            display: list-item
-        ul
-            padding-left: 1em
-        p
-            color: #4C4C4C !important
-        
 // Kitten Mode {{{
 .kitten-mode-activated
     background-image: url(http://placekitten.com/g/1365/769)
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a595bb9e495..a9f54a846ed 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1062,7 +1062,7 @@
     </span>
 </t>
 <t t-name="FieldStatus">
-    <ul t-att-class="'oe_form_field_status ' + (widget.options.clickable ? 'oe_form_steps_clickable' : 'oe_form_steps')" t-att-style="widget.node.attrs.style"/>
+    <ul t-att-class="'oe_form_field_status ' + (widget.options.clickable ? 'oe_form_status_clickable' : 'oe_form_status')" t-att-style="widget.node.attrs.style"/>
 </t>
 <t t-name="FieldStatus.content">
     <t t-foreach="widget.selection" t-as="i">

From d7b31c3202f6b979d78a7a89eb12ec8444349701 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 11 Sep 2012 17:36:45 +0200
Subject: [PATCH 993/999] [FIX] Force create when no email in name_create of
 mail.compose

bzr revid: fp@tinyerp.com-20120911153645-vpi3wi4ddt2tqr5s
---
 addons/mail/wizard/mail_compose_message_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 70b50c154ac..468aaf39882 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -14,7 +14,7 @@
                     <group>
                         <field name="subject" placeholder="Subject..."/>
                         <field name="partner_ids" widget="many2many_tags" placeholder="Add contacts to notify..."
-                                context="{'force_create':True}"
+                                context="{'force_email':True}"
                                 on_change="onchange_partner_ids(partner_ids)"/>
                     </group>
                     <notebook>

From a161895287e7b4d081c8a075989c15f0a6de6f34 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 11 Sep 2012 18:14:35 +0200
Subject: [PATCH 994/999] [IMP] stock move picking representation

bzr revid: abo@openerp.com-20120911161435-jmlffnxe0utk3qft
---
 addons/stock/stock.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 41b4394edbf..e93f9bb34ea 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1577,7 +1577,13 @@ class stock_move(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         res = []
         for line in self.browse(cr, uid, ids, context=context):
-            res.append((line.id, (line.picking_id.origin or '/')+ ' ' +(line.product_id.code or '/')+': '+line.location_id.name+' > '+line.location_dest_id.name))
+            name = line.location_id.name+' > '+line.location_dest_id.name
+            # optional prefixes
+            if line.product_id.code:
+                name = line.product_id.code + ': ' + name
+            if line.picking_id.origin:
+                name = line.picking_id.origin + '/ ' + name
+            res.append((line.id, name))
         return res
 
     def _check_tracking(self, cr, uid, ids, context=None):

From 0296e350a9d9ac6f6dcaea1bd6d0f68e16786b48 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 11 Sep 2012 18:19:00 +0200
Subject: [PATCH 995/999] [IMP] quick create partners with email

bzr revid: fp@tinyerp.com-20120911161900-7vd2qtd9e0guk1pu
---
 addons/mail/wizard/mail_compose_message_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 468aaf39882..2899c0c9a41 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -65,7 +65,7 @@
                                 class="oe_mail_compose_message_body_html"
                                 attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
                         <field name="partner_ids" colspan="2" nolabel="1" widget="many2many_tags" placeholder="Add contacts to notify..."
-                                context="{'force_create':True}"
+                                context="{'force_email':True}"
                                 on_change="onchange_partner_ids(partner_ids)"
                                 class="oe_mail_compose_message_partner_ids"/>
                         <field name="attachment_ids" colspan="2" nolabel="1" widget="many2many_tags"

From e2fc0c95a5fc05d8c2167ad803c1f6a7f8d26ce1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 11 Sep 2012 18:19:26 +0200
Subject: [PATCH 996/999] [IMP] quick create partners usability

bzr revid: fp@tinyerp.com-20120911161926-fk35p5wwefuwpxlx
---
 openerp/addons/base/res/res_partner.py       |  7 +++++++
 openerp/addons/base/res/res_partner_view.xml | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 6033cfd785e..52200c3fb02 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -223,6 +223,13 @@ class res_partner(osv.osv):
             image = tools.image_colorize(open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png')).read())
         return tools.image_resize_image_big(image.encode('base64'))
 
+    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        if (not view_id) and (view_type=='form') and context and context.get('force_email', False):
+            view_id = self.pool.get('ir.model.data').get_object_reference(cr, user, 'base', 'view_partner_simple_form')[1]
+
+        return super(res_partner, self).fields_view_get(cr, user, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
+
+
     _defaults = {
         'active': True,
         'lang': lambda self, cr, uid, ctx: ctx.get('lang', 'en_US'),
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 752f264f550..18b5fd76a49 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -89,6 +89,26 @@
             </field>
         </record>
 
+        <record id="view_partner_simple_form" model="ir.ui.view">
+            <field name="name">res.partner.simplified.form</field>
+            <field name="model">res.partner</field>
+            <field name="arch" type="xml">
+                <form string="Contact" version="7.0">
+                    <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
+                    <div class="oe_title">
+                        <group>
+                            <field name="name"/>
+                            <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
+                            <field name="function" placeholder="e.g. Sales Director"/>
+                            <field name="email" required="context.get('force_email', False)"/>
+                            <field name="phone"/>
+                            <field name="mobile"/>
+                        </group>
+                    </div>
+                </form>
+            </field>
+        </record>
+
         <record id="view_partner_form" model="ir.ui.view">
             <field name="name">res.partner.form</field>
             <field name="model">res.partner</field>

From b4441a1ca483e2aab8bf7b466b1075ab702cd7d0 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 12 Sep 2012 02:57:21 +0200
Subject: [PATCH 997/999] [IMP] account template loading speedup 1min on runbot
 check parent_id type constraint before create/write remove parent_id eval 0

bzr revid: al@openerp.com-20120912005721-ofpgkaorlm4zrwgy
---
 addons/account/account.py                     | 25 +++++++++++--------
 .../data/configurable_account_chart.xml       |  1 -
 addons/account/demo/account_minimal.xml       |  1 -
 addons/l10n_ca/account_chart_en.xml           |  1 -
 addons/l10n_gr/account_chart.xml              |  1 -
 addons/l10n_gt/account_chart.xml              |  1 -
 addons/l10n_hn/account_chart.xml              |  1 -
 addons/l10n_in/l10n_in_private_chart.xml      |  3 +--
 addons/l10n_in/l10n_in_public_chart.xml       |  3 +--
 addons/l10n_th/account_data.xml               |  1 -
 addons/l10n_uy/account_chart_template.xml     |  1 -
 11 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 57356f7d3ef..e5e29f178a3 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2516,22 +2516,25 @@ class account_account_template(osv.osv):
         'nocreate': False,
     }
 
-    def _check_type(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        accounts = self.browse(cr, uid, ids, context=context)
-        for account in accounts:
-            if account.parent_id and account.parent_id.type != 'view':
-                return False
-        return True
-
     _check_recursion = check_cycle
     _constraints = [
         (_check_recursion, 'Error!\nYou cannot create recursive account templates.', ['parent_id']),
-        (_check_type, 'Configuration Error!\nYou cannot define children to an account that has internal type other than  "View".', ['type']),
-
     ]
 
+    def create(self, cr, uid, vals, context=None):
+        if 'parent_id' in vals:
+            parent = self.read(cr, uid, [vals['parent_id']], ['type'])
+            if parent and parent[0]['type'] != 'view':
+                raise osv.except_osv(_('Warning!'), _("You may only select a parent account of type 'View'."))
+        return super(account_account_template, self).create(cr, uid, vals, context=context)
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if 'parent_id' in vals:
+            parent = self.read(cr, uid, [vals['parent_id']], ['type'])
+            if parent and parent[0]['type'] != 'view':
+                raise osv.except_osv(_('Warning!'), _("You may only select a parent account of type 'View'."))
+        return super(account_account_template, self).write(cr, uid, ids, vals, context=context)
+
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
diff --git a/addons/account/data/configurable_account_chart.xml b/addons/account/data/configurable_account_chart.xml
index 18e22a5e4f2..b8b23344ff3 100644
--- a/addons/account/data/configurable_account_chart.xml
+++ b/addons/account/data/configurable_account_chart.xml
@@ -45,7 +45,6 @@
         <record id="conf_chart0" model="account.account.template">
             <field name="code">0</field>
             <field name="name">Configurable Account Chart</field>
-            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="data_account_type_view"/>
         </record>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 94b3d2d4085..53f2b54e0ef 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -19,7 +19,6 @@
         <record id="chart0" model="account.account">
             <field name="code">X0</field>
             <field name="name">Chart For Automated Tests</field>
-            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="data_account_type_view"/>
         </record>
diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml
index 0d67e081d08..acb4fa4802b 100644
--- a/addons/l10n_ca/account_chart_en.xml
+++ b/addons/l10n_ca/account_chart_en.xml
@@ -6,7 +6,6 @@
         <record id="chart0_en" model="account.account.template">
             <field name="code">0</field>
             <field name="name">Account Chart CA EN</field>
-            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="account.data_account_type_view"/>
         </record>
diff --git a/addons/l10n_gr/account_chart.xml b/addons/l10n_gr/account_chart.xml
index 0ad5579d867..950d9e7b09c 100644
--- a/addons/l10n_gr/account_chart.xml
+++ b/addons/l10n_gr/account_chart.xml
@@ -7,7 +7,6 @@
         <record id="chartgr_0" model="account.account.template">
             <field name="code">0</field>
             <field name="name">Γενικό Λογιστικό Σχέδιο</field>
-            <!--<field eval="0" name="parent_id"/> -->
             <field name="type">view</field>
             <field name="user_type" ref="account_type_view"/>
         </record>
diff --git a/addons/l10n_gt/account_chart.xml b/addons/l10n_gt/account_chart.xml
index ffb4177d743..0f9aecfb423 100644
--- a/addons/l10n_gt/account_chart.xml
+++ b/addons/l10n_gt/account_chart.xml
@@ -7,7 +7,6 @@
         <record id="plan_raiz" model="account.account.template">
             <field name="code">-</field>
             <field name="name">Plan contable de Guatemala (sencillo)</field>
-            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="cuenta_vista"/>
         </record>
diff --git a/addons/l10n_hn/account_chart.xml b/addons/l10n_hn/account_chart.xml
index 7bd17b0e82d..228c60ef4dc 100644
--- a/addons/l10n_hn/account_chart.xml
+++ b/addons/l10n_hn/account_chart.xml
@@ -7,7 +7,6 @@
         <record id="plan_raiz" model="account.account.template">
             <field name="code">-</field>
             <field name="name">Plan contable de Honduras (sencillo)</field>
-            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="cuenta_vista"/>
         </record>
diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml
index db11d0638c8..f38f95750cf 100644
--- a/addons/l10n_in/l10n_in_private_chart.xml
+++ b/addons/l10n_in/l10n_in_private_chart.xml
@@ -8,7 +8,6 @@
             <field name="name">Partnership/Private Firm Chart of Account</field>
             <field name="code">0</field>
             <field name="type">view</field>
-            <field eval="0" name="parent_id"/>
             <field name="user_type" ref="account.data_account_type_view"/>
             <field name="reconcile" eval="False"/>
         </record>
@@ -520,4 +519,4 @@
         
         
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
index 2c2dda0dd9d..4a4098d56c9 100644
--- a/addons/l10n_in/l10n_in_public_chart.xml
+++ b/addons/l10n_in/l10n_in_public_chart.xml
@@ -9,7 +9,6 @@
             <field name="name">Public Firm Chart of Account</field>
             <field name="code">0</field>
             <field name="type">view</field>
-			<field eval="0" name="parent_id"/>
             <field name="user_type" ref="account.data_account_type_view"/>
             <field name="reconcile" eval="False"/>
         </record>
@@ -673,4 +672,4 @@
         </record>
         
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index 48e7b4f33d6..d5885d4b92b 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -26,7 +26,6 @@
 <record id="a_root" model="account.account.template">
     <field name="code">0</field>
     <field name="name">Simple chart of accounts</field>
-    <field name="parent_id" eval="False"/>
     <field name="type">view</field>
     <field name="user_type" ref="acc_type_view"/>
 </record>
diff --git a/addons/l10n_uy/account_chart_template.xml b/addons/l10n_uy/account_chart_template.xml
index 1548d3ee25a..8308263d8b0 100644
--- a/addons/l10n_uy/account_chart_template.xml
+++ b/addons/l10n_uy/account_chart_template.xml
@@ -4,7 +4,6 @@
         <record id="uy_code_0" model="account.account.template">
             <field name="code">0</field>
             <field name="type">view</field>
-            <field name="parent_id" eval="False"/>
             <field name="name">Uruguay - Plan de Cuentas</field>
             <field name="user_type" ref="type_view"/>
         </record>

From 7bcbbdd54a7654371f014e8c2a2656a9479a3fe5 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 12 Sep 2012 04:36:26 +0000
Subject: [PATCH 998/999] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120912043626-nse0tdwah2xn825c
---
 openerp/addons/base/i18n/pt_BR.po | 367 +++++++++++++++---------------
 1 file changed, 185 insertions(+), 182 deletions(-)

diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index 51426f4bc29..2fe5ba9cabd 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-08-20 15:33+0000\n"
-"Last-Translator: Renato Lima - http://www.akretion.com "
-"<renatonlima@gmail.com>\n"
+"PO-Revision-Date: 2012-09-11 09:31+0000\n"
+"Last-Translator: Carlos Paiva <Unknown>\n"
 "Language-Team: <pt@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: 2012-09-05 04:45+0000\n"
-"X-Generator: Launchpad (build 15901)\n"
+"X-Launchpad-Export-Date: 2012-09-12 04:36+0000\n"
+"X-Generator: Launchpad (build 15930)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -196,7 +195,7 @@ msgstr "Bélgica - comunicação estruturada"
 #. module: base
 #: field:ir.actions.act_window,target:0
 msgid "Target Window"
-msgstr "Janela Destino"
+msgstr "Janela de destino"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
@@ -382,7 +381,7 @@ msgstr ""
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
-msgstr "O nome da língua deve ser único !"
+msgstr "O nome do idioma deve ser único!"
 
 #. module: base
 #: model:ir.module.module,description:base.module_import_base
@@ -452,7 +451,7 @@ msgstr "Regras de ação automatizada"
 #. module: base
 #: view:ir.attachment:0
 msgid "Owner"
-msgstr "Dono"
+msgstr "Proprietário"
 
 #. module: base
 #: field:ir.actions.act_window,src_model:0
@@ -610,8 +609,8 @@ msgid ""
 "If you check this, then the second time the user prints with same attachment "
 "name, it returns the previous report."
 msgstr ""
-"Se marcar esta opção, na segunda vez que usar a impressora com o mesmo "
-"anexo, usará a impressora anterior"
+"Se você marcar esta opção, na segunda vez que o usuário imprimir com o mesmo "
+"nome de anexo, retornará a impressão anterior."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_layout
@@ -877,7 +876,7 @@ msgstr ""
 msgid ""
 "Manual: Launched manually.\n"
 "Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after having been launched manually, it sets "
+"Launch Manually Once: after hacing been launched manually, it sets "
 "automatically to Done."
 msgstr ""
 "Manual: Iniciado manualmente\n"
@@ -1035,7 +1034,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #: model:ir.model,name:base.model_base_module_upgrade
 msgid "Module Upgrade"
-msgstr "Atualizar múdlos"
+msgstr "Atualizar Módulos"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1147,7 +1146,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
-msgstr "%B - Nome do mes completo"
+msgstr "%B - Nome do mês completo"
 
 #. module: base
 #: field:ir.actions.todo,type:0
@@ -1169,7 +1168,7 @@ msgstr "Tipo"
 #. module: base
 #: field:ir.mail_server,smtp_user:0
 msgid "Username"
-msgstr "Nome do usuário"
+msgstr "Nome de usuário"
 
 #. module: base
 #: code:addons/orm.py:398
@@ -1235,7 +1234,7 @@ msgstr "Registro #%d do %s não foi encontrado, não é possível copiar!"
 #. module: base
 #: field:ir.module.module,contributors:0
 msgid "Contributors"
-msgstr "Contribuidores"
+msgstr "Colaboradores"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_planning
@@ -1298,7 +1297,7 @@ msgstr "Uganda"
 #. module: base
 #: field:ir.model.access,perm_unlink:0
 msgid "Delete Access"
-msgstr "Acesso deletado"
+msgstr "Excluir Acesso"
 
 #. module: base
 #: model:res.country,name:base.ne
@@ -1445,7 +1444,7 @@ msgstr "Sistema de gestão de documentos"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_claim
 msgid "Claims Management"
-msgstr "Gestão de reclamações"
+msgstr "Gestão de Solicitações"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_purchase_root
@@ -1470,10 +1469,10 @@ msgid ""
 "use the accounting application of OpenERP, journals and accounts will be "
 "created automatically based on these data."
 msgstr ""
-"Configurar contas de banco da sua empresa e selecione aqueles que devem "
-"aparecer no rodapé do relatório. Você pode reordenar contas bancárias de "
-"exibição de lista. Se você usar o aplicativo de contabilidade do OpenERP, "
-"diários e contas serão criadas automaticamente com base nos dados."
+"Configure as contas bancárias da empresa e escolha quais deverão aparecer no "
+"rodapé do relatório. Você pode reordenar na listagem. Se você usar o "
+"aplicativo de Contabilidade do OpenERP, os diários e contas serão criadas "
+"automaticamente com base nesses dados."
 
 #. module: base
 #: view:ir.module.module:0
@@ -2174,17 +2173,17 @@ msgstr "%s (cópia)"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_chart
 msgid "Template of Charts of Accounts"
-msgstr "Modelo de gráficos de contas"
+msgstr "Modelo de Plano de Contas"
 
 #. module: base
 #: field:res.partner.address,type:0
 msgid "Address Type"
-msgstr "Tipo de endereço"
+msgstr "Tipo de Endereço"
 
 #. module: base
 #: view:ir.ui.menu:0
 msgid "Full Path"
-msgstr "Endereço completo"
+msgstr "Caminho Completo"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_br
@@ -2284,7 +2283,7 @@ msgid ""
 "decimal number [00,53]. All days in a new year preceding the first Sunday "
 "are considered to be in week 0."
 msgstr ""
-"%U - Número da semana do ano (Domingo com oo primeiro dia da semana) com 2 "
+"%U - Número da semana do ano (Domingo como o primeiro dia da semana) com 2 "
 "decimais [00,53]. Todos os dias, em um novo ano que precede o primeiro "
 "domingo são considerados na semana 0."
 
@@ -2646,7 +2645,7 @@ msgstr "Editor de Workflow"
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "To be removed"
-msgstr "Para ser removido"
+msgstr "A ser removido"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_sequence
@@ -2913,7 +2912,7 @@ msgstr "Frances(BE) / Frances(BE)"
 #: view:ir.actions.server:0
 #: field:workflow.activity,action_id:0
 msgid "Server Action"
-msgstr "Ação de servidor"
+msgstr "Ação de Servidor"
 
 #. module: base
 #: help:ir.actions.client,params:0
@@ -2968,7 +2967,7 @@ msgstr "SMS - Gateway: clickatell"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Field Mappings"
-msgstr "Mapeando campos"
+msgstr "Mapeamentos de Campo"
 
 #. module: base
 #: code:addons/base/publisher_warranty/publisher_warranty.py:125
@@ -3090,7 +3089,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%p - Equivalent of either AM or PM."
-msgstr "%p - Equivalente de cada uma das AM ou PM."
+msgstr "%p - Equivalente a AM ou PM."
 
 #. module: base
 #: view:ir.actions.server:0
@@ -3412,7 +3411,7 @@ msgstr "Setor de RH"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_dashboard_admin
 msgid "Administration Dashboard"
-msgstr "Painel de administração"
+msgstr "Painel de Administração"
 
 #. module: base
 #: code:addons/orm.py:4408
@@ -3434,7 +3433,7 @@ msgstr "Dependência de módulos"
 #. module: base
 #: selection:publisher_warranty.contract.wizard,state:0
 msgid "Draft"
-msgstr "Rascunho"
+msgstr "Provisório"
 
 #. module: base
 #: selection:res.users,view:0
@@ -3503,7 +3502,7 @@ msgstr "Administrador RH"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_contract
 msgid "Employee Contracts"
-msgstr "Contratos de empregado"
+msgstr "Contratos de Funcionários"
 
 #. module: base
 #: model:ir.module.module,description:base.module_wiki_faq
@@ -3529,7 +3528,7 @@ msgstr ""
 #. module: base
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "Erro! Voce não pode criar empresas recursivas"
+msgstr "Erro! Você não pode criar empresas recursivas."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_users
@@ -3556,7 +3555,7 @@ msgstr "Tratamento para o contato"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_manufacturer
 msgid "Products Manufacturers"
-msgstr "Fabricantes de produtos"
+msgstr "Fabricantes dos Produtos"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:217
@@ -3640,7 +3639,7 @@ msgstr "Alemanha / Deutsch"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Fields Mapping"
-msgstr "Mapendo campos"
+msgstr "Mapeamento de Campos"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_dashboard
@@ -3964,7 +3963,7 @@ msgstr ""
 #. module: base
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Você não pode criar recursiva a membros associados."
+msgstr "Erro! Você não pode criar membros associados recursivamente."
 
 #. module: base
 #: view:res.payterm:0
@@ -4068,7 +4067,7 @@ msgstr ""
 #. module: base
 #: view:ir.model:0
 msgid "Create a Menu"
-msgstr "Criar um menu"
+msgstr "Criar um Menu"
 
 #. module: base
 #: help:res.partner,vat:0
@@ -4161,7 +4160,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Search Actions"
-msgstr "Ações de pesquisa"
+msgstr "Ações da Pesquisa"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_partner_wizard_ean_check
@@ -4222,8 +4221,8 @@ msgstr "GPL-2 ou versão superior"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "Mr."
-msgstr "Mr."
+msgid "M."
+msgstr "M."
 
 #. module: base
 #: code:addons/base/module/module.py:519
@@ -4563,7 +4562,7 @@ msgstr "Planos de Contas"
 #. module: base
 #: view:res.request:0
 msgid "Request Date"
-msgstr "Data da Mensagem"
+msgstr "Data de Solicitação:"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:52
@@ -4809,7 +4808,7 @@ msgstr "Setor de Telecom"
 #. module: base
 #: field:workflow.transition,trigger_model:0
 msgid "Trigger Object"
-msgstr "Objeto a disparar"
+msgstr "Acionar Objeto"
 
 #. module: base
 #: sql_constraint:ir.sequence.type:0
@@ -4819,7 +4818,7 @@ msgstr "`code` precisa ser único."
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_expense
 msgid "Expenses Management"
-msgstr "Gerenciamento de despesas"
+msgstr "Controle de Despesas"
 
 #. module: base
 #: view:workflow.activity:0
@@ -4852,7 +4851,7 @@ msgstr "Marketing"
 #. module: base
 #: view:res.partner.bank:0
 msgid "Bank account"
-msgstr "Conta Bancaria"
+msgstr "Conta Bancária"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_gr
@@ -4872,7 +4871,7 @@ msgstr "Tipo de Sequencia"
 #. module: base
 #: view:ir.ui.view.custom:0
 msgid "Customized Architecture"
-msgstr "Arquitetura Customisada"
+msgstr "Arquitetura Personalizada"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_gantt
@@ -5167,7 +5166,7 @@ msgstr "Validação do Número do IVA"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_partner_assign
 msgid "Partners Geo-Localization"
-msgstr "Parceiros Geo-localização"
+msgstr "Geo-Localização dos Parceiros"
 
 #. module: base
 #: model:res.country,name:base.ke
@@ -5298,7 +5297,7 @@ msgstr "Esse contrato já está registrado no sistema."
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_type_form
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_typeform
 msgid "Bank Account Types"
-msgstr "Tipos de contas bancárias"
+msgstr "Tipos de Contas Bancárias"
 
 #. module: base
 #: help:ir.sequence,suffix:0
@@ -5379,7 +5378,7 @@ msgstr "Mauritius"
 #: view:ir.model.access:0
 #: view:ir.rule:0
 msgid "Full Access"
-msgstr "Acesso completo"
+msgstr "Acesso Completo"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -5453,7 +5452,7 @@ msgstr "Hungria"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
-msgstr "Processo de Recrutamento"
+msgstr "Processo de Seleção"
 
 #. module: base
 #: model:res.country,name:base.br
@@ -5494,7 +5493,7 @@ msgstr "Espanhol (PA) / Español (PA)"
 #: view:res.currency:0
 #: field:res.currency,rate_ids:0
 msgid "Rates"
-msgstr "Preços"
+msgstr "Taxas"
 
 #. module: base
 #: model:res.country,name:base.sy
@@ -5539,7 +5538,7 @@ msgstr ""
 #. module: base
 #: selection:res.request,state:0
 msgid "draft"
-msgstr "esboço"
+msgstr "Provisório"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -5741,7 +5740,7 @@ msgstr "Campo"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_long_term
 msgid "Long Term Projects"
-msgstr "Projectos de longo prazo"
+msgstr "Projetos de Longo Prazo"
 
 #. module: base
 #: model:res.country,name:base.ve
@@ -5761,7 +5760,7 @@ msgstr "Zâmbia"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Launch Configuration Wizard"
-msgstr "Assistente de configuração"
+msgstr "Iniciar o Assistente de Configuração"
 
 #. module: base
 #: help:res.partner,user_id:0
@@ -6017,7 +6016,7 @@ msgstr "Web"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_lunch
 msgid "Lunch Orders"
-msgstr "Abir Ordens"
+msgstr "Pedidos de Almoço"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6159,7 +6158,7 @@ msgstr ""
 
 #. module: base
 #: help:res.country.state,code:0
-msgid "The state code in max. three chars."
+msgid "The state code in three chars.\n"
 msgstr "O código de situação com 3 caracteres.\n"
 
 #. module: base
@@ -6175,7 +6174,7 @@ msgstr "Testar"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_kanban
 msgid "Base Kanban"
-msgstr ""
+msgstr "Painéis Kanban"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6196,7 +6195,7 @@ msgstr "Título"
 #: field:base.module.import,state:0
 #: field:base.module.update,state:0
 msgid "state"
-msgstr "status"
+msgstr "situação"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_analytic_analysis
@@ -6330,7 +6329,7 @@ msgstr ""
 #. module: base
 #: field:res.partner.bank.type.field,bank_type_id:0
 msgid "Bank Type"
-msgstr "Tipo de banco"
+msgstr "Tipo de Banco"
 
 #. module: base
 #: code:addons/base/res/res_users.py:87
@@ -6394,7 +6393,7 @@ msgstr "res.partner.title"
 #. module: base
 #: view:res.partner.bank:0
 msgid "Bank Account Owner"
-msgstr "Titular da conta bancária"
+msgstr "Titular da Conta Bancária"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_uncategorized
@@ -6446,7 +6445,7 @@ msgstr "Guadalupe (em francês)"
 #: code:addons/base/res/res_lang.py:191
 #, python-format
 msgid "User Error"
-msgstr "Erro de usuário"
+msgstr "Erro do Usuário"
 
 #. module: base
 #: help:workflow.transition,signal:0
@@ -6487,7 +6486,7 @@ msgstr "Nome do Menu"
 #. module: base
 #: view:ir.module.module:0
 msgid "Author Website"
-msgstr "Autor do site"
+msgstr "Site do Autor"
 
 #. module: base
 #: model:ir.module.module,description:base.module_board
@@ -6534,7 +6533,7 @@ msgstr "Carregar uma tradução oficial"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_cancel
 msgid "Cancel Journal Entries"
-msgstr "Cancelar entradas de diário"
+msgstr "Cancelar Entradas de Diário"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -6545,7 +6544,7 @@ msgstr "Configuração de ação"
 #: model:ir.model,name:base.model_res_partner_address
 #: view:res.partner.address:0
 msgid "Partner Addresses"
-msgstr "Endereços do parceiro"
+msgstr "Endereços do Parceiro"
 
 #. module: base
 #: help:ir.mail_server,smtp_debug:0
@@ -6565,7 +6564,7 @@ msgstr "Construtor de Consulta"
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Launch Automatically"
-msgstr "Iniciar automaticamente"
+msgstr "Iniciar Automaticamente"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mail
@@ -6687,7 +6686,7 @@ msgstr "ir.actions.url"
 #. module: base
 #: model:res.widget,title:base.currency_converter_widget
 msgid "Currency Converter"
-msgstr "conversor de moedas"
+msgstr "Conversor de Moedas"
 
 #. module: base
 #: help:ir.values,key:0
@@ -6695,6 +6694,8 @@ msgid ""
 "- Action: an action attached to one slot of the given model\n"
 "- Default: a default value for a model field"
 msgstr ""
+"- Ação: uma ação ligada a um slot do modelo dado\n"
+"- Padrão: um valor padrão para um campo modelo"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_addess_tree
@@ -6710,7 +6711,7 @@ msgstr "Numero de módulos adicionados"
 #. module: base
 #: view:res.currency:0
 msgid "Price Accuracy"
-msgstr "Precisão do preço"
+msgstr "Precisão do Preço"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6737,7 +6738,7 @@ msgstr "Desinstalar"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_budget
 msgid "Budgets Management"
-msgstr "Gestão de orçamentos"
+msgstr "Gestão de Orçamentos"
 
 #. module: base
 #: field:workflow.triggers,workitem_id:0
@@ -6795,7 +6796,7 @@ msgstr "Para"
 #. module: base
 #: view:ir.sequence:0
 msgid "Current Year without Century: %(y)s"
-msgstr "Ano atual sem o século: %(y)s"
+msgstr "Ano Atual (2 dígitos): %(y)s"
 
 #. module: base
 #: help:ir.actions.client,tag:0
@@ -6944,7 +6945,7 @@ msgstr "Não existe uma visão do tipo '%s' definida para a estrutura!"
 #. module: base
 #: view:ir.module.module:0
 msgid "Defined Reports"
-msgstr "Relatórios definidos"
+msgstr "Relatórios Definidos"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_payterm_form
@@ -7070,7 +7071,7 @@ msgstr "Incluir recarregamento automático dos dados"
 #. module: base
 #: help:res.partner,employee:0
 msgid "Check this box if the partner is an Employee."
-msgstr "Marque esta caixa se o parceiro for um empregado."
+msgstr "Marque esta caixa se o parceiro for um Funcionário."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_profiling
@@ -7085,7 +7086,7 @@ msgstr "Rastreador de Problemas"
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Work Days"
-msgstr "Dias de trabalho"
+msgstr "Dias de Trabalho"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_multi_company
@@ -7117,7 +7118,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,advice:0
 msgid "Advice"
-msgstr "Advertência"
+msgstr "Recomendação"
 
 #. module: base
 #: view:res.company:0
@@ -7202,12 +7203,12 @@ msgstr "View herdada"
 #. module: base
 #: view:ir.translation:0
 msgid "Source Term"
-msgstr "Equipe Origem"
+msgstr "Termo de Origem"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
 msgid "Timesheets Validation"
-msgstr "Validação de quadros de horários"
+msgstr "Validação da Planilha de Horas"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_main_pm
@@ -7280,12 +7281,12 @@ msgstr "Contrato de manutenção"
 #: model:res.groups,name:base.group_user
 #: field:res.partner,employee:0
 msgid "Employee"
-msgstr "Empregado"
+msgstr "Funcionário"
 
 #. module: base
 #: field:ir.model.access,perm_create:0
 msgid "Create Access"
-msgstr "Acesso Criação"
+msgstr "Criar Acesso"
 
 #. module: base
 #: field:res.bank,state:0
@@ -7298,7 +7299,7 @@ msgstr "Estado(UF)"
 #. module: base
 #: field:ir.actions.server,copy_object:0
 msgid "Copy Of"
-msgstr "Copiar de"
+msgstr "Cópia de"
 
 #. module: base
 #: field:ir.model,osv_memory:0
@@ -7354,7 +7355,7 @@ msgstr "Ao excluir"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_multilang
 msgid "Multi Language Chart of Accounts"
-msgstr "Plano de contas multi idiomas"
+msgstr "Plano de Contas Multi-Idiomas"
 
 #. module: base
 #: selection:res.lang,direction:0
@@ -7400,7 +7401,7 @@ msgstr "Assinatura"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_caldav
 msgid "Meetings Synchronization"
-msgstr "Sincronização de reuniões"
+msgstr "Sincronização de Reuniões"
 
 #. module: base
 #: field:ir.actions.act_window,context:0
@@ -7416,7 +7417,7 @@ msgstr "res.widget.user"
 #. module: base
 #: field:res.partner.category,complete_name:0
 msgid "Full Name"
-msgstr "Nome completo"
+msgstr "Nome Completo"
 
 #. module: base
 #: view:base.module.configuration:0
@@ -7432,7 +7433,7 @@ msgstr "O nome do módulo deve ser único!"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_contact
 msgid "Contacts Management"
-msgstr "Administração de contatos"
+msgstr "Administração de Contatos"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr_rib
@@ -7632,7 +7633,7 @@ msgstr ""
 #: code:addons/orm.py:1883
 #, python-format
 msgid "Insufficient fields for Calendar View!"
-msgstr "Não tem campos suficiente para representação de calendário"
+msgstr "Sem campos suficientes para Visualização de Calendário"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -7693,7 +7694,7 @@ msgstr "Menus criados"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_analytic_default
 msgid "Account Analytic Defaults"
-msgstr "Padrões analíticos de conta"
+msgstr "Padrões Analíticos da Conta"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_contract
@@ -7823,7 +7824,7 @@ msgstr "Lido"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_association
 msgid "Associations Management"
-msgstr "Gestão de associações"
+msgstr "Gestão de Associações"
 
 #. module: base
 #: help:ir.model,modules:0
@@ -7917,7 +7918,7 @@ msgstr "Campos"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_employee_form
 msgid "Employees"
-msgstr "Colaboradores"
+msgstr "Funcionários"
 
 #. module: base
 #: field:ir.exports.line,name:0
@@ -7964,7 +7965,7 @@ msgstr "Ref. Visão de Pesquisa"
 #. module: base
 #: field:ir.module.module,installed_version:0
 msgid "Latest version"
-msgstr "Última verão"
+msgstr "Última versão"
 
 #. module: base
 #: view:ir.mail_server:0
@@ -8090,7 +8091,7 @@ msgstr "Burquina Fasso"
 #. module: base
 #: selection:ir.model.fields,state:0
 msgid "Custom Field"
-msgstr "Customizar campo"
+msgstr "Campo Personalizado"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_retro_planning
@@ -8266,7 +8267,7 @@ msgstr "Gestão de Conhecimento"
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
 msgid "Company Bank Accounts"
-msgstr "Contas bancárias da empresa"
+msgstr "Contas Bancárias da Empresa"
 
 #. module: base
 #: help:ir.mail_server,smtp_pass:0
@@ -8331,7 +8332,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.bank.type,name:base.bank_normal
 msgid "Normal Bank Account"
-msgstr "Conta bancária normal"
+msgstr "Conta Bancária Normal"
 
 #. module: base
 #: view:ir.actions.wizard:0
@@ -8568,7 +8569,7 @@ msgstr "ir.ui.menu"
 #: model:ir.module.category,name:base.module_category_project_management
 #: model:ir.module.module,shortdesc:base.module_project
 msgid "Project Management"
-msgstr "Gerenciamento de projetos"
+msgstr "Gerenciamento de Projetos"
 
 #. module: base
 #: model:res.country,name:base.us
@@ -8676,7 +8677,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_iban
 msgid "IBAN Bank Accounts"
-msgstr ""
+msgstr "Contas Bancárias IBAN"
 
 #. module: base
 #: field:res.company,user_ids:0
@@ -8755,7 +8756,7 @@ msgstr "2.  %a ,%A         ==> Sex, Sexta"
 #. module: base
 #: view:res.request.history:0
 msgid "Request History"
-msgstr "Histórico das mensagens"
+msgstr "Histórico de Solicitações"
 
 #. module: base
 #: help:ir.rule,global:0
@@ -8810,7 +8811,7 @@ msgstr "Dominica"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_module_record
 msgid "Record and Create Modules"
-msgstr "Gravar e criar módulos"
+msgstr "Gravar e Criar Módulos"
 
 #. module: base
 #: model:ir.model,name:base.model_partner_sms_send
@@ -8946,7 +8947,7 @@ msgstr "Segundo: %(sec)s"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_view_base_module_update
 msgid "Update Modules List"
-msgstr "Atualizar lista de módulos"
+msgstr "Atualizar Lista de Módulos"
 
 #. module: base
 #: code:addons/base/module/module.py:295
@@ -9071,7 +9072,7 @@ msgstr "México"
 #: code:addons/base/ir/ir_mail_server.py:414
 #, python-format
 msgid "Missing SMTP Server"
-msgstr "Falha no servidor de SMTP"
+msgstr "Faltando o Servidor SMTP"
 
 #. module: base
 #: field:ir.attachment,name:0
@@ -9197,7 +9198,7 @@ msgstr "Ações Múltiplas"
 #: view:base.language.import:0
 #: view:wizard.ir.model.menu.create:0
 msgid "_Close"
-msgstr "_Close"
+msgstr "(_C) Fechar"
 
 #. module: base
 #: field:multi_company.default,company_dest_id:0
@@ -9217,7 +9218,7 @@ msgstr "ID da visão definido no arquivo xml"
 #. module: base
 #: model:ir.model,name:base.model_base_module_import
 msgid "Import Module"
-msgstr "Importar módulo"
+msgstr "Importar Módulo"
 
 #. module: base
 #: model:res.country,name:base.as
@@ -9334,7 +9335,7 @@ msgstr "Iteração"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_planning
 msgid "Resources Planing"
-msgstr "Planejamento de recursos"
+msgstr "Planejamento de Recursos"
 
 #. module: base
 #: field:ir.module.module,complexity:0
@@ -9349,14 +9350,14 @@ msgstr "Incorporado"
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field_bic
 msgid "bank_bic"
-msgstr ""
+msgstr "bank_bic"
 
 #. module: base
 #: code:addons/orm.py:3988
 #: code:addons/orm.py:4085
 #, python-format
 msgid "UserError"
-msgstr "Erro de usuário"
+msgstr "Erro de Usuário"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_analytic_default
@@ -9463,7 +9464,7 @@ msgstr "Gerenciamento de Reparos"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_asset
 msgid "Assets Management"
-msgstr "Gestão de ativos"
+msgstr "Gestão Patrimonial"
 
 #. module: base
 #: view:ir.model.access:0
@@ -9734,7 +9735,7 @@ msgstr "Ilhas Marianas do Norte"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_claim_from_delivery
 msgid "Claim on Deliveries"
-msgstr "Reclamar sobre as entregas"
+msgstr "Solicitações em Entregas"
 
 #. module: base
 #: model:res.country,name:base.sb
@@ -9750,7 +9751,7 @@ msgstr "Ilhas Salomão"
 #: code:addons/orm.py:4408
 #, python-format
 msgid "AccessError"
-msgstr "AccessError"
+msgstr "Erro de Acesso"
 
 #. module: base
 #: view:res.request:0
@@ -9789,7 +9790,7 @@ msgstr ""
 #. module: base
 #: field:res.log,create_date:0
 msgid "Creation Date"
-msgstr "Data de criação"
+msgstr "Data de Criação"
 
 #. module: base
 #: view:ir.translation:0
@@ -9829,7 +9830,7 @@ msgstr "Ucrânia"
 #: field:res.company,website:0
 #: field:res.partner,website:0
 msgid "Website"
-msgstr "Página da Web"
+msgstr "Site"
 
 #. module: base
 #: selection:ir.mail_server,smtp_encryption:0
@@ -9946,7 +9947,7 @@ msgstr ""
 #: field:ir.ui.view,type:0
 #: field:wizard.ir.model.menu.create.line,view_type:0
 msgid "View Type"
-msgstr "Tipo de visão"
+msgstr "Tipo de Visão"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_2
@@ -9957,7 +9958,7 @@ msgstr "Interface de Usuário"
 #: field:res.partner,child_ids:0
 #: field:res.request,ref_partner_id:0
 msgid "Partner Ref."
-msgstr "Código Parceiro"
+msgstr "Cód. do Parceiro"
 
 #. module: base
 #: field:ir.attachment,create_date:0
@@ -10023,7 +10024,7 @@ msgstr "O módulo adiciona usuário do google em res.user"
 #: selection:base.module.import,state:0
 #: selection:base.module.update,state:0
 msgid "done"
-msgstr "Concluído"
+msgstr "concluído"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -10038,7 +10039,7 @@ msgstr "Uruguai - plano de contas"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration_shortcut
 msgid "Custom Shortcuts"
-msgstr "Atalhos Customizados"
+msgstr "Atalhos Personalizados"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -10177,7 +10178,7 @@ msgstr "Código Python"
 #. module: base
 #: help:ir.actions.server,state:0
 msgid "Type of the Action that is to be executed"
-msgstr "Tipo de ação a ser executada"
+msgstr "Tipo de Ação a ser executada"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base
@@ -10223,7 +10224,7 @@ msgstr "Zona Neutra"
 #. module: base
 #: view:ir.model:0
 msgid "Custom"
-msgstr "Personalizar"
+msgstr "Personalizado"
 
 #. module: base
 #: view:res.request:0
@@ -10401,7 +10402,7 @@ msgstr "Guiana"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_expiry
 msgid "Products Expiry Date"
-msgstr "Data de validade"
+msgstr "Data de Validade"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account
@@ -10543,7 +10544,7 @@ msgstr ""
 #. module: base
 #: view:ir.model:0
 msgid "Fields Description"
-msgstr "Descrição de campos"
+msgstr "Descrição dos Campos"
 
 #. module: base
 #: model:ir.module.module,description:base.module_report_designer
@@ -10566,12 +10567,12 @@ msgstr "Sincronização multi-DB"
 #. module: base
 #: selection:ir.module.module,complexity:0
 msgid "Expert"
-msgstr "Especialista"
+msgstr "Avançado"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_holidays
 msgid "Leaves Management"
-msgstr "Gerenciamento de folhas"
+msgstr "Gerenciamento de Folgas"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -10612,12 +10613,12 @@ msgstr ""
 #: selection:ir.translation,type:0
 #: field:wizard.ir.model.menu.create.line,view_id:0
 msgid "View"
-msgstr "View"
+msgstr "Visualizar"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_wiki_sale_faq
 msgid "Wiki: Sale FAQ"
-msgstr "Wiki: Venda FAQ"
+msgstr "Wiki: FAQ de Vendas"
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -10889,7 +10890,7 @@ msgstr ""
 #. module: base
 #: field:ir.cron,interval_type:0
 msgid "Interval Unit"
-msgstr "Intervalo de unidade"
+msgstr "Unidade de Intervalo"
 
 #. module: base
 #: field:publisher_warranty.contract,kind:0
@@ -10957,7 +10958,7 @@ msgstr "ID do registro de destino no banco de dados"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_analytic_analysis
 msgid "Contracts Management"
-msgstr "Gerenciamento de contratos"
+msgstr "Gestão de Contratos"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -10972,7 +10973,7 @@ msgstr "res.request"
 #. module: base
 #: view:ir.model:0
 msgid "In Memory"
-msgstr "Em Memória"
+msgstr "Na Memória"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -11071,12 +11072,12 @@ msgstr "Nome do Serviço"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_import_base
 msgid "Framework for complex import"
-msgstr "Quadro para importação complexa"
+msgstr "Framework para importação complexa"
 
 #. module: base
 #: view:ir.actions.todo.category:0
 msgid "Wizard Category"
-msgstr "Assistente de Categoria"
+msgstr "Categoria do Assistênte"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -11150,11 +11151,14 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"Por favor defina o BIC/Swift code no Banco para o tipo de conta IBAN para "
+"fazer pagamentos válidos"
 
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
-msgstr "%A - Nome da semana completo."
+msgstr "%A - Dia da Semana por extenso"
 
 #. module: base
 #: help:ir.values,user_id:0
@@ -11532,7 +11536,7 @@ msgstr "Saint Kitts & Nevis Anguilla"
 #. module: base
 #: model:ir.module.category,name:base.module_category_point_of_sale
 msgid "Point of Sales"
-msgstr "Ponto de vendas"
+msgstr "Ponto de Vendas"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_payroll_account
@@ -11653,7 +11657,7 @@ msgstr ""
 #. module: base
 #: help:ir.model.fields,model_id:0
 msgid "The model this field belongs to"
-msgstr "O modelo pertence a este campo"
+msgstr "Modelo a que este campo pertence"
 
 #. module: base
 #: model:res.country,name:base.mq
@@ -11707,7 +11711,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_resquest_ref
 #: view:res.request:0
 msgid "Requests"
-msgstr "Mensagens"
+msgstr "Solicitações"
 
 #. module: base
 #: model:res.country,name:base.ye
@@ -11722,7 +11726,7 @@ msgstr "Ou"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_br
 msgid "Brazilian - Accounting"
-msgstr "Brasileiro - contabilidade"
+msgstr "Brasileiro - Contabilidade"
 
 #. module: base
 #: model:res.country,name:base.pk
@@ -11833,9 +11837,7 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_bank_form
 msgid "Manage bank records you want to be used in the system."
-msgstr ""
-"Gerencia os registros de bancos que você quiser que sejam usados pelo "
-"sistema."
+msgstr "Gerencia os registros bancários a serem usados no sistema."
 
 #. module: base
 #: view:base.module.import:0
@@ -11877,7 +11879,7 @@ msgstr "Ação Inicial"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event_project
 msgid "Retro-Planning on Events"
-msgstr ""
+msgstr "Retro-Planejamento em Eventos"
 
 #. module: base
 #: code:addons/custom.py:555
@@ -12111,7 +12113,7 @@ msgstr "Seqüências"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
-msgid "Miss"
+msgid "Mss"
 msgstr "Sra"
 
 #. module: base
@@ -12181,7 +12183,7 @@ msgstr "Normal"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_purchase_double_validation
 msgid "Double Validation on Purchases"
-msgstr "Validação dupla em compras"
+msgstr "Validação Dupla em Compras"
 
 #. module: base
 #: field:res.bank,street2:0
@@ -12238,7 +12240,7 @@ msgstr "Filtro"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
-msgid "Mrs."
+msgid "Ms."
 msgstr "Sra."
 
 #. module: base
@@ -12321,7 +12323,7 @@ msgstr "Operações de Produção"
 #. module: base
 #: selection:publisher_warranty.contract,state:0
 msgid "Terminated"
-msgstr "Terminado"
+msgstr "Finalizado"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
@@ -12356,7 +12358,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr
 msgid "Employee Directory"
-msgstr "Diretório de funcionários"
+msgstr "Diretório de Funcionários"
 
 #. module: base
 #: view:ir.cron:0
@@ -12533,7 +12535,7 @@ msgstr "Tunísia"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Wizards to be Launched"
-msgstr "Assistentes de lançamento"
+msgstr "Assistentes a serem Executados"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_manufacturing
@@ -12549,7 +12551,7 @@ msgstr "Comores"
 #. module: base
 #: view:res.request:0
 msgid "Draft and Active"
-msgstr "Esboço e ativo"
+msgstr "Provisório e Ativo"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_server_action
@@ -13024,7 +13026,8 @@ msgid ""
 "If set to true, the wizard will not be displayed on the right toolbar of a "
 "form view."
 msgstr ""
-"Se marcado, o ajudante não mostrará a barra de ferramenta no formulário"
+"Se selecionado, o assistente não será exibido na barra de ferramentas a "
+"direita do formulário."
 
 #. module: base
 #: view:base.language.import:0
@@ -13175,7 +13178,7 @@ msgstr "URL do ícone"
 #: field:ir.actions.url,type:0
 #: field:ir.actions.wizard,type:0
 msgid "Action Type"
-msgstr "Tipo de ação"
+msgstr "Tipo de Ação"
 
 #. module: base
 #: model:res.country,name:base.vn
@@ -13237,7 +13240,7 @@ msgstr "Costa Rica"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_module_doc_rst
 msgid "Generate Docs of Modules"
-msgstr "Documentos gerais dos módulos"
+msgstr "Gerar Documentos dos Módulos"
 
 #. module: base
 #: model:res.company,overdue_msg:base.main_company
@@ -13286,7 +13289,7 @@ msgstr "ir.actions.client"
 #. module: base
 #: help:ir.values,value:0
 msgid "Default value (pickled) or reference to an action"
-msgstr ""
+msgstr "Valor padrão (selecionado) ou referencia a uma ação"
 
 #. module: base
 #: sql_constraint:res.groups:0
@@ -13417,7 +13420,7 @@ msgstr "Aquisições"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_payroll_account
 msgid "Payroll Accounting"
-msgstr "Contabilização de pagamentos"
+msgstr "Contabilidade da Folha de Pagamentos"
 
 #. module: base
 #: help:ir.attachment,type:0
@@ -13427,12 +13430,12 @@ msgstr "Arquivo Binário ou URL externa"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
-msgstr "Datas em Pedidos"
+msgstr "Datas em Pedidos de Venda"
 
 #. module: base
 #: view:ir.attachment:0
 msgid "Creation Month"
-msgstr "Mês de criação"
+msgstr "Mês de Criação"
 
 #. module: base
 #: model:res.country,name:base.nl
@@ -13533,7 +13536,7 @@ msgstr "Malayalam / മലയാളം"
 #: field:res.request,body:0
 #: field:res.request.history,req_id:0
 msgid "Request"
-msgstr "Mensagem"
+msgstr "Requisição"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.act_ir_actions_todo_form
@@ -13555,7 +13558,7 @@ msgstr "Retrato"
 #. module: base
 #: field:ir.cron,numbercall:0
 msgid "Number of Calls"
-msgstr "Numero de chamadas"
+msgstr "Número de Chamadas"
 
 #. module: base
 #: code:addons/base/res/res_bank.py:189
@@ -13606,7 +13609,7 @@ msgstr "Aplicar"
 #. module: base
 #: field:res.request,trigger_date:0
 msgid "Trigger Date"
-msgstr "Data de disparo"
+msgstr "Data de Disparo"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -13761,13 +13764,13 @@ msgstr ""
 #. module: base
 #: field:res.request.history,body:0
 msgid "Body"
-msgstr "Corpo"
+msgstr "Conteúdo"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:199
 #, python-format
 msgid "Connection test succeeded!"
-msgstr "Conecção testada com sucesso!"
+msgstr "Conexão bem sucedida!"
 
 #. module: base
 #: view:partner.massmail.wizard:0
@@ -13777,7 +13780,7 @@ msgstr "Enviar email"
 #. module: base
 #: field:res.users,menu_id:0
 msgid "Menu Action"
-msgstr "Menu Ação"
+msgstr "Ação do Menu"
 
 #. module: base
 #: help:ir.model.fields,selection:0
@@ -13858,7 +13861,7 @@ msgstr "Gabão"
 #. module: base
 #: model:res.groups,name:base.group_multi_company
 msgid "Multi Companies"
-msgstr "Multi empresas"
+msgstr "Multi Empresas"
 
 #. module: base
 #: view:ir.model:0
@@ -13867,7 +13870,7 @@ msgstr "Multi empresas"
 #: model:res.groups,name:base.group_erp_manager
 #: view:res.users:0
 msgid "Access Rights"
-msgstr "Direitos de acesso"
+msgstr "Permissões de Acesso"
 
 #. module: base
 #: model:res.country,name:base.gl
@@ -13965,7 +13968,7 @@ msgstr "Consumidores"
 #. module: base
 #: view:res.company:0
 msgid "Set Bank Accounts"
-msgstr "Definir contas bancárias"
+msgstr "Definir Contas Bancárias"
 
 #. module: base
 #: field:ir.actions.client,tag:0
@@ -13981,7 +13984,7 @@ msgstr "Você não pode excluir a linguagem de preferida do usuário!"
 #. module: base
 #: field:ir.values,model_id:0
 msgid "Model (change only)"
-msgstr "Modelo(Troca somente)"
+msgstr "Modelo (apenas alterar)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_marketing_campaign_crm_demo
@@ -14014,12 +14017,12 @@ msgstr ""
 #. module: base
 #: view:ir.filters:0
 msgid "Current User"
-msgstr "Usuário atual"
+msgstr "Usuário Atual"
 
 #. module: base
 #: field:res.company,company_registry:0
 msgid "Company Registry"
-msgstr "Registro de empresa"
+msgstr "Registro da Empresa"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -14309,7 +14312,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.server:0
 msgid "Action to Launch"
-msgstr "Ação de Lançamento"
+msgstr "Ação a ser Executada"
 
 #. module: base
 #: help:res.users,context_lang:0
@@ -14445,7 +14448,7 @@ msgstr "Zaire"
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
-msgstr "ID do recurso"
+msgstr "ID do Recurso"
 
 #. module: base
 #: view:ir.cron:0
@@ -14518,12 +14521,12 @@ msgstr "Atividades"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product
 msgid "Products & Pricelists"
-msgstr "Produtos & Preços"
+msgstr "Produtos & Lista de Preços"
 
 #. module: base
 #: field:ir.actions.act_window,auto_refresh:0
 msgid "Auto-Refresh"
-msgstr "Auto-atualizar"
+msgstr "Atualização Automática"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:74
@@ -14601,7 +14604,7 @@ msgstr "Ações"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_delivery
 msgid "Delivery Costs"
-msgstr "Custos de entrega"
+msgstr "Custos de Entrega"
 
 #. module: base
 #: code:addons/base/ir/ir_cron.py:293
@@ -14722,7 +14725,7 @@ msgstr "A atividade destino."
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_check_writing
 msgid "Check writing"
-msgstr "Verificação escrita"
+msgstr "Verificar gravação"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_layout
@@ -14754,7 +14757,7 @@ msgstr "Guia técnico"
 #. module: base
 #: view:res.company:0
 msgid "Address Information"
-msgstr "Informações de endereço"
+msgstr "Informações de Endereço"
 
 #. module: base
 #: model:res.country,name:base.tz
@@ -14789,7 +14792,7 @@ msgstr "Outras ações de configuração"
 #. module: base
 #: selection:ir.module.module.dependency,state:0
 msgid "Uninstallable"
-msgstr "Não instalado"
+msgstr "Não Instalável"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_dashboard
@@ -14805,7 +14808,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Supplier Partners"
-msgstr "Parceiros do fornecedor"
+msgstr "Parceiros Fornecedores"
 
 #. module: base
 #: view:res.config.installer:0
@@ -14844,12 +14847,12 @@ msgstr "Conferência de EAN"
 #. module: base
 #: view:res.partner:0
 msgid "Customer Partners"
-msgstr "Clientes parceiros"
+msgstr "Parceiros Clientes"
 
 #. module: base
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr "Você não pode ter dois usuários com o mesmo login !"
+msgstr "Você não pode ter dois usuários com o mesmo login!"
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_history
@@ -14859,7 +14862,7 @@ msgstr "res.request.history"
 #. module: base
 #: model:ir.model,name:base.model_multi_company_default
 msgid "Default multi company"
-msgstr "Multi-empresa por padrão"
+msgstr "Multi Empresa Padrão"
 
 #. module: base
 #: view:res.request:0
@@ -15161,7 +15164,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_designer
 msgid "Report Designer"
-msgstr "Editor de relatório"
+msgstr "Editor de Relatório"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_address_book
@@ -15198,7 +15201,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_lead
 msgid "Leads & Opportunities"
-msgstr "Indicações & Oportunidades"
+msgstr "Prospectos & Oportunidades"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -15393,7 +15396,7 @@ msgstr ""
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "View :"
-msgstr "View :"
+msgstr "Visão:"
 
 #. module: base
 #: field:ir.model.fields,view_load:0
@@ -15500,7 +15503,7 @@ msgstr ""
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr "O nome do país deve ser único !"
+msgstr "O nome do país deve ser único!"
 
 #. module: base
 #: field:base.language.export,name:0
@@ -15657,7 +15660,7 @@ msgstr "ir.model.data"
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Publisher Warranty Contract"
-msgstr "Contrato de Garantia do Distribuidor"
+msgstr "Contrato de Garantia do Editor"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -15711,7 +15714,7 @@ msgstr "Jamaica"
 #: field:res.partner,color:0
 #: field:res.partner.address,color:0
 msgid "Color Index"
-msgstr "Índice de cores"
+msgstr "Índice de Cores"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_category_form
@@ -15911,7 +15914,7 @@ msgstr ""
 #. module: base
 #: view:ir.sequence:0
 msgid "Day of the week (0:Monday): %(weekday)s"
-msgstr "Dia da Semana(0:Domingo): %(weekday)s"
+msgstr "Dia da semana (0:Segunda):  %(weekday)s"
 
 #. module: base
 #: model:res.country,name:base.ck
@@ -16041,7 +16044,7 @@ msgstr ""
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Change Color"
-msgstr "Alterar cor"
+msgstr "Alterar Cor"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
@@ -16051,7 +16054,7 @@ msgstr "Setor de TI"
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "Select Groups"
-msgstr "Selecionar grupos"
+msgstr "Selecionar Grupos"
 
 #. module: base
 #: view:res.lang:0
@@ -16096,7 +16099,7 @@ msgstr "Renomeie uma coluna de cada vez!"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Wizard Button"
-msgstr "Butão do assistente"
+msgstr "Botão do Assistente"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -16158,7 +16161,7 @@ msgstr "Contabilidade - Canadense"
 #: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
 #: model:ir.ui.menu,name:base.next_id_11
 msgid "Configuration Wizards"
-msgstr "Assistentes de configuração"
+msgstr "Assistentes de Configuração"
 
 #. module: base
 #: field:res.lang,code:0
@@ -16310,7 +16313,7 @@ msgstr "Serra Leoa"
 #: view:res.company:0
 #: view:res.partner:0
 msgid "General Information"
-msgstr "Informação Básica"
+msgstr "Informações Gerais"
 
 #. module: base
 #: model:res.country,name:base.tc
@@ -16434,7 +16437,7 @@ msgstr "Contexto"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_mrp
 msgid "Sales and MRP Management"
-msgstr "Vendas e Gestão de MRP"
+msgstr "Gestão de Vendas e MRP"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_sms_send

From f1f23c52ea1601b7588a91497ba46e5b826719b7 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 12 Sep 2012 04:36:34 +0000
Subject: [PATCH 999/999] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120912043634-3kvok93tuqtsfez5
---
 .../i18n/pt_BR.po                             | 385 ++++++++++++++++++
 addons/account_check_writing/i18n/es_EC.po    | 207 ++++++++++
 2 files changed, 592 insertions(+)
 create mode 100644 addons/account_bank_statement_extensions/i18n/pt_BR.po
 create mode 100644 addons/account_check_writing/i18n/es_EC.po

diff --git a/addons/account_bank_statement_extensions/i18n/pt_BR.po b/addons/account_bank_statement_extensions/i18n/pt_BR.po
new file mode 100644
index 00000000000..ade94336f2a
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/pt_BR.po
@@ -0,0 +1,385 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-09-11 18:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@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: 2012-09-12 04:36+0000\n"
+"X-Generator: Launchpad (build 15930)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Procurar Transações Bancárias"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "ID Global"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "Código da Conta-pai"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Débito"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "Cancelar linhas de instrução selecionadas"
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "A RIB e/ ou IBAN não é válido."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Agrupar Por..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr "Situação"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Provisório"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Demonstrativo"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "Confirme as linhas do demonstrativo selecionadas"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Relatório de Balanço Bancário"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Cancelar Linhas"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Informações de Pagamento em Lote"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Confirmar Linhas"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr ""
+"Não é permitido excluir! Vá a linha do demonstrativo bancário associada para "
+"excluir ou modificar esta linha do demonstrativo"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Diário"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Linhas do Demonstrativo Confirmadas."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Transações de Crédito"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "cancelar linhas do demonstrativo selecionadas."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Número da Contrapartida"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Transações"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Saldo final"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Data"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "Valor Global"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Transações de Débito."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Filtros Extendidos..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Linhas confirmadas não podem ser alteradas."
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Por favor defina o BIC/Swift code no Banco para o tipo de conta IBAN para "
+"fazer pagamentos válidos"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr "Confirmar as linhas do demonstrativo."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+"Você tem certeza de que deseja cancelar as Linhas de Demonstrativo Bancário "
+"selecionadas?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Crédito"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Valor"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Fin.Account"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Moeda da Contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "BIC da Contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Códigos derivados (sub-contas)"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+"Você deseja confirmar as Linhas do Demonstrativo Bancário selecionadas?"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+"O valor do recibo deve ser o mesmo valor da linha equivalente no extrato"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+"Código para identificar transações que pertencem ao nível de globalização "
+"dentro de um mesmo lote de pagamento"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Linhas de Demonstrativo Provisórias."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Linha do Demonstrativo Bancário"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Nome da Contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr "Comunicação"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Contas Bancárias"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "O diário e o período escolhido tem que pertencer à mesma empresa."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extrato Bancário"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "Linha do Demonstrativo"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "O código precisa ser único!"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Linhas do Demonstrativo Bancário"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Lote de Pagamentos Filho"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Linhas do Demonstrativo"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Valor Total"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "ID Globalização"
diff --git a/addons/account_check_writing/i18n/es_EC.po b/addons/account_check_writing/i18n/es_EC.po
new file mode 100644
index 00000000000..7543458097f
--- /dev/null
+++ b/addons/account_check_writing/i18n/es_EC.po
@@ -0,0 +1,207 @@
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-09-12 01:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@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: 2012-09-12 04:36+0000\n"
+"X-Generator: Launchpad (build 15930)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "Cheque on Top"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+"El pago de cheques permite rastrear el pago a sus proveedores. Cuando "
+"selecciona un proveedor, el método de pago y monto, OpenERP propondrá "
+"conciliarlo con tu factura, y podrá imprimir el cheque."
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr "Imprimir Cheque"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Cheque in middle"
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Cheque on bottom"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Error! No puede crear compañías recursivas."
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr "Activar si este diario es usado para emitir cheques"
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Permitir emisión de cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr "Escribir Cheque"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr "Descuento"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr "Monto Inicial"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Permitir Emisión de Cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Pagos"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Usar cheque preimpreso"
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "¡El nombre de la compañía debe ser único!"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr "Fecha de vencimiento"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Compañias"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Error de Configuración! La moneda seleccionada debe ser compartida por las "
+"cuentas por defecto tambíen"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "Saldo Deudor"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr "Monto Cheque"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Comprobantes de Pago"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "El nombre del diaro debe ser único por compañía !"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "El código del diario debe ser único por compañía !"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "Monto en Letras"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Saldo Inicial"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr "Elegir diseño de cheque"
+
+#~ msgid "Default Check layout"
+#~ msgstr "Diseño de cheque por defecto"